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

2 files changed, 13 insertions, 15 deletions

diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 2df73bef3e89..e5ebe71571a6 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -7,12 +7,9 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.4.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX} \
-		http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/${SUBDIR}/ \
-		ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/${SUBDIR}/
-MASTER_SITE_SUBDIR=	updates/3/i386
+DISTNAME=	${PORTNAME}-${PORTVERSION}-4.fc3.3
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X, Linux binary
@@ -27,17 +24,15 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib
 		${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
 
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
 USE_XLIB=	yes
-RESTRICTED=	"binaries under GNU LGPL without accompanying source"
-RPM_SET=	gtk2-${PORTVERSION}-4.fc3.3.${ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+BRANDELF_DIRS=	usr/bin
 PLIST_SUB=	LIBVERSION="400.14" PORTVERSION="${PORTVERSION}"
 
 post-install:
-.for ii in gdk-pixbuf-query-loaders-32 gtk-demo gtk-query-immodules-2.0-32
-	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii}
-.endfor
 	@chroot ${PREFIX} /usr/bin/gtk-query-immodules-2.0-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
 	@chroot ${PREFIX} /usr/bin/gdk-pixbuf-query-loaders-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gdk-pixbuf.loaders
 
-.include "../linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-gtk2/distinfo.i386 b/x11-toolkits/linux-f10-gtk2/distinfo.i386
index d08be6cdf92f..e55c9461ddd5 100644
--- a/x11-toolkits/linux-f10-gtk2/distinfo.i386
+++ b/x11-toolkits/linux-f10-gtk2/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
-SHA256 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
-SIZE (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 44f37d231bffc16d7e516a7798007bb1
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = b8f7e3688e344960e90cb2d09188dbf0b4450d9f0c00ab90d14745335f0827c1
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 9690086