Update to 0.9.5.

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

7 files changed, 109 insertions, 68 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index b08b1bf30..3249f8d3d 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.15 2010/08/06 03:21:51 avl Exp $
+#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.16 2010/09/06 17:21:21 marcus Exp $
 #
 
 PORTNAME=	gobject-introspection
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	0.9.5
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index 64bf8ecd0..b5c99a8bb 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gobject-introspection-0.9.3.tar.bz2) = f79a70e9461416ad630d34c8a35c7fe0
-SHA256 (gnome2/gobject-introspection-0.9.3.tar.bz2) = 662bdd2bf70239fa579777f58bfd0bbb08c6f9b6313020a9b672505d7e3c1c1d
-SIZE (gnome2/gobject-introspection-0.9.3.tar.bz2) = 780411
+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
diff --git a/devel/gobject-introspection/files/patch-gir_Makefile.in b/devel/gobject-introspection/files/patch-gir_Makefile.in
index f56e9f69b..72abb184a 100644
--- a/devel/gobject-introspection/files/patch-gir_Makefile.in
+++ b/devel/gobject-introspection/files/patch-gir_Makefile.in
@@ -1,15 +1,14 @@
---- gir/Makefile.in.orig	2010-06-06 15:58:29.000000000 -0400
-+++ gir/Makefile.in	2010-06-06 15:59:15.000000000 -0400
-@@ -436,14 +436,13 @@ GLib_2_0_gir_SCANNERFLAGS = --noclosure 
+--- 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 = \
  GLib_2_0_gir_PACKAGES = glib-2.0
- GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \
+ GLib_2_0_gir_CFLAGS = \
              -I$(GLIB_INCLUDEDIR) \
 -            -I$(GLIB_LIBDIR)/glib-2.0/include \
              -DGETTEXT_PACKAGE=Dummy \
              -DGLIB_COMPILATION \
              -D__G_I18N_LIB_H__
  
- GLib_2_0_gir_ASSERTIONS = GLib-2.0.xpath
  GLib_2_0_gir_FILES = \
 -                $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
 +                $(GLIB_INCLUDEDIR)/glibconfig.h \
