- convert to use bsd.linux-rpm.mk (get rid of include of linux-gtk/Makefile) [1]

- use fixed plists [1]
- category "linux" added to those ports without it [1]
- update some ports to a recent FC3 one [1]

- remove plists/... for Alpha (there's no support since linux_base-8 for
  Alpha anymore)
- don't hardcode version numbers in some plists, use PLIST_SUB instead
  (any errors are mine, don't keep them, send them to me)

Regarding linux-ungif I declare a maintainer timeout (one month, Boris tried
to contact the maintainer) and also pull the "sweeping commit"-card (the
port which it uses as some kind of master port can not be used for this
anymore). Besides this, I don't think he will be upset when other people
do the work instead of adding an entry to his TODO list. :-)

This commit brings us just before the switch of the default linux base
port to the fc3 one, modulo some bugs which may appear. So:
	 Beta testers wanted!

To test:
sed -i.old -e 's:linux-XFree86-libs:linux-xorg-libs:' /usr/ports/Mk/bsd.port.mk
echo OVERRIDE_LINUX_BASE_PORT=fc3 >> /etc/make.conf
portupgrade -f -o emulators/linux_base-fc3 -f linux_base-8
portupgrade -o x11/linux-xorg-libs linux-XFree86-libs
portupgrade linux-\*

The first two steps are necessary to switch to fc3 as the new default linux
base port, the last 3 steps to upgrade to fc3.

And feel free to send a big "Thank you!" to Boris, he did a lot of the work!
I just provided some hints and answered some questions (besides from
committing all the necessary changes for FC3 and doing some minor
changes+comments/improvements to/of his work), even when he tries to tell
you something else. ;-)

Submitted by:	Boris Samorodov <bsam@ipt.ru> [1]

27 files changed, 159 insertions, 1038 deletions

diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile
index d3cffb4d10f5..ae2f5fa560e8 100644
--- a/x11-toolkits/linux-f10-gtk/Makefile
+++ b/x11-toolkits/linux-f10-gtk/Makefile
@@ -7,75 +7,21 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	gtk
-PORTVERSION?=	1.2.10
-PORTREVISION?=	0
-CATEGORIES?=	x11-toolkits linux
-MASTER_SITES?=	${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g} ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
-PKGNAMEPREFIX=	linux-
-DISTFILES=	${RPM_SET} ${SRC_DISTFILES}
+PORTNAME=	gtk
+PORTVERSION=	1.2.10
+PORTREVISION=	1
+CATEGORIES=	x11-toolkits linux
+DISTNAME=	gtk+-${PORTVERSION}-33
 
-MAINTAINER?=	freebsd-emulation@FreeBSD.org
-COMMENT?=	RPM of the Gtk lib
+MAINTAINER=	freebsd-emulation@FreeBSD.org
+COMMENT=	RPM of the Gtk lib
 
-BUILD_DEPENDS+=	rpm:${PORTSDIR}/archivers/rpm
-# XXX: I haven't checked if every port which includes this Makefile needs
-#      USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the
-#      RPM bits.
-RUN_DEPENDS?=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
+ONLY_FOR_ARCHS=	i386 amd64
 
-ONLY_FOR_ARCHS?=	i386 alpha amd64
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+USE_XLIB=	yes
 
