5 files changed, 71 insertions, 48 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 35312296c6e3..2015f253a605 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	gobject-introspection
-# Date created:				19 July 2009
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.39 2011/06/11 19:51:15 mezz Exp $
-#
+#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.51 2013/02/18 22:07:40 kwm Exp $
 
 PORTNAME=	gobject-introspection
-PORTVERSION=	0.10.8
-PORTREVISION=	3
+PORTVERSION=	1.34.2
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,12 +11,15 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Generate interface introspection data for GObject libraries
 
+# we need cairo otherwise the generated Cairo gir is broken
+BUILD_DEPENDS=	cairo-trace:${PORTSDIR}/graphics/cairo
 LIB_DEPENDS=	ffi:${PORTSDIR}/devel/libffi
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20 ltverhack
+USE_GNOME=	gnomehier gnomehack glib20 ltverhack
+USE_PKGCONFIG=	build
 USE_PYTHON=	-2.7
 USE_BISON=	build
 USE_GETTEXT=	yes
@@ -37,15 +35,4 @@ MAKE_ENV=	HOME=${WRKDIR}
 
 MAN1=		g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1
 
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|'cc'|'${CC:Q:C/[[:space:]]+/', '/g}'|g" \
-		${WRKSRC}/giscanner/sourcescanner.py
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "arm"
-BROKEN=		Does not compile on arm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index c1537f1494e8..c8a30b46dd2f 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gobject-introspection-0.10.8.tar.bz2) = 5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e
-SIZE (gnome3/gobject-introspection-0.10.8.tar.bz2) = 1024874
+SHA256 (gnome3/gobject-introspection-1.34.2.tar.xz) = bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429
+SIZE (gnome3/gobject-introspection-1.34.2.tar.xz) = 1088768
diff --git a/devel/gobject-introspection/files/patch-Makefile.in b/devel/gobject-introspection/files/patch-Makefile.in
index fea86b08b627..d35bf348b2d8 100644
--- a/devel/gobject-introspection/files/patch-Makefile.in
+++ b/devel/gobject-introspection/files/patch-Makefile.in
@@ -1,18 +1,16 @@
---- Makefile.in.orig	2010-12-24 00:50:07.000000000 +0100
-+++ Makefile.in	2010-12-24 00:51:39.000000000 +0100
-@@ -864,13 +864,13 @@
+--- Makefile.in.orig	2012-10-02 11:01:03.000000000 +0000
++++ Makefile.in	2012-10-02 11:02:59.000000000 +0000
+@@ -973,12 +973,11 @@
  GLib_2_0_gir_PACKAGES = glib-2.0
  GLib_2_0_gir_CFLAGS = \
              -I$(GLIB_INCLUDEDIR) \
 -            -I$(GLIB_LIBDIR)/glib-2.0/include \
-+            -I$(GLIB_INCLUDEDIR)/.. \
              -DGETTEXT_PACKAGE=Dummy \
              -DGLIB_COMPILATION \
              -D__G_I18N_LIB_H__
  
