Update to 2.4.2.

Use for all option except WITH_WEBKIT2 (which is quite complex) new
options handlers.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19637 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 14 insertions, 31 deletions

diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 5e60bfda1..a18c3d20c 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	webkit
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk3
@@ -39,6 +39,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_DOLT_BASH=""
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--with-gtk=3.0 \
 		--enable-svg-fonts \
 		--enable-geolocation \
@@ -75,30 +76,14 @@ WEBGL_DESC=	Enable Web GL support
 DEBUG_DESC=	Just enable debug symbols
 FULLDEBUG_DESC=	Enable asserts and other debug support
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MWEBGL}
-USE_GL=		gl
-CONFIGURE_ARGS+=--enable-webgl
-.else
-CONFIGURE_ARGS+=--disable-webgl
-.endif
-
-.if ${PORT_OPTIONS:MWEBAUDIO}
-CONFIGURE_ARGS+=--enable-web-audio
-.else
-CONFIGURE_ARGS+=--disable-web-audio
-.endif
-
-.if ${PORT_OPTIONS:MFULLDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.else
-CONFIGURE_ARGS+=--disable-debug
-.endif
+WEBGL_CONFIGURE_ENABLE=	webgl
+WEBGL_USE=	GL=gl
+WEBAUDIO_CONFIGURE_ENABLE=	web-audio
+FULLDEBUG_CONFIGURE_ENABLE=	debug
+DEBUG_CONFIGURE_ON=	--enable-debug-symbols=yes
+DEBUG_CONFIGURE_OFF=	--disable-debug-symbols
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug-symbols=yes
-.endif
+.include <bsd.port.options.mk>
 
 # gtest to use <tr1/tuple,> while libc++ only has <tuple>
 CPPFLAGS+=	-DGTEST_USE_OWN_TR1_TUPLE
@@ -166,7 +151,5 @@ post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Programs/MiniBrowser \
 		${STAGEDIR}${PREFIX}/bin/
 .endif
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
 
 .include <bsd.port.post.mk>
diff --git a/www/webkit-gtk3/distinfo b/www/webkit-gtk3/distinfo
index a1cf18056..43491720b 100644
--- a/www/webkit-gtk3/distinfo
+++ b/www/webkit-gtk3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (webkitgtk-2.4.1.tar.xz) = 6eed5d41ecdcfbafe3c2fbb0f0b79b9cda87a5ea0e7d0938afb6c6c82996e2f7
-SIZE (webkitgtk-2.4.1.tar.xz) = 9836352
+SHA256 (webkitgtk-2.4.2.tar.xz) = cac8385c3b8a956793eb6b67712c23297a39e5f8b429523f32bbdcdf9c21d00a
+SIZE (webkitgtk-2.4.2.tar.xz) = 9837440
diff --git a/www/webkit-gtk3/pkg-plist b/www/webkit-gtk3/pkg-plist
index 46d4af39c..d82a58fa5 100644
--- a/www/webkit-gtk3/pkg-plist
+++ b/www/webkit-gtk3/pkg-plist
@@ -259,15 +259,15 @@ lib/girepository-1.0/WebKit-3.0.typelib
 lib/libjavascriptcoregtk-3.0.la
 lib/libjavascriptcoregtk-3.0.so
 lib/libjavascriptcoregtk-3.0.so.0
-lib/libjavascriptcoregtk-3.0.so.0.16.9
+lib/libjavascriptcoregtk-3.0.so.0.16.10
 %%WEBKIT2%%lib/libwebkit2gtk-3.0.la
 %%WEBKIT2%%lib/libwebkit2gtk-3.0.so
 %%WEBKIT2%%lib/libwebkit2gtk-3.0.so.25
-%%WEBKIT2%%lib/libwebkit2gtk-3.0.so.25.10.4
+%%WEBKIT2%%lib/libwebkit2gtk-3.0.so.25.10.5
 lib/libwebkitgtk-3.0.la
 lib/libwebkitgtk-3.0.so
 lib/libwebkitgtk-3.0.so.0
-lib/libwebkitgtk-3.0.so.0.22.7
+lib/libwebkitgtk-3.0.so.0.22.8
 %%WEBKIT2%%lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.la
 %%WEBKIT2%%lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
 libdata/pkgconfig/javascriptcoregtk-3.0.pc