Say hello to the linux mega patch, it consolidates our linux bits a

little bit and allows to proceed to a more recent linux_base from
a stable (read as: the major bugs should be ironed out or identified
and most linux ports build just fine) source.

It also allows to ship 4.11 with a working linuxolator (the EOLed
linux_base is marked forbidden because of a security hole).

This is a major update, please read UPDATING (and CHANGES if you
develop linux ports).

Changes:
 - change the default linux_base from v7 to v8
 - add a newer freetype to linux_base-8 for nicer fonts display [1]
 - don't let cpio use hardlinks in the linux_base-8 port to quiet some
   warnings in some cases [2]
 - fix a cut&past error in the linux_base-8 pkg-install script [3]
 - convert the binary knob "USE_LINUX" to a version specifier, e.g.
   USE_LINUX=<value> specifies a dependency upon
   emulators/linux_base-<value>, exceptions are a value of "7" (which
   does what you want and adds a dependency to linux_base) and any
   value without a corresponding port in
   PORTSDIR/emulators/linux_base-<value> (which adds a dependency to
   the default linux_base)
 - don't implicitly add USE_LINUX with the USE_LINUX_PREFIX knob,
   this allows us to use the USE_LINUX_PREFIX knob for linux_base and
   paves the way for splitting up future linux base ports into
   individual pieces
 - remove RESTRICTED from some GPL licensed ports, even when we only
   distribute binaries, we get them from official linux sites, so
   anyone can grab them there if he needs to
 - add a dependency upon the linux X11 bits where necessary (based upon
   guesswork)
 - don't use USE_X_PREFIX in some linux ports since it adds a dependency
   to the FreeBSD X11 libs, as a workaround use PREFIX?= (the clean
   solution would be to remove the implicit USE_XLIB from USE_X_PREFIX)
 - bump the portrevision of the linux ports ("better safe than sorry"
   algorithm)
 - pass maintainership of the important linux infrastructure to a
   mailinglist, hijack freebsd-emulation@ for this purpose (if somebody
   doesn't like this: tell us your bikeshed color at freebsd-emulation@,
   my color would be "linuxolator@" in case someone cares...)
 - add a pkg-install script for linux-fontconfig, but don't use it;
   everything should work without it (the FreeBSD fc-cache program should
   do all the work), but in case we need it we just need to decomment the
   pkg-install part in the Makefile
 - fix some dependencies
 - fix some bugs
 - add some static plists
 - unbreak the ports with dependecies to more than one linux_base

This also fixes some ports which are marked BROKEN because of dependencies
to v7 and v8 of linux_base at the same time.

Known bugs:
 - the linux-mesa and linux-devtools ports install libGL*.so symlinks
 - some "minor" plist bugs (e.g. ld.so.{conf,cache} are modified by
   the linux X11 port, so linx_Base-8 moans at deinstall time)

Future work (interested souls should coordinate with freebsd-emulation@):
 - add some kind of USE_LINUX_X11 knob to streamline the X11 dependencies,
   or modify the behavior of USE_XLIB in the USE_LINUX case
   AFAIK trevor has some patches.
 - make USE_XLIB and USE_X_PREFIX orthogonal to be able to get rid of
   the PREFIX?= workaround in some linux ports
   Should be discussed/coordinated on/with x11@.
 - move the RPM bits from x11-toolkits/linux-gtk/Makefile to PORTSDIR/Mk/
 - update to a more recent linux base

PR:			69997, 70539 (and maybe others)
Discussed with/on:	java@, x11@, trevor, portmgr
Tested by:		mezz, portmgr, pointyhat
RPM hunted down by:	Joseph Gelinas <scirocco@tasam.com> [1]
Requested by:		portmgr [2]
Submitted by:		kris [3]
Approved by:		portmgr

23 files changed, 112 insertions, 48 deletions

diff --git a/devel/linux-allegro/Makefile b/devel/linux-allegro/Makefile
index 31521b556a97..69b888e9e899 100644
--- a/devel/linux-allegro/Makefile
+++ b/devel/linux-allegro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	allegro
 PORTVERSION=	4.0.3
+PORTREVISION=	1
 CATEGORIES=	devel linux
 MASTER_SITES=	http://membres.lycos.fr/ebotcazou/allegro/
 PKGNAMEPREFIX=	linux-
