- update to 1.2.10

 - use the fedora legacy site before the rpm mirrors (should speed up the
   fetch operation)
 - allow to add SRC RPM's (not used in this port, since it also serves
   as a framework for other ports which would break then, I hope this
   will be fixed soon by seperating the framework from this Makefile)

9 files changed, 177 insertions, 171 deletions

diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile
index f103054282d4..d3cffb4d10f5 100644
--- a/x11-toolkits/linux-f10-gtk/Makefile
+++ b/x11-toolkits/linux-f10-gtk/Makefile
@@ -8,12 +8,12 @@
 #
 
 PORTNAME?=	gtk
-PORTVERSION?=	1.2
-PORTREVISION?=	5
+PORTVERSION?=	1.2.10
+PORTREVISION?=	0
 CATEGORIES?=	x11-toolkits linux
-MASTER_SITES?=	${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} ${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g}
+MASTER_SITES?=	${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g} ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 PKGNAMEPREFIX=	linux-
-DISTFILES=	${RPM_SET}
+DISTFILES=	${RPM_SET} ${SRC_DISTFILES}
 
 MAINTAINER?=	freebsd-emulation@FreeBSD.org
 COMMENT?=	RPM of the Gtk lib
@@ -45,7 +45,7 @@ LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
 # Let's avoid hardcoding 'en' as the language.
 LANG=		en
 # Set the version of linux_base
-BASEVERSION?=	7.1
+BASEVERSION?=	8.0
 RPM_MIRRORS=	\
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/
@@ -55,9 +55,7 @@ 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.9-4.${ARCH}.rpm
-.elif (${ARCH} == "alpha")
-RPM_SET?=	gtk+-1.2.9-4.${ARCH}.rpm
+RPM_SET?=	gtk+-1.2.10-22.${ARCH}.rpm
 .endif
 DBPATH=		/var/lib/rpm
 RPMFLAGS+=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
diff --git a/x11-toolkits/linux-f10-gtk/distinfo.i386 b/x11-toolkits/linux-f10-gtk/distinfo.i386
index 0e0f9dc32411..3a34cdf9f23f 100644
--- a/x11-toolkits/linux-f10-gtk/distinfo.i386
+++ b/x11-toolkits/linux-f10-gtk/distinfo.i386
@@ -1,2 +1,3 @@
-MD5 (rpm/gtk+-1.2.9-4.i386.rpm) = fbabd839e9196eec18abd0c8cc164c02
-SIZE (rpm/gtk+-1.2.9-4.i386.rpm) = 921419
+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
diff --git a/x11-toolkits/linux-f10-gtk/pkg-plist.i386 b/x11-toolkits/linux-f10-gtk/pkg-plist.i386
index bfff3d2d83bf..1379ffb1f057 100644
--- a/x11-toolkits/linux-f10-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-f10-gtk/pkg-plist.i386
@@ -1,36 +1,66 @@
 etc/gtk/gtkrc
 etc/gtk/gtkrc.az
+etc/gtk/gtkrc.be
+etc/gtk/gtkrc.bg
+etc/gtk/gtkrc.bg_BG.iso88595
 etc/gtk/gtkrc.cp1251
 etc/gtk/gtkrc.cp1255
-etc/gtk/gtkrc.el
-etc/gtk/gtkrc.eo
+etc/gtk/gtkrc.cs
+etc/gtk/gtkrc.cy
+etc/gtk/gtkrc.et
+etc/gtk/gtkrc.ga
 etc/gtk/gtkrc.he
+etc/gtk/gtkrc.he_IL.cp1255
+etc/gtk/gtkrc.he_IL.microsoftcp1255
+etc/gtk/gtkrc.hr
+etc/gtk/gtkrc.hu
 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.iso885913
+etc/gtk/gtkrc.iso885914
+etc/gtk/gtkrc.iso885915
+etc/gtk/gtkrc.iso88592
+etc/gtk/gtkrc.iso88593
+etc/gtk/gtkrc.iso88595
+etc/gtk/gtkrc.iso88597
+etc/gtk/gtkrc.iso88599
 etc/gtk/gtkrc.ja
