- 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, 28 insertions, 52 deletions

diff --git a/graphics/linux-ungif/Makefile b/graphics/linux-ungif/Makefile
index c3fff197ca4c..5c8218e4fc27 100644
--- a/graphics/linux-ungif/Makefile
+++ b/graphics/linux-ungif/Makefile
@@ -4,19 +4,19 @@
 # $FreeBSD$
 #
 PORTNAME=	ungif
-PORTVERSION=	4.1.0
-PORTREVISION=	3
+PORTVERSION=	4.1.3
 CATEGORIES=	graphics linux
+DISTNAME=	libungif-${PORTVERSION}-1
 
 MAINTAINTER=	maho@FreeBSD.org
 COMMENT=	RPM of the ungif lib
 
 NOT_FOR_ARCHS=	amd64
 
-.if (${MACHINE_ARCH} == "i386")
-RPM_SET=	libungif-4.1.0-7.${MACHINE_ARCH}.rpm
-.else
-RPM_SET=	libungif-4.1.0-8.${MACHINE_ARCH}.rpm
-.endif
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-ungif/distinfo.alpha b/graphics/linux-ungif/distinfo.alpha
deleted file mode 100644
index 6054d65663f5..000000000000
--- a/graphics/linux-ungif/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libungif-4.1.0-8.alpha.rpm) = 60bdb595dcd4a7cff8943a7a513d5957
-SIZE (rpm/libungif-4.1.0-8.alpha.rpm) = 115455
diff --git a/graphics/linux-ungif/distinfo.i386 b/graphics/linux-ungif/distinfo.i386
index 7df2039f460a..cb837bcc44e2 100644
--- a/graphics/linux-ungif/distinfo.i386
+++ b/graphics/linux-ungif/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libungif-4.1.0-7.i386.rpm) = 4cf169c6fc0b69251c2e9ddaad5e2a71
-SIZE (rpm/libungif-4.1.0-7.i386.rpm) = 44699
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 35af56b8b6551e3087ab2fd496f55dac
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 2bd28a1c9d9e22f47f9fbeb4e9bf95a9294037eedb322f5e4cc410a43f41d65d
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 39722
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = a8bce6737125e66f2af311d6e6dc2997
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 47590b7d466edcab4bdfc58724f7c7379dc933677e9a4296eee457d0aa081b1b
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 447818
diff --git a/graphics/linux-ungif/pkg-plist.alpha b/graphics/linux-ungif/pkg-plist.alpha
deleted file mode 100644
index 7962c90ed21d..000000000000
--- a/graphics/linux-ungif/pkg-plist.alpha
+++ /dev/null
@@ -1,20 +0,0 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
diff --git a/graphics/linux-ungif/pkg-plist.i386 b/graphics/linux-ungif/pkg-plist.i386
index 7962c90ed21d..8ec7dee5fa38 100644
--- a/graphics/linux-ungif/pkg-plist.i386
+++ b/graphics/linux-ungif/pkg-plist.i386
@@ -1,20 +1,14 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
+usr/lib/libgif.so.4
+usr/lib/libgif.so.%%PORTVERSION%%
+usr/lib/libungif.so.4
+usr/lib/libungif.so.%%PORTVERSION%%
+usr/share/doc/libungif-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libungif-%%PORTVERSION%%/BUGS
+usr/share/doc/libungif-%%PORTVERSION%%/COPYING
+usr/share/doc/libungif-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libungif-%%PORTVERSION%%/NEWS
+usr/share/doc/libungif-%%PORTVERSION%%/ONEWS
+usr/share/doc/libungif-%%PORTVERSION%%/README
+usr/share/doc/libungif-%%PORTVERSION%%/TODO
+usr/share/doc/libungif-%%PORTVERSION%%/UNCOMPRESSED_GIF
+@dirrm usr/share/doc/libungif-%%PORTVERSION%%