-USE_LINUX=		yes
-USE_LINUX_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "amd64")
-ARCH=		i386
-RPMFLAGS+=	--ignorearch
-.endif
-DIST_SUBDIR?=	rpm
-EXTRACT_ONLY=
-NO_BUILD=	yes
-PLIST?=		${PKGDIR}/pkg-plist.${ARCH}
-MD5_FILE?=	${MASTERDIR}/distinfo.${ARCH}
-LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
-
-# Let's avoid hardcoding 'en' as the language.
-LANG=		en
-# Set the version of linux_base
-BASEVERSION?=	8.0
-RPM_MIRRORS=	\
-	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
-	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/
-FEDORALEGACY_MIRRORS=	\
-	http://download.fedoralegacy.org/redhat/__DIR__/
-STDDIR=		linux/${BASEVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS
-UPDDIR=		linux/updates/${BASEVERSION}/${LANG}/os/${ARCH}
-FEDORADIR=	${BASEVERSION}/os/${ARCH}
-.if (${ARCH} == "i386")
-RPM_SET?=	gtk+-1.2.10-22.${ARCH}.rpm
-.endif
-DBPATH=		/var/lib/rpm
-RPMFLAGS+=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
-		--nodeps --replacepkgs --oldpackage
-RPMDIR=		${DISTDIR}/${DIST_SUBDIR}
-
-do-install:
-	@for R in ${RPM_SET}; do \
-		${ECHO_MSG} $$R; \
-		rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
-	done
-	@${LINUX_LDCONFIG}
-
-new-plist:
-	@${RM} -rf ${WRKSRC}/tmp
-	@${MKDIR} ${WRKSRC}/tmp
-	@cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
-		${FIND} * -type f -o -type l > ${PLIST}.new; \
-		${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' \
-		>> ${PLIST}.new
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-gtk/distinfo.alpha b/x11-toolkits/linux-f10-gtk/distinfo.alpha
deleted file mode 100644
index 3b30df4d412f..000000000000
--- a/x11-toolkits/linux-f10-gtk/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/gtk+-1.2.9-4.alpha.rpm) = 72107f3edc89e27e1481b89fd752ff82
-SIZE (rpm/gtk+-1.2.9-4.alpha.rpm) = 1166775
diff --git a/x11-toolkits/linux-f10-gtk/distinfo.i386 b/x11-toolkits/linux-f10-gtk/distinfo.i386
index 3a34cdf9f23f..40e58d497d51 100644
--- a/x11-toolkits/linux-f10-gtk/distinfo.i386
+++ b/x11-toolkits/linux-f10-gtk/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk+-1.2.10-22.i386.rpm) = 1932769e2a4fc10524b77a69811f4427
-SHA256 (rpm/gtk+-1.2.10-22.i386.rpm) = 7949c5204a620056f09279e6571ae2f4bacf6c8cbbf7fc7a4e4e75c33f806c6a
-SIZE (rpm/gtk+-1.2.10-22.i386.rpm) = 948063
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 6ed518519e2fba27bb5bf3cbf1ab258c
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = bb3968184a73eb25ae966dd0dccc5975bdfa7734bcd24c7508ca9b52b12fc404
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 856964
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 428f57749b40021404b67d203962e98b
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 3fd4a4e9a31cd4fcd52d8fe7c97581f8bb7e0e3f7b8736b26fbc557afb0e25cf
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 2918540
diff --git a/x11-toolkits/linux-f10-gtk/pkg-plist.alpha b/x11-toolkits/linux-f10-gtk/pkg-plist.alpha
deleted file mode 100644
index 052e7ae60a60..000000000000
--- a/x11-toolkits/linux-f10-gtk/pkg-plist.alpha
+++ /dev/null
@@ -1,182 +0,0 @@
-etc/gtk/gtkrc
-etc/gtk/gtkrc.az
-etc/gtk/gtkrc.cp1251
-etc/gtk/gtkrc.cp1255
-etc/gtk/gtkrc.el
-etc/gtk/gtkrc.eo
-etc/gtk/gtkrc.he
-etc/gtk/gtkrc.hy
-etc/gtk/gtkrc.iso-8859-13
-etc/gtk/gtkrc.iso-8859-14
-etc/gtk/gtkrc.iso-8859-15
-etc/gtk/gtkrc.iso-8859-2
-etc/gtk/gtkrc.iso-8859-5
-etc/gtk/gtkrc.ja
-etc/gtk/gtkrc.ka_GE.georgianacademy
-etc/gtk/gtkrc.ka_GE.georgianps
-etc/gtk/gtkrc.ko
-etc/gtk/gtkrc.ru
-etc/gtk/gtkrc.th
-etc/gtk/gtkrc.tr
-etc/gtk/gtkrc.uk
-etc/gtk/gtkrc.vi_VN.tcvn
-etc/gtk/gtkrc.vi_VN.viscii
-etc/gtk/gtkrc.zh_CN
-etc/gtk/gtkrc.zh_TW.big5
-usr/lib/libgdk-1.2.so.0.9.0
-usr/lib/libgtk-1.2.so.0.9.0
-usr/share/doc/gtk+-1.2.9/AUTHORS
-usr/share/doc/gtk+-1.2.9/COPYING
-usr/share/doc/gtk+-1.2.9/ChangeLog
-usr/share/doc/gtk+-1.2.9/NEWS
-usr/share/doc/gtk+-1.2.9/README
-usr/share/doc/gtk+-1.2.9/TODO
-usr/share/locale/az/LC_MESSAGES/gtk+.mo
-usr/share/locale/ca/LC_MESSAGES/gtk+.mo
-usr/share/locale/cs/LC_MESSAGES/gtk+.mo
-usr/share/locale/da/LC_MESSAGES/gtk+.mo
-usr/share/locale/de/LC_MESSAGES/gtk+.mo
-usr/share/locale/el/LC_MESSAGES/gtk+.mo
-usr/share/locale/es/LC_MESSAGES/gtk+.mo
-usr/share/locale/et/LC_MESSAGES/gtk+.mo
-usr/share/locale/eu/LC_MESSAGES/gtk+.mo
-usr/share/locale/fi/LC_MESSAGES/gtk+.mo
-usr/share/locale/fr/LC_MESSAGES/gtk+.mo
-usr/share/locale/ga/LC_MESSAGES/gtk+.mo
-usr/share/locale/gl/LC_MESSAGES/gtk+.mo
-usr/share/locale/hr/LC_MESSAGES/gtk+.mo
-usr/share/locale/hu/LC_MESSAGES/gtk+.mo
-usr/share/locale/it/LC_MESSAGES/gtk+.mo
-usr/share/locale/ja/LC_MESSAGES/gtk+.mo
-usr/share/locale/ko/LC_MESSAGES/gtk+.mo
-usr/share/locale/lt/LC_MESSAGES/gtk+.mo
-usr/share/locale/nl/LC_MESSAGES/gtk+.mo
-usr/share/locale/nn/LC_MESSAGES/gtk+.mo
-usr/share/locale/no/LC_MESSAGES/gtk+.mo
-usr/share/locale/pl/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt_BR/LC_MESSAGES/gtk+.mo
-usr/share/locale/ro/LC_MESSAGES/gtk+.mo
-usr/share/locale/ru/LC_MESSAGES/gtk+.mo
-usr/share/locale/sk/LC_MESSAGES/gtk+.mo
-usr/share/locale/sl/LC_MESSAGES/gtk+.mo
-usr/share/locale/sp/LC_MESSAGES/gtk+.mo
-usr/share/locale/sr/LC_MESSAGES/gtk+.mo
-usr/share/locale/sv/LC_MESSAGES/gtk+.mo
-usr/share/locale/tr/LC_MESSAGES/gtk+.mo
-usr/share/locale/uk/LC_MESSAGES/gtk+.mo
-usr/share/locale/wa/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
-usr/share/themes/Default/gtk/gtkrc
-etc/gtk/gtkrc.be
-etc/gtk/gtkrc.bg
-etc/gtk/gtkrc.bg_BG.iso88595
-etc/gtk/gtkrc.cs
-etc/gtk/gtkrc.cy
-etc/gtk/gtkrc.et
-etc/gtk/gtkrc.ga
-etc/gtk/gtkrc.he_IL.cp1255
-etc/gtk/gtkrc.he_IL.microsoftcp1255
-etc/gtk/gtkrc.hr
-etc/gtk/gtkrc.hu
-etc/gtk/gtkrc.ka
-etc/gtk/gtkrc.lt
-etc/gtk/gtkrc.lv
-etc/gtk/gtkrc.mi
-etc/gtk/gtkrc.mk
-etc/gtk/gtkrc.pl
-etc/gtk/gtkrc.ro
-etc/gtk/gtkrc.ru_RU.iso88595
-etc/gtk/gtkrc.sk
-etc/gtk/gtkrc.sl
-etc/gtk/gtkrc.sp
-etc/gtk/gtkrc.sq
-etc/gtk/gtkrc.sr
-etc/gtk/gtkrc.sr.iso88595
-etc/gtk/gtkrc.vi
-etc/gtk/gtkrc.vi_VN.viscii111
-etc/gtk/gtkrc.yi
-usr/lib/libgdk-1.2.so.0
-usr/lib/libgtk-1.2.so.0
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.9
-@dirrm usr/share/themes/Default/gtk
-@dirrmtry usr/share/themes/Default
-@dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
-@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
-@dirrmtry usr/share/locale/sp/LC_MESSAGES
-@dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
-@dirrmtry usr/share/locale/nn/LC_MESSAGES
-@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
-@dirrmtry usr/share/locale/lt/LC_MESSAGES
-@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
-@dirrmtry usr/share/locale/eu/LC_MESSAGES
-@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
-@dirrmtry usr/share/locale/az/LC_MESSAGES
-@dirrmtry usr/share/locale/az
-
diff --git a/x11-toolkits/linux-f10-gtk/pkg-plist.i386 b/x11-toolkits/linux-f10-gtk/pkg-plist.i386
index d24b9a54faef..95b28b3a31ae 100644
--- a/x11-toolkits/linux-f10-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-f10-gtk/pkg-plist.i386
@@ -24,10 +24,12 @@ etc/gtk/gtkrc.iso88595
 etc/gtk/gtkrc.iso88597
 etc/gtk/gtkrc.iso88599
 etc/gtk/gtkrc.ja