+etc/gtk/gtkrc.ka
 etc/gtk/gtkrc.ka_GE.georgianacademy
 etc/gtk/gtkrc.ka_GE.georgianps
 etc/gtk/gtkrc.ko
+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
+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.th
-etc/gtk/gtkrc.tr
 etc/gtk/gtkrc.uk
+etc/gtk/gtkrc.utf8
+etc/gtk/gtkrc.vi
 etc/gtk/gtkrc.vi_VN.tcvn
 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_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/lib/libgdk-1.2.so.0
+usr/lib/libgdk-1.2.so.0.9.1
+usr/lib/libgtk-1.2.so.0
+usr/lib/libgtk-1.2.so.0.9.1
+usr/share/doc/gtk+-1.2.10/AUTHORS
+usr/share/doc/gtk+-1.2.10/COPYING
+usr/share/doc/gtk+-1.2.10/ChangeLog
+usr/share/doc/gtk+-1.2.10/NEWS
+usr/share/doc/gtk+-1.2.10/README
+usr/share/doc/gtk+-1.2.10/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
@@ -65,42 +95,13 @@ 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/vi/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/doc/gtk+-1.2.10
 @dirrm usr/share/themes/Default/gtk
 @unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
 @unexec rmdir %D/usr/share/themes 2>/dev/null || true
@@ -111,6 +112,8 @@ usr/lib/libgtk-1.2.so.0
 @unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/vi 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile
index f103054282d4..d3cffb4d10f5 100644
--- a/x11-toolkits/linux-f8-gtk/Makefile
+++ b/x11-toolkits/linux-f8-gtk/Makefile
@@ -8,12 +8,12 @@
 #
 
 PORTNAME?=	gtk
-PORTVERSION?=	1.2
-PORTREVISION?=	5
+PORTVERSION?=	1.2.10
+PORTREVISION?=	0
 CATEGORIES?=	x11-toolkits linux
-MASTER_SITES?=	${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} ${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g}
+MASTER_SITES?=	${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g} ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 PKGNAMEPREFIX=	linux-
-DISTFILES=	${RPM_SET}
+DISTFILES=	${RPM_SET} ${SRC_DISTFILES}
 
 MAINTAINER?=	freebsd-emulation@FreeBSD.org
 COMMENT?=	RPM of the Gtk lib
@@ -45,7 +45,7 @@ LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
 # Let's avoid hardcoding 'en' as the language.
 LANG=		en
 # Set the version of linux_base
-BASEVERSION?=	7.1
+BASEVERSION?=	8.0
 RPM_MIRRORS=	\
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/
@@ -55,9 +55,7 @@ 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.9-4.${ARCH}.rpm
-.elif (${ARCH} == "alpha")
-RPM_SET?=	gtk+-1.2.9-4.${ARCH}.rpm
+RPM_SET?=	gtk+-1.2.10-22.${ARCH}.rpm
 .endif
 DBPATH=		/var/lib/rpm
 RPMFLAGS+=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
diff --git a/x11-toolkits/linux-f8-gtk/distinfo.i386 b/x11-toolkits/linux-f8-gtk/distinfo.i386
index 0e0f9dc32411..3a34cdf9f23f 100644
--- a/x11-toolkits/linux-f8-gtk/distinfo.i386
+++ b/x11-toolkits/linux-f8-gtk/distinfo.i386
@@ -1,2 +1,3 @@
-MD5 (rpm/gtk+-1.2.9-4.i386.rpm) = fbabd839e9196eec18abd0c8cc164c02
-SIZE (rpm/gtk+-1.2.9-4.i386.rpm) = 921419
+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
diff --git a/x11-toolkits/linux-f8-gtk/pkg-plist.i386 b/x11-toolkits/linux-f8-gtk/pkg-plist.i386
index bfff3d2d83bf..1379ffb1f057 100644
--- a/x11-toolkits/linux-f8-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-f8-gtk/pkg-plist.i386
@@ -1,36 +1,66 @@
 etc/gtk/gtkrc
 etc/gtk/gtkrc.az
