Update to 1.29.4.

Do some house keeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16342 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 73 insertions, 25 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 59a6a1f79..770decc98 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,11 +3,11 @@
 # Whom:				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.164 2011/09/15 16:18:46 kwm Exp $
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.29.3
+PORTVERSION=	1.29.4
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME \
@@ -17,7 +17,7 @@ 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 +34,9 @@ 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`
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 PLIST_SUB=	VERSION="1.6.0"
 
 FONTSCALE=	${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
@@ -50,24 +46,12 @@ MAN1=		pango-view.1 pango-querymodules.1
 
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--with-x=no
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-				${GLIB2_CFLAGS} -I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB+=		X11="@comment "
 .else
 USE_XORG+=		xft xrender
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-				${GLIB2_CFLAGS} -I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB+=		X11=""
 .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 7985c7bc8..c43d2b45d 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/pango-1.29.3.tar.bz2) = a177f455f358a9b075e3b5d7e04891d90380c551e3ec28125e3d9aacca7dd43b
-SIZE (gnome2/pango-1.29.3.tar.bz2) = 1470053
+SHA256 (gnome2/pango-1.29.4.tar.xz) = 7ae8d1953e6098a2706df58c1f84555c06ace7006bb34c0e54ab9acd98c1127f
+SIZE (gnome2/pango-1.29.4.tar.xz) = 1155456
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index a85d35545..7ecd6f8ca 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -105,6 +105,70 @@ 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/home.png
+share/gtk-doc/html/pango/index-1.10.html
+share/gtk-doc/html/pango/index-1.12.html
+share/gtk-doc/html/pango/index-1.14.html
+share/gtk-doc/html/pango/index-1.16.html
+share/gtk-doc/html/pango/index-1.18.html
+share/gtk-doc/html/pango/index-1.2.html
+share/gtk-doc/html/pango/index-1.20.html
+share/gtk-doc/html/pango/index-1.22.html
+share/gtk-doc/html/pango/index-1.24.html
+share/gtk-doc/html/pango/index-1.26.html
+share/gtk-doc/html/pango/index-1.28.html
+share/gtk-doc/html/pango/index-1.30.html
+share/gtk-doc/html/pango/index-1.4.html
+share/gtk-doc/html/pango/index-1.6.html
+share/gtk-doc/html/pango/index-1.8.html
+share/gtk-doc/html/pango/index-all.html
+share/gtk-doc/html/pango/index-deprecated.html
+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-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