+etc/gtk/gtkrc.ja.utf8
 etc/gtk/gtkrc.ka
 etc/gtk/gtkrc.ka_GE.georgianacademy
 etc/gtk/gtkrc.ka_GE.georgianps
 etc/gtk/gtkrc.ko
+etc/gtk/gtkrc.ko.utf8
 etc/gtk/gtkrc.lt
 etc/gtk/gtkrc.lv
 etc/gtk/gtkrc.mi
@@ -50,7 +52,9 @@ etc/gtk/gtkrc.vi_VN.viscii
 etc/gtk/gtkrc.vi_VN.viscii111
 etc/gtk/gtkrc.yi
 etc/gtk/gtkrc.zh_CN
+etc/gtk/gtkrc.zh_CN.utf8
 etc/gtk/gtkrc.zh_TW.big5
+etc/gtk/gtkrc.zh_TW.utf8
 usr/lib/libgdk-1.2.so.0
 usr/lib/libgdk-1.2.so.0.9.1
 usr/lib/libgtk-1.2.so.0
@@ -100,85 +104,22 @@ usr/share/locale/wa/LC_MESSAGES/gtk+.mo
 usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
 usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
 usr/share/themes/Default/gtk/gtkrc
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.10
-@dirrm usr/share/themes/Default/gtk
+@dirrmtry usr/share/themes/Default/gtk
 @dirrmtry usr/share/themes/Default
 @dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
 @dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
 @dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
 @dirrmtry usr/share/locale/vi/LC_MESSAGES
 @dirrmtry usr/share/locale/vi
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
 @dirrmtry usr/share/locale/sp/LC_MESSAGES
 @dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
 @dirrmtry usr/share/locale/nn/LC_MESSAGES
 @dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
 @dirrmtry usr/share/locale/lt/LC_MESSAGES
 @dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
 @dirrmtry usr/share/locale/eu/LC_MESSAGES
 @dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
 @dirrmtry usr/share/locale/az/LC_MESSAGES
 @dirrmtry usr/share/locale/az