+etc/gtk/gtkrc.be
+etc/gtk/gtkrc.bg
+etc/gtk/gtkrc.bg_BG.iso88595
 etc/gtk/gtkrc.cp1251
 etc/gtk/gtkrc.cp1255
-etc/gtk/gtkrc.el
-etc/gtk/gtkrc.eo
+etc/gtk/gtkrc.cs
+etc/gtk/gtkrc.cy
+etc/gtk/gtkrc.et
+etc/gtk/gtkrc.ga
 etc/gtk/gtkrc.he
+etc/gtk/gtkrc.he_IL.cp1255
+etc/gtk/gtkrc.he_IL.microsoftcp1255
+etc/gtk/gtkrc.hr
+etc/gtk/gtkrc.hu
 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.iso885913
+etc/gtk/gtkrc.iso885914
+etc/gtk/gtkrc.iso885915
+etc/gtk/gtkrc.iso88592
+etc/gtk/gtkrc.iso88593
+etc/gtk/gtkrc.iso88595
+etc/gtk/gtkrc.iso88597
+etc/gtk/gtkrc.iso88599
 etc/gtk/gtkrc.ja
+etc/gtk/gtkrc.ka
 etc/gtk/gtkrc.ka_GE.georgianacademy
 etc/gtk/gtkrc.ka_GE.georgianps
 etc/gtk/gtkrc.ko
+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
+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.th
-etc/gtk/gtkrc.tr
 etc/gtk/gtkrc.uk
+etc/gtk/gtkrc.utf8
+etc/gtk/gtkrc.vi
 etc/gtk/gtkrc.vi_VN.tcvn
 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_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/lib/libgdk-1.2.so.0
+usr/lib/libgdk-1.2.so.0.9.1
+usr/lib/libgtk-1.2.so.0
+usr/lib/libgtk-1.2.so.0.9.1
+usr/share/doc/gtk+-1.2.10/AUTHORS
+usr/share/doc/gtk+-1.2.10/COPYING
+usr/share/doc/gtk+-1.2.10/ChangeLog
+usr/share/doc/gtk+-1.2.10/NEWS
+usr/share/doc/gtk+-1.2.10/README
+usr/share/doc/gtk+-1.2.10/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
@@ -65,42 +95,13 @@ 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/vi/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/doc/gtk+-1.2.10
 @dirrm usr/share/themes/Default/gtk
 @unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
 @unexec rmdir %D/usr/share/themes 2>/dev/null || true
@@ -111,6 +112,8 @@ usr/lib/libgtk-1.2.so.0
 @unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/vi 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile
index f103054282d4..d3cffb4d10f5 100644
--- a/x11-toolkits/linux-gtk/Makefile
+++ b/x11-toolkits/linux-gtk/Makefile
@@ -8,12 +8,12 @@
 #
 
 PORTNAME?=	gtk
-PORTVERSION?=	1.2
-PORTREVISION?=	5
+PORTVERSION?=	1.2.10
+PORTREVISION?=	0
 CATEGORIES?=	x11-toolkits linux
-MASTER_SITES?=	${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} ${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g}
+MASTER_SITES?=	${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g} ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 PKGNAMEPREFIX=	linux-
-DISTFILES=	${RPM_SET}
+DISTFILES=	${RPM_SET} ${SRC_DISTFILES}
 
 MAINTAINER?=	freebsd-emulation@FreeBSD.org
 COMMENT?=	RPM of the Gtk lib
@@ -45,7 +45,7 @@ LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
 # Let's avoid hardcoding 'en' as the language.
 LANG=		en
 # Set the version of linux_base
