5 files changed, 108 insertions, 93 deletions

diff --git a/x11/linux-gnomelibs/Makefile b/x11/linux-gnomelibs/Makefile
index dfd9fc7b4f96..832e78fc82f0 100644
--- a/x11/linux-gnomelibs/Makefile
+++ b/x11/linux-gnomelibs/Makefile
@@ -6,22 +6,17 @@
 #
 
 PORTNAME=	gnomelibs
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION=	1.0.40
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION=	1.0.54
-.endif
-
+PORTVERSION=	1.2.8
 CATEGORIES=	x11 linux
 
 MAINTAINER=	taoka@FreeBSD.org
 
-RPM_SET=	gnome-libs-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+RPM_SET=	gnome-libs-${PORTVERSION}-11.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
 
 .if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
+MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/i386/RedHat/RPMS/
 .elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
+MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/alpha/RedHat/RPMS/
 .endif
diff --git a/x11/linux-gnomelibs/distinfo.alpha b/x11/linux-gnomelibs/distinfo.alpha
index ffe652940688..f078942a5d4a 100644
--- a/x11/linux-gnomelibs/distinfo.alpha
+++ b/x11/linux-gnomelibs/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/gnome-libs-1.0.54-1.alpha.rpm) = 81d5bbd4f2fa44b0e6cc1c5fae0fa5f4
+MD5 (rpm/gnome-libs-1.2.8-11.alpha.rpm) = f0c13edcc03e2f034abc02b5862cf012
diff --git a/x11/linux-gnomelibs/distinfo.i386 b/x11/linux-gnomelibs/distinfo.i386
index 923e0af93a6b..e6c4817b17a5 100644
--- a/x11/linux-gnomelibs/distinfo.i386
+++ b/x11/linux-gnomelibs/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/gnome-libs-1.0.40-1.i386.rpm) = 3132ff6485f44f323961206e1c446c39
+MD5 (rpm/gnome-libs-1.2.8-11.i386.rpm) = 6352b24f9d7d7d7d9dfb3ccac356a4cb
diff --git a/x11/linux-gnomelibs/pkg-plist.alpha b/x11/linux-gnomelibs/pkg-plist.alpha
index 439caa5b6b64..fa990faf9fdc 100644
--- a/x11/linux-gnomelibs/pkg-plist.alpha
+++ b/x11/linux-gnomelibs/pkg-plist.alpha
@@ -1,3 +1,22 @@
+etc/gnome/gtkrc
+etc/gnome/gtkrc.el
+etc/gnome/gtkrc.eo
+etc/gnome/gtkrc.he
+etc/gnome/gtkrc.hy
+etc/gnome/gtkrc.iso88592
+etc/gnome/gtkrc.iso88595
+etc/gnome/gtkrc.ja
+etc/gnome/gtkrc.ka_GE.georgianacademy
+etc/gnome/gtkrc.ka_GE.georgianps
+etc/gnome/gtkrc.ko
+etc/gnome/gtkrc.ru
+etc/gnome/gtkrc.th
+etc/gnome/gtkrc.tr
+etc/gnome/gtkrc.uk
+etc/gnome/gtkrc.vi_VN.tcvn
+etc/gnome/gtkrc.vi_VN.viscii
+etc/gnome/gtkrc.zh_CN
+etc/gnome/gtkrc.zh_TW.Big5
 etc/mime-magic
 etc/mime-magic.dat
 etc/paper.config
@@ -13,48 +32,20 @@ usr/bin/gnome-name-service
 usr/bin/gnome_segv
 usr/bin/goad-browser
 usr/bin/loadshlib
-usr/bin/new-object
-usr/doc/gnome-libs-1.0.54/AUTHORS
-usr/doc/gnome-libs-1.0.54/COPYING
-usr/doc/gnome-libs-1.0.54/ChangeLog
-usr/doc/gnome-libs-1.0.54/NEWS
-usr/doc/gnome-libs-1.0.54/README
-usr/lib/libart_lgpl.so.2
-usr/lib/libart_lgpl.so.2.1.0
-usr/lib/libgnome.so.32
-usr/lib/libgnome.so.32.3.8
-usr/lib/libgnomesupport.so.0
+usr/lib/libart_lgpl.so.2.2.0
+usr/lib/libgnome.so.32.4.1
 usr/lib/libgnomesupport.so.0.0.0
-usr/lib/libgnomeui.so.32
-usr/lib/libgnomeui.so.32.10.3
-usr/lib/libgnorba.so.27
+usr/lib/libgnomeui.so.32.12.1
 usr/lib/libgnorba.so.27.1.8