@@ -14,9 +15,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.${MACHINE_ARCH}
 EXTRACT_SUFX=	.rpm
 EXTRACT_ONLY=
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform game programming library (linux version)
 
+USE_LINUX=		yes
 USE_LINUX_PREFIX=	yes
 LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
 
diff --git a/devel/linux-f10-allegro/Makefile b/devel/linux-f10-allegro/Makefile
index 31521b556a97..69b888e9e899 100644
--- a/devel/linux-f10-allegro/Makefile
+++ b/devel/linux-f10-allegro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	allegro
 PORTVERSION=	4.0.3
+PORTREVISION=	1
 CATEGORIES=	devel linux
 MASTER_SITES=	http://membres.lycos.fr/ebotcazou/allegro/
 PKGNAMEPREFIX=	linux-
@@ -14,9 +15,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.${MACHINE_ARCH}
 EXTRACT_SUFX=	.rpm
 EXTRACT_ONLY=
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform game programming library (linux version)
 
+USE_LINUX=		yes
 USE_LINUX_PREFIX=	yes
 LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
 
diff --git a/devel/linux-f10-libglade/Makefile b/devel/linux-f10-libglade/Makefile
index 74d833804aea..f076547bce49 100644
--- a/devel/linux-f10-libglade/Makefile
+++ b/devel/linux-f10-libglade/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	libglade
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
diff --git a/devel/linux-f10-libglade2/Makefile b/devel/linux-f10-libglade2/Makefile
index 74d833804aea..f076547bce49 100644
--- a/devel/linux-f10-libglade2/Makefile
+++ b/devel/linux-f10-libglade2/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	libglade
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
diff --git a/devel/linux-f10-sdl12/Makefile b/devel/linux-f10-sdl12/Makefile
index 9c988a991431..28845887cf76 100644
--- a/devel/linux-f10-sdl12/Makefile
+++ b/devel/linux-f10-sdl12/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 MASTER_SITES=	http://www.libsdl.org/release/ \
 		ftp://ftp.icm.edu.pl/vol/rzm9/linux-pld/pool/s/SDL/
@@ -17,10 +17,11 @@ DISTNAME=	${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH}
 EXTRACT_SUFX=	.rpm
 EXTRACT_ONLY=
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform multi-media development API (linux version)
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 USE_LINUX_PREFIX=	yes
 LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
diff --git a/devel/linux-f8-allegro/Makefile b/devel/linux-f8-allegro/Makefile
index 31521b556a97..69b888e9e899 100644
--- a/devel/linux-f8-allegro/Makefile
+++ b/devel/linux-f8-allegro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	allegro
 PORTVERSION=	4.0.3
+PORTREVISION=	1
 CATEGORIES=	devel linux
 MASTER_SITES=	http://membres.lycos.fr/ebotcazou/allegro/
 PKGNAMEPREFIX=	linux-
@@ -14,9 +15,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.${MACHINE_ARCH}
 EXTRACT_SUFX=	.rpm
 EXTRACT_ONLY=
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform game programming library (linux version)
 
+USE_LINUX=		yes
 USE_LINUX_PREFIX=	yes
 LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
 
diff --git a/devel/linux-f8-libglade/Makefile b/devel/linux-f8-libglade/Makefile
index 74d833804aea..f076547bce49 100644
--- a/devel/linux-f8-libglade/Makefile
+++ b/devel/linux-f8-libglade/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	libglade
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
diff --git a/devel/linux-f8-libglade2/Makefile b/devel/linux-f8-libglade2/Makefile
index 74d833804aea..f076547bce49 100644
--- a/devel/linux-f8-libglade2/Makefile
+++ b/devel/linux-f8-libglade2/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	libglade
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
diff --git a/devel/linux-f8-sdl12/Makefile b/devel/linux-f8-sdl12/Makefile
index 9c988a991431..28845887cf76 100644
--- a/devel/linux-f8-sdl12/Makefile
+++ b/devel/linux-f8-sdl12/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 MASTER_SITES=	http://www.libsdl.org/release/ \
 		ftp://ftp.icm.edu.pl/vol/rzm9/linux-pld/pool/s/SDL/
