diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/webkit-gtk2/Makefile | 16 | ||||
| -rw-r--r-- | www/webkit-gtk2/distinfo | 4 | ||||
| -rw-r--r-- | www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit.pc.in | 10 | ||||
| -rw-r--r-- | www/webkit-gtk3/Makefile | 13 | ||||
| -rw-r--r-- | www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit.pc.in | 10 |
5 files changed, 16 insertions, 37 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 5a896f394..093072809 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk2/Makefile,v 1.83 2011/10/14 18:21:52 kwm Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.84 2011/11/30 14:08:50 kwm Exp $ # PORTNAME= webkit -PORTVERSION= 1.6.1 -PORTREVISION= 2 +PORTVERSION= 1.6.3 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/ PKGNAMESUFFIX= -gtk2 @@ -25,6 +24,7 @@ LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ soup-2.4.1:${PORTSDIR}/devel/libsoup +USE_XZ= yes USE_GETTEXT= yes USE_GSTREAMER= yes MAKE_JOBS_SAFE= yes @@ -36,15 +36,13 @@ USE_GNOME= gtk20 libxslt ltverhack USE_PERL5= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= ZLIB_CFLAGS="-I/usr/include" \ +CONFIGURE_ENV= ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \ + ZLIB_CFLAGS="-I/usr/include" \ ZLIB_LIBS="-L/usr/lib -lz" \ - ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \ ac_cv_path_DOLT_BASH="" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --enable-icon-database \ - --with-gtk=2.0 \ - --enable-svg \ +CONFIGURE_ARGS= --with-gtk=2.0 \ --enable-svg-fonts \ --enable-introspection MAKEFILE= GNUmakefile @@ -59,7 +57,7 @@ OPTIONS= WEBGL "Enable webGL support (experimental)" off \ .include <bsd.port.pre.mk> .if defined(WITH_WEBGL) -USE_GSTREAMER+= yes +USE_GL= gl CONFIGURE_ARGS+=--enable-webgl .else CONFIGURE_ARGS+=--disable-webgl diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo index 19abb919c..54ed1be1e 100644 --- a/www/webkit-gtk2/distinfo +++ b/www/webkit-gtk2/distinfo @@ -1,2 +1,2 @@ -SHA256 (webkit-1.6.1.tar.gz) = 05b09d851a04597d50fdca71ed8b09f5a0337d696b141a435255ae2095e140ad -SIZE (webkit-1.6.1.tar.gz) = 10129874 +SHA256 (webkit-1.6.3.tar.xz) = 12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3 +SIZE (webkit-1.6.3.tar.xz) = 6794004 diff --git a/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit.pc.in b/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit.pc.in deleted file mode 100644 index eaa546d10..000000000 --- a/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit.pc.in +++ /dev/null @@ -1,10 +0,0 @@ ---- Source/WebKit/gtk/webkit.pc.in.orig 2011-11-30 14:16:35.000000000 +0100 -+++ Source/WebKit/gtk/webkit.pc.in 2011-11-30 14:20:00.000000000 +0100 -@@ -6,6 +6,6 @@ - Name: WebKit - Description: Web content engine for GTK+ - Version: @VERSION@ --Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 -+Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@ - Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@ - Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@ diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile index f4051b9ad..3f1c0a0d3 100644 --- a/www/webkit-gtk3/Makefile +++ b/www/webkit-gtk3/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk3/Makefile,v 1.23 2011/10/14 18:21:53 kwm Exp $ +# $MCom: ports/www/webkit-gtk3/Makefile,v 1.24 2011/11/30 14:08:50 kwm Exp $ # PORTNAME= webkit -PORTVERSION= 1.6.1 -PORTREVISION= 2 +PORTVERSION= 1.6.3 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/ PKGNAMESUFFIX= -gtk3 @@ -25,6 +24,7 @@ LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ soup-2.4.1:${PORTSDIR}/devel/libsoup +USE_XZ= yes USE_GETTEXT= yes USE_GSTREAMER= yes MAKE_JOBS_SAFE= yes @@ -36,13 +36,14 @@ USE_GNOME= gtk30 libxslt ltverhack USE_PERL5= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ +CONFIGURE_ENV= ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \ ZLIB_CFLAGS="-I/usr/include" \ ZLIB_LIBS="-L/usr/lib -lz" \ - ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \ ac_cv_path_DOLT_BASH="" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gtk=3.0 \ + --enable-svg-fonts \ --enable-introspection MAKEFILE= GNUmakefile GLIB_SCHEMAS= org.webkitgtk-3.0.gschema.xml diff --git a/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit.pc.in b/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit.pc.in deleted file mode 100644 index eaa546d10..000000000 --- a/www/webkit-gtk3/files/patch-Source_WebKit_gtk_webkit.pc.in +++ /dev/null @@ -1,10 +0,0 @@ ---- Source/WebKit/gtk/webkit.pc.in.orig 2011-11-30 14:16:35.000000000 +0100 -+++ Source/WebKit/gtk/webkit.pc.in 2011-11-30 14:20:00.000000000 +0100 -@@ -6,6 +6,6 @@ - Name: WebKit - Description: Web content engine for GTK+ - Version: @VERSION@ --Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 -+Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@ - Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@ - Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@ |