-usr/lib/libgnorbagtk.so.0
 usr/lib/libgnorbagtk.so.0.0.0
-usr/lib/libgtkxmhtml.so.1
 usr/lib/libgtkxmhtml.so.1.0.1
-usr/lib/libzvt.so.2
-usr/lib/libzvt.so.2.2.6
+usr/lib/libzvt.so.2.2.9
 usr/sbin/gnome-pty-helper
-usr/share/gtkrc
-usr/share/gtkrc.el
-usr/share/gtkrc.eo
-usr/share/gtkrc.he
-usr/share/gtkrc.hy
-usr/share/gtkrc.iso88592
-usr/share/gtkrc.iso88595
-usr/share/gtkrc.ja
-usr/share/gtkrc.ka_GE.georgianacademy
-usr/share/gtkrc.ka_GE.georgianps
-usr/share/gtkrc.ko
-usr/share/gtkrc.ru
-usr/share/gtkrc.th
-usr/share/gtkrc.tr
-usr/share/gtkrc.uk
-usr/share/gtkrc.vi_VN.tcvn
-usr/share/gtkrc.vi_VN.viscii
-usr/share/gtkrc.zh_CN
-usr/share/gtkrc.zh_TW.Big5
+usr/share/doc/gnome-libs-1.2.8/AUTHORS
+usr/share/doc/gnome-libs-1.2.8/COPYING
+usr/share/doc/gnome-libs-1.2.8/ChangeLog
+usr/share/doc/gnome-libs-1.2.8/NEWS
+usr/share/doc/gnome-libs-1.2.8/README
 usr/share/idl/GnomeObject.idl
 usr/share/idl/Table.idl
 usr/share/idl/desktop-editor.idl
@@ -80,15 +71,23 @@ usr/share/locale/hu/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/it/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/ja/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/ko/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/lt/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/nl/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/nn/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/no/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/pl/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/pt/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/pt_BR/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/ro/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/ru/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/sk/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/sl/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/sp/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/sr/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/sv/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/tr/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/wa/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
 usr/share/mime-info/gnome.mime
 usr/share/pixmaps/calculator-font.png
@@ -100,9 +99,19 @@ usr/share/pixmaps/gnome-warning.png
 usr/share/pixmaps/no.xpm
 usr/share/pixmaps/yes.xpm
 usr/share/type-convert/type.convert
+usr/bin/new-object
+usr/lib/libart_lgpl.so.2
+usr/lib/libgnome.so.32
+usr/lib/libgnomesupport.so.0
+usr/lib/libgnomeui.so.32
+usr/lib/libgnorba.so.27
+usr/lib/libgnorbagtk.so.0
+usr/lib/libgtkxmhtml.so.1
+usr/lib/libzvt.so.2
+@dirrm usr/share/type-convert
+@dirrm usr/share/pixmaps
+@dirrm usr/share/mime-info
+@dirrm usr/share/doc/gnome-libs-1.2.8
 @dirrm etc/sound/events
 @dirrm etc/sound
-@dirrm usr/doc/gnome-libs-1.0.40
-@dirrm usr/share/mime-info
-@dirrm usr/share/pixmaps
-@dirrm usr/share/type-convert
+@dirrm etc/gnome
diff --git a/x11/linux-gnomelibs/pkg-plist.i386 b/x11/linux-gnomelibs/pkg-plist.i386
index 70d3a4599b60..9f3fbc95a4de 100644
--- a/x11/linux-gnomelibs/pkg-plist.i386
+++ b/x11/linux-gnomelibs/pkg-plist.i386
@@ -1,3 +1,22 @@
+etc/gnome/gtkrc
+etc/gnome/gtkrc.el
+etc/gnome/gtkrc.eo
+etc/gnome/gtkrc.he
+etc/gnome/gtkrc.hy
+etc/gnome/gtkrc.iso88592
+etc/gnome/gtkrc.iso88595
+etc/gnome/gtkrc.ja
+etc/gnome/gtkrc.ka_GE.georgianacademy
+etc/gnome/gtkrc.ka_GE.georgianps
+etc/gnome/gtkrc.ko
+etc/gnome/gtkrc.ru
+etc/gnome/gtkrc.th
+etc/gnome/gtkrc.tr
+etc/gnome/gtkrc.uk
+etc/gnome/gtkrc.vi_VN.tcvn
+etc/gnome/gtkrc.vi_VN.viscii
+etc/gnome/gtkrc.zh_CN
+etc/gnome/gtkrc.zh_TW.Big5
 etc/mime-magic
 etc/mime-magic.dat
 etc/paper.config