-BASEVERSION?=	7.1
+BASEVERSION?=	8.0
 RPM_MIRRORS=	\
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/
@@ -55,9 +55,7 @@ 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.9-4.${ARCH}.rpm
-.elif (${ARCH} == "alpha")
-RPM_SET?=	gtk+-1.2.9-4.${ARCH}.rpm
+RPM_SET?=	gtk+-1.2.10-22.${ARCH}.rpm
 .endif
 DBPATH=		/var/lib/rpm
 RPMFLAGS+=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
diff --git a/x11-toolkits/linux-gtk/distinfo.i386 b/x11-toolkits/linux-gtk/distinfo.i386
index 0e0f9dc32411..3a34cdf9f23f 100644
--- a/x11-toolkits/linux-gtk/distinfo.i386
+++ b/x11-toolkits/linux-gtk/distinfo.i386
@@ -1,2 +1,3 @@
-MD5 (rpm/gtk+-1.2.9-4.i386.rpm) = fbabd839e9196eec18abd0c8cc164c02
-SIZE (rpm/gtk+-1.2.9-4.i386.rpm) = 921419
+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
diff --git a/x11-toolkits/linux-gtk/pkg-plist.i386 b/x11-toolkits/linux-gtk/pkg-plist.i386
index bfff3d2d83bf..1379ffb1f057 100644
--- a/x11-toolkits/linux-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-gtk/pkg-plist.i386
@@ -1,36 +1,66 @@
 etc/gtk/gtkrc
 etc/gtk/gtkrc.az
+etc/gtk/gtkrc.be
+etc/gtk/gtkrc.bg
+etc/gtk/gtkrc.bg_BG.iso88595
 etc/gtk/gtkrc.cp1251
 etc/gtk/gtkrc.cp1255
-etc/gtk/gtkrc.el
-etc/gtk/gtkrc.eo
+etc/gtk/gtkrc.cs
+etc/gtk/gtkrc.cy
+etc/gtk/gtkrc.et
+etc/gtk/gtkrc.ga
 etc/gtk/gtkrc.he
+etc/gtk/gtkrc.he_IL.cp1255
+etc/gtk/gtkrc.he_IL.microsoftcp1255
+etc/gtk/gtkrc.hr
+etc/gtk/gtkrc.hu
 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.iso885913
+etc/gtk/gtkrc.iso885914
+etc/gtk/gtkrc.iso885915
+etc/gtk/gtkrc.iso88592
+etc/gtk/gtkrc.iso88593
+etc/gtk/gtkrc.iso88595
+etc/gtk/gtkrc.iso88597
+etc/gtk/gtkrc.iso88599
 etc/gtk/gtkrc.ja
+etc/gtk/gtkrc.ka
 etc/gtk/gtkrc.ka_GE.georgianacademy
 etc/gtk/gtkrc.ka_GE.georgianps
 etc/gtk/gtkrc.ko
+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
+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.th
-etc/gtk/gtkrc.tr
 etc/gtk/gtkrc.uk
+etc/gtk/gtkrc.utf8
+etc/gtk/gtkrc.vi
 etc/gtk/gtkrc.vi_VN.tcvn
 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_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/lib/libgdk-1.2.so.0
+usr/lib/libgdk-1.2.so.0.9.1
+usr/lib/libgtk-1.2.so.0
+usr/lib/libgtk-1.2.so.0.9.1
+usr/share/doc/gtk+-1.2.10/AUTHORS
+usr/share/doc/gtk+-1.2.10/COPYING
+usr/share/doc/gtk+-1.2.10/ChangeLog
+usr/share/doc/gtk+-1.2.10/NEWS
+usr/share/doc/gtk+-1.2.10/README
+usr/share/doc/gtk+-1.2.10/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
@@ -65,42 +95,13 @@ 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/vi/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/doc/gtk+-1.2.10
 @dirrm usr/share/themes/Default/gtk
 @unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
 @unexec rmdir %D/usr/share/themes 2>/dev/null || true
@@ -111,6 +112,8 @@ usr/lib/libgtk-1.2.so.0
 @unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/vi 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
 @unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true