4 files changed, 51 insertions, 61 deletions

diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile
index 11c9512817ba..41725e1bc18d 100644
--- a/x11-toolkits/linux-f8-pango/Makefile
+++ b/x11-toolkits/linux-f8-pango/Makefile
@@ -1,32 +1,31 @@
-# New ports collection makefile for:	linux-pango
-# Date created:				2003-07-05
-# Whom:					trevor
+# New ports collection makefile for:	x11-toolkits/linux-f8-pango
+# Date created:				2008-03-29
+# Whom:					bsam
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.10.2
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-1.gst.1.4
+PORTVERSION=	1.18.4
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	http://gstreamer.freedesktop.org/pkg/%SUBDIR%/ CENKES/myports
-MASTER_SITE_SUBDIR=	${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/RPMS.gst010
-MASTER_SITE_SRC_SUBDIR=	${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/SRPMS.gst010
+PKGNAMEPREFIX=	linux-f8-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
-COMMENT=	Linux pango binary
+COMMENT=	The pango library (Linux Fedora 8)
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 # these libraries are required by pango-querymodules
 USE_LINUX_APPS=	cairo expat fontconfig xorglibs
-LINUX_DIST_VER=	4
+LINUX_DIST_VER=	8
+RPMVERSION=	1.fc8
+BRANDELF_FILES=	usr/bin/pango-querymodules-32
 USE_LDCONFIG=	yes
-BRANDELF_DIRS=	usr/bin
-PLIST_SUB+=	LIBVERSION="1001.1" PORTVERSION="${PORTVERSION}"
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 post-install:
-	@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i686-redhat-linux-gnu/pango.modules
+	@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i386-redhat-linux-gnu/pango.modules
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f8-pango/distinfo.i386 b/x11-toolkits/linux-f8-pango/distinfo.i386
index 4a335ae6840d..ec1db5370219 100644
--- a/x11-toolkits/linux-f8-pango/distinfo.i386
+++ b/x11-toolkits/linux-f8-pango/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/4/pango-1.10.2-1.gst.1.4.i386.rpm) = d6176302304cba90c72bfc0a0521a3ab
-SHA256 (rpm/i386/fedora/4/pango-1.10.2-1.gst.1.4.i386.rpm) = 62dd4631d4409a9d98d524f2222d7c7e36e99162575a56a3a5f3609558fe9698
-SIZE (rpm/i386/fedora/4/pango-1.10.2-1.gst.1.4.i386.rpm) = 304251
-MD5 (rpm/i386/fedora/4/pango-1.10.2-1.gst.1.4.src.rpm) = 9516d228274e7c5101ffa6de7471f339
-SHA256 (rpm/i386/fedora/4/pango-1.10.2-1.gst.1.4.src.rpm) = 38d100485aa5f3c8220d240c484a26a379fffea88be5b1eaedcef4480501831e
-SIZE (rpm/i386/fedora/4/pango-1.10.2-1.gst.1.4.src.rpm) = 1095844
+MD5 (rpm/i386/fedora/8/pango-1.18.4-1.fc8.i386.rpm) = 0355027d56d1f7a8fe24b66a4d659e2f
+SHA256 (rpm/i386/fedora/8/pango-1.18.4-1.fc8.i386.rpm) = 4e2b77750101ffc58ad775c7f99767b394620132bfd7f258ce90306fd03e61a6
+SIZE (rpm/i386/fedora/8/pango-1.18.4-1.fc8.i386.rpm) = 371133
+MD5 (rpm/i386/fedora/8/pango-1.18.4-1.fc8.src.rpm) = 139f2413f700014310c8906e90717831
+SHA256 (rpm/i386/fedora/8/pango-1.18.4-1.fc8.src.rpm) = 8fa04b47fc893d4336131203f06a3cb38d666d210e9ff05ccf33a072d63ec7aa
+SIZE (rpm/i386/fedora/8/pango-1.18.4-1.fc8.src.rpm) = 1336123
diff --git a/x11-toolkits/linux-f8-pango/pkg-descr b/x11-toolkits/linux-f8-pango/pkg-descr
deleted file mode 100644
index 922f2bcf8586..000000000000
--- a/x11-toolkits/linux-f8-pango/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-This is a Linux/i386 binary port of Pango.
-
-from the home page:
-
-	The goal of the Pango project is to provide an open-source
-	framework for the layout and rendering of internationalized
-	text.  Pango is an offshoot of the GTK+ and GNOME projects,
-	and the initial focus is operation in those environments,
-	however there is nothing fundamentally GTK+- or GNOME-specific
-	about Pango.  Pango uses Unicode for all of its encoding,
-	and will eventually support output in all the world's major
-	languages.
-
-WWW:	http://pango.org
diff --git a/x11-toolkits/linux-f8-pango/pkg-plist b/x11-toolkits/linux-f8-pango/pkg-plist
index 751a7d4a96a6..71de5646c193 100644
--- a/x11-toolkits/linux-f8-pango/pkg-plist
+++ b/x11-toolkits/linux-f8-pango/pkg-plist
@@ -1,36 +1,41 @@
-etc/pango/i686-redhat-linux-gnu/pango.modules
+@comment file listing
+etc/pango/i386-redhat-linux-gnu/pango.modules
 etc/pango/pangox.aliases
 usr/bin/pango-querymodules-32
 usr/lib/libpango-1.0.so.0
-usr/lib/libpango-1.0.so.0.%%LIBVERSION%%
+usr/lib/libpango-1.0.so.0.1800.4
 usr/lib/libpangocairo-1.0.so.0
-usr/lib/libpangocairo-1.0.so.0.%%LIBVERSION%%
+usr/lib/libpangocairo-1.0.so.0.1800.4
 usr/lib/libpangoft2-1.0.so.0
-usr/lib/libpangoft2-1.0.so.0.%%LIBVERSION%%
+usr/lib/libpangoft2-1.0.so.0.1800.4
 usr/lib/libpangox-1.0.so.0
-usr/lib/libpangox-1.0.so.0.%%LIBVERSION%%
+usr/lib/libpangox-1.0.so.0.1800.4
 usr/lib/libpangoxft-1.0.so.0
-usr/lib/libpangoxft-1.0.so.0.%%LIBVERSION%%
-usr/lib/pango/1.4.0/modules/pango-arabic-fc.so
-usr/lib/pango/1.4.0/modules/pango-basic-fc.so
-usr/lib/pango/1.4.0/modules/pango-basic-x.so
-usr/lib/pango/1.4.0/modules/pango-hangul-fc.so
-usr/lib/pango/1.4.0/modules/pango-hebrew-fc.so
-usr/lib/pango/1.4.0/modules/pango-indic-fc.so
-usr/lib/pango/1.4.0/modules/pango-khmer-fc.so
-usr/lib/pango/1.4.0/modules/pango-syriac-fc.so
-usr/lib/pango/1.4.0/modules/pango-thai-fc.so
-usr/lib/pango/1.4.0/modules/pango-tibetan-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/lib/libpangoxft-1.0.so.0.1800.4
+usr/lib/pango/1.6.0/modules/pango-arabic-fc.so
+usr/lib/pango/1.6.0/modules/pango-arabic-lang.so
+usr/lib/pango/1.6.0/modules/pango-basic-x.so
+usr/lib/pango/1.6.0/modules/pango-hangul-fc.so
+usr/lib/pango/1.6.0/modules/pango-hebrew-fc.so
+usr/lib/pango/1.6.0/modules/pango-indic-fc.so
+usr/lib/pango/1.6.0/modules/pango-indic-lang.so
+usr/lib/pango/1.6.0/modules/pango-khmer-fc.so
+usr/lib/pango/1.6.0/modules/pango-syriac-fc.so
+usr/lib/pango/1.6.0/modules/pango-thai-fc.so
+usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so
+usr/share/doc/pango-1.18.4/AUTHORS
+usr/share/doc/pango-1.18.4/COPYING
+usr/share/doc/pango-1.18.4/HELLO.txt
+usr/share/doc/pango-1.18.4/NEWS
+usr/share/doc/pango-1.18.4/README
 usr/share/man/man1/pango-querymodules.1.gz
-@dirrm etc/pango/i686-redhat-linux-gnu
-@dirrm etc/pango
-@dirrm usr/lib/pango/1.4.0/modules
-@dirrm usr/lib/pango/1.4.0
+@comment deal with empty directories created by the port
+@exec /bin/mkdir -p %D/etc/pango/i386-redhat-linux-gnu
+@dirrmtry etc/pango/i386-redhat-linux-gnu
+@comment non-empty directory listing in revers order
+@dirrm usr/share/doc/pango-1.18.4
+@dirrm usr/lib/pango/1.6.0/modules
+@dirrm usr/lib/pango/1.6.0
 @dirrm usr/lib/pango
-@dirrm usr/share/doc/pango-%%PORTVERSION%%
+@dirrm etc/pango
+@exec chroot %D /usr/bin/pango-querymodules-32 > %D/etc/pango/i386-redhat-linux-gnu/pango.modules