+@dirrm usr/share/doc/gtk+-1.2.10
+@dirrm etc/gtk
diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 2df73bef3e89..e5ebe71571a6 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -7,12 +7,9 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.4.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX} \
-		http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/${SUBDIR}/ \
-		ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/${SUBDIR}/
-MASTER_SITE_SUBDIR=	updates/3/i386
+DISTNAME=	${PORTNAME}-${PORTVERSION}-4.fc3.3
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X, Linux binary
@@ -27,17 +24,15 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib
 		${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
 
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
 USE_XLIB=	yes
-RESTRICTED=	"binaries under GNU LGPL without accompanying source"
-RPM_SET=	gtk2-${PORTVERSION}-4.fc3.3.${ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+BRANDELF_DIRS=	usr/bin
 PLIST_SUB=	LIBVERSION="400.14" PORTVERSION="${PORTVERSION}"
 
 post-install:
-.for ii in gdk-pixbuf-query-loaders-32 gtk-demo gtk-query-immodules-2.0-32
-	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii}
-.endfor
 	@chroot ${PREFIX} /usr/bin/gtk-query-immodules-2.0-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
 	@chroot ${PREFIX} /usr/bin/gdk-pixbuf-query-loaders-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gdk-pixbuf.loaders
 
-.include "../linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-gtk2/distinfo.i386 b/x11-toolkits/linux-f10-gtk2/distinfo.i386
index d08be6cdf92f..e55c9461ddd5 100644
--- a/x11-toolkits/linux-f10-gtk2/distinfo.i386
+++ b/x11-toolkits/linux-f10-gtk2/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
-SHA256 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
-SIZE (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 44f37d231bffc16d7e516a7798007bb1
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = b8f7e3688e344960e90cb2d09188dbf0b4450d9f0c00ab90d14745335f0827c1
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 9690086
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index f8cb49fb09d1..4c38c1d477b6 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -7,13 +7,12 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-7
 
 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
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
@@ -23,12 +22,13 @@ RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree8
 
 USE_XLIB=	yes
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
-RPM_SET=	pango-${PORTVERSION}-7.i386.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+BRANDELF_DIRS=	usr/bin
 PLIST_SUB+=	LIBVERSION="600.0" PORTVERSION="${PORTVERSION}"
 
 post-install:
-	@${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"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-pango/distinfo.i386 b/x11-toolkits/linux-f10-pango/distinfo.i386
index 9cee7663d040..8009062442e7 100644
--- a/x11-toolkits/linux-f10-pango/distinfo.i386
+++ b/x11-toolkits/linux-f10-pango/distinfo.i386
@@ -1,3 +1,6 @@
-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
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 277273
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 962e177a9b5e7a74c34b9204e3a5aa41
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 8faac8c88dcc58203569d31a8881447b553bf52f26525799cfc1f54a09e1bfbe
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 879369
diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile
index d3cffb4d10f5..ae2f5fa560e8 100644
--- a/x11-toolkits/linux-f8-gtk/Makefile
+++ b/x11-toolkits/linux-f8-gtk/Makefile
@@ -7,75 +7,21 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	gtk
-PORTVERSION?=	1.2.10
-PORTREVISION?=	0
-CATEGORIES?=	x11-toolkits linux
-MASTER_SITES?=	${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g} ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
-PKGNAMEPREFIX=	linux-
-DISTFILES=	${RPM_SET} ${SRC_DISTFILES}
+PORTNAME=	gtk
+PORTVERSION=	1.2.10
+PORTREVISION=	1
+CATEGORIES=	x11-toolkits linux
+DISTNAME=	gtk+-${PORTVERSION}-33
 
-MAINTAINER?=	freebsd-emulation@FreeBSD.org
-COMMENT?=	RPM of the Gtk lib
+MAINTAINER=	freebsd-emulation@FreeBSD.org
+COMMENT=	RPM of the Gtk lib
 
-BUILD_DEPENDS+=	rpm:${PORTSDIR}/archivers/rpm
-# XXX: I haven't checked if every port which includes this Makefile needs
-#      USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the
-#      RPM bits.
-RUN_DEPENDS?=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
+ONLY_FOR_ARCHS=	i386 amd64
 
-ONLY_FOR_ARCHS?=	i386 alpha amd64
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+USE_XLIB=	yes
 
-USE_LINUX=		yes
-USE_LINUX_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "amd64")
-ARCH=		i386
-RPMFLAGS+=	--ignorearch
-.endif
-DIST_SUBDIR?=	rpm
-EXTRACT_ONLY=
-NO_BUILD=	yes
-PLIST?=		${PKGDIR}/pkg-plist.${ARCH}
-MD5_FILE?=	${MASTERDIR}/distinfo.${ARCH}
-LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
-
-# Let's avoid hardcoding 'en' as the language.
-LANG=		en
-# Set the version of linux_base
-BASEVERSION?=	8.0
-RPM_MIRRORS=	\
-	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
-	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/
-FEDORALEGACY_MIRRORS=	\
-	http://download.fedoralegacy.org/redhat/__DIR__/
-STDDIR=		linux/${BASEVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS
-UPDDIR=		linux/updates/${BASEVERSION}/${LANG}/os/${ARCH}
-FEDORADIR=	${BASEVERSION}/os/${ARCH}
-.if (${ARCH} == "i386")
-RPM_SET?=	gtk+-1.2.10-22.${ARCH}.rpm
-.endif
-DBPATH=		/var/lib/rpm
-RPMFLAGS+=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
-		--nodeps --replacepkgs --oldpackage
-RPMDIR=		${DISTDIR}/${DIST_SUBDIR}
-
-do-install:
-	@for R in ${RPM_SET}; do \
-		${ECHO_MSG} $$R; \
-		rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
-	done
-	@${LINUX_LDCONFIG}
-
-new-plist:
-	@${RM} -rf ${WRKSRC}/tmp
-	@${MKDIR} ${WRKSRC}/tmp
-	@cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
-		${FIND} * -type f -o -type l > ${PLIST}.new; \
-		${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' \
-		>> ${PLIST}.new
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f8-gtk/distinfo.alpha b/x11-toolkits/linux-f8-gtk/distinfo.alpha
deleted file mode 100644
index 3b30df4d412f..000000000000
--- a/x11-toolkits/linux-f8-gtk/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/gtk+-1.2.9-4.alpha.rpm) = 72107f3edc89e27e1481b89fd752ff82
-SIZE (rpm/gtk+-1.2.9-4.alpha.rpm) = 1166775
diff --git a/x11-toolkits/linux-f8-gtk/distinfo.i386 b/x11-toolkits/linux-f8-gtk/distinfo.i386
index 3a34cdf9f23f..40e58d497d51 100644
--- a/x11-toolkits/linux-f8-gtk/distinfo.i386
+++ b/x11-toolkits/linux-f8-gtk/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk+-1.2.10-22.i386.rpm) = 1932769e2a4fc10524b77a69811f4427
-SHA256 (rpm/gtk+-1.2.10-22.i386.rpm) = 7949c5204a620056f09279e6571ae2f4bacf6c8cbbf7fc7a4e4e75c33f806c6a
-SIZE (rpm/gtk+-1.2.10-22.i386.rpm) = 948063
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 6ed518519e2fba27bb5bf3cbf1ab258c
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = bb3968184a73eb25ae966dd0dccc5975bdfa7734bcd24c7508ca9b52b12fc404
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 856964
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 428f57749b40021404b67d203962e98b
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 3fd4a4e9a31cd4fcd52d8fe7c97581f8bb7e0e3f7b8736b26fbc557afb0e25cf
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 2918540
diff --git a/x11-toolkits/linux-f8-gtk/pkg-plist.alpha b/x11-toolkits/linux-f8-gtk/pkg-plist.alpha
deleted file mode 100644
index 052e7ae60a60..000000000000
--- a/x11-toolkits/linux-f8-gtk/pkg-plist.alpha
+++ /dev/null
@@ -1,182 +0,0 @@
-etc/gtk/gtkrc
-etc/gtk/gtkrc.az
-etc/gtk/gtkrc.cp1251
-etc/gtk/gtkrc.cp1255
-etc/gtk/gtkrc.el
-etc/gtk/gtkrc.eo
-etc/gtk/gtkrc.he
-etc/gtk/gtkrc.hy
-etc/gtk/gtkrc.iso-8859-13
-etc/gtk/gtkrc.iso-8859-14
-etc/gtk/gtkrc.iso-8859-15
-etc/gtk/gtkrc.iso-8859-2
-etc/gtk/gtkrc.iso-8859-5
-etc/gtk/gtkrc.ja
-etc/gtk/gtkrc.ka_GE.georgianacademy
-etc/gtk/gtkrc.ka_GE.georgianps
-etc/gtk/gtkrc.ko
-etc/gtk/gtkrc.ru
-etc/gtk/gtkrc.th
-etc/gtk/gtkrc.tr
-etc/gtk/gtkrc.uk
-etc/gtk/gtkrc.vi_VN.tcvn
-etc/gtk/gtkrc.vi_VN.viscii
-etc/gtk/gtkrc.zh_CN
-etc/gtk/gtkrc.zh_TW.big5
-usr/lib/libgdk-1.2.so.0.9.0
-usr/lib/libgtk-1.2.so.0.9.0
-usr/share/doc/gtk+-1.2.9/AUTHORS
-usr/share/doc/gtk+-1.2.9/COPYING
-usr/share/doc/gtk+-1.2.9/ChangeLog
-usr/share/doc/gtk+-1.2.9/NEWS
-usr/share/doc/gtk+-1.2.9/README
-usr/share/doc/gtk+-1.2.9/TODO
-usr/share/locale/az/LC_MESSAGES/gtk+.mo
-usr/share/locale/ca/LC_MESSAGES/gtk+.mo
-usr/share/locale/cs/LC_MESSAGES/gtk+.mo
-usr/share/locale/da/LC_MESSAGES/gtk+.mo
-usr/share/locale/de/LC_MESSAGES/gtk+.mo
-usr/share/locale/el/LC_MESSAGES/gtk+.mo
-usr/share/locale/es/LC_MESSAGES/gtk+.mo
-usr/share/locale/et/LC_MESSAGES/gtk+.mo
-usr/share/locale/eu/LC_MESSAGES/gtk+.mo
-usr/share/locale/fi/LC_MESSAGES/gtk+.mo
-usr/share/locale/fr/LC_MESSAGES/gtk+.mo
-usr/share/locale/ga/LC_MESSAGES/gtk+.mo
-usr/share/locale/gl/LC_MESSAGES/gtk+.mo
-usr/share/locale/hr/LC_MESSAGES/gtk+.mo
-usr/share/locale/hu/LC_MESSAGES/gtk+.mo
-usr/share/locale/it/LC_MESSAGES/gtk+.mo
-usr/share/locale/ja/LC_MESSAGES/gtk+.mo
-usr/share/locale/ko/LC_MESSAGES/gtk+.mo
-usr/share/locale/lt/LC_MESSAGES/gtk+.mo
-usr/share/locale/nl/LC_MESSAGES/gtk+.mo
-usr/share/locale/nn/LC_MESSAGES/gtk+.mo
-usr/share/locale/no/LC_MESSAGES/gtk+.mo
-usr/share/locale/pl/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt_BR/LC_MESSAGES/gtk+.mo
-usr/share/locale/ro/LC_MESSAGES/gtk+.mo
-usr/share/locale/ru/LC_MESSAGES/gtk+.mo
-usr/share/locale/sk/LC_MESSAGES/gtk+.mo
-usr/share/locale/sl/LC_MESSAGES/gtk+.mo
-usr/share/locale/sp/LC_MESSAGES/gtk+.mo
-usr/share/locale/sr/LC_MESSAGES/gtk+.mo
-usr/share/locale/sv/LC_MESSAGES/gtk+.mo
-usr/share/locale/tr/LC_MESSAGES/gtk+.mo
-usr/share/locale/uk/LC_MESSAGES/gtk+.mo
-usr/share/locale/wa/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
-usr/share/themes/Default/gtk/gtkrc
-etc/gtk/gtkrc.be
-etc/gtk/gtkrc.bg
-etc/gtk/gtkrc.bg_BG.iso88595
-etc/gtk/gtkrc.cs
-etc/gtk/gtkrc.cy
-etc/gtk/gtkrc.et
-etc/gtk/gtkrc.ga
-etc/gtk/gtkrc.he_IL.cp1255
-etc/gtk/gtkrc.he_IL.microsoftcp1255
-etc/gtk/gtkrc.hr
-etc/gtk/gtkrc.hu
-etc/gtk/gtkrc.ka
-etc/gtk/gtkrc.lt
-etc/gtk/gtkrc.lv
-etc/gtk/gtkrc.mi
-etc/gtk/gtkrc.mk
-etc/gtk/gtkrc.pl
-etc/gtk/gtkrc.ro
-etc/gtk/gtkrc.ru_RU.iso88595
-etc/gtk/gtkrc.sk
-etc/gtk/gtkrc.sl
-etc/gtk/gtkrc.sp
-etc/gtk/gtkrc.sq
-etc/gtk/gtkrc.sr
-etc/gtk/gtkrc.sr.iso88595
-etc/gtk/gtkrc.vi
-etc/gtk/gtkrc.vi_VN.viscii111
-etc/gtk/gtkrc.yi
-usr/lib/libgdk-1.2.so.0
-usr/lib/libgtk-1.2.so.0
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.9
-@dirrm usr/share/themes/Default/gtk
-@dirrmtry usr/share/themes/Default
-@dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
-@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
-@dirrmtry usr/share/locale/sp/LC_MESSAGES
-@dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
-@dirrmtry usr/share/locale/nn/LC_MESSAGES
-@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
-@dirrmtry usr/share/locale/lt/LC_MESSAGES
-@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
-@dirrmtry usr/share/locale/eu/LC_MESSAGES
-@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
-@dirrmtry usr/share/locale/az/LC_MESSAGES
-@dirrmtry usr/share/locale/az
-
diff --git a/x11-toolkits/linux-f8-gtk/pkg-plist.i386 b/x11-toolkits/linux-f8-gtk/pkg-plist.i386
index d24b9a54faef..95b28b3a31ae 100644
--- a/x11-toolkits/linux-f8-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-f8-gtk/pkg-plist.i386
@@ -24,10 +24,12 @@ etc/gtk/gtkrc.iso88595
 etc/gtk/gtkrc.iso88597
 etc/gtk/gtkrc.iso88599
 etc/gtk/gtkrc.ja
+etc/gtk/gtkrc.ja.utf8
 etc/gtk/gtkrc.ka
 etc/gtk/gtkrc.ka_GE.georgianacademy
 etc/gtk/gtkrc.ka_GE.georgianps
 etc/gtk/gtkrc.ko
+etc/gtk/gtkrc.ko.utf8
 etc/gtk/gtkrc.lt
 etc/gtk/gtkrc.lv
 etc/gtk/gtkrc.mi
@@ -50,7 +52,9 @@ etc/gtk/gtkrc.vi_VN.viscii
 etc/gtk/gtkrc.vi_VN.viscii111
 etc/gtk/gtkrc.yi
 etc/gtk/gtkrc.zh_CN
+etc/gtk/gtkrc.zh_CN.utf8
 etc/gtk/gtkrc.zh_TW.big5
+etc/gtk/gtkrc.zh_TW.utf8
 usr/lib/libgdk-1.2.so.0
 usr/lib/libgdk-1.2.so.0.9.1
 usr/lib/libgtk-1.2.so.0
@@ -100,85 +104,22 @@ usr/share/locale/wa/LC_MESSAGES/gtk+.mo
 usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
 usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
 usr/share/themes/Default/gtk/gtkrc
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.10
-@dirrm usr/share/themes/Default/gtk
+@dirrmtry usr/share/themes/Default/gtk
 @dirrmtry usr/share/themes/Default
 @dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
 @dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
 @dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
 @dirrmtry usr/share/locale/vi/LC_MESSAGES
 @dirrmtry usr/share/locale/vi
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
 @dirrmtry usr/share/locale/sp/LC_MESSAGES
 @dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
 @dirrmtry usr/share/locale/nn/LC_MESSAGES
 @dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
 @dirrmtry usr/share/locale/lt/LC_MESSAGES
 @dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
 @dirrmtry usr/share/locale/eu/LC_MESSAGES
 @dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
 @dirrmtry usr/share/locale/az/LC_MESSAGES
 @dirrmtry usr/share/locale/az
+@dirrm usr/share/doc/gtk+-1.2.10
+@dirrm etc/gtk
diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile
index 2df73bef3e89..e5ebe71571a6 100644
--- a/x11-toolkits/linux-f8-gtk2/Makefile
+++ b/x11-toolkits/linux-f8-gtk2/Makefile
@@ -7,12 +7,9 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.4.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX} \
-		http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/${SUBDIR}/ \
-		ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/${SUBDIR}/
-MASTER_SITE_SUBDIR=	updates/3/i386
+DISTNAME=	${PORTNAME}-${PORTVERSION}-4.fc3.3
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X, Linux binary
@@ -27,17 +24,15 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib
 		${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
 
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
 USE_XLIB=	yes
-RESTRICTED=	"binaries under GNU LGPL without accompanying source"
-RPM_SET=	gtk2-${PORTVERSION}-4.fc3.3.${ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+BRANDELF_DIRS=	usr/bin
 PLIST_SUB=	LIBVERSION="400.14" PORTVERSION="${PORTVERSION}"
 
 post-install:
-.for ii in gdk-pixbuf-query-loaders-32 gtk-demo gtk-query-immodules-2.0-32
-	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii}
-.endfor
 	@chroot ${PREFIX} /usr/bin/gtk-query-immodules-2.0-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
 	@chroot ${PREFIX} /usr/bin/gdk-pixbuf-query-loaders-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gdk-pixbuf.loaders
 
-.include "../linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f8-gtk2/distinfo.i386 b/x11-toolkits/linux-f8-gtk2/distinfo.i386
index d08be6cdf92f..e55c9461ddd5 100644
--- a/x11-toolkits/linux-f8-gtk2/distinfo.i386
+++ b/x11-toolkits/linux-f8-gtk2/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
-SHA256 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
-SIZE (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 44f37d231bffc16d7e516a7798007bb1
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = b8f7e3688e344960e90cb2d09188dbf0b4450d9f0c00ab90d14745335f0827c1
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 9690086
diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile
index f8cb49fb09d1..4c38c1d477b6 100644
--- a/x11-toolkits/linux-f8-pango/Makefile
+++ b/x11-toolkits/linux-f8-pango/Makefile
@@ -7,13 +7,12 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-7
 
 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
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
@@ -23,12 +22,13 @@ RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree8
 
 USE_XLIB=	yes
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
-RPM_SET=	pango-${PORTVERSION}-7.i386.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+BRANDELF_DIRS=	usr/bin
 PLIST_SUB+=	LIBVERSION="600.0" PORTVERSION="${PORTVERSION}"
 
 post-install:
-	@${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"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f8-pango/distinfo.i386 b/x11-toolkits/linux-f8-pango/distinfo.i386
index 9cee7663d040..8009062442e7 100644
--- a/x11-toolkits/linux-f8-pango/distinfo.i386
+++ b/x11-toolkits/linux-f8-pango/distinfo.i386
@@ -1,3 +1,6 @@
-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
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 277273
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 962e177a9b5e7a74c34b9204e3a5aa41
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 8faac8c88dcc58203569d31a8881447b553bf52f26525799cfc1f54a09e1bfbe
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 879369
diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile
index d3cffb4d10f5..ae2f5fa560e8 100644
--- a/x11-toolkits/linux-gtk/Makefile
+++ b/x11-toolkits/linux-gtk/Makefile
@@ -7,75 +7,21 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	gtk
-PORTVERSION?=	1.2.10
-PORTREVISION?=	0
-CATEGORIES?=	x11-toolkits linux
-MASTER_SITES?=	${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g} ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
-PKGNAMEPREFIX=	linux-
-DISTFILES=	${RPM_SET} ${SRC_DISTFILES}
+PORTNAME=	gtk
+PORTVERSION=	1.2.10
+PORTREVISION=	1
+CATEGORIES=	x11-toolkits linux
+DISTNAME=	gtk+-${PORTVERSION}-33
 
-MAINTAINER?=	freebsd-emulation@FreeBSD.org
-COMMENT?=	RPM of the Gtk lib
+MAINTAINER=	freebsd-emulation@FreeBSD.org
+COMMENT=	RPM of the Gtk lib
 
-BUILD_DEPENDS+=	rpm:${PORTSDIR}/archivers/rpm
-# XXX: I haven't checked if every port which includes this Makefile needs
-#      USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the
-#      RPM bits.
-RUN_DEPENDS?=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
+ONLY_FOR_ARCHS=	i386 amd64
 
-ONLY_FOR_ARCHS?=	i386 alpha amd64
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+USE_XLIB=	yes
 
-USE_LINUX=		yes
-USE_LINUX_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "amd64")
-ARCH=		i386
-RPMFLAGS+=	--ignorearch
-.endif
-DIST_SUBDIR?=	rpm
-EXTRACT_ONLY=
-NO_BUILD=	yes
-PLIST?=		${PKGDIR}/pkg-plist.${ARCH}
-MD5_FILE?=	${MASTERDIR}/distinfo.${ARCH}
-LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
-
-# Let's avoid hardcoding 'en' as the language.
-LANG=		en
-# Set the version of linux_base
-BASEVERSION?=	8.0
-RPM_MIRRORS=	\
-	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
-	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/
-FEDORALEGACY_MIRRORS=	\
-	http://download.fedoralegacy.org/redhat/__DIR__/
-STDDIR=		linux/${BASEVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS
-UPDDIR=		linux/updates/${BASEVERSION}/${LANG}/os/${ARCH}
-FEDORADIR=	${BASEVERSION}/os/${ARCH}
-.if (${ARCH} == "i386")
-RPM_SET?=	gtk+-1.2.10-22.${ARCH}.rpm
-.endif
-DBPATH=		/var/lib/rpm
-RPMFLAGS+=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
-		--nodeps --replacepkgs --oldpackage
-RPMDIR=		${DISTDIR}/${DIST_SUBDIR}
-
-do-install:
-	@for R in ${RPM_SET}; do \
-		${ECHO_MSG} $$R; \
-		rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
-	done
-	@${LINUX_LDCONFIG}
-
-new-plist:
-	@${RM} -rf ${WRKSRC}/tmp
-	@${MKDIR} ${WRKSRC}/tmp
-	@cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
-		${FIND} * -type f -o -type l > ${PLIST}.new; \
-		${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' \
-		>> ${PLIST}.new
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-gtk/distinfo.alpha b/x11-toolkits/linux-gtk/distinfo.alpha
deleted file mode 100644
index 3b30df4d412f..000000000000
--- a/x11-toolkits/linux-gtk/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/gtk+-1.2.9-4.alpha.rpm) = 72107f3edc89e27e1481b89fd752ff82
-SIZE (rpm/gtk+-1.2.9-4.alpha.rpm) = 1166775
diff --git a/x11-toolkits/linux-gtk/distinfo.i386 b/x11-toolkits/linux-gtk/distinfo.i386
index 3a34cdf9f23f..40e58d497d51 100644
--- a/x11-toolkits/linux-gtk/distinfo.i386
+++ b/x11-toolkits/linux-gtk/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk+-1.2.10-22.i386.rpm) = 1932769e2a4fc10524b77a69811f4427
-SHA256 (rpm/gtk+-1.2.10-22.i386.rpm) = 7949c5204a620056f09279e6571ae2f4bacf6c8cbbf7fc7a4e4e75c33f806c6a
-SIZE (rpm/gtk+-1.2.10-22.i386.rpm) = 948063
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 6ed518519e2fba27bb5bf3cbf1ab258c
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = bb3968184a73eb25ae966dd0dccc5975bdfa7734bcd24c7508ca9b52b12fc404
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 856964
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 428f57749b40021404b67d203962e98b
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 3fd4a4e9a31cd4fcd52d8fe7c97581f8bb7e0e3f7b8736b26fbc557afb0e25cf
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 2918540
diff --git a/x11-toolkits/linux-gtk/pkg-plist.alpha b/x11-toolkits/linux-gtk/pkg-plist.alpha
deleted file mode 100644
index 052e7ae60a60..000000000000
--- a/x11-toolkits/linux-gtk/pkg-plist.alpha
+++ /dev/null
@@ -1,182 +0,0 @@
-etc/gtk/gtkrc
-etc/gtk/gtkrc.az
-etc/gtk/gtkrc.cp1251
-etc/gtk/gtkrc.cp1255
-etc/gtk/gtkrc.el
-etc/gtk/gtkrc.eo
-etc/gtk/gtkrc.he
-etc/gtk/gtkrc.hy
-etc/gtk/gtkrc.iso-8859-13
-etc/gtk/gtkrc.iso-8859-14
-etc/gtk/gtkrc.iso-8859-15
-etc/gtk/gtkrc.iso-8859-2
-etc/gtk/gtkrc.iso-8859-5
-etc/gtk/gtkrc.ja
-etc/gtk/gtkrc.ka_GE.georgianacademy
-etc/gtk/gtkrc.ka_GE.georgianps
-etc/gtk/gtkrc.ko
-etc/gtk/gtkrc.ru
-etc/gtk/gtkrc.th
-etc/gtk/gtkrc.tr
-etc/gtk/gtkrc.uk
-etc/gtk/gtkrc.vi_VN.tcvn
-etc/gtk/gtkrc.vi_VN.viscii
-etc/gtk/gtkrc.zh_CN
-etc/gtk/gtkrc.zh_TW.big5
-usr/lib/libgdk-1.2.so.0.9.0
-usr/lib/libgtk-1.2.so.0.9.0
-usr/share/doc/gtk+-1.2.9/AUTHORS
-usr/share/doc/gtk+-1.2.9/COPYING
-usr/share/doc/gtk+-1.2.9/ChangeLog
-usr/share/doc/gtk+-1.2.9/NEWS
-usr/share/doc/gtk+-1.2.9/README
-usr/share/doc/gtk+-1.2.9/TODO
-usr/share/locale/az/LC_MESSAGES/gtk+.mo
-usr/share/locale/ca/LC_MESSAGES/gtk+.mo
-usr/share/locale/cs/LC_MESSAGES/gtk+.mo
-usr/share/locale/da/LC_MESSAGES/gtk+.mo
-usr/share/locale/de/LC_MESSAGES/gtk+.mo
-usr/share/locale/el/LC_MESSAGES/gtk+.mo
-usr/share/locale/es/LC_MESSAGES/gtk+.mo
-usr/share/locale/et/LC_MESSAGES/gtk+.mo
-usr/share/locale/eu/LC_MESSAGES/gtk+.mo
-usr/share/locale/fi/LC_MESSAGES/gtk+.mo
-usr/share/locale/fr/LC_MESSAGES/gtk+.mo
-usr/share/locale/ga/LC_MESSAGES/gtk+.mo
-usr/share/locale/gl/LC_MESSAGES/gtk+.mo
-usr/share/locale/hr/LC_MESSAGES/gtk+.mo
-usr/share/locale/hu/LC_MESSAGES/gtk+.mo
-usr/share/locale/it/LC_MESSAGES/gtk+.mo
-usr/share/locale/ja/LC_MESSAGES/gtk+.mo
-usr/share/locale/ko/LC_MESSAGES/gtk+.mo
-usr/share/locale/lt/LC_MESSAGES/gtk+.mo
-usr/share/locale/nl/LC_MESSAGES/gtk+.mo
-usr/share/locale/nn/LC_MESSAGES/gtk+.mo
-usr/share/locale/no/LC_MESSAGES/gtk+.mo
-usr/share/locale/pl/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt_BR/LC_MESSAGES/gtk+.mo
-usr/share/locale/ro/LC_MESSAGES/gtk+.mo
-usr/share/locale/ru/LC_MESSAGES/gtk+.mo
-usr/share/locale/sk/LC_MESSAGES/gtk+.mo
-usr/share/locale/sl/LC_MESSAGES/gtk+.mo
-usr/share/locale/sp/LC_MESSAGES/gtk+.mo
-usr/share/locale/sr/LC_MESSAGES/gtk+.mo
-usr/share/locale/sv/LC_MESSAGES/gtk+.mo
-usr/share/locale/tr/LC_MESSAGES/gtk+.mo
-usr/share/locale/uk/LC_MESSAGES/gtk+.mo
-usr/share/locale/wa/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
-usr/share/themes/Default/gtk/gtkrc
-etc/gtk/gtkrc.be
-etc/gtk/gtkrc.bg
-etc/gtk/gtkrc.bg_BG.iso88595
-etc/gtk/gtkrc.cs
-etc/gtk/gtkrc.cy
-etc/gtk/gtkrc.et
-etc/gtk/gtkrc.ga
-etc/gtk/gtkrc.he_IL.cp1255
-etc/gtk/gtkrc.he_IL.microsoftcp1255
-etc/gtk/gtkrc.hr
-etc/gtk/gtkrc.hu
-etc/gtk/gtkrc.ka
-etc/gtk/gtkrc.lt
-etc/gtk/gtkrc.lv
-etc/gtk/gtkrc.mi
-etc/gtk/gtkrc.mk
-etc/gtk/gtkrc.pl
-etc/gtk/gtkrc.ro
-etc/gtk/gtkrc.ru_RU.iso88595
-etc/gtk/gtkrc.sk
-etc/gtk/gtkrc.sl
-etc/gtk/gtkrc.sp
-etc/gtk/gtkrc.sq
-etc/gtk/gtkrc.sr
-etc/gtk/gtkrc.sr.iso88595
-etc/gtk/gtkrc.vi
-etc/gtk/gtkrc.vi_VN.viscii111
-etc/gtk/gtkrc.yi
-usr/lib/libgdk-1.2.so.0
-usr/lib/libgtk-1.2.so.0
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.9
-@dirrm usr/share/themes/Default/gtk
-@dirrmtry usr/share/themes/Default
-@dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
-@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
-@dirrmtry usr/share/locale/sp/LC_MESSAGES
-@dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
-@dirrmtry usr/share/locale/nn/LC_MESSAGES
-@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
-@dirrmtry usr/share/locale/lt/LC_MESSAGES
-@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
-@dirrmtry usr/share/locale/eu/LC_MESSAGES
-@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
-@dirrmtry usr/share/locale/az/LC_MESSAGES
-@dirrmtry usr/share/locale/az
-
diff --git a/x11-toolkits/linux-gtk/pkg-plist.i386 b/x11-toolkits/linux-gtk/pkg-plist.i386
index d24b9a54faef..95b28b3a31ae 100644
--- a/x11-toolkits/linux-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-gtk/pkg-plist.i386
@@ -24,10 +24,12 @@ etc/gtk/gtkrc.iso88595
 etc/gtk/gtkrc.iso88597
 etc/gtk/gtkrc.iso88599
 etc/gtk/gtkrc.ja
+etc/gtk/gtkrc.ja.utf8
 etc/gtk/gtkrc.ka
 etc/gtk/gtkrc.ka_GE.georgianacademy
 etc/gtk/gtkrc.ka_GE.georgianps
 etc/gtk/gtkrc.ko
+etc/gtk/gtkrc.ko.utf8
 etc/gtk/gtkrc.lt
 etc/gtk/gtkrc.lv
 etc/gtk/gtkrc.mi
@@ -50,7 +52,9 @@ etc/gtk/gtkrc.vi_VN.viscii
 etc/gtk/gtkrc.vi_VN.viscii111
 etc/gtk/gtkrc.yi
 etc/gtk/gtkrc.zh_CN
+etc/gtk/gtkrc.zh_CN.utf8
 etc/gtk/gtkrc.zh_TW.big5
+etc/gtk/gtkrc.zh_TW.utf8
 usr/lib/libgdk-1.2.so.0
 usr/lib/libgdk-1.2.so.0.9.1
 usr/lib/libgtk-1.2.so.0
@@ -100,85 +104,22 @@ usr/share/locale/wa/LC_MESSAGES/gtk+.mo
 usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
 usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
 usr/share/themes/Default/gtk/gtkrc
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.10
-@dirrm usr/share/themes/Default/gtk
+@dirrmtry usr/share/themes/Default/gtk
 @dirrmtry usr/share/themes/Default
 @dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
 @dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
 @dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
 @dirrmtry usr/share/locale/vi/LC_MESSAGES
 @dirrmtry usr/share/locale/vi
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
 @dirrmtry usr/share/locale/sp/LC_MESSAGES
 @dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
 @dirrmtry usr/share/locale/nn/LC_MESSAGES
 @dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
 @dirrmtry usr/share/locale/lt/LC_MESSAGES
 @dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
 @dirrmtry usr/share/locale/eu/LC_MESSAGES
 @dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
 @dirrmtry usr/share/locale/az/LC_MESSAGES
 @dirrmtry usr/share/locale/az
+@dirrm usr/share/doc/gtk+-1.2.10
+@dirrm etc/gtk
diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile
index 2df73bef3e89..e5ebe71571a6 100644
--- a/x11-toolkits/linux-gtk2/Makefile
+++ b/x11-toolkits/linux-gtk2/Makefile
@@ -7,12 +7,9 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.4.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX} \
-		http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/${SUBDIR}/ \
-		ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/${SUBDIR}/
-MASTER_SITE_SUBDIR=	updates/3/i386
+DISTNAME=	${PORTNAME}-${PORTVERSION}-4.fc3.3
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X, Linux binary
@@ -27,17 +24,15 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib
 		${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
 
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
 USE_XLIB=	yes
-RESTRICTED=	"binaries under GNU LGPL without accompanying source"
-RPM_SET=	gtk2-${PORTVERSION}-4.fc3.3.${ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+BRANDELF_DIRS=	usr/bin
 PLIST_SUB=	LIBVERSION="400.14" PORTVERSION="${PORTVERSION}"
 
 post-install:
-.for ii in gdk-pixbuf-query-loaders-32 gtk-demo gtk-query-immodules-2.0-32
-	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii}
-.endfor
 	@chroot ${PREFIX} /usr/bin/gtk-query-immodules-2.0-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
 	@chroot ${PREFIX} /usr/bin/gdk-pixbuf-query-loaders-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gdk-pixbuf.loaders
 
-.include "../linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-gtk2/distinfo.i386 b/x11-toolkits/linux-gtk2/distinfo.i386
index d08be6cdf92f..e55c9461ddd5 100644
--- a/x11-toolkits/linux-gtk2/distinfo.i386
+++ b/x11-toolkits/linux-gtk2/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
-SHA256 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
-SIZE (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 44f37d231bffc16d7e516a7798007bb1
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = b8f7e3688e344960e90cb2d09188dbf0b4450d9f0c00ab90d14745335f0827c1
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 9690086
diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile
index f8cb49fb09d1..4c38c1d477b6 100644
--- a/x11-toolkits/linux-pango/Makefile
+++ b/x11-toolkits/linux-pango/Makefile
@@ -7,13 +7,12 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-7
 
 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
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
@@ -23,12 +22,13 @@ RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree8
 
 USE_XLIB=	yes
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
-RPM_SET=	pango-${PORTVERSION}-7.i386.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+BRANDELF_DIRS=	usr/bin
 PLIST_SUB+=	LIBVERSION="600.0" PORTVERSION="${PORTVERSION}"
 
 post-install:
-	@${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"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-pango/distinfo.i386 b/x11-toolkits/linux-pango/distinfo.i386
index 9cee7663d040..8009062442e7 100644
--- a/x11-toolkits/linux-pango/distinfo.i386
+++ b/x11-toolkits/linux-pango/distinfo.i386
@@ -1,3 +1,6 @@
-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
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 277273
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 962e177a9b5e7a74c34b9204e3a5aa41
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 8faac8c88dcc58203569d31a8881447b553bf52f26525799cfc1f54a09e1bfbe
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 879369