- 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]

5 files changed, 58 insertions, 163 deletions

diff --git a/x11/linux-gnomelibs/Makefile b/x11/linux-gnomelibs/Makefile
index c41ab454c7fa..03e07ad0e1e6 100644
--- a/x11/linux-gnomelibs/Makefile
+++ b/x11/linux-gnomelibs/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	gnomelibs
-PORTVERSION=	1.2.8
-PORTREVISION=	4
+PORTVERSION=	1.4.1.2.90
 CATEGORIES=	x11 linux
+DISTNAME=	gnome-libs-${PORTVERSION}-44
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RPM of gnome-libs
 
-RPM_SET=	gnome-libs-${PORTVERSION}-11.${ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+INSTALLS_SHLIB=	yes
+BRANDELF_DIRS=	usr/bin usr/sbin
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
-
-MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/${ARCH}/RedHat/RPMS/
+.include <bsd.port.mk>
diff --git a/x11/linux-gnomelibs/distinfo.alpha b/x11/linux-gnomelibs/distinfo.alpha
deleted file mode 100644
index 5df802896222..000000000000
--- a/x11/linux-gnomelibs/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/gnome-libs-1.2.8-11.alpha.rpm) = f0c13edcc03e2f034abc02b5862cf012
-SIZE (rpm/gnome-libs-1.2.8-11.alpha.rpm) = 1504221
diff --git a/x11/linux-gnomelibs/distinfo.i386 b/x11/linux-gnomelibs/distinfo.i386
index 60e2e7b9718f..ad0d22c49f8f 100644
--- a/x11/linux-gnomelibs/distinfo.i386
+++ b/x11/linux-gnomelibs/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/gnome-libs-1.2.8-11.i386.rpm) = 6352b24f9d7d7d7d9dfb3ccac356a4cb
-SIZE (rpm/gnome-libs-1.2.8-11.i386.rpm) = 1062583
+MD5 (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.i386.rpm) = 2c6cdb49ffa69054f0f9a52de99c3493
+SHA256 (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.i386.rpm) = 47ac5ac949c9ecfa1dac5569271aea872b1537c7d6ee6d1612fddcde85831cb1
+SIZE (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.i386.rpm) = 999699
+MD5 (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.src.rpm) = 6d7097387d7ce32f981393d67da9e758
+SHA256 (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.src.rpm) = ea909d5267300987536a2b3a2dee5dbeca16176ed282d25ff90e0e58a2afa66a
+SIZE (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.src.rpm) = 3904771
diff --git a/x11/linux-gnomelibs/pkg-plist.alpha b/x11/linux-gnomelibs/pkg-plist.alpha
deleted file mode 100644
index fa990faf9fdc..000000000000
--- a/x11/linux-gnomelibs/pkg-plist.alpha
+++ /dev/null
@@ -1,117 +0,0 @@
-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
-etc/sound/events/gnome.soundlist
-etc/sound/events/gtk-events.soundlist
-usr/bin/dns-helper
-usr/bin/gconfigger
-usr/bin/gnome-bug
-usr/bin/gnome-dump-metadata
-usr/bin/gnome-gen-mimedb
-usr/bin/gnome-moz-remote
-usr/bin/gnome-name-service
-usr/bin/gnome_segv
-usr/bin/goad-browser
-usr/bin/loadshlib
-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.12.1
-usr/lib/libgnorba.so.27.1.8
-usr/lib/libgnorbagtk.so.0.0.0
-usr/lib/libgtkxmhtml.so.1.0.1
-usr/lib/libzvt.so.2.2.9
-usr/sbin/gnome-pty-helper
-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
-usr/share/idl/desktop-textviewer.idl
-usr/share/idl/gnome-factory.idl
-usr/share/idl/gnome-unknown.idl
-usr/share/idl/name-service.idl
-usr/share/locale/ca/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/cs/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/da/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/de/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/el/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/en_GB/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/es/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/et/LC_MESSAGES/gnome-libs.mo
-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
-usr/share/pixmaps/gnome-default-dlg.png
-usr/share/pixmaps/gnome-error.png
-usr/share/pixmaps/gnome-info.png
-usr/share/pixmaps/gnome-question.png
-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 etc/gnome
diff --git a/x11/linux-gnomelibs/pkg-plist.i386 b/x11/linux-gnomelibs/pkg-plist.i386
index 0c58af34a8c2..044e9339dd51 100644
--- a/x11/linux-gnomelibs/pkg-plist.i386
+++ b/x11/linux-gnomelibs/pkg-plist.i386
@@ -32,20 +32,31 @@ usr/bin/gnome-name-service
 usr/bin/gnome_segv
 usr/bin/goad-browser
 usr/bin/loadshlib
