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, 39 insertions, 42 deletions

diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 52d006bff392..4e2984f4a6a9 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	gnome-doc-utils
-# Date created:				11 November 2004
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.84 2010/09/29 15:20:02 kwm Exp $
-#
+#   $MCom: ports/trunk/textproc/gnome-doc-utils/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-doc-utils
-PORTVERSION=	0.20.3
+PORTVERSION=	0.20.10
 CATEGORIES=	textproc gnome
 MASTER_SITES=	GNOME
 
@@ -22,11 +18,10 @@ RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian \
 		${LOCALBASE}/share/xml/docbook/4.3/catalog.xml:${PORTSDIR}/textproc/docbook-xml-430 \
 		${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:${PORTSDIR}/textproc/docbook-xml-440
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USE_XZ=		yes
 MAKE_JOBS_UNSAFE=yes
-USES=		gettext
-USE_GNOME=	gnomehier gnomehack libxslt intlhack
+USES=		gettext gmake pathfix pkgconfig
+USE_GNOME=	gnomehier libxslt intlhack
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
index 4fdb9e279b2d..c8e02ae7b975 100644
--- a/textproc/gnome-doc-utils/distinfo
+++ b/textproc/gnome-doc-utils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome-doc-utils-0.20.3.tar.bz2) = 1a1812ebf216a868af7478c55d3d4778ef50ebe41bfc5d42342a547b796829b3
-SIZE (gnome-doc-utils-0.20.3.tar.bz2) = 706057
+SHA256 (gnome-doc-utils-0.20.10.tar.xz) = cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
+SIZE (gnome-doc-utils-0.20.10.tar.xz) = 526700
diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist
index dc9481d9c71d..e760e82d2f6f 100644
--- a/textproc/gnome-doc-utils/pkg-plist
+++ b/textproc/gnome-doc-utils/pkg-plist
@@ -137,6 +137,7 @@ share/gnome/help/gnome-doc-xslt/de/utils.xml
 share/locale/ar/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/as/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ast/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/be/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/be@latin/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/bg/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/bn/LC_MESSAGES/gnome-doc-utils.mo
@@ -152,6 +153,7 @@ share/locale/el/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/en_CA/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/en_GB/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/en@shaw/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/eo/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/es/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/et/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/eu/LC_MESSAGES/gnome-doc-utils.mo
@@ -168,6 +170,7 @@ share/locale/id/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/it/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ja/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ka/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/km/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/kn/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ko/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/lt/LC_MESSAGES/gnome-doc-utils.mo
@@ -202,16 +205,14 @@ share/locale/te/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/th/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/tr/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ug/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/uz/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/uk/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/vi/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/wa/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-doc-utils.mo
-share/omf/gnome-doc-make/gnome-doc-make-C.omf
-share/omf/gnome-doc-make/gnome-doc-make-de.omf
-share/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf
-share/omf/gnome-doc-xslt/gnome-doc-xslt-de.omf
 share/xml/gnome/xslt/common/utils.xsl
 share/xml/gnome/xslt/common/theme.xsl
 share/xml/gnome/xslt/docbook/common/db-chunk.xsl
@@ -282,8 +283,6 @@ share/xml/mallard/1.0/mallard.rng
 @dirrm share/xml/gnome/xslt/common
 @dirrm share/xml/gnome/xslt
 @dirrm share/xml/gnome
-@dirrm share/omf/gnome-doc-xslt
-@dirrm share/omf/gnome-doc-make
 @dirrm share/gnome/help/gnome-doc-xslt/de
 @dirrm share/gnome/help/gnome-doc-xslt/C
 @dirrm share/gnome/help/gnome-doc-xslt
@@ -303,6 +302,8 @@ share/xml/mallard/1.0/mallard.rng
 @dirrm %%PYTHON_SITELIBDIR%%/xml2po
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
@@ -319,6 +320,8 @@ share/xml/mallard/1.0/mallard.rng
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
 @dirrmtry share/locale/en@shaw/LC_MESSAGES
 @dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 6a8371c810c7..41a381d64af0 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,9 +1,9 @@
 # Created by: fenner
 # $FreeBSD$
-#    $MCom: ports-stable/textproc/gtk-doc/Makefile,v 1.1 2010/06/24 09:20:01 kwm Exp $
+#    $MCom: ports/trunk/textproc/gtk-doc/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gtk-doc
-PORTVERSION=	1.15
+PORTVERSION=	1.18
 CATEGORIES=	textproc
 MASTER_SITES=	GNOME
 
