Switch from RUN_DEPEND on gobject-introspection to USE_GNOME=introspection:build

Use new LIB_DEPEND syntax, enable stage support.
Don't hardcode -lstdc++ to fix build on HEAD.

4 files changed, 39 insertions, 21 deletions

diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 6528da0cad3c..316864018275 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -14,12 +14,11 @@ COMMENT=	An opensource browser engine
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc \
-		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
-		icutu:${PORTSDIR}/devel/icu \
-		curl:${PORTSDIR}/ftp/curl \
-		soup-2.4:${PORTSDIR}/devel/libsoup
+		gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc
+LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
+		libicutu.so:${PORTSDIR}/devel/icu \
+		libcurl.so:${PORTSDIR}/ftp/curl \
+		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
 USE_XZ=		yes
 USE_PYTHON_BUILD=	yes
@@ -27,7 +26,7 @@ USE_GSTREAMER=	yes
 USE_XORG=	xt
 USES=		bison gmake pkgconfig gettext perl5
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gtk20 libxslt ltverhack
+USE_GNOME=	gtk20 introspection:build libxslt ltverhack
 USE_SQLITE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -50,7 +49,6 @@ OPTIONS_DEFINE=	WEBGL DEBUG
 OPTIONS_DEFAULT=WEBGL
 WEBGL_DESC=	Enable Web GL support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWEBGL}
diff --git a/www/webkit-gtk2/files/patch-GNUmakefile.in b/www/webkit-gtk2/files/patch-GNUmakefile.in
index 95497d8f840d..6071daaeaaf8 100644
--- a/www/webkit-gtk2/files/patch-GNUmakefile.in
+++ b/www/webkit-gtk2/files/patch-GNUmakefile.in
@@ -1,6 +1,16 @@
---- GNUmakefile.in.orig	2013-03-21 23:46:15.000000000 -0500
-+++ GNUmakefile.in	2013-03-21 23:49:07.000000000 -0500
-@@ -70033,7 +70033,7 @@
+--- GNUmakefile.in.orig	2013-10-03 09:22:02.000000000 +0000
++++ GNUmakefile.in	2013-10-03 09:23:50.000000000 +0000
+@@ -19060,8 +19060,7 @@
+ 	libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ 	$(WINMM_LIBS) \
+ 	-lm \
+-	-lpthread \
+-	-lstdc++
++	-lpthread
+ 
+ Programs_minidom_LDFLAGS = \
+ 	-no-install \
+@@ -70033,7 +70032,7 @@
  
  info-am:
  
@@ -9,7 +19,7 @@
  	install-dist_audioDATA install-dist_resourcesDATA \
  	install-dist_webinspectorDATA \
  	install-dist_webinspectorimagesDATA \
-@@ -70388,7 +70388,7 @@
+@@ -70388,7 +70387,7 @@
  @ENABLE_INTROSPECTION_TRUE@	     --pkg=gobject-2.0 \
  @ENABLE_INTROSPECTION_TRUE@	     --pkg=gtk+-@GTK_API_VERSION@ \
  @ENABLE_INTROSPECTION_TRUE@	     --pkg=libsoup-2.4 \
@@ -18,7 +28,7 @@
  @ENABLE_INTROSPECTION_TRUE@	     --output=$@ \
  @ENABLE_INTROSPECTION_TRUE@	     --add-include-path=$(WebKit) \
  @ENABLE_INTROSPECTION_TRUE@	     --add-include-path=$(top_builddir) \
-@@ -70680,7 +70680,7 @@
+@@ -70680,7 +70679,7 @@
  	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
  	exit 1
  
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 122f8ca9f799..ccae8cc7db18 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -14,19 +14,18 @@ COMMENT=	An opensource browser engine
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc \
-		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
-		icutu:${PORTSDIR}/devel/icu \
-		curl:${PORTSDIR}/ftp/curl \
-		soup-2.4:${PORTSDIR}/devel/libsoup
+		gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc
+LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
+		libicutu.so:${PORTSDIR}/devel/icu \
+		libcurl.so:${PORTSDIR}/ftp/curl \
+		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
 USE_XZ=		yes
 USE_GSTREAMER=	yes
 USE_XORG=	xt
 USES=		bison gmake pkgconfig gettext perl5
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gtk30 libxslt ltverhack
+USE_GNOME=	gtk30 introspection:build libxslt ltverhack
 USE_SQLITE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -49,7 +48,6 @@ OPTIONS_DEFINE=	WEBGL DEBUG
 OPTIONS_DEFAULT=WEBGL
 WEBGL_DESC=	Enable Web GL support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWEBGL}
diff --git a/www/webkit-gtk3/files/patch-GNUmakefile.in b/www/webkit-gtk3/files/patch-GNUmakefile.in
new file mode 100644
index 000000000000..05a3a314c784
--- /dev/null
+++ b/www/webkit-gtk3/files/patch-GNUmakefile.in
@@ -0,0 +1,12 @@
+--- GNUmakefile.in.orig	2013-10-03 09:22:02.000000000 +0000
++++ GNUmakefile.in	2013-10-03 09:23:50.000000000 +0000
+@@ -19060,8 +19060,7 @@
+ 	libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ 	$(WINMM_LIBS) \
+ 	-lm \
+-	-lpthread \
+-	-lstdc++
++	-lpthread
+ 
+ Programs_minidom_LDFLAGS = \
+ 	-no-install \