diff --git a/devel/gobject-introspection/files/patch-girepository_giconstantinfo.c b/devel/gobject-introspection/files/patch-girepository_giconstantinfo.c
deleted file mode 100644
index ab531acde..000000000
--- a/devel/gobject-introspection/files/patch-girepository_giconstantinfo.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- girepository/giconstantinfo.c.orig	2010-09-06 13:15:38.000000000 -0400
-+++ girepository/giconstantinfo.c	2010-09-06 13:17:33.000000000 -0400
-@@ -64,6 +64,9 @@ g_constant_info_get_type (GIConstantInfo
-   return _g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 8);
- }
- 
-+#define DO_ALIGNED_COPY(dest_addr, src_addr, type) \
-+        memcpy((dest_addr), (src_addr), sizeof(type))
-+
- /**
-  * g_constant_info_get_value:
-  * @info: a #GIConstantInfo
-@@ -118,16 +121,16 @@ g_constant_info_get_value (GIConstantInf
- 	      value->v_uint32 = *(guint32*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_INT64:
--	      value->v_int64 = *(gint64*)&rinfo->typelib->data[blob->offset];
-+	      DO_ALIGNED_COPY(&value->v_int64, &rinfo->typelib->data[blob->offset], gint64);
- 	      break;
- 	    case GI_TYPE_TAG_UINT64:
--	      value->v_uint64 = *(guint64*)&rinfo->typelib->data[blob->offset];
-+	      DO_ALIGNED_COPY(&value->v_uint64, &rinfo->typelib->data[blob->offset], guint64);
- 	      break;
- 	    case GI_TYPE_TAG_FLOAT:
--	      value->v_float = *(gfloat*)&rinfo->typelib->data[blob->offset];
-+	      DO_ALIGNED_COPY(&value->v_float, &rinfo->typelib->data[blob->offset], gfloat);
- 	      break;
- 	    case GI_TYPE_TAG_DOUBLE:
--	      value->v_double = *(gdouble*)&rinfo->typelib->data[blob->offset];
-+	      DO_ALIGNED_COPY(&value->v_double, &rinfo->typelib->data[blob->offset], gdouble);
- 	      break;
- 	    }
- 	}
diff --git a/devel/gobject-introspection/files/patch-tests_Makefile.in b/devel/gobject-introspection/files/patch-tests_Makefile.in
new file mode 100644
index 000000000..74966e82b
--- /dev/null
+++ b/devel/gobject-introspection/files/patch-tests_Makefile.in
@@ -0,0 +1,12 @@
+--- 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 @@
+ 
+ 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
+ 
+ # 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
new file mode 100644
index 000000000..c307cae1e
--- /dev/null
+++ b/devel/gobject-introspection/files/patch-tests_scanner_Makefile.in
@@ -0,0 +1,12 @@
+--- 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 28a2d5b30..97d247621 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -22,8 +22,8 @@ include/gobject-introspection-1.0/gitypelib.h
 include/gobject-introspection-1.0/gitypes.h
 include/gobject-introspection-1.0/giunioninfo.h
 include/gobject-introspection-1.0/givfuncinfo.h
-lib/girepository-1.0/Everything-1.0.typelib
-lib/girepository-1.0/GIMarshallingTests-1.0.typelib
+lib/girepository-1.0/DBus-1.0.typelib
+lib/girepository-1.0/DBusGLib-1.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
@@ -53,30 +53,36 @@ lib/gobject-introspection/giscanner/ast.pyo
 lib/gobject-introspection/giscanner/cachestore.py
 lib/gobject-introspection/giscanner/cachestore.pyc
 lib/gobject-introspection/giscanner/cachestore.pyo
+lib/gobject-introspection/giscanner/codegen.py
+lib/gobject-introspection/giscanner/codegen.pyc
+lib/gobject-introspection/giscanner/codegen.pyo
 lib/gobject-introspection/giscanner/config.py
 lib/gobject-introspection/giscanner/config.pyc
 lib/gobject-introspection/giscanner/config.pyo
 lib/gobject-introspection/giscanner/dumper.py
 lib/gobject-introspection/giscanner/dumper.pyc
 lib/gobject-introspection/giscanner/dumper.pyo
+lib/gobject-introspection/giscanner/gdumpparser.py
+lib/gobject-introspection/giscanner/gdumpparser.pyc
+lib/gobject-introspection/giscanner/gdumpparser.pyo
 lib/gobject-introspection/giscanner/girparser.py
 lib/gobject-introspection/giscanner/girparser.pyc
 lib/gobject-introspection/giscanner/girparser.pyo
 lib/gobject-introspection/giscanner/girwriter.py
 lib/gobject-introspection/giscanner/girwriter.pyc
 lib/gobject-introspection/giscanner/girwriter.pyo
-lib/gobject-introspection/giscanner/glibast.py
-lib/gobject-introspection/giscanner/glibast.pyc
-lib/gobject-introspection/giscanner/glibast.pyo
-lib/gobject-introspection/giscanner/glibtransformer.py
-lib/gobject-introspection/giscanner/glibtransformer.pyc
-lib/gobject-introspection/giscanner/glibtransformer.pyo
+lib/gobject-introspection/giscanner/introspectablepass.py
+lib/gobject-introspection/giscanner/introspectablepass.pyc
+lib/gobject-introspection/giscanner/introspectablepass.pyo
 lib/gobject-introspection/giscanner/libtoolimporter.py
 lib/gobject-introspection/giscanner/libtoolimporter.pyc
 lib/gobject-introspection/giscanner/libtoolimporter.pyo
-lib/gobject-introspection/giscanner/minixpath.py
-lib/gobject-introspection/giscanner/minixpath.pyc
-lib/gobject-introspection/giscanner/minixpath.pyo
+lib/gobject-introspection/giscanner/maintransformer.py
+lib/gobject-introspection/giscanner/maintransformer.pyc
+lib/gobject-introspection/giscanner/maintransformer.pyo
+lib/gobject-introspection/giscanner/message.py
+lib/gobject-introspection/giscanner/message.pyc
+lib/gobject-introspection/giscanner/message.pyo
 lib/gobject-introspection/giscanner/odict.py
 lib/gobject-introspection/giscanner/odict.pyc
 lib/gobject-introspection/giscanner/odict.pyo
@@ -89,6 +95,9 @@ lib/gobject-introspection/giscanner/shlibs.pyo
 lib/gobject-introspection/giscanner/sourcescanner.py
 lib/gobject-introspection/giscanner/sourcescanner.pyc
 lib/gobject-introspection/giscanner/sourcescanner.pyo
+lib/gobject-introspection/giscanner/testcodegen.py
+lib/gobject-introspection/giscanner/testcodegen.pyc
+lib/gobject-introspection/giscanner/testcodegen.pyo
 lib/gobject-introspection/giscanner/transformer.py
 lib/gobject-introspection/giscanner/transformer.pyc
 lib/gobject-introspection/giscanner/transformer.pyo
@@ -102,19 +111,11 @@ lib/libgirepository-1.0.a
 lib/libgirepository-1.0.la
 lib/libgirepository-1.0.so
 lib/libgirepository-1.0.so.1
-lib/libgirepository-everything-1.0.a
-lib/libgirepository-everything-1.0.la
-lib/libgirepository-everything-1.0.so
-lib/libgirepository-everything-1.0.so.1
-lib/libgirepository-gimarshallingtests-1.0.a
-lib/libgirepository-gimarshallingtests-1.0.la
-lib/libgirepository-gimarshallingtests-1.0.so
-lib/libgirepository-gimarshallingtests-1.0.so.1
 libdata/pkgconfig/gobject-introspection-1.0.pc
 libdata/pkgconfig/gobject-introspection-no-export-1.0.pc
 share/aclocal/introspection.m4
-share/gir-1.0/Everything-1.0.gir
-share/gir-1.0/GIMarshallingTests-1.0.gir
+share/gir-1.0/DBus-1.0.gir
+share/gir-1.0/DBusGLib-1.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
@@ -129,10 +130,61 @@ 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
-@dirrm include/gobject-introspection-1.0
+share/gobject-introspection-1.0/tests/everything.c
+share/gobject-introspection-1.0/tests/everything.h
+share/gobject-introspection-1.0/tests/gimarshallingtests.c
+share/gobject-introspection-1.0/tests/gimarshallingtests.h
+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
 @dirrm lib/gobject-introspection
-@dirrm share/gobject-introspection-1.0
-@dirrmtry share/gir-1.0
+@dirrm include/gobject-introspection-1.0