Bump portrevsion, the gir files need to be regened to pick up new

api's from glib20 otherwise gtk30 will fail with a unable to resolve error in the
gir bits.


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

6 files changed, 245 insertions, 0 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
new file mode 100644
index 000000000..a4a1a9784
--- /dev/null
+++ b/devel/gobject-introspection/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for:	gobject-introspection
+# Date created:				19 July 2009
+# Whom:					Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD: ports/devel/gobject-introspection/Makefile,v 1.10 2010/06/06 20:09:32 marcus Exp $
+#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.8 2010/04/22 15:11:23 kwm Exp $
+#
+
+PORTNAME=	gobject-introspection
+PORTVERSION=	0.6.14
+PORTREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Generate interface introspection data for GObject libraries
+
+BUILD_DEPENDS=	flex:${PORTSDIR}/textproc/flex
+LIB_DEPENDS=	ffi.5:${PORTSDIR}/devel/libffi \
+		cairo.2:${PORTSDIR}/graphics/cairo
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack glib20
+USE_PYTHON=	yes
+USE_BISON=	both
+USE_GETTEXT=	yes
+USE_AUTOTOOLS=	libtool:22
+USE_LDCONFIG=	yes
+MAKE_JOBS_UNSAFE=yes
+
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+MAN1=		g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|'cc'|'${CC:Q}'|g' \
+		${WRKSRC}/giscanner/sourcescanner.py
+
+.include <bsd.port.post.mk>
+
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
new file mode 100644
index 000000000..cce161879
--- /dev/null
+++ b/devel/gobject-introspection/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gobject-introspection-0.6.14.tar.bz2) = 7ea9be9a347b5c408fd3c3907803de9b
+SHA256 (gnome2/gobject-introspection-0.6.14.tar.bz2) = c4713bcbcebb06861738a8f630ab05289666e631f42f7abbf2e836978db7eba6
+SIZE (gnome2/gobject-introspection-0.6.14.tar.bz2) = 763182
diff --git a/devel/gobject-introspection/files/patch-gir_Makefile.in b/devel/gobject-introspection/files/patch-gir_Makefile.in
new file mode 100644
index 000000000..f56e9f69b
--- /dev/null
+++ b/devel/gobject-introspection/files/patch-gir_Makefile.in
@@ -0,0 +1,18 @@
+--- 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 
+ GLib_2_0_gir_PACKAGES = glib-2.0
+ GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \
+             -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 \
+ 	$(GLIB_INCLUDEDIR)/glib/*.h \
+                 glib-2.0.c
+ 
diff --git a/devel/gobject-introspection/files/patch-girepository_ginfo.c b/devel/gobject-introspection/files/patch-girepository_ginfo.c
new file mode 100644
index 000000000..794bf443c
--- /dev/null
+++ b/devel/gobject-introspection/files/patch-girepository_ginfo.c
@@ -0,0 +1,46 @@
+--- girepository/ginfo.c.orig	2010-06-01 15:48:36.000000000 -0400
++++ girepository/ginfo.c	2010-06-06 16:02:36.000000000 -0400
+@@ -2110,6 +2110,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))
++
+ gint
+ g_constant_info_get_value (GIConstantInfo *info,
+ 			   GArgument      *value)
+@@ -2148,16 +2151,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;
+ 	    case GI_TYPE_TAG_TIME_T:
+ 	      value->v_long = *(long*)&rinfo->typelib->data[blob->offset];
+@@ -2175,10 +2178,10 @@ g_constant_info_get_value (GIConstantInf
+ 	      value->v_uint = *(guint*)&rinfo->typelib->data[blob->offset];
+ 	      break;
+ 	    case GI_TYPE_TAG_LONG:
+-	      value->v_long = *(glong*)&rinfo->typelib->data[blob->offset];
++	      DO_ALIGNED_COPY(&value->v_long, &rinfo->typelib->data[blob->offset], glong);
+ 	      break;
+ 	    case GI_TYPE_TAG_ULONG:
+-	      value->v_ulong = *(gulong*)&rinfo->typelib->data[blob->offset];
++	      DO_ALIGNED_COPY(&value->v_ulong, &rinfo->typelib->data[blob->offset], gulong);
+ 	      break;
+ 	    }
+ 	}
diff --git a/devel/gobject-introspection/pkg-descr b/devel/gobject-introspection/pkg-descr
new file mode 100644
index 000000000..9416d171f
--- /dev/null
+++ b/devel/gobject-introspection/pkg-descr
@@ -0,0 +1,9 @@
+GObject Introspection is a project for providing machine readable introspection
+data of the API of C libraries. This introspection data can be used in several
+different use cases, for example automatic code generation for bindings, API
+verification and documentation generation.
+
+GObject Introspection contains tools to generate and handle the introspection
+data.
+
+WWW: http://live.gnome.org/GObjectIntrospection
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
new file mode 100644
index 000000000..7588b6839
--- /dev/null
+++ b/devel/gobject-introspection/pkg-plist
@@ -0,0 +1,123 @@
+bin/g-ir-compiler
+bin/g-ir-generate
+bin/g-ir-scanner
+include/gobject-introspection-1.0/gibaseinfo.h
+include/gobject-introspection-1.0/gifunctioninfo.h
+include/gobject-introspection-1.0/girepository.h
+include/gobject-introspection-1.0/girffi.h
+include/gobject-introspection-1.0/gitypelib.h
+include/gobject-introspection-1.0/gitypes.h
+lib/girepository-1.0/Everything-1.0.typelib
+lib/girepository-1.0/GIMarshallingTests-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
+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/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/girepository-1.0/xrandr-1.3.typelib
+lib/gobject-introspection/giscanner/__init__.py
+lib/gobject-introspection/giscanner/__init__.pyc
+lib/gobject-introspection/giscanner/__init__.pyo
+lib/gobject-introspection/giscanner/_giscanner.a
+lib/gobject-introspection/giscanner/_giscanner.la
+lib/gobject-introspection/giscanner/_giscanner.so
+lib/gobject-introspection/giscanner/annotationparser.py
+lib/gobject-introspection/giscanner/annotationparser.pyc
+lib/gobject-introspection/giscanner/annotationparser.pyo
+lib/gobject-introspection/giscanner/ast.py
+lib/gobject-introspection/giscanner/ast.pyc
+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/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/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/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/odict.py
+lib/gobject-introspection/giscanner/odict.pyc
+lib/gobject-introspection/giscanner/odict.pyo
+lib/gobject-introspection/giscanner/scannermain.py
+lib/gobject-introspection/giscanner/scannermain.pyc
+lib/gobject-introspection/giscanner/scannermain.pyo
+lib/gobject-introspection/giscanner/shlibs.py
+lib/gobject-introspection/giscanner/shlibs.pyc
+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/transformer.py
+lib/gobject-introspection/giscanner/transformer.pyc
+lib/gobject-introspection/giscanner/transformer.pyo
+lib/gobject-introspection/giscanner/utils.py
+lib/gobject-introspection/giscanner/utils.pyc
+lib/gobject-introspection/giscanner/utils.pyo
+lib/gobject-introspection/giscanner/xmlwriter.py
+lib/gobject-introspection/giscanner/xmlwriter.pyc
+lib/gobject-introspection/giscanner/xmlwriter.pyo
+lib/libgirepository-1.0.a
+lib/libgirepository-1.0.la
+lib/libgirepository-1.0.so
+lib/libgirepository-1.0.so.0
+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/GIRepository-2.0.gir
+share/gir-1.0/GL-1.0.gir
+share/gir-1.0/GLib-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/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
+share/gir-1.0/xrandr-1.3.gir
+share/gobject-introspection-1.0/Makefile.introspection
+@dirrm share/gobject-introspection-1.0
+@dirrm include/gobject-introspection-1.0
+@dirrmtry lib/girepository-1.0
+@dirrm lib/gobject-introspection/giscanner
+@dirrm lib/gobject-introspection
+@dirrmtry share/gir-1.0