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

6 files changed, 39 insertions, 60 deletions

diff --git a/accessibility/linux-atk/Makefile b/accessibility/linux-atk/Makefile
index 493d10e9a664..dcecd6c6244f 100644
--- a/accessibility/linux-atk/Makefile
+++ b/accessibility/linux-atk/Makefile
@@ -7,26 +7,19 @@
 
 PORTNAME=	atk
 PORTVERSION=	1.8.0
-PORTREVISION=	1
-CATEGORIES=	accessibility
-MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR=	3/i386/os/Fedora/RPMS \
-			3/SRPMS
+PORTREVISION=	2
+CATEGORIES=	accessibility linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
 
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
-RPM_SET=	atk-${PORTVERSION}-2.i386.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
 PLIST_SUB+=	LIBVERSION="800.0" PORTVERSION="${PORTVERSION}"
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
-
-.if defined(PACKAGE_BUILDING)
-DISTFILES+=	atk-1.8.0-2.src.rpm
-ALWAYS_KEEP_DISTFILES=	yes
-.endif
+.include <bsd.port.mk>
diff --git a/accessibility/linux-atk/distinfo.i386 b/accessibility/linux-atk/distinfo.i386
index 75c4c5f92a77..9c857c20003a 100644
--- a/accessibility/linux-atk/distinfo.i386
+++ b/accessibility/linux-atk/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
-SHA256 (rpm/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
-SIZE (rpm/atk-1.8.0-2.i386.rpm) = 174373
-MD5 (rpm/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
-SHA256 (rpm/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
-SIZE (rpm/rpm/atk-1.8.0-2.src.rpm) = 509083
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 174373
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 509083
diff --git a/accessibility/linux-f10-atk/Makefile b/accessibility/linux-f10-atk/Makefile
index 493d10e9a664..dcecd6c6244f 100644
--- a/accessibility/linux-f10-atk/Makefile
+++ b/accessibility/linux-f10-atk/Makefile
@@ -7,26 +7,19 @@
 
 PORTNAME=	atk
 PORTVERSION=	1.8.0
-PORTREVISION=	1
-CATEGORIES=	accessibility
-MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR=	3/i386/os/Fedora/RPMS \
-			3/SRPMS
+PORTREVISION=	2
+CATEGORIES=	accessibility linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
 
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
-RPM_SET=	atk-${PORTVERSION}-2.i386.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
 PLIST_SUB+=	LIBVERSION="800.0" PORTVERSION="${PORTVERSION}"
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
-
-.if defined(PACKAGE_BUILDING)
-DISTFILES+=	atk-1.8.0-2.src.rpm
-ALWAYS_KEEP_DISTFILES=	yes
-.endif
+.include <bsd.port.mk>
diff --git a/accessibility/linux-f10-atk/distinfo.i386 b/accessibility/linux-f10-atk/distinfo.i386
index 75c4c5f92a77..9c857c20003a 100644
--- a/accessibility/linux-f10-atk/distinfo.i386
+++ b/accessibility/linux-f10-atk/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
-SHA256 (rpm/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
-SIZE (rpm/atk-1.8.0-2.i386.rpm) = 174373
-MD5 (rpm/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
-SHA256 (rpm/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
-SIZE (rpm/rpm/atk-1.8.0-2.src.rpm) = 509083
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 174373
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 509083
diff --git a/accessibility/linux-f8-atk/Makefile b/accessibility/linux-f8-atk/Makefile
index 493d10e9a664..dcecd6c6244f 100644
--- a/accessibility/linux-f8-atk/Makefile
+++ b/accessibility/linux-f8-atk/Makefile
@@ -7,26 +7,19 @@
 
 PORTNAME=	atk
 PORTVERSION=	1.8.0
-PORTREVISION=	1
-CATEGORIES=	accessibility
-MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR=	3/i386/os/Fedora/RPMS \
-			3/SRPMS
+PORTREVISION=	2
+CATEGORIES=	accessibility linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
 
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
-RPM_SET=	atk-${PORTVERSION}-2.i386.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
 PLIST_SUB+=	LIBVERSION="800.0" PORTVERSION="${PORTVERSION}"
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
-
-.if defined(PACKAGE_BUILDING)
-DISTFILES+=	atk-1.8.0-2.src.rpm
-ALWAYS_KEEP_DISTFILES=	yes
-.endif
+.include <bsd.port.mk>
diff --git a/accessibility/linux-f8-atk/distinfo.i386 b/accessibility/linux-f8-atk/distinfo.i386
index 75c4c5f92a77..9c857c20003a 100644
--- a/accessibility/linux-f8-atk/distinfo.i386
+++ b/accessibility/linux-f8-atk/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
-SHA256 (rpm/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
-SIZE (rpm/atk-1.8.0-2.i386.rpm) = 174373
-MD5 (rpm/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
-SHA256 (rpm/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
-SIZE (rpm/rpm/atk-1.8.0-2.src.rpm) = 509083
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 174373
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 509083