The FreeBSD GNOME team presents a Glib and Gtk+ 3 update.

This update updates Glib20 to 2.36 and Gtk+ 3.8

* The gio-fam-backend port that used gamin for the GFileMonitor API is gone.
  It is replaced by a GIO kqueue implementation developed as part of a NetBSD
  GSoC 2011 project by Dimitry Matveev.
* Fix a bug in the glib20 Makefile so it includes -lintl in the glib-2.0
  pkgconfig file [1]. This broke static linking and newer binutils.
* Add introspection USE_GNOME component which sets GI_SCANNER_DISABLE_CACHE to
  prevent creation of /  root/.cache dir. Defaults to build & run depend,
  but :build and :run switches available.
* New x11-toolkits/pangox-compat port and companion USE_GNOME component for
  pangox support which was removed from the pango port. Add it to ports still
  using pangox API.

Exp-run by:	bapt@
PR:		ports/178958 [1]
Submitted by:	emaste@ [1]

6 files changed, 101 insertions, 97 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 7afebc768dbd..dbb26fab1638 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,9 +1,10 @@
 # Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.51 2013/02/18 22:07:40 kwm Exp $
+#   $MCom: ports/trunk/devel/gobject-introspection/Makefile 18634 2013-07-26 10:42:35Z kwm $
 
 PORTNAME=	gobject-introspection
-PORTVERSION=	1.34.2
+PORTVERSION=	1.36.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -13,12 +14,11 @@ 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.6:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	ffi:${PORTSDIR}/devel/libffi
 
-USES=		bison pathfix pkgconfig gettext
+USES=		bison gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehier glib20 ltverhack
 USE_PYTHON=	-2.7
 USE_AUTOTOOLS=	libtool