@@ -25,15 +25,13 @@ CATALOG_DIR=		${PREFIX}/share/sgml/${PORTNAME}
 XMLCATMGR=		${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_PERL5=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix shebangfix
-USE_GNOME=	gnomehack gnomeprefix libxslt gnomedocutils
+USES=		gmake pathfix pkgconfig shebangfix
+USE_GNOME=	gnomeprefix libxslt gnomedocutils
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
-
 SHEBANG_FILES=	tools/docpercentages.pl
 
 PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
@@ -42,10 +40,7 @@ PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \
-		-e 's|#!/bin/bash|#!/bin/sh|g' \
-		${WRKSRC}/tests/tools.sh.in \
-		${WRKSRC}/tests/fail.sh \
-		${WRKSRC}/tests/sanity.sh
+		${WRKSRC}/tests/tools.sh
 
 post-install:
 	-@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${CATALOG_DIR}/gtk-doc.cat
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index dfb982f109f0..e5a1075cef7e 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-doc-1.15.tar.bz2) = 59cc73babf0db3a89d1a71f7ef5394a42ec1d3447d3a0a1539057a7b0ce44831
-SIZE (gtk-doc-1.15.tar.bz2) = 787687
+SHA256 (gtk-doc-1.18.tar.xz) = 785b591c561be1c8206f0d2575dc63558ea6199c3afe49cbc4efde94a6629a20
+SIZE (gtk-doc-1.18.tar.xz) = 637936
diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist
index 51f4fe9c5396..905715452a74 100644
--- a/textproc/gtk-doc/pkg-plist
+++ b/textproc/gtk-doc/pkg-plist
@@ -22,14 +22,16 @@ share/gnome/help/gtk-doc-manual/en_GB/gtk-doc-manual.xml
 share/gnome/help/gtk-doc-manual/es/gtk-doc-manual.xml
 share/gnome/help/gtk-doc-manual/fr/gtk-doc-manual.xml
 share/gnome/help/gtk-doc-manual/gu/gtk-doc-manual.xml
+share/gnome/help/gtk-doc-manual/sl/gtk-doc-manual.xml
 share/gnome/help/gtk-doc-manual/sv/gtk-doc-manual.xml
 share/gnome/help/gtk-doc-manual/ta/gtk-doc-manual.xml
 share/gnome/help/gtk-doc-manual/te/gtk-doc-manual.xml
-%%DATADIR%%/data/devhelp.xsl
 %%DATADIR%%/data/devhelp2.xsl
 %%DATADIR%%/data/gtk-doc.dcl
 %%DATADIR%%/data/gtk-doc.dsl
+%%DATADIR%%/data/gtk-doc.flat.make
 %%DATADIR%%/data/gtk-doc.make
+%%DATADIR%%/data/gtk-doc.notmpl-flat.make
 %%DATADIR%%/data/gtk-doc.notmpl.make
 %%DATADIR%%/data/gtk-doc.xsl
 %%DATADIR%%/data/gtkdoc-common.pl
@@ -47,6 +49,7 @@ share/omf/gtk-doc-manual/gtk-doc-manual-en_GB.omf
 share/omf/gtk-doc-manual/gtk-doc-manual-es.omf
 share/omf/gtk-doc-manual/gtk-doc-manual-fr.omf
 share/omf/gtk-doc-manual/gtk-doc-manual-gu.omf
+share/omf/gtk-doc-manual/gtk-doc-manual-sl.omf
 share/omf/gtk-doc-manual/gtk-doc-manual-sv.omf
 share/omf/gtk-doc-manual/gtk-doc-manual-ta.omf
 share/omf/gtk-doc-manual/gtk-doc-manual-te.omf
@@ -57,15 +60,16 @@ share/sgml/gtk-doc/gtk-doc.cat
 @dirrm share/omf/gtk-doc-manual
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@dirrm share/gnome/help/gtk-doc-manual/bn_IN
-@dirrm share/gnome/help/gtk-doc-manual/de
-@dirrm share/gnome/help/gtk-doc-manual/el
-@dirrm share/gnome/help/gtk-doc-manual/en_GB
-@dirrm share/gnome/help/gtk-doc-manual/es
-@dirrm share/gnome/help/gtk-doc-manual/fr
-@dirrm share/gnome/help/gtk-doc-manual/gu
-@dirrm share/gnome/help/gtk-doc-manual/sv
-@dirrm share/gnome/help/gtk-doc-manual/ta
 @dirrm share/gnome/help/gtk-doc-manual/te
+@dirrm share/gnome/help/gtk-doc-manual/ta
+@dirrm share/gnome/help/gtk-doc-manual/sv
+@dirrm share/gnome/help/gtk-doc-manual/sl
+@dirrm share/gnome/help/gtk-doc-manual/gu
+@dirrm share/gnome/help/gtk-doc-manual/fr
+@dirrm share/gnome/help/gtk-doc-manual/es
+@dirrm share/gnome/help/gtk-doc-manual/en_GB
+@dirrm share/gnome/help/gtk-doc-manual/el
+@dirrm share/gnome/help/gtk-doc-manual/de
+@dirrm share/gnome/help/gtk-doc-manual/bn_IN
 @dirrm share/gnome/help/gtk-doc-manual/C
 @dirrm share/gnome/help/gtk-doc-manual