* Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4 which

  are the latest stable releases.
* Update vala to the newest stable release 0.18.1, also update a few ports
  in the gtk/gnome stack.
* The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles.
* Remove pkg-config run depends from glib20 and freetype2. This doesn't
  eliminate pkg-config run dependency completely, a second phase is needed
  and is planned.
* Support for .:run. and .:build. for USE_GNOME components was added.
  Currently only libxml2 and libxslt support this mechanism.
* Updates of the telepathy stack and empathy.
* Trim makefile headers, convert ports to new options, trim off library
  versions for some ports.
* Fix other ports so they build with the new glib version.

Thanks to miwi and crees for helping out with some exp-runs.
Approved by:	portmgr (miwi & bapt)
Obtained from:	gnome team repo

11 files changed, 66 insertions, 24 deletions

diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 4f76bd1db871..b5301d92334e 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	enchant
-# Date created:				03 January 2004
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports-stable/textproc/enchant/Makefile,v 1.3 2010/07/20 07:48:41 kwm Exp $
-#
 
 PORTNAME=	enchant
 PORTVERSION=	1.6.0
@@ -19,6 +15,7 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 ltverhack
+USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--disable-uspell \
 		--disable-voikko
 MAKE_JOBS_SAFE=	yes
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 42e3e679c4b9..fa0c38a119fa 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,26 +1,29 @@
-# New ports collection makefile for:	libcroco
-# Date created:				08 July 2003
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libcroco
-PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTVERSION=	0.6.8
 CATEGORIES=	textproc gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CSS2 parsing library
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack glib20 libxml2 ltverhack
+USE_PKGCONFIG=	build
+CONFIGURE_ARGS=	--disable-gtk-doc-html
 
 PLIST_SUB=	VERSION="0.6"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 900035
+CONFIGURE_ARGS+=--disable-Bsymbolic
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/libcroco/distinfo b/textproc/libcroco/distinfo
index 6babe5e87a68..2a235aef5680 100644
--- a/textproc/libcroco/distinfo
+++ b/textproc/libcroco/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libcroco-0.6.2.tar.bz2) = be24853f64c09b63d39e563fb0222e29bae1a33c3d9f6cbffc0bc27669371749
-SIZE (libcroco-0.6.2.tar.bz2) = 415492
+SHA256 (libcroco-0.6.8.tar.xz) = ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570
+SIZE (libcroco-0.6.8.tar.xz) = 464992
diff --git a/textproc/libcroco/pkg-plist b/textproc/libcroco/pkg-plist
index 940a8ca6099e..1dc5ecc8e3e5 100644
--- a/textproc/libcroco/pkg-plist
+++ b/textproc/libcroco/pkg-plist
@@ -33,5 +33,44 @@ lib/libcroco-%%VERSION%%.la
 lib/libcroco-%%VERSION%%.so
 lib/libcroco-%%VERSION%%.so.3
 libdata/pkgconfig/libcroco-%%VERSION%%.pc
