Update to 0.9.6.

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

8 files changed, 25 insertions, 103 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index d948da12d..d277cf1cd 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Alexander Logvinov <avl@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.18 2010/09/11 15:03:03 kwm Exp $
+#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.19 2010/09/16 00:51:41 avl Exp $
 #
 
 PORTNAME=	gobject-introspection
-PORTVERSION=	0.9.5
-PORTREVISION=	2
+PORTVERSION=	0.9.6
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -23,7 +22,7 @@ LIB_DEPENDS=	ffi.5:${PORTSDIR}/devel/libffi \
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20
+USE_GNOME=	gnomehack glib20 ltverhack
 USE_PYTHON=	yes
 USE_BISON=	both
 USE_GETTEXT=	yes
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index b5c99a8bb..5f4e99ccf 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gobject-introspection-0.9.5.tar.bz2) = 114684e42d69fdad9d9626dc97e79d7d
-SHA256 (gnome2/gobject-introspection-0.9.5.tar.bz2) = 93ea75860b468f1439a3735b3b132707afbb785867c00b1a5d7841697c4d5964
-SIZE (gnome2/gobject-introspection-0.9.5.tar.bz2) = 831012
+MD5 (gnome2/gobject-introspection-0.9.6.tar.bz2) = 756bf1b012b97d64821e6d892d527173
+SHA256 (gnome2/gobject-introspection-0.9.6.tar.bz2) = e653258394b44a7fc4cdac604c72948c3eff7f1b882f094cfea21ed19acb9ee6
+SIZE (gnome2/gobject-introspection-0.9.6.tar.bz2) = 585940
diff --git a/devel/gobject-introspection/files/patch-gir_Makefile.in b/devel/gobject-introspection/files/patch-gir_Makefile.in
index 72abb184a..12f312e47 100644
--- a/devel/gobject-introspection/files/patch-gir_Makefile.in
+++ b/devel/gobject-introspection/files/patch-gir_Makefile.in
@@ -1,6 +1,6 @@
---- gir/Makefile.in.orig	2010-09-11 12:46:28.000000000 +0000
-+++ gir/Makefile.in	2010-09-11 12:46:53.000000000 +0000
-@@ -393,13 +393,12 @@ GLib_2_0_gir_SCANNERFLAGS = \
+--- gir/Makefile.in.orig	2010-09-18 21:40:00.000000000 +0000
++++ gir/Makefile.in	2010-09-18 21:40:00.000000000 +0000
+@@ -393,13 +393,12 @@
  GLib_2_0_gir_PACKAGES = glib-2.0
  GLib_2_0_gir_CFLAGS = \
              -I$(GLIB_INCLUDEDIR) \
diff --git a/devel/gobject-introspection/files/patch-giscanner_scannermain.py b/devel/gobject-introspection/files/patch-giscanner_scannermain.py
deleted file mode 100644
index 6a2d6b0c4..000000000
--- a/devel/gobject-introspection/files/patch-giscanner_scannermain.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- giscanner/scannermain.py.orig	2010-09-11 16:30:31.000000000 +0000
-+++ giscanner/scannermain.py	2010-09-11 16:32:10.000000000 +0000
-@@ -246,8 +246,9 @@ def scanner_main(args):
-     libraries = options.libraries
- 
-     if options.strip_prefix:
--        _error("""Option --strip-prefix has been replaced;
--see --identifier-prefix and --symbol-prefix.""")
-+        print """g-ir-scanner: warning: Option --strip-prefix has been deprecated;
-+see --identifier-prefix and --symbol-prefix."""
-+        options.identifier_prefixes.append(options.strip_prefix)
- 
-     filenames = []
-     for arg in args:
diff --git a/devel/gobject-introspection/files/patch-giscanner_transformer.py b/devel/gobject-introspection/files/patch-giscanner_transformer.py
deleted file mode 100644
index ccd30f79e..000000000
--- a/devel/gobject-introspection/files/patch-giscanner_transformer.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- giscanner/transformer.py.orig
-+++ giscanner/transformer.py
-@@ -80,6 +80,10 @@ class Transformer(object):
- 
-     def parse(self, symbols):
-         for symbol in symbols:
-+            ## WORKAROUND ##
-+            # https://bugzilla.gnome.org/show_bug.cgi?id=550616
-+            if symbol.ident in ['gst_g_error_get_type']:
-+                continue
-             node = self._traverse_one(symbol)
-             if node:
-                 self._append_new_node(node)
diff --git a/devel/gobject-introspection/files/patch-tests_Makefile.in b/devel/gobject-introspection/files/patch-tests_Makefile.in
index 74966e82b..a96e8a48d 100644
--- a/devel/gobject-introspection/files/patch-tests_Makefile.in
+++ b/devel/gobject-introspection/files/patch-tests_Makefile.in
@@ -1,12 +1,18 @@
---- tests/Makefile.in.orig	2010-09-11 12:39:37.000000000 +0000
-+++ tests/Makefile.in	2010-09-11 12:39:59.000000000 +0000
-@@ -805,7 +805,8 @@
+--- tests/Makefile.in.orig	2010-09-21 16:31:48.000000000 +0000
++++ tests/Makefile.in	2010-09-21 16:33:10.000000000 +0000
+@@ -819,6 +819,7 @@
+ 	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
+ 	--namespace=Everything --nsversion=1.0 \
+ 	--add-include-path=$(top_builddir)/gir --include=Gio-2.0 \
++	--libtool="$(LIBTOOL)" \
+ 	--library=libeverything-1.0.la --output=$@ \
+ 	everything.h everything.c
  
