- Update to 1.10.2

Reviewed by:	netchild, emulation

3 files changed, 19 insertions, 21 deletions

diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index b963fbde1970..9f0c8a58bcf2 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -6,9 +6,12 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.8.1
+PORTVERSION=	1.10.2
+DISTVERSIONSUFFIX=	-1.gst.1.4
 CATEGORIES=	x11-toolkits linux
-DISTNAME=	${PORTNAME}-${PORTVERSION}-2
+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
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux pango binary
@@ -16,6 +19,7 @@ COMMENT=	Linux pango binary
 # these libraries are required by pango-querymodules
 RUN_DEPENDS=	${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/libcairo.so.2.2.3:${PORTSDIR}/graphics/linux-cairo \
 		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 
 USE_XLIB=	yes
@@ -24,9 +28,9 @@ USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
 INSTALLS_SHLIB=	yes
 BRANDELF_DIRS=	usr/bin
-PLIST_SUB+=	LIBVERSION="800.1" PORTVERSION="${PORTVERSION}"
+PLIST_SUB+=	LIBVERSION="1001.1" PORTVERSION="${PORTVERSION}"
 
 post-install:
-	@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i386-redhat-linux-gnu/pango.modules
+	@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i686-redhat-linux-gnu/pango.modules
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-pango/distinfo.i386 b/x11-toolkits/linux-f10-pango/distinfo.i386
index 0f726fb0fef3..4a335ae6840d 100644
--- a/x11-toolkits/linux-f10-pango/distinfo.i386
+++ b/x11-toolkits/linux-f10-pango/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/4/pango-1.8.1-2.i386.rpm) = 10f69813617d9c49632e54cb8d9524ad
-SHA256 (rpm/i386/fedora/4/pango-1.8.1-2.i386.rpm) = 696e963d0475f58335a5212d844d913e3ebf3307ec46fcf9847351556252d29e
-SIZE (rpm/i386/fedora/4/pango-1.8.1-2.i386.rpm) = 278400
-MD5 (rpm/i386/fedora/4/pango-1.8.1-2.src.rpm) = a5c99ef37765ff0b5352b7f95c4f1b15
-SHA256 (rpm/i386/fedora/4/pango-1.8.1-2.src.rpm) = 1362885855b498c7ca2e6ac4e5738d688120b96f3001d8c82350faa1f3fc4f70
-SIZE (rpm/i386/fedora/4/pango-1.8.1-2.src.rpm) = 921274
+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
diff --git a/x11-toolkits/linux-f10-pango/pkg-plist b/x11-toolkits/linux-f10-pango/pkg-plist
index 947f053fbe82..751a7d4a96a6 100644
--- a/x11-toolkits/linux-f10-pango/pkg-plist
+++ b/x11-toolkits/linux-f10-pango/pkg-plist
@@ -1,31 +1,25 @@
-etc/pango/i386-redhat-linux-gnu/pango.modules
+etc/pango/i686-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/libpangocairo-1.0.so.0
+usr/lib/libpangocairo-1.0.so.0.%%LIBVERSION%%
 usr/lib/libpangoft2-1.0.so.0
 usr/lib/libpangoft2-1.0.so.0.%%LIBVERSION%%
 usr/lib/libpangox-1.0.so.0
 usr/lib/libpangox-1.0.so.0.%%LIBVERSION%%
 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.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-syriac-fc.la
+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.la
 usr/lib/pango/1.4.0/modules/pango-thai-fc.so
-usr/lib/pango/1.4.0/modules/pango-tibetan-fc.la
 usr/lib/pango/1.4.0/modules/pango-tibetan-fc.so
 usr/share/doc/pango-%%PORTVERSION%%/AUTHORS
 usr/share/doc/pango-%%PORTVERSION%%/COPYING
@@ -34,7 +28,7 @@ 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/i686-redhat-linux-gnu
 @dirrm etc/pango
 @dirrm usr/lib/pango/1.4.0/modules
 @dirrm usr/lib/pango/1.4.0