Fix some plist screw-ups, and pay for them by fixing gstreamer and webkit

support.


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

3 files changed, 69 insertions, 41 deletions

diff --git a/devel/gir-repository/Makefile b/devel/gir-repository/Makefile
index db42119b8..c48589096 100644
--- a/devel/gir-repository/Makefile
+++ b/devel/gir-repository/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gir-repository/Makefile,v 1.1 2009/08/16 21:51:47 kwm Exp $
+#   $MCom: ports/devel/gir-repository/Makefile,v 1.2 2009/08/29 23:12:13 marcus Exp $
 #
 
 PORTNAME=	gir-repository
 PORTVERSION=	0.6.4
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,7 +22,8 @@ LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		avahi-gobject.0:${PORTSDIR}/net/avahi-app \
 		goocanvas.3:${PORTSDIR}/graphics/goocanvas \
 		poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \
-		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
+		webkit-1.0.11:${PORTSDIR}/www/webkit-gtk2
 
 USE_BZIP2=	yes
 USE_GSTREAMER=	yes
@@ -33,11 +35,4 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22
 
-post-patch:
-# Make configure not detect Webkit or gstreamer it doesn't build.
-	@${REINPLACE_CMD} -e 's|have_webkit=true|have_webkit=false|g' \
-		-e 's|have_gstreamer_plugins_base=true|have_gstreamer_plugins_base=false|g' \
-		-e 's|have_gstreamer=true|have_gstreamer=false|g' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/devel/gir-repository/files/patch-gir_Makefile.in b/devel/gir-repository/files/patch-gir_Makefile.in
new file mode 100644
index 000000000..ca1d8626b
--- /dev/null
+++ b/devel/gir-repository/files/patch-gir_Makefile.in
@@ -0,0 +1,31 @@
+--- gir/Makefile.in.orig	2009-08-29 19:46:15.000000000 -0400
++++ gir/Makefile.in	2009-08-29 19:52:38.000000000 -0400
+@@ -413,7 +413,7 @@ libgirepo_DBus_custom_la_SOURCES = \
+ 
+ @BUILD_GCONF_TRUE@GCONF_INCLUDEDIR = `pkg-config --variable=includedir gconf-2.0`/gconf/2
+ @BUILD_SOUP_TRUE@SOUP_INCLUDEDIR = `pkg-config --variable=includedir libsoup-2.4`/libsoup-2.4
+-@BUILD_SOUP_TRUE@SOUP_HDRS = $(shell echo $(SOUP_INCLUDEDIR)/libsoup/*.h | sed -re 's,[^ \t]+/soup-(gnome[a-z-]*|cookie-jar-sqlite)\.h[ \t]?,,g')
++@BUILD_SOUP_TRUE@SOUP_HDRS = $(shell echo $(SOUP_INCLUDEDIR)/libsoup/*.h | sed -Ee 's,[^ \t]+/soup-(gnome[a-z-]*|cookie-jar-sqlite)\.h[ \t]?,,g')
+ @BUILD_GNOMEKEYRING_TRUE@GNOMEKEYRING_INCLUDEDIR = `pkg-config --variable=includedir gnome-keyring-1`/gnome-keyring-1
+ 
+ # pango
+@@ -1384,16 +1384,16 @@ uninstall-am: uninstall-dist_girDATA uni
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --output $@ \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	     $(GSTFFT_INCLUDEDIR)/gst/fft/*h
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@GstInterfaces-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
+-@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstInterfaces --nsversion=0.10 \
++@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	$(DEBUG) csh -c "$(INTROSPECTION_SCANNER) -v --namespace GstInterfaces --nsversion=0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	    --add-include-path=$(srcdir) --add-include-path=. \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --include=Gst-0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	     --library=gstinterfaces-0.10 \
+-@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	     --libtool="$(LIBTOOL)" \
++@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	     --libtool=\"$(LIBTOOL)\" \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --pkg gobject-2.0 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --pkg gstreamer-0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --pkg gstreamer-interfaces-0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --output $@ \
+-@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	     $(GSTINTERFACES_INCLUDEDIR)/gst/interfaces/{colorbalance,colorbalancechannel,interfaces-enumtypes,mixer,mixeroptions,mixertrack,navigation,propertyprobe,tuner,tunerchannel,tunernorm,videoorientation,xoverlay}*h
++@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	     $(GSTINTERFACES_INCLUDEDIR)/gst/interfaces/{colorbalance,colorbalancechannel,interfaces-enumtypes,mixer,mixeroptions,mixertrack,navigation,propertyprobe,tuner,tunerchannel,tunernorm,videoorientation,xoverlay}*h"
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@GstNetbuffer-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstNetbuffer --nsversion=0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	    --add-include-path=$(srcdir) --add-include-path=. \
diff --git a/devel/gir-repository/pkg-plist b/devel/gir-repository/pkg-plist
index 2e1751f22..d629f35d7 100644
--- a/devel/gir-repository/pkg-plist
+++ b/devel/gir-repository/pkg-plist
@@ -3,23 +3,30 @@ lib/girepository-1.0/Avahi-0.6.typelib
 lib/girepository-1.0/AvahiCore-0.6.typelib
 lib/girepository-1.0/Babl-0.0.typelib
 lib/girepository-1.0/DBus-1.0.typelib
-lib/girepository-1.0/Everything-1.0.typelib
 lib/girepository-1.0/GConf-2.0.typelib
 lib/girepository-1.0/Gdk-2.0.typelib
 lib/girepository-1.0/GdkPixbuf-2.0.typelib
-lib/girepository-1.0/GIRepository-2.0.typelib
-lib/girepository-1.0/GL-1.0.typelib
-lib/girepository-1.0/GLib-2.0.typelib
 lib/girepository-1.0/GMenu-2.0.typelib
-lib/girepository-1.0/GModule-2.0.typelib
-lib/girepository-1.0/GObject-2.0.typelib
-lib/girepository-1.0/Gio-2.0.typelib
 lib/girepository-1.0/GnomeKeyring-2.0.typelib
 lib/girepository-1.0/GooCanvas-0.10.typelib
+lib/girepository-1.0/Gst-0.10.typelib
+lib/girepository-1.0/GstAudio-0.10.typelib
+lib/girepository-1.0/GstBase-0.10.typelib
+lib/girepository-1.0/GstController-0.10.typelib
+lib/girepository-1.0/GstFft-0.10.typelib
+lib/girepository-1.0/GstInterfaces-0.10.typelib
+lib/girepository-1.0/GstNet-0.10.typelib
+lib/girepository-1.0/GstNetbuffer-0.10.typelib
+lib/girepository-1.0/GstPbutils-0.10.typelib
+lib/girepository-1.0/GstRiff-0.10.typelib
+lib/girepository-1.0/GstRtp-0.10.typelib
+lib/girepository-1.0/GstRtsp-0.10.typelib
+lib/girepository-1.0/GstSdp-0.10.typelib
+lib/girepository-1.0/GstTag-0.10.typelib
+lib/girepository-1.0/GstVideo-0.10.typelib
 lib/girepository-1.0/Gtk-2.0.typelib
-lib/girepository-1.0/GtkClutter-0.10.typelib
 lib/girepository-1.0/GtkSource-2.2.typelib
-lib/girepository-1.0/Json-1.0.typelib
+lib/girepository-1.0/JSCore-1.0.typelib
 lib/girepository-1.0/Nautilus-1.0.typelib
 lib/girepository-1.0/Notify-0.4.typelib
 lib/girepository-1.0/Pango-1.0.typelib
@@ -31,14 +38,8 @@ lib/girepository-1.0/Poppler-0.8.typelib
 lib/girepository-1.0/Soup-2.4.typelib
 lib/girepository-1.0/Unique-1.0.typelib
 lib/girepository-1.0/Vte-1.0.typelib
+lib/girepository-1.0/WebKit-1.0.typelib
 lib/girepository-1.0/Wnck-1.0.typelib
-lib/girepository-1.0/cairo-1.0.typelib
-lib/girepository-1.0/fontconfig-2.0.typelib
-lib/girepository-1.0/freetype2-2.0.typelib
-lib/girepository-1.0/libxml2-2.0.typelib
-lib/girepository-1.0/xfixes-4.0.typelib
-lib/girepository-1.0/xft-2.0.typelib
-lib/girepository-1.0/xlib-2.0.typelib
 lib/libgirepo-DBus-custom.a
 lib/libgirepo-DBus-custom.la
 lib/libgirepo-DBus-custom.so
@@ -53,21 +54,30 @@ share/gir-1.0/Avahi-0.6.gir
 share/gir-1.0/AvahiCore-0.6.gir
 share/gir-1.0/Babl-0.0.gir
 share/gir-1.0/DBus-1.0.gir
-share/gir-1.0/Everything-1.0.gir
 share/gir-1.0/GConf-2.0.gir
-share/gir-1.0/GIRepository-2.0.gir
-share/gir-1.0/GL-1.0.gir
-share/gir-1.0/GLib-2.0.gir
 share/gir-1.0/GMenu-2.0.gir
-share/gir-1.0/GModule-2.0.gir
-share/gir-1.0/GObject-2.0.gir
-share/gir-1.0/Gio-2.0.gir
 share/gir-1.0/GnomeKeyring-2.0.gir
 share/gir-1.0/GooCanvas-0.10.gir
 share/gir-1.0/Gdk-2.0.gir
 share/gir-1.0/GdkPixbuf-2.0.gir
+share/gir-1.0/Gst-0.10.gir
+share/gir-1.0/GstAudio-0.10.gir
+share/gir-1.0/GstBase-0.10.gir
+share/gir-1.0/GstController-0.10.gir
+share/gir-1.0/GstFft-0.10.gir
+share/gir-1.0/GstInterfaces-0.10.gir
+share/gir-1.0/GstNet-0.10.gir
+share/gir-1.0/GstNetbuffer-0.10.gir
+share/gir-1.0/GstPbutils-0.10.gir
+share/gir-1.0/GstRiff-0.10.gir
+share/gir-1.0/GstRtp-0.10.gir
+share/gir-1.0/GstRtsp-0.10.gir
+share/gir-1.0/GstSdp-0.10.gir
+share/gir-1.0/GstTag-0.10.gir
+share/gir-1.0/GstVideo-0.10.gir
 share/gir-1.0/Gtk-2.0.gir
 share/gir-1.0/GtkSource-2.2.gir
+share/gir-1.0/JSCore-1.0.gir
 share/gir-1.0/Nautilus-1.0.gir
 share/gir-1.0/Notify-0.4.gir
 share/gir-1.0/Pango-1.0.gir
@@ -79,13 +89,5 @@ share/gir-1.0/Poppler-0.8.gir
 share/gir-1.0/Soup-2.4.gir
 share/gir-1.0/Unique-1.0.gir
 share/gir-1.0/Vte-1.0.gir
+share/gir-1.0/WebKit-1.0.gir
 share/gir-1.0/Wnck-1.0.gir
-share/gir-1.0/cairo-1.0.gir
-share/gir-1.0/fontconfig-2.0.gir
-share/gir-1.0/freetype2-2.0.gir
-share/gir-1.0/libxml2-2.0.gir
-share/gir-1.0/xfixes-4.0.gir
-share/gir-1.0/xft-2.0.gir
-share/gir-1.0/xlib-2.0.gir
-@dirrm lib/girepository-1.0
-@dirrm share/gir-1.0