summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/webkit-gtk2/Makefile12
-rw-r--r--www/webkit-gtk2/files/patch-GNUmakefile.in20
-rw-r--r--www/webkit-gtk2/pkg-plist68
3 files changed, 27 insertions, 73 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 52b560069..c6ac5caa4 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,11 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/webkit-gtk2/Makefile,v 1.86 2012/05/22 12:53:13 kwm Exp $
+# $MCom: ports/www/webkit-gtk2/Makefile,v 1.87 2012/05/22 17:09:57 kwm Exp $
#
PORTNAME= webkit
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= -gtk2
@@ -52,19 +53,20 @@ MAKEFILE= GNUmakefile
BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
#_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
-OPTIONS= WEBGL "Enable webGL support (experimental)" off \
- DEBUG "Build with debug support" off
+OPTIONS_DEFINE= WEBGL DEBUG
+OPTIONS_DEFAULT=WEBGL
+WEBGL_DESC= Enable Web GL support
.include <bsd.port.pre.mk>
-.if defined(WITH_WEBGL)
+.if ${PORT_OPTIONS:MWEBGL}
USE_GL= gl
CONFIGURE_ARGS+=--enable-webgl
.else
CONFIGURE_ARGS+=--disable-webgl
.endif
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
.else
CONFIGURE_ARGS+=--disable-debug
diff --git a/www/webkit-gtk2/files/patch-GNUmakefile.in b/www/webkit-gtk2/files/patch-GNUmakefile.in
new file mode 100644
index 000000000..6a03d0216
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-GNUmakefile.in
@@ -0,0 +1,20 @@
+--- GNUmakefile.in.orig 2012-07-13 11:41:16.000000000 +0200
++++ GNUmakefile.in 2012-07-13 11:46:05.000000000 +0200
+@@ -73545,7 +73545,7 @@
+
+ info-am:
+
+-install-data-am: install-audioDATA install-data-local \
++install-data-am: install-audioDATA po-install-data-local \
+ install-dist_audioDATA install-dist_resourcesDATA \
+ install-dist_webinspectorDATA \
+ install-dist_webinspectorimagesDATA \
+@@ -74192,7 +74192,7 @@
+ echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+ exit 1
+
+-po-install-data-local: all
++po-install-data-local:
+ $(mkdir_p) $(DESTDIR)$(datadir)
+ @catalogs='$(MOFILES)'; \
+ for cat in $$catalogs; do \
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index a68743b46..93dfa03ce 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -286,73 +286,6 @@ libdata/pkgconfig/javascriptcoregtk-1.0.pc
libdata/pkgconfig/webkit-1.0.pc
share/gir-1.0/JSCore-1.0.gir
share/gir-1.0/WebKit-1.0.gir
-share/gtk-doc/html/webkitgtk/WebKitFaviconDatabase.html
-share/gtk-doc/html/webkitgtk/WebKitGeolocationPolicyDecision.html
-share/gtk-doc/html/webkitgtk/WebKitHitTestResult.html
-share/gtk-doc/html/webkitgtk/WebKitIconDatabase.html
-share/gtk-doc/html/webkitgtk/WebKitNetworkRequest.html
-share/gtk-doc/html/webkitgtk/WebKitNetworkResponse.html
-share/gtk-doc/html/webkitgtk/WebKitSecurityOrigin.html
-share/gtk-doc/html/webkitgtk/WebKitSoupAuthDialog.html
-share/gtk-doc/html/webkitgtk/WebKitSpellChecker.html
-share/gtk-doc/html/webkitgtk/WebKitViewportAttributes.html
-share/gtk-doc/html/webkitgtk/WebKitWebBackForwardList.html
-share/gtk-doc/html/webkitgtk/WebKitWebDataSource.html
-share/gtk-doc/html/webkitgtk/WebKitWebDatabase.html
-share/gtk-doc/html/webkitgtk/WebKitWebFrame.html
-share/gtk-doc/html/webkitgtk/WebKitWebHistoryItem.html
-share/gtk-doc/html/webkitgtk/WebKitWebInspector.html
-share/gtk-doc/html/webkitgtk/WebKitWebNavigationAction.html
-share/gtk-doc/html/webkitgtk/WebKitWebPlugin.html
-share/gtk-doc/html/webkitgtk/WebKitWebPluginDatabase.html
-share/gtk-doc/html/webkitgtk/WebKitWebPolicyDecision.html
-share/gtk-doc/html/webkitgtk/WebKitWebResource.html
-share/gtk-doc/html/webkitgtk/WebKitWebSettings.html
-share/gtk-doc/html/webkitgtk/WebKitWebWindowFeatures.html
-share/gtk-doc/html/webkitgtk/annotation-glossary.html
-share/gtk-doc/html/webkitgtk/ch01.html
-share/gtk-doc/html/webkitgtk/ch02.html
-share/gtk-doc/html/webkitgtk/ch03.html
-share/gtk-doc/html/webkitgtk/home.png
-share/gtk-doc/html/webkitgtk/index-1.0.1.html
-share/gtk-doc/html/webkitgtk/index-1.0.2.html
-share/gtk-doc/html/webkitgtk/index-1.0.3.html
-share/gtk-doc/html/webkitgtk/index-1.1.1.html
-share/gtk-doc/html/webkitgtk/index-1.1.10.html
-share/gtk-doc/html/webkitgtk/index-1.1.11.html
-share/gtk-doc/html/webkitgtk/index-1.1.13.html
-share/gtk-doc/html/webkitgtk/index-1.1.14.html
-share/gtk-doc/html/webkitgtk/index-1.1.15.html
-share/gtk-doc/html/webkitgtk/index-1.1.16.html
-share/gtk-doc/html/webkitgtk/index-1.1.17.html
-share/gtk-doc/html/webkitgtk/index-1.1.18.html
-share/gtk-doc/html/webkitgtk/index-1.1.2.html
-share/gtk-doc/html/webkitgtk/index-1.1.20.html
-share/gtk-doc/html/webkitgtk/index-1.1.23.html
-share/gtk-doc/html/webkitgtk/index-1.1.3.html
-share/gtk-doc/html/webkitgtk/index-1.1.4.html
-share/gtk-doc/html/webkitgtk/index-1.1.5.html
-share/gtk-doc/html/webkitgtk/index-1.1.6.html
-share/gtk-doc/html/webkitgtk/index-1.1.7.html
-share/gtk-doc/html/webkitgtk/index-1.1.8.html
-share/gtk-doc/html/webkitgtk/index-1.3.1.html
-share/gtk-doc/html/webkitgtk/index-1.3.2.html
-share/gtk-doc/html/webkitgtk/index-1.3.3.html
-share/gtk-doc/html/webkitgtk/index-1.3.4.html
-share/gtk-doc/html/webkitgtk/index-1.3.8.html
-share/gtk-doc/html/webkitgtk/index-all.html
-share/gtk-doc/html/webkitgtk/index-deprecated.html
-share/gtk-doc/html/webkitgtk/index.html
-share/gtk-doc/html/webkitgtk/index.sgml
-share/gtk-doc/html/webkitgtk/left.png
-share/gtk-doc/html/webkitgtk/right.png
-share/gtk-doc/html/webkitgtk/style.css
-share/gtk-doc/html/webkitgtk/up.png
-share/gtk-doc/html/webkitgtk/webkit-environment.html
-share/gtk-doc/html/webkitgtk/webkitgtk-Global-functions.html
-share/gtk-doc/html/webkitgtk/webkitgtk-webkitdownload.html
-share/gtk-doc/html/webkitgtk/webkitgtk-webkitwebview.html
-share/gtk-doc/html/webkitgtk/webkitgtk.devhelp2
share/locale/ar/LC_MESSAGES/webkit-2.0.mo
share/locale/bg/LC_MESSAGES/webkit-2.0.mo
share/locale/cs/LC_MESSAGES/webkit-2.0.mo
@@ -740,7 +673,6 @@ share/webkitgtk-1.0/webinspector/utilities.js
@dirrm share/webkitgtk-1.0/resources
@dirrm share/webkitgtk-1.0/images
@dirrm share/webkitgtk-1.0
-@dirrm share/gtk-doc/html/webkitgtk
@dirrm include/webkitgtk-1.0/webkit2/WebKit2
@dirrm include/webkitgtk-1.0/webkit2
@dirrm include/webkitgtk-1.0/webkit