@@ -13,48 +32,20 @@ usr/bin/gnome-name-service
 usr/bin/gnome_segv
 usr/bin/goad-browser
 usr/bin/loadshlib
-usr/bin/new-object
-usr/doc/gnome-libs-1.0.40/AUTHORS
-usr/doc/gnome-libs-1.0.40/COPYING
-usr/doc/gnome-libs-1.0.40/ChangeLog
-usr/doc/gnome-libs-1.0.40/NEWS
-usr/doc/gnome-libs-1.0.40/README
-usr/lib/libart_lgpl.so.2
-usr/lib/libart_lgpl.so.2.1.0
-usr/lib/libgnome.so.32
-usr/lib/libgnome.so.32.3.7
-usr/lib/libgnomesupport.so.0
+usr/lib/libart_lgpl.so.2.2.0
+usr/lib/libgnome.so.32.4.1
 usr/lib/libgnomesupport.so.0.0.0
-usr/lib/libgnomeui.so.32
-usr/lib/libgnomeui.so.32.10.3
-usr/lib/libgnorba.so.27
+usr/lib/libgnomeui.so.32.12.1
 usr/lib/libgnorba.so.27.1.8
-usr/lib/libgnorbagtk.so.0
 usr/lib/libgnorbagtk.so.0.0.0
-usr/lib/libgtkxmhtml.so.1
 usr/lib/libgtkxmhtml.so.1.0.1
-usr/lib/libzvt.so.2
-usr/lib/libzvt.so.2.2.6
+usr/lib/libzvt.so.2.2.9
 usr/sbin/gnome-pty-helper
-usr/share/gtkrc
-usr/share/gtkrc.el
-usr/share/gtkrc.eo
-usr/share/gtkrc.he
-usr/share/gtkrc.hy
-usr/share/gtkrc.iso88592
-usr/share/gtkrc.iso88595
-usr/share/gtkrc.ja
-usr/share/gtkrc.ka_GE.georgianacademy
-usr/share/gtkrc.ka_GE.georgianps
-usr/share/gtkrc.ko
-usr/share/gtkrc.ru
-usr/share/gtkrc.th
-usr/share/gtkrc.tr
-usr/share/gtkrc.uk
-usr/share/gtkrc.vi_VN.tcvn
-usr/share/gtkrc.vi_VN.viscii
-usr/share/gtkrc.zh_CN
-usr/share/gtkrc.zh_TW.Big5
+usr/share/doc/gnome-libs-1.2.8/AUTHORS
+usr/share/doc/gnome-libs-1.2.8/COPYING
+usr/share/doc/gnome-libs-1.2.8/ChangeLog
+usr/share/doc/gnome-libs-1.2.8/NEWS
+usr/share/doc/gnome-libs-1.2.8/README
 usr/share/idl/GnomeObject.idl
 usr/share/idl/Table.idl
 usr/share/idl/desktop-editor.idl
@@ -74,20 +65,29 @@ usr/share/locale/eu/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/fi/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/fr/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/ga/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/gl/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/hr/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/hu/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/it/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/ja/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/ko/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/lt/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/nl/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/nn/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/no/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/pl/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/pt/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/pt_BR/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/ro/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/ru/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/sk/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/sl/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/sp/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/sr/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/sv/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/tr/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/wa/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
 usr/share/mime-info/gnome.mime
 usr/share/pixmaps/calculator-font.png
@@ -99,9 +99,20 @@ usr/share/pixmaps/gnome-warning.png
 usr/share/pixmaps/no.xpm
 usr/share/pixmaps/yes.xpm
 usr/share/type-convert/type.convert
+usr/bin/new-object
+usr/lib/libart_lgpl.so.2
+usr/lib/libgnome.so.32
+usr/lib/libgnomesupport.so.0
+usr/lib/libgnomeui.so.32
+usr/lib/libgnorba.so.27
+usr/lib/libgnorbagtk.so.0
+usr/lib/libgtkxmhtml.so.1
+usr/lib/libzvt.so.2
+@dirrm usr/share/type-convert
+@dirrm usr/share/pixmaps
+@dirrm usr/share/mime-info
+@dirrm usr/share/idl
+@dirrm usr/share/doc/gnome-libs-1.2.8
 @dirrm etc/sound/events
 @dirrm etc/sound
-@dirrm usr/doc/gnome-libs-1.0.40
-@dirrm usr/share/mime-info
-@dirrm usr/share/pixmaps
-@dirrm usr/share/type-convert
+@dirrm etc/gnome