@@ -17,10 +17,11 @@ DISTNAME=	${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH}
 EXTRACT_SUFX=	.rpm
 EXTRACT_ONLY=
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform multi-media development API (linux version)
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 USE_LINUX_PREFIX=	yes
 LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
diff --git a/devel/linux-glib2/Makefile b/devel/linux-glib2/Makefile
index 665aee3747ff..4c64f045642d 100644
--- a/devel/linux-glib2/Makefile
+++ b/devel/linux-glib2/Makefile
@@ -7,25 +7,15 @@
 
 PORTNAME=	glib2
 PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Version 2.X Linux/i386 binary port of GLib
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/plist
-RESTRICTED=	"binary under GNU LGPL without accompanying source"
+PLIST=		${PKGDIR}/pkg-plist
 RPM_SET=	glib2-2.2.1-1.i386.rpm
 
-pre-install:
-	${RM} -rf ${WRKSRC}/tmp
-	${MKDIR} ${WRKSRC}/tmp
-	cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | \
-		${CPIO} -id; ${FIND} * -type f -o -type l > ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} glib | ${SED} -e 's:^:@dirrm :' \
-		>> ${PLIST}
-
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/devel/linux-glib2/pkg-plist b/devel/linux-glib2/pkg-plist
new file mode 100644
index 000000000000..deed898fe114
--- /dev/null
+++ b/devel/linux-glib2/pkg-plist
@@ -0,0 +1,55 @@
+etc/profile.d/glib2.csh
+etc/profile.d/glib2.sh
+usr/lib/libglib-2.0.so.0
+usr/lib/libglib-2.0.so.0.200.1
+usr/lib/libgmodule-2.0.so.0
+usr/lib/libgmodule-2.0.so.0.200.1
+usr/lib/libgobject-2.0.so.0
+usr/lib/libgobject-2.0.so.0.200.1
+usr/lib/libgthread-2.0.so.0
+usr/lib/libgthread-2.0.so.0.200.1
+usr/share/doc/glib2-2.2.1/AUTHORS
+usr/share/doc/glib2-2.2.1/COPYING
+usr/share/doc/glib2-2.2.1/ChangeLog
+usr/share/doc/glib2-2.2.1/NEWS
+usr/share/doc/glib2-2.2.1/README
+usr/share/locale/am/LC_MESSAGES/glib20.mo
+usr/share/locale/az/LC_MESSAGES/glib20.mo
+usr/share/locale/be/LC_MESSAGES/glib20.mo
+usr/share/locale/bg/LC_MESSAGES/glib20.mo
+usr/share/locale/bn/LC_MESSAGES/glib20.mo
+usr/share/locale/ca/LC_MESSAGES/glib20.mo
+usr/share/locale/cs/LC_MESSAGES/glib20.mo
+usr/share/locale/da/LC_MESSAGES/glib20.mo
+usr/share/locale/de/LC_MESSAGES/glib20.mo
+usr/share/locale/el/LC_MESSAGES/glib20.mo
+usr/share/locale/es/LC_MESSAGES/glib20.mo
+usr/share/locale/et/LC_MESSAGES/glib20.mo
+usr/share/locale/eu/LC_MESSAGES/glib20.mo
+usr/share/locale/fi/LC_MESSAGES/glib20.mo
+usr/share/locale/fr/LC_MESSAGES/glib20.mo
+usr/share/locale/gl/LC_MESSAGES/glib20.mo
+usr/share/locale/hi/LC_MESSAGES/glib20.mo
+usr/share/locale/ja/LC_MESSAGES/glib20.mo
+usr/share/locale/ko/LC_MESSAGES/glib20.mo
+usr/share/locale/mn/LC_MESSAGES/glib20.mo
+usr/share/locale/ms/LC_MESSAGES/glib20.mo
+usr/share/locale/nl/LC_MESSAGES/glib20.mo
+usr/share/locale/nn/LC_MESSAGES/glib20.mo
+usr/share/locale/no/LC_MESSAGES/glib20.mo
+usr/share/locale/pl/LC_MESSAGES/glib20.mo
+usr/share/locale/pt/LC_MESSAGES/glib20.mo
+usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo
+usr/share/locale/ro/LC_MESSAGES/glib20.mo
+usr/share/locale/ru/LC_MESSAGES/glib20.mo
+usr/share/locale/sk/LC_MESSAGES/glib20.mo
+usr/share/locale/sl/LC_MESSAGES/glib20.mo
+usr/share/locale/sq/LC_MESSAGES/glib20.mo
+usr/share/locale/sv/LC_MESSAGES/glib20.mo
+usr/share/locale/ta/LC_MESSAGES/glib20.mo
+usr/share/locale/tr/LC_MESSAGES/glib20.mo
+usr/share/locale/uk/LC_MESSAGES/glib20.mo
+usr/share/locale/vi/LC_MESSAGES/glib20.mo
+usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo
+usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
+@dirrm usr/share/doc/glib2-2.2.1
diff --git a/devel/linux-libglade/Makefile b/devel/linux-libglade/Makefile
index 74d833804aea..f076547bce49 100644
--- a/devel/linux-libglade/Makefile
+++ b/devel/linux-libglade/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	libglade
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
diff --git a/devel/linux-libglade2/Makefile b/devel/linux-libglade2/Makefile
index 74d833804aea..f076547bce49 100644
--- a/devel/linux-libglade2/Makefile
+++ b/devel/linux-libglade2/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	libglade
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
diff --git a/devel/linux-runrev/Makefile b/devel/linux-runrev/Makefile
index ff9bb732fddc..8e0ed0fc0c8f 100644
--- a/devel/linux-runrev/Makefile
+++ b/devel/linux-runrev/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	runrev
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	devel linux
 MASTER_SITES=	ftp://ftp.runrev.com/pub/revolution/ \
 		http://www.runrev.com/revolution/engines11/unix/