+share/gtk-doc/html/libcroco/ch01.html
+share/gtk-doc/html/libcroco/home.png
+share/gtk-doc/html/libcroco/index.html
+share/gtk-doc/html/libcroco/index.sgml
+share/gtk-doc/html/libcroco/left.png
+share/gtk-doc/html/libcroco/libcroco-cr-additional-sel.html
+share/gtk-doc/html/libcroco/libcroco-cr-attr-sel.html
+share/gtk-doc/html/libcroco/libcroco-cr-cascade.html
+share/gtk-doc/html/libcroco/libcroco-cr-declaration.html
+share/gtk-doc/html/libcroco/libcroco-cr-doc-handler.html
+share/gtk-doc/html/libcroco/libcroco-cr-enc-handler.html
+share/gtk-doc/html/libcroco/libcroco-cr-fonts.html
+share/gtk-doc/html/libcroco/libcroco-cr-input.html
+share/gtk-doc/html/libcroco/libcroco-cr-num.html
+share/gtk-doc/html/libcroco/libcroco-cr-om-parser.html
+share/gtk-doc/html/libcroco/libcroco-cr-parser.html
+share/gtk-doc/html/libcroco/libcroco-cr-parsing-location.html
+share/gtk-doc/html/libcroco/libcroco-cr-prop-list.html
+share/gtk-doc/html/libcroco/libcroco-cr-pseudo.html
+share/gtk-doc/html/libcroco/libcroco-cr-rgb.html
+share/gtk-doc/html/libcroco/libcroco-cr-sel-eng.html
+share/gtk-doc/html/libcroco/libcroco-cr-selector.html
+share/gtk-doc/html/libcroco/libcroco-cr-simple-sel.html
+share/gtk-doc/html/libcroco/libcroco-cr-statement.html
+share/gtk-doc/html/libcroco/libcroco-cr-string.html
+share/gtk-doc/html/libcroco/libcroco-cr-style.html
+share/gtk-doc/html/libcroco/libcroco-cr-stylesheet.html
+share/gtk-doc/html/libcroco/libcroco-cr-term.html
+share/gtk-doc/html/libcroco/libcroco-cr-tknzr.html
+share/gtk-doc/html/libcroco/libcroco-cr-token.html
+share/gtk-doc/html/libcroco/libcroco-cr-utils.html
+share/gtk-doc/html/libcroco/libcroco-libcroco-config.html
+share/gtk-doc/html/libcroco/libcroco.devhelp2
+share/gtk-doc/html/libcroco/right.png
+share/gtk-doc/html/libcroco/style.css
+share/gtk-doc/html/libcroco/up.png
+@dirrm share/gtk-doc/html/libcroco
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
 @dirrm include/libcroco-%%VERSION%%/libcroco
 @dirrm include/libcroco-%%VERSION%%
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index af7e47900799..b0a5bb903cb8 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libxml
-# Date created:				28 September 1998
-# Whom:					Yukihiro Nakai <Nakai@technologist.com>
-#
+# Created by: Yukihiro Nakai <Nakai@technologist.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libxml
 PORTVERSION=	1.8.17
@@ -18,7 +14,6 @@ DEPRECATED=	Last release in 2002, unsupported by developers
 
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 324ffe85c085..b883442df245 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -8,9 +8,9 @@ MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A grammar checking library
 
-LIB_DEPENDS=	pspell.16:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	pspell:${PORTSDIR}/textproc/aspell
 
-USE_GNOME=	gnomehack ltverhack pkgconfig
+USE_GNOME=	gnomehack ltverhack
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile
index 7285253f89c9..147f8b9d2170 100644
--- a/textproc/qstardict/Makefile
+++ b/textproc/qstardict/Makefile
@@ -46,6 +46,7 @@ post-patch:
 		${WRKSRC}/qstardict.pro
 .endif
 	@${REINPLACE_CMD} -e "s|/usr/share/stardict/dic|${DICPATH}|g" \
+		-e "s|glib.*\.h|glib.h|g" \
 		${WRKSRC}/plugins/stardict/stardict.cpp
 
 do-configure:
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index f598dea347ee..ddbb36d7b0aa 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -28,6 +28,7 @@ post-patch:
 		's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|-D.*_DISABLE_DEPRECATED||g' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/util.h
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index d52e436e6bc5..7a8a70ac7900 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A suffix array library and tools, which provide fast full-text search
 
 USE_GNOME=	glib20 gnomehack
+USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index 18c49bc80542..6a5ab1e092bf 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -18,6 +18,7 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 SUB_FILES=	pkg-message
 
 .if !defined(WITHOUT_NLS)
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index c4205b0e713c..9528679ea16a 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -27,4 +27,8 @@ CONFIGURE_ARGS=	--disable-gtk-doc \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
+		${WRKSRC}/libfo/fo-libfo-basic.h
+
 .include <bsd.port.mk>