- 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, 10 deletions

diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile
index f8cb49fb09d1..4c38c1d477b6 100644
--- a/x11-toolkits/linux-pango/Makefile
+++ b/x11-toolkits/linux-pango/Makefile
@@ -7,13 +7,12 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-7
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux pango binary
-MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR=	3/i386/os/Fedora/RPMS
 
 # these libraries are required by pango-querymodules
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
@@ -23,12 +22,13 @@ RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree8
 
 USE_XLIB=	yes
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
-RPM_SET=	pango-${PORTVERSION}-7.i386.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+BRANDELF_DIRS=	usr/bin
 PLIST_SUB+=	LIBVERSION="600.0" PORTVERSION="${PORTVERSION}"
 
 post-install:
-	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/pango-querymodules-32
 	@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i386-redhat-linux-gnu/pango.modules
 
-.include "../linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-pango/distinfo.i386 b/x11-toolkits/linux-pango/distinfo.i386
index 9cee7663d040..8009062442e7 100644
--- a/x11-toolkits/linux-pango/distinfo.i386
+++ b/x11-toolkits/linux-pango/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
-SHA256 (rpm/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
-SIZE (rpm/pango-1.6.0-7.i386.rpm) = 277273
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 277273
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 962e177a9b5e7a74c34b9204e3a5aa41
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 8faac8c88dcc58203569d31a8881447b553bf52f26525799cfc1f54a09e1bfbe
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 879369