@@ -18,7 +19,8 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	blackend@FreeBSD.org
 COMMENT=	Revolution is a rapid application development environment
 
-RUN_DEPENDS=	xanim:${PORTSDIR}/multimedia/xanim
+RUN_DEPENDS=	xanim:${PORTSDIR}/multimedia/xanim \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 NO_CDROM=	"Sale for profit is not permitted"
 
diff --git a/devel/linux-sdl12/Makefile b/devel/linux-sdl12/Makefile
index 9c988a991431..28845887cf76 100644
--- a/devel/linux-sdl12/Makefile
+++ b/devel/linux-sdl12/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 MASTER_SITES=	http://www.libsdl.org/release/ \
 		ftp://ftp.icm.edu.pl/vol/rzm9/linux-pld/pool/s/SDL/
@@ -17,10 +17,11 @@ DISTNAME=	${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH}
 EXTRACT_SUFX=	.rpm
 EXTRACT_ONLY=
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform multi-media development API (linux version)
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 USE_LINUX_PREFIX=	yes
 LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
diff --git a/devel/linux-understand_ada/Makefile b/devel/linux-understand_ada/Makefile
index 1e183c104497..1811f55c172e 100644
--- a/devel/linux-understand_ada/Makefile
+++ b/devel/linux-understand_ada/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	understand_ada
 PORTVERSION=	1.4.206
+PORTREVISION=	1
 CATEGORIES=	devel linux
 MASTER_SITES=	http://www.scitools.com/ftp/pub/download/${PORTNAME}/%SUBDIR%/
 MASTER_SITE_SUBDIR=	latest pastbuilds
@@ -16,6 +17,8 @@ DISTNAME=	und_ada-14b${PORTVERSION:E}-linux
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Understand can parse a Ada project helping reverse engineer it
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/linux-understand_c/Makefile b/devel/linux-understand_c/Makefile
index e756735380d5..c1c15d208080 100644
--- a/devel/linux-understand_c/Makefile
+++ b/devel/linux-understand_c/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	understand_c
 PORTVERSION=	1.4.206
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel linux
 MASTER_SITES=	http://www.scitools.com/ftp/pub/download/understand_c/%SUBDIR%/
@@ -17,6 +18,8 @@ DISTNAME=	und_c-14b${PORTVERSION:E}-linux
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Understand can parse a C/C++ project helping reverse engineer it
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/linux-understand_java/Makefile b/devel/linux-understand_java/Makefile
index 795b9ae39c30..543e1529dc9f 100644
--- a/devel/linux-understand_java/Makefile
+++ b/devel/linux-understand_java/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	understand_java
 PORTVERSION=	1.4.206
