2 files changed, 71 insertions, 17 deletions

diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile
index d85e6f6c789d..bfae1cfb4acb 100644
--- a/x11-toolkits/linux-pango/Makefile
+++ b/x11-toolkits/linux-pango/Makefile
@@ -7,35 +7,27 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
 
-MAINTAINER=	trevor@FreeBSD.org
-COMMENT=	Linux/i386 pango binary
+MAINTAINER=	freebsd-emulation@FreeBSD.org
+COMMENT=	Linux pango binary
 
 # these libraries are required by pango-querymodules
-RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXft.so.2:${PORTSDIR}/x11/linux-XFree86-libs \
+BUILD_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
 		${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \
 		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
 		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/plist
-RESTRICTED=	"binary under GNU LGPL without accompanying source"
+PLIST=		${PKGDIR}/pkg-plist
 RPM_SET=	pango-1.2.1-3.i386.rpm
 
-pre-install:
-	${RM} -rf ${WRKSRC}/tmp
-	${ECHO_CMD} etc/pango/pango.modules > ${PLIST}
-	${MKDIR} ${WRKSRC}/tmp
-	cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
-		${FIND} * -type f -o -type l >> ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} pango | \
-		${SED} -e 's:^:@dirrm :' >> ${PLIST}
-
 post-install:
-	${PREFIX}/usr/bin/pango-querymodules > ${PREFIX}/etc/pango/pango.modules
+	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/pango-querymodules
+	@${PREFIX}/usr/bin/pango-querymodules > ${PREFIX}/etc/pango/pango.modules
 
 .include "../linux-gtk/Makefile"
diff --git a/x11-toolkits/linux-pango/pkg-plist b/x11-toolkits/linux-pango/pkg-plist
new file mode 100644
index 000000000000..16c90a328e25
--- /dev/null
+++ b/x11-toolkits/linux-pango/pkg-plist
@@ -0,0 +1,62 @@
+etc/pango/pango.modules
+etc/pango/pangox.aliases
+usr/bin/pango-querymodules
+usr/lib/libpango-1.0.so.0
+usr/lib/libpango-1.0.so.0.200.1
+usr/lib/libpangoft2-1.0.so.0
+usr/lib/libpangoft2-1.0.so.0.200.1
+usr/lib/libpangox-1.0.so.0
+usr/lib/libpangox-1.0.so.0.200.1
+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
+@dirrm etc/pango
+@dirrm usr/lib/pango/1.2.0/modules
+@dirrm usr/lib/pango/1.2.0
+@dirrm usr/lib/pango
+@dirrm usr/share/doc/pango-1.2.1