Update to 1.6.0.

Tested with:	acroread7

3 files changed, 42 insertions, 64 deletions

diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile
index 4bee89d4e45a..59f0e039dc3a 100644
--- a/x11-toolkits/linux-f8-pango/Makefile
+++ b/x11-toolkits/linux-f8-pango/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTVERSION=	1.6.0
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits linux
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux pango binary
+MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITE_SUBDIR=	3/i386/os/Fedora/RPMS
 
 # these libraries are required by pango-querymodules
 BUILD_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
@@ -22,13 +24,13 @@ BUILD_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFre
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_XLIB=	yes
-BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${PKGDIR}/pkg-plist
-RPM_SET=	pango-1.2.1-3.i386.rpm
+RPM_SET=	pango-${PORTVERSION}-7.i386.rpm
+PLIST_SUB+=	LIBVERSION="600.0" PORTVERSION="${PORTVERSION}"
 
 post-install:
-	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/pango-querymodules
-	@${PREFIX}/usr/bin/pango-querymodules > ${PREFIX}/etc/pango/pango.modules
+	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/pango-querymodules-32
+	@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i386-redhat-linux-gnu/pango.modules
 
 .include "../linux-gtk/Makefile"
diff --git a/x11-toolkits/linux-f8-pango/distinfo.i386 b/x11-toolkits/linux-f8-pango/distinfo.i386
index ab1aabbb22dd..9cee7663d040 100644
--- a/x11-toolkits/linux-f8-pango/distinfo.i386
+++ b/x11-toolkits/linux-f8-pango/distinfo.i386
@@ -1,3 +1,3 @@
-$FreeBSD$
-MD5 (rpm/pango-1.2.1-3.i386.rpm) = b2a0d771608ee5a5741d1df65277a905
-SIZE (rpm/pango-1.2.1-3.i386.rpm) = 332082
+MD5 (rpm/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
+SHA256 (rpm/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
+SIZE (rpm/pango-1.6.0-7.i386.rpm) = 277273
diff --git a/x11-toolkits/linux-f8-pango/pkg-plist b/x11-toolkits/linux-f8-pango/pkg-plist
index 16c90a328e25..6629110f253e 100644
--- a/x11-toolkits/linux-f8-pango/pkg-plist
+++ b/x11-toolkits/linux-f8-pango/pkg-plist
@@ -1,62 +1,38 @@
-etc/pango/pango.modules
+etc/pango/i386-redhat-linux-gnu/pango.modules
 etc/pango/pangox.aliases
-usr/bin/pango-querymodules
+usr/bin/pango-querymodules-32
 usr/lib/libpango-1.0.so.0
-usr/lib/libpango-1.0.so.0.200.1
+usr/lib/libpango-1.0.so.0.%%LIBVERSION%%
 usr/lib/libpangoft2-1.0.so.0
-usr/lib/libpangoft2-1.0.so.0.200.1
+usr/lib/libpangoft2-1.0.so.0.%%LIBVERSION%%
 usr/lib/libpangox-1.0.so.0
-usr/lib/libpangox-1.0.so.0.200.1
+usr/lib/libpangox-1.0.so.0.%%LIBVERSION%%
 usr/lib/libpangoxft-1.0.so.0
-usr/lib/libpangoxft-1.0.so.0.200.1
-usr/lib/pango/1.2.0/modules/pango-arabic-ft2.la
-usr/lib/pango/1.2.0/modules/pango-arabic-ft2.so
-usr/lib/pango/1.2.0/modules/pango-arabic-x.la
-usr/lib/pango/1.2.0/modules/pango-arabic-x.so
-usr/lib/pango/1.2.0/modules/pango-arabic-xft.la
-usr/lib/pango/1.2.0/modules/pango-arabic-xft.so
-usr/lib/pango/1.2.0/modules/pango-basic-ft2.la
-usr/lib/pango/1.2.0/modules/pango-basic-ft2.so
-usr/lib/pango/1.2.0/modules/pango-basic-x.la
-usr/lib/pango/1.2.0/modules/pango-basic-x.so
-usr/lib/pango/1.2.0/modules/pango-basic-xft.la
-usr/lib/pango/1.2.0/modules/pango-basic-xft.so
-usr/lib/pango/1.2.0/modules/pango-bengali-x.la
-usr/lib/pango/1.2.0/modules/pango-bengali-x.so
-usr/lib/pango/1.2.0/modules/pango-devanagari-x.la
-usr/lib/pango/1.2.0/modules/pango-devanagari-x.so
-usr/lib/pango/1.2.0/modules/pango-gujarati-x.la
-usr/lib/pango/1.2.0/modules/pango-gujarati-x.so
-usr/lib/pango/1.2.0/modules/pango-gurmukhi-x.la
-usr/lib/pango/1.2.0/modules/pango-gurmukhi-x.so
-usr/lib/pango/1.2.0/modules/pango-hangul-x.la
-usr/lib/pango/1.2.0/modules/pango-hangul-x.so
-usr/lib/pango/1.2.0/modules/pango-hangul-xft.la
-usr/lib/pango/1.2.0/modules/pango-hangul-xft.so
-usr/lib/pango/1.2.0/modules/pango-hebrew-ft2.la
-usr/lib/pango/1.2.0/modules/pango-hebrew-ft2.so
-usr/lib/pango/1.2.0/modules/pango-hebrew-x.la
-usr/lib/pango/1.2.0/modules/pango-hebrew-x.so
-usr/lib/pango/1.2.0/modules/pango-hebrew-xft.la
-usr/lib/pango/1.2.0/modules/pango-hebrew-xft.so
-usr/lib/pango/1.2.0/modules/pango-indic-xft.la
-usr/lib/pango/1.2.0/modules/pango-indic-xft.so
-usr/lib/pango/1.2.0/modules/pango-myanmar-x.la
-usr/lib/pango/1.2.0/modules/pango-myanmar-x.so
-usr/lib/pango/1.2.0/modules/pango-tamil-x.la
-usr/lib/pango/1.2.0/modules/pango-tamil-x.so
-usr/lib/pango/1.2.0/modules/pango-thai-x.la
-usr/lib/pango/1.2.0/modules/pango-thai-x.so
-usr/lib/pango/1.2.0/modules/pango-thai-xft.la
-usr/lib/pango/1.2.0/modules/pango-thai-xft.so
-usr/share/doc/pango-1.2.1/AUTHORS
-usr/share/doc/pango-1.2.1/COPYING
-usr/share/doc/pango-1.2.1/ChangeLog
-usr/share/doc/pango-1.2.1/HELLO.utf8
-usr/share/doc/pango-1.2.1/README
-usr/share/doc/pango-1.2.1/TODO
+usr/lib/libpangoxft-1.0.so.0.%%LIBVERSION%%
+usr/lib/pango/1.4.0/modules/pango-arabic-fc.la
+usr/lib/pango/1.4.0/modules/pango-arabic-fc.so
+usr/lib/pango/1.4.0/modules/pango-basic-fc.la
+usr/lib/pango/1.4.0/modules/pango-basic-fc.so
+usr/lib/pango/1.4.0/modules/pango-basic-x.la
+usr/lib/pango/1.4.0/modules/pango-basic-x.so
+usr/lib/pango/1.4.0/modules/pango-hangul-fc.la
+usr/lib/pango/1.4.0/modules/pango-hangul-fc.so
+usr/lib/pango/1.4.0/modules/pango-hebrew-fc.la
+usr/lib/pango/1.4.0/modules/pango-hebrew-fc.so
+usr/lib/pango/1.4.0/modules/pango-indic-fc.la
+usr/lib/pango/1.4.0/modules/pango-indic-fc.so
+usr/lib/pango/1.4.0/modules/pango-thai-fc.la
+usr/lib/pango/1.4.0/modules/pango-thai-fc.so
+usr/share/doc/pango-%%PORTVERSION%%/AUTHORS
+usr/share/doc/pango-%%PORTVERSION%%/COPYING
+usr/share/doc/pango-%%PORTVERSION%%/ChangeLog
+usr/share/doc/pango-%%PORTVERSION%%/HELLO.utf8
+usr/share/doc/pango-%%PORTVERSION%%/README
+usr/share/doc/pango-%%PORTVERSION%%/TODO
+usr/share/man/man1/pango-querymodules.1.gz
+@dirrm etc/pango/i386-redhat-linux-gnu
 @dirrm etc/pango
-@dirrm usr/lib/pango/1.2.0/modules
-@dirrm usr/lib/pango/1.2.0
+@dirrm usr/lib/pango/1.4.0/modules
+@dirrm usr/lib/pango/1.4.0
 @dirrm usr/lib/pango
-@dirrm usr/share/doc/pango-1.2.1
+@dirrm usr/share/doc/pango-%%PORTVERSION%%