@@ -26,11 +26,14 @@ USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-tests
 
 # Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260
 MAKE_ENV=	HOME=${WRKDIR}
 
 MAN1=		g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|'gcc'|'cc'|g' \
+		${WRKSRC}/giscanner/dumper.py
+
 .include <bsd.port.mk>
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index c8a30b46dd2f..a72b0f501568 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gobject-introspection-1.34.2.tar.xz) = bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429
-SIZE (gnome3/gobject-introspection-1.34.2.tar.xz) = 1088768
+SHA256 (gnome3/gobject-introspection-1.36.0.tar.xz) = e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383
+SIZE (gnome3/gobject-introspection-1.36.0.tar.xz) = 1201108
diff --git a/devel/gobject-introspection/files/patch-configure b/devel/gobject-introspection/files/patch-configure
index d2838d890f5e..693f3a8534f3 100644
--- a/devel/gobject-introspection/files/patch-configure
+++ b/devel/gobject-introspection/files/patch-configure
@@ -1,29 +1,11 @@
---- 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"`
--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 @@
+--- configure.orig	2013-03-29 22:15:44.000000000 +0000
++++ configure	2013-03-29 22:18:30.000000000 +0000
+@@ -14623,7 +14623,7 @@
  
  { $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"
+ 	PYTHON_LIBS=`$PYTHON-config --ldflags --libs`
  fi
  
diff --git a/devel/gobject-introspection/files/patch-giscanner_dumper.py b/devel/gobject-introspection/files/patch-giscanner_dumper.py
new file mode 100644
index 000000000000..7307c617e314
--- /dev/null
+++ b/devel/gobject-introspection/files/patch-giscanner_dumper.py
@@ -0,0 +1,14 @@
+--- giscanner/dumper.py.orig	2013-02-23 11:40:08.000000000 +0100
++++ giscanner/dumper.py	2013-06-28 21:51:35.000000000 +0200
+@@ -89,8 +89,9 @@
+         # Enable the --msvc-syntax pkg-config flag when
+         # the Microsoft compiler is used
+         # (This is the other way to check whether Visual C++ is used subsequently)
+-        if 'cl' in self._compiler_cmd:
+-            self._pkgconfig_msvc_flags = '--msvc-syntax'
++        if 'clang' not in self._compiler_cmd:
++            if 'cl' in self._compiler_cmd:
++                self._pkgconfig_msvc_flags = '--msvc-syntax'
+         self._uninst_srcdir = os.environ.get(
+             'UNINSTALLED_INTROSPECTION_SRCDIR')
+         self._packages = ['gio-2.0 gmodule-2.0']
diff --git a/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py b/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py
new file mode 100644
index 000000000000..999fc742b2ff
--- /dev/null
+++ b/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py
@@ -0,0 +1,16 @@
+--- giscanner/sourcescanner.py.orig	2013-03-06 23:53:19.000000000 +0100
++++ giscanner/sourcescanner.py	2013-06-28 22:01:04.000000000 +0200
+@@ -281,8 +281,11 @@
+         # some help from gcc from MinGW/Cygwin or so.
+         # Note that the generated dumper program is
+         # still built and linked by Visual C++.
+-        if 'cl' in cpp_exec:
+-            cpp_args = 'gcc'.split()
++        if 'clang' not in cpp_exec:
++            if 'cl' in cpp_exec:
++                cpp_args = 'gcc'.split()
++            else:
++	        cpp_args = cpp_exec
+         else:
+             cpp_args = cpp_exec
+         cpp_args += ['-E', '-C', '-I.', '-']
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
index 2d400ec2ebe0..6493d359072e 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -50,9 +50,6 @@ 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
@@ -65,6 +62,45 @@ lib/gobject-introspection/giscanner/codegen.pyo
 lib/gobject-introspection/giscanner/docmain.py
 lib/gobject-introspection/giscanner/docmain.pyc
 lib/gobject-introspection/giscanner/docmain.pyo
+lib/gobject-introspection/giscanner/doctemplates/C/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/constructor.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/default.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/method.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/property.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/record.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/signal.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/vfunc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/constructor.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/default.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/method.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/property.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/record.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/signal.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/vfunc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/constructor.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/default.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/method.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/property.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/record.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/signal.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/vfunc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/base.tmpl
+lib/gobject-introspection/giscanner/doctemplates/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/namespace.tmpl
+lib/gobject-introspection/giscanner/docwriter.py
+lib/gobject-introspection/giscanner/docwriter.pyc
+lib/gobject-introspection/giscanner/docwriter.pyo
 lib/gobject-introspection/giscanner/dumper.py
 lib/gobject-introspection/giscanner/dumper.pyc
 lib/gobject-introspection/giscanner/dumper.pyo
@@ -86,27 +122,6 @@ 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
@@ -116,6 +131,9 @@ 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/sectionparser.py
+lib/gobject-introspection/giscanner/sectionparser.pyc
+lib/gobject-introspection/giscanner/sectionparser.pyo
 lib/gobject-introspection/giscanner/shlibs.py
 lib/gobject-introspection/giscanner/shlibs.pyc
 lib/gobject-introspection/giscanner/shlibs.pyo
@@ -159,57 +177,28 @@ share/gir-1.0/xlib-2.0.gir
 share/gir-1.0/xrandr-1.3.gir
 share/gobject-introspection-1.0/Makefile.introspection
 share/gobject-introspection-1.0/gdump.c
+share/gobject-introspection-1.0/tests/annotation.c
+share/gobject-introspection-1.0/tests/annotation.h
+share/gobject-introspection-1.0/tests/drawable.c
+share/gobject-introspection-1.0/tests/drawable.h
 share/gobject-introspection-1.0/tests/everything.c
 share/gobject-introspection-1.0/tests/everything.h
+share/gobject-introspection-1.0/tests/foo.c
+share/gobject-introspection-1.0/tests/foo.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
-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-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-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
-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.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
-@dirrm share/gtk-doc/html/gi
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
+share/gobject-introspection-1.0/tests/utility.c
+share/gobject-introspection-1.0/tests/utility.h
+share/gobject-introspection-1.0/tests/warnlib.c
+share/gobject-introspection-1.0/tests/warnlib.h
 @dirrm share/gobject-introspection-1.0/tests
 @dirrm share/gobject-introspection-1.0
+@dirrm lib/gobject-introspection/giscanner/doctemplates/Python
+@dirrm lib/gobject-introspection/giscanner/doctemplates/Gjs
+@dirrm lib/gobject-introspection/giscanner/doctemplates/C
+@dirrm lib/gobject-introspection/giscanner/doctemplates
 @dirrm lib/gobject-introspection/giscanner
 @dirrm lib/gobject-introspection
 @dirrm include/gobject-introspection-1.0