+usr/bin/new-object
+usr/lib/libart_lgpl.so.2
 usr/lib/libart_lgpl.so.2.2.0
-usr/lib/libgnome.so.32.4.1
+usr/lib/libgnome.so.32
+usr/lib/libgnome.so.32.4.3
+usr/lib/libgnomesupport.so.0
 usr/lib/libgnomesupport.so.0.0.0
-usr/lib/libgnomeui.so.32.12.1
+usr/lib/libgnomeui.so.32
+usr/lib/libgnomeui.so.32.14.1
+usr/lib/libgnorba.so.27
 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.2.9
+usr/lib/libzvt.so.2
+usr/lib/libzvt.so.2.2.10
 usr/sbin/gnome-pty-helper
-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/doc/gnome-libs-1.4.1.2.90/AUTHORS
+usr/share/doc/gnome-libs-1.4.1.2.90/COPYING
+usr/share/doc/gnome-libs-1.4.1.2.90/ChangeLog
+usr/share/doc/gnome-libs-1.4.1.2.90/LICENSE
+usr/share/doc/gnome-libs-1.4.1.2.90/NEWS
+usr/share/doc/gnome-libs-1.4.1.2.90/README
+usr/share/doc/gnome-libs-1.4.1.2.90/changelog
 usr/share/idl/GnomeObject.idl
 usr/share/idl/Table.idl
 usr/share/idl/desktop-editor.idl
@@ -53,6 +64,7 @@ usr/share/idl/desktop-textviewer.idl
 usr/share/idl/gnome-factory.idl
 usr/share/idl/gnome-unknown.idl
 usr/share/idl/name-service.idl
+usr/share/locale/az/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/ca/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/cs/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/da/LC_MESSAGES/gnome-libs.mo
@@ -72,6 +84,8 @@ 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/lv/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/ms/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
@@ -85,45 +99,38 @@ 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/ta/LC_MESSAGES/gnome-libs.mo
 usr/share/locale/tr/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/uk/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/vi/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/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 usr/share/mime-info/gnome.mime
 usr/share/pixmaps/calculator-font.png
-usr/share/pixmaps/gnome-default-dlg.png
-usr/share/pixmaps/gnome-error.png
-usr/share/pixmaps/gnome-info.png
-usr/share/pixmaps/gnome-question.png
-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/mime-info
+@dirrmtry usr/share/locale/vi/LC_MESSAGES
+@dirrmtry usr/share/locale/vi
+@dirrmtry usr/share/locale/ta/LC_MESSAGES
+@dirrmtry usr/share/locale/ta
+@dirrmtry usr/share/locale/sp/LC_MESSAGES
+@dirrmtry usr/share/locale/sp
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/lv/LC_MESSAGES
+@dirrmtry usr/share/locale/lv
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
 @dirrm usr/share/idl
-@dirrm usr/share/doc/gnome-libs-1.2.8
+@dirrm usr/share/doc/gnome-libs-1.4.1.2.90
 @dirrm etc/sound/events
 @dirrm etc/sound
 @dirrm etc/gnome
-@dirrmtry usr/share/locale/eu/LC_MESSAGES
-@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/lt/LC_MESSAGES
-@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/nn/LC_MESSAGES
-@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/sp/LC_MESSAGES
-@dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_TW.Big5