- GLib_2_0_gir_FILES = \
--                $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
-+                $(GLIB_INCLUDEDIR)/glibconfig.h \
+-GLib_2_0_gir_FILES = $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
++GLib_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/glibconfig.h \
  	$(GLIB_INCLUDEDIR)/glib/*.h \
-                 gir/glib-2.0.c
- 
+ 	$(GLIB_INCLUDEDIR)/gobject/glib-types.h gir/glib-2.0.c \
+ 	$(am__append_4)
diff --git a/devel/gobject-introspection/files/patch-configure b/devel/gobject-introspection/files/patch-configure
index 7fbbcde68d78..d2838d890f5e 100644
--- a/devel/gobject-introspection/files/patch-configure
+++ b/devel/gobject-introspection/files/patch-configure
@@ -1,11 +1,29 @@
---- configure.orig	2011-05-02 17:19:45.000000000 -0500
-+++ configure	2011-05-02 17:19:58.000000000 -0500
-@@ -15983,7 +15983,7 @@
+--- configure.orig	2011-09-23 11:49:54.000000000 +0200
++++ configure	2011-09-23 11:50:31.000000000 +0200
+@@ -14400,10 +14400,10 @@
  $as_echo_n "checking for headers required to compile python extensions... " >&6; }
  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
--PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-+PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags`
- if test "$py_prefix" != "$py_exec_prefix"; then
-   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+-if test "x$PYTHON_INCLUDES" == x; then
+-  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
++if test "x$PYTHON_INCLUDES" = x; then
++  PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags`
+   if test "$py_prefix" != "$py_exec_prefix"; then
+-    PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++    PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags`
+   fi
  fi
+ 
+@@ -14429,10 +14429,10 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to link against libpython" >&5
+ $as_echo_n "checking for libraries required to link against libpython... " >&6; }
+-if test "x$PYTHON_LIBS" == x; then
++if test "x$PYTHON_LIBS" = x; then
+ 	PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
+ fi
+-if test "x$PYTHON_LIB_LOC" == x; then
++if test "x$PYTHON_LIB_LOC" = x; then
+ 	PYTHON_LIB_LOC="${py_prefix}/lib"
+ fi
+ 
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
index c39c55aa80c4..2d400ec2ebe0 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -7,7 +7,6 @@ include/gobject-introspection-1.0/gibaseinfo.h
 include/gobject-introspection-1.0/gicallableinfo.h
 include/gobject-introspection-1.0/giconstantinfo.h
 include/gobject-introspection-1.0/gienuminfo.h
-include/gobject-introspection-1.0/gierrordomaininfo.h
 include/gobject-introspection-1.0/gifieldinfo.h
 include/gobject-introspection-1.0/gifunctioninfo.h
 include/gobject-introspection-1.0/giinterfaceinfo.h
@@ -51,6 +50,9 @@ lib/gobject-introspection/giscanner/annotationmain.pyo
 lib/gobject-introspection/giscanner/annotationparser.py
 lib/gobject-introspection/giscanner/annotationparser.pyc
 lib/gobject-introspection/giscanner/annotationparser.pyo
+lib/gobject-introspection/giscanner/annotationpatterns.py
+lib/gobject-introspection/giscanner/annotationpatterns.pyc
+lib/gobject-introspection/giscanner/annotationpatterns.pyo
 lib/gobject-introspection/giscanner/ast.py
 lib/gobject-introspection/giscanner/ast.pyc
 lib/gobject-introspection/giscanner/ast.pyo
@@ -60,9 +62,9 @@ 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/docmain.py
+lib/gobject-introspection/giscanner/docmain.pyc
+lib/gobject-introspection/giscanner/docmain.pyo
 lib/gobject-introspection/giscanner/dumper.py
 lib/gobject-introspection/giscanner/dumper.pyc
 lib/gobject-introspection/giscanner/dumper.pyo
@@ -84,6 +86,27 @@ lib/gobject-introspection/giscanner/libtoolimporter.pyo
 lib/gobject-introspection/giscanner/maintransformer.py
 lib/gobject-introspection/giscanner/maintransformer.pyc
 lib/gobject-introspection/giscanner/maintransformer.pyo
+lib/gobject-introspection/giscanner/mallard-C-class.tmpl
+lib/gobject-introspection/giscanner/mallard-C-default.tmpl
+lib/gobject-introspection/giscanner/mallard-C-enum.tmpl
+lib/gobject-introspection/giscanner/mallard-C-function.tmpl
+lib/gobject-introspection/giscanner/mallard-C-namespace.tmpl
+lib/gobject-introspection/giscanner/mallard-C-property.tmpl
+lib/gobject-introspection/giscanner/mallard-C-record.tmpl
+lib/gobject-introspection/giscanner/mallard-C-signal.tmpl
+lib/gobject-introspection/giscanner/mallard-C-vfunc.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-class.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-default.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-enum.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-function.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-namespace.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-property.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-record.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-signal.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-vfunc.tmpl
+lib/gobject-introspection/giscanner/mallardwriter.py
+lib/gobject-introspection/giscanner/mallardwriter.pyc
+lib/gobject-introspection/giscanner/mallardwriter.pyo
 lib/gobject-introspection/giscanner/message.py
 lib/gobject-introspection/giscanner/message.pyc
 lib/gobject-introspection/giscanner/message.pyo
@@ -148,7 +171,6 @@ 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
@@ -161,6 +183,7 @@ 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-gierrordomaininfo.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
@@ -171,7 +194,6 @@ 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
@@ -188,8 +210,6 @@ share/gtk-doc/html/gi/up.png
 @dirrmtry share/gtk-doc
 @dirrm share/gobject-introspection-1.0/tests
 @dirrm share/gobject-introspection-1.0
-@dirrmtry share/gir-1.0
-@dirrmtry lib/girepository-1.0
 @dirrm lib/gobject-introspection/giscanner
 @dirrm lib/gobject-introspection
 @dirrm include/gobject-introspection-1.0