* 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

3 files changed, 88 insertions, 37 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 98a5fcbd92ca..d22134d2b2e8 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -1,23 +1,18 @@
-# New ports collection makefile for:   pango
-# Date Created:			18 July 2000
-# Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.163 2011/04/05 17:29:19 kwm Exp $
-#
+#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.167 2012/06/06 21:18:48 kwm Exp $
 
 PORTNAME=	pango
-PORTVERSION=	1.28.4
-PORTREVISION?=	1
+PORTVERSION=	1.30.1
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	GNOME \
-		ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An open-source framework for the layout and rendering of i18n text
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 
 .if !defined(REFERENCE_PORT)
 
@@ -34,13 +29,10 @@ MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack glib20 ltverhack referencehack
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
-		--enable-static
-# Hmm.. tough one.  Found this one when I had graphics/hdf installed
-# (which installs glist.h) which is picked up before the glib-2.0
-# stuff, with Bad Results[tm]
-#
-GLIB2_CFLAGS=	`pkg-config glib-2.0 --cflags`
+USE_PKGCONFIG=	build
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 PLIST_SUB=	VERSION="1.6.0"
 
 FONTSCALE=	${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
@@ -48,26 +40,19 @@ FONTENCOD=	${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
 
 MAN1=		pango-view.1 pango-querymodules.1
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--with-x=no
-CPPFLAGS+=		-I${LOCALBASE}/include/freetype2 \
-			${GLIB2_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-PLIST_SUB+=		X11="@comment "
-.else
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=X11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
 USE_XORG+=		xft xrender
-CPPFLAGS+=		-I${LOCALBASE}/include/freetype2 \
-			${GLIB2_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
 PLIST_SUB+=		X11=""
+.else
+CONFIGURE_ARGS+=	--with-x=no
+PLIST_SUB+=		X11="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|have_introspection=true|have_introspection=false|g' \
-		${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
 
 .endif
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 1adfc864270d..4d62edcdb228 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/pango-1.28.4.tar.bz2) = 7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f
-SIZE (gnome2/pango-1.28.4.tar.bz2) = 1503441
+SHA256 (gnome2/pango-1.30.1.tar.xz) = 3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe
+SIZE (gnome2/pango-1.30.1.tar.xz) = 1162828
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index a85d35545893..09ff8cfe5c43 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -105,6 +105,72 @@ share/gir-1.0/Pango-1.0.gir
 share/gir-1.0/PangoCairo-1.0.gir
 share/gir-1.0/PangoFT2-1.0.gir
 %%X11%%share/gir-1.0/PangoXft-1.0.gir
+share/gtk-doc/html/pango/PangoEngineLang.html
+share/gtk-doc/html/pango/PangoEngineShape.html
+share/gtk-doc/html/pango/PangoFcDecoder.html
+share/gtk-doc/html/pango/PangoFcFont.html
+share/gtk-doc/html/pango/PangoFcFontMap.html
+share/gtk-doc/html/pango/PangoMarkupFormat.html
+share/gtk-doc/html/pango/annotation-glossary.html
+share/gtk-doc/html/pango/api-index-1-10.html
+share/gtk-doc/html/pango/api-index-1-12.html
+share/gtk-doc/html/pango/api-index-1-14.html
+share/gtk-doc/html/pango/api-index-1-16.html
+share/gtk-doc/html/pango/api-index-1-18.html
+share/gtk-doc/html/pango/api-index-1-2.html
+share/gtk-doc/html/pango/api-index-1-20.html
+share/gtk-doc/html/pango/api-index-1-22.html
+share/gtk-doc/html/pango/api-index-1-24.html
+share/gtk-doc/html/pango/api-index-1-26.html
+share/gtk-doc/html/pango/api-index-1-28.html
+share/gtk-doc/html/pango/api-index-1-30.html
+share/gtk-doc/html/pango/api-index-1-4.html
+share/gtk-doc/html/pango/api-index-1-6.html
+share/gtk-doc/html/pango/api-index-1-8.html
+share/gtk-doc/html/pango/api-index-deprecated.html
+share/gtk-doc/html/pango/api-index-full.html
+share/gtk-doc/html/pango/home.png
+share/gtk-doc/html/pango/index.html
+share/gtk-doc/html/pango/index.sgml
+share/gtk-doc/html/pango/layout.gif
+share/gtk-doc/html/pango/left.png
+share/gtk-doc/html/pango/lowlevel.html
+share/gtk-doc/html/pango/pango-ATSUI-Fonts.html
+share/gtk-doc/html/pango/pango-Bidirectional-Text.html
+share/gtk-doc/html/pango/pango-Cairo-Rendering.html
+share/gtk-doc/html/pango/pango-CoreText-Fonts.html
+share/gtk-doc/html/pango/pango-Coverage-Maps.html
+share/gtk-doc/html/pango/pango-Engines.html
+share/gtk-doc/html/pango/pango-Fonts.html
+share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
+share/gtk-doc/html/pango/pango-Glyph-Storage.html
+share/gtk-doc/html/pango/pango-Layout-Objects.html
+share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html
+share/gtk-doc/html/pango/pango-Modules.html
+share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
+share/gtk-doc/html/pango/pango-Scripts-and-Languages.html
+share/gtk-doc/html/pango/pango-Tab-Stops.html
+share/gtk-doc/html/pango/pango-Text-Attributes.html
+share/gtk-doc/html/pango/pango-Text-Processing.html
+share/gtk-doc/html/pango/pango-Version-Checking.html
+share/gtk-doc/html/pango/pango-Vertical-Text.html
+share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html
+share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html
+share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html
+share/gtk-doc/html/pango/pango-hierarchy.html
+share/gtk-doc/html/pango/pango-pango-renderer.html
+share/gtk-doc/html/pango/pango-querymodules.html
+share/gtk-doc/html/pango/pango.devhelp2
+share/gtk-doc/html/pango/pango.html
+share/gtk-doc/html/pango/rendering.html
+share/gtk-doc/html/pango/right.png
+share/gtk-doc/html/pango/rotated-text.png
+share/gtk-doc/html/pango/style.css
+share/gtk-doc/html/pango/tools.html
+share/gtk-doc/html/pango/up.png
+@dirrm share/gtk-doc/html/pango
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
 @dirrm lib/pango/%%VERSION%%/modules
 @dirrm lib/pango/%%VERSION%%
 @dirrm lib/pango