+PORTREVISION=	1
 CATEGORIES=	devel java linux
 MASTER_SITES=	http://www.scitools.com/ftp/pub/download/${PORTNAME}/%SUBDIR%/
 MASTER_SITE_SUBDIR=	latest pastbuilds
@@ -16,6 +17,8 @@ DISTNAME=	und_java-14b${PORTVERSION:E}-linux
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Understand can parse a Java project helping reverse engineer it
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/linux_devtools-6/Makefile b/devel/linux_devtools-6/Makefile
index 4ba330e7178c..561f5ef77188 100644
--- a/devel/linux_devtools-6/Makefile
+++ b/devel/linux_devtools-6/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		linux_devtools
 PORTVERSION=		6.1
-PORTREVISION=	1
+PORTREVISION=		2
 CATEGORIES=		devel emulators linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX}
 MASTER_SITE_SUBDIR=	${PORTVERSION}/en/os/${MACHINE_ARCH}/RedHat/RPMS
@@ -25,12 +25,10 @@ PATCH_SITES=		${MASTER_SITE_REDHAT_LINUX}
 PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/en/os/${MACHINE_ARCH}
 PATCHFILES=
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=		freebsd-emulation@FreeBSD.org
 COMMENT=	Packages needed for doing development in Linux mode
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=		\
-	${PREFIX}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-6
 
 NO_LATEST_LINK=		yes
 ONLY_FOR_ARCHS=		alpha i386
@@ -40,6 +38,7 @@ EXTRACT_ONLY=
 NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
 NO_MTREE=		yes
+USE_LINUX=		6
 PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 
 .include <bsd.port.pre.mk>
diff --git a/devel/linux_devtools-7/Makefile b/devel/linux_devtools-7/Makefile
index 8d0a7880dcbd..3db268adfbc0 100644
--- a/devel/linux_devtools-7/Makefile
+++ b/devel/linux_devtools-7/Makefile
@@ -20,16 +20,14 @@ PATCH_SITES=		${MASTER_SITE_REDHAT_LINUX}
 PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}
 PATCHFILES=		${UPDATES}
 
-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		freebsd-emulation@FreeBSD.org
 COMMENT=		Packages needed for doing development in Linux mode
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=		alpha i386
 
-RESTRICTED=		"binaries under GNU GPL without accompanying source"
-
-USE_LINUX=		yes
+USE_LINUX=		7
 DIST_SUBDIR=		rpm
 PREFIX=			${LINUXBASE}
 NO_BUILD=		yes
diff --git a/devel/linux_devtools/Makefile b/devel/linux_devtools/Makefile
index d3c062ab6c13..7f7e664654a9 100644
--- a/devel/linux_devtools/Makefile
+++ b/devel/linux_devtools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		linux_devtools
 PORTVERSION=		8.0
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		devel emulators linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX}
 MASTER_SITE_SUBDIR=	${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS
@@ -30,14 +30,12 @@ PATCH_SITES=		${MASTER_SITE_REDHAT_LINUX}
 PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}
 PATCHFILES=		${UPDATES}
 
-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		freebsd-emulation@FreeBSD.org
 COMMENT=		Packages needed for doing development in Linux mode
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8
-
-RESTRICTED=		"binaries under GNU GPL without accompanying source"
 
+USE_LINUX=		yes
 NO_LATEST_LINK=		yes
 ONLY_FOR_ARCHS=		i386
 CONFLICTS=		linux_devtools-*
diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile
index e3b8690da129..b6e7c0cef6e6 100644
--- a/devel/linux_kdump/Makefile
+++ b/devel/linux_kdump/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	linux_kdump
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	devel linux
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	marcel
diff --git a/devel/zendstudio/Makefile b/devel/zendstudio/Makefile
index d112032b49c5..4a2e872affe2 100644
--- a/devel/zendstudio/Makefile
+++ b/devel/zendstudio/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=	ZendStudio
 PORTVERSION=	3.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
 MASTER_SITES=	http://www.zend.com/store/products/zend-studio.php
 MAINTAINER=	tux@pinguru.net
 COMMENT=	A PHP IDE
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 USE_LINUX=	yes
 NO_BUILD=	yes
 RESTRICTED=	"Redistribution is not permitted"