- install-data-local:
- 	for src in everything.c everything.h gimarshallingtests.c gimarshallingtests.h; do \
--	  install -m 644 -D $$src $(DESTDIR)$(datadir)/gobject-introspection-1.0/tests/$$src; \
-+	  install -m 644 -d $(DESTDIR)$(datadir)/gobject-introspection-1.0/tests/; \
-+	  install -m 644 $$src $(DESTDIR)$(datadir)/gobject-introspection-1.0/tests/$$src; \
- 	done
+@@ -826,6 +827,7 @@
+ 	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
+ 	--namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 \
+ 	--add-include-path=$(top_builddir)/gir --include=Gio-2.0 \
++	--libtool="$(LIBTOOL)" \
+ 	--library=libgimarshallingtests-1.0.la  --output=$@ \
+ 	$(srcdir)/gimarshallingtests.h $(srcdir)/gimarshallingtests.c
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/devel/gobject-introspection/files/patch-tests_scanner_Makefile.in b/devel/gobject-introspection/files/patch-tests_scanner_Makefile.in
deleted file mode 100644
index c307cae1e..000000000
--- a/devel/gobject-introspection/files/patch-tests_scanner_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- tests/scanner/Makefile.in.orig	2010-09-11 12:38:09.000000000 +0000
-+++ tests/scanner/Makefile.in	2010-09-11 12:38:40.000000000 +0000
-@@ -949,7 +949,8 @@
- 
- install-data-local:
- 	for src in $(libregress_la_SOURCES); do \
--	  install -m 644 -D $$src $(DESTDIR)$(datadir)/gobject-introspection-1.0/tests/$$src; \
-+	  install -m 644 -d $(DESTDIR)$(datadir)/gobject-introspection-1.0/tests/; \
-+	  install -m 644 $$src $(DESTDIR)$(datadir)/gobject-introspection-1.0/tests/$$src; \
- 	done
- 
- Regress-1.0.gir: $(top_builddir)/gir/Gio-2.0.gir libregress.la
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
index 97d247621..ac59bb270 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -130,47 +130,6 @@ share/gir-1.0/xfixes-4.0.gir
 share/gir-1.0/xft-2.0.gir
 share/gir-1.0/xlib-2.0.gir
 share/gir-1.0/xrandr-1.3.gir
-share/gtk-doc/html/gi/annotation-glossary.html
-share/gtk-doc/html/gi/gi-GIArgInfo.html
-share/gtk-doc/html/gi/gi-GIBaseInfo.html
-share/gtk-doc/html/gi/gi-GICallableInfo.html
-share/gtk-doc/html/gi/gi-GIConstantInfo.html
-share/gtk-doc/html/gi/gi-GIEnumInfo.html
-share/gtk-doc/html/gi/gi-GIErrorDomainInfo.html
-share/gtk-doc/html/gi/gi-GIFieldInfo.html
-share/gtk-doc/html/gi/gi-GIFunctionInfo.html
-share/gtk-doc/html/gi/gi-GIInterfaceInfo.html
-share/gtk-doc/html/gi/gi-GIObjectInfo.html
-share/gtk-doc/html/gi/gi-GIPropertyInfo.html
-share/gtk-doc/html/gi/gi-GIRegisteredTypeInfo.html
-share/gtk-doc/html/gi/gi-GISignalInfo.html
-share/gtk-doc/html/gi/gi-GIStructInfo.html
-share/gtk-doc/html/gi/gi-GITypeInfo.html
-share/gtk-doc/html/gi/gi-GIUnionInfo.html
-share/gtk-doc/html/gi/gi-GIVFuncInfo.html
-share/gtk-doc/html/gi/gi-ffi.html
-share/gtk-doc/html/gi/gi-gir-reference.html
-share/gtk-doc/html/gi/gi-gir.html
-share/gtk-doc/html/gi/gi-girepository.html
-share/gtk-doc/html/gi/gi-girffi.html
-share/gtk-doc/html/gi/gi-gtypelib.html
-share/gtk-doc/html/gi/gi-libgirepository.html
-share/gtk-doc/html/gi/gi-overview.html
-share/gtk-doc/html/gi/gi-repository-structs.html
-share/gtk-doc/html/gi/gi-struct-hierarchy.html
-share/gtk-doc/html/gi/gi-typelib.html
-share/gtk-doc/html/gi/gi.devhelp
-share/gtk-doc/html/gi/gi.devhelp2
-share/gtk-doc/html/gi/girepository.html
-share/gtk-doc/html/gi/glib.html
-share/gtk-doc/html/gi/home.png
-share/gtk-doc/html/gi/index.html
-share/gtk-doc/html/gi/index.sgml
-share/gtk-doc/html/gi/left.png
-share/gtk-doc/html/gi/overview.png
-share/gtk-doc/html/gi/right.png
-share/gtk-doc/html/gi/style.css
-share/gtk-doc/html/gi/up.png
 share/gobject-introspection-1.0/Makefile.introspection
 share/gobject-introspection-1.0/tests/everything.c
 share/gobject-introspection-1.0/tests/everything.h
@@ -180,9 +139,6 @@ share/gobject-introspection-1.0/tests/regress.c
 share/gobject-introspection-1.0/tests/regress.h
 @dirrm share/gobject-introspection-1.0/tests
 @dirrm share/gobject-introspection-1.0
-@dirrm share/gtk-doc/html/gi
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
 @dirrmtry share/gir-1.0
 @dirrmtry lib/girepository-1.0
 @dirrm lib/gobject-introspection/giscanner