4 files changed, 27 insertions, 26 deletions

diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 3bd339501b68..fc588d83ac5d 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.14.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits linux
 PKGNAMEPREFIX=	linux-f10-
 DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index 1832dbb0f22a..1eeaab7c0c7c 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -6,11 +6,13 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.22.3
-PORTREVISION=	1
+PORTVERSION=	1.28.3
+DISTVERSIONSUFFIX=	-1.fc10
 CATEGORIES=	x11-toolkits linux
+MASTER_SITES=	LOCAL
+MASTER_SITE_SUBDIR=	netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
+MASTER_SITE_SRC_SUBDIR=	netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
 PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	The pango library (Linux Fedora 10)
@@ -29,6 +31,6 @@ USE_LDCONFIG=	yes
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 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-pc-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 ceb4fdf62e55..dc15f4226cf2 100644
--- a/x11-toolkits/linux-f10-pango/distinfo.i386
+++ b/x11-toolkits/linux-f10-pango/distinfo.i386
@@ -1,6 +1,4 @@
-MD5 (rpm/i386/fedora/10/pango-1.22.3-1.fc10.i386.rpm) = f266a55131ffe92541bdcbe03e7d114a
-SHA256 (rpm/i386/fedora/10/pango-1.22.3-1.fc10.i386.rpm) = 6aa64523453303366f1ac1bfd2a707bd4f7940dd13c366ad22b0fcde489fa44f
-SIZE (rpm/i386/fedora/10/pango-1.22.3-1.fc10.i386.rpm) = 383756
-MD5 (rpm/i386/fedora/10/pango-1.22.3-1.fc10.src.rpm) = 3ca29e030a3a491f1c43de6bdd27af1b
-SHA256 (rpm/i386/fedora/10/pango-1.22.3-1.fc10.src.rpm) = dc0b7f735d7b383f7740f0de2f2edca611caab9e4081dfadae89055bb71e3125
-SIZE (rpm/i386/fedora/10/pango-1.22.3-1.fc10.src.rpm) = 1401369
+SHA256 (rpm/i386/fedora/10/pango-1.28.3-1.fc10.i386.rpm) = 74026915d7e50f8ff6ee7a4ec81e5bb4ef082b3ba7b4431c74681b10d4a4bd63
+SIZE (rpm/i386/fedora/10/pango-1.28.3-1.fc10.i386.rpm) = 387292
+SHA256 (rpm/i386/fedora/10/pango-1.28.3-1.fc10.src.rpm) = 132ae2a498ebfcf92a69afa2b75229e39a703089813d02f6d5f7d4d20b806148
+SIZE (rpm/i386/fedora/10/pango-1.28.3-1.fc10.src.rpm) = 1433664
diff --git a/x11-toolkits/linux-f10-pango/pkg-plist b/x11-toolkits/linux-f10-pango/pkg-plist
index 8421e649921c..553eeaa40cb6 100644
--- a/x11-toolkits/linux-f10-pango/pkg-plist
+++ b/x11-toolkits/linux-f10-pango/pkg-plist
@@ -1,17 +1,17 @@
 @comment file listing
-etc/pango/i386-redhat-linux-gnu/pango.modules
+etc/pango/i686-pc-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.2203.0
+usr/lib/libpango-1.0.so.0.2800.3
 usr/lib/libpangocairo-1.0.so.0
-usr/lib/libpangocairo-1.0.so.0.2203.0
+usr/lib/libpangocairo-1.0.so.0.2800.3
 usr/lib/libpangoft2-1.0.so.0
-usr/lib/libpangoft2-1.0.so.0.2203.0
+usr/lib/libpangoft2-1.0.so.0.2800.3
 usr/lib/libpangox-1.0.so.0
-usr/lib/libpangox-1.0.so.0.2203.0
+usr/lib/libpangox-1.0.so.0.2800.3
 usr/lib/libpangoxft-1.0.so.0
-usr/lib/libpangoxft-1.0.so.0.2203.0
+usr/lib/libpangoxft-1.0.so.0.2800.3
 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
@@ -24,19 +24,20 @@ 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-thai-lang.so
 usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so
-usr/share/doc/pango-1.22.3/AUTHORS
-usr/share/doc/pango-1.22.3/COPYING
-usr/share/doc/pango-1.22.3/HELLO.txt
-usr/share/doc/pango-1.22.3/NEWS
-usr/share/doc/pango-1.22.3/README
+usr/share/doc/pango-1.28.3/AUTHORS
+usr/share/doc/pango-1.28.3/COPYING
+usr/share/doc/pango-1.28.3/HELLO.txt
+usr/share/doc/pango-1.28.3/NEWS
+usr/share/doc/pango-1.28.3/README
 usr/share/man/man1/pango-querymodules.1.gz
+usr/share/man/man1/pango-view.1.gz
 @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
+@exec /bin/mkdir -p %D/etc/pango/i686-pc-linux-gnu
+@dirrmtry etc/pango/i686-pc-linux-gnu
 @comment non-empty directory listing in revers order
-@dirrm usr/share/doc/pango-1.22.3
+@dirrm usr/share/doc/pango-1.28.3
 @dirrm usr/lib/pango/1.6.0/modules
 @dirrm usr/lib/pango/1.6.0
 @dirrm usr/lib/pango
 @dirrm etc/pango
-@exec chroot %D /usr/bin/pango-querymodules-32 > %D/etc/pango/i386-redhat-linux-gnu/pango.modules
+@exec chroot %D /usr/bin/pango-querymodules-32 > %D/etc/pango/i686-pc-linux-gnu/pango.modules