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
2004-12-31 18:24:10 +00:00
parent 440d8863c8
commit 64cf27c85d
251 changed files with 1698 additions and 615 deletions
--- a/4
+++ b/4
@@ -10,6 +10,10 @@ in the release notes.

 All ports committers are allowed to commit to this file.

+20041231:
+AUTHOR: netchild@FreeBSD.org
+  USE_LINUX_PREFIX doesn't implies USE_LINUX anymore.
+
 20041209:
 AUTHOR: portmgr@FreeBSD.org
  The following changes were committed:
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -341,7 +341,9 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 # USE_QT_VER	- Set to 3 to use the QT libraries.
 #				  Implies inclusion of bsd.kde.mk.
 ##
-# USE_LINUX		- Set to yes to say the port needs emulators/linux_base.
+# USE_LINUX		- Set to yes to say the port needs emulators/linux_base-8.
+#				  Set to value <X>, if the port needs emulators/linux_base-<X>.
+#				  If set to "7", a dependency is registered to emulators/linux_base.
 # USE_LINUX_PREFIX
 #				- controls the action of PREFIX (see above).
 ##
@@ -1134,9 +1136,6 @@ USE_X_PREFIX=	yes
 .if defined(USE_X_PREFIX)
 USE_XLIB=		yes
 .endif
-.if defined(USE_LINUX_PREFIX)
-USE_LINUX=		yes
-.endif
 .if defined(USE_X_PREFIX)
 PREFIX?=		${X11BASE}
 .elif defined(USE_LINUX_PREFIX)
@@ -1479,7 +1478,15 @@ LIB_DEPENDS+=	intl.${USE_GETTEXT}:${PORTSDIR}/devel/gettext
 .endif

 .if defined(USE_LINUX)
-RUN_DEPENDS+=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
+.	if exists(${PORTSDIR}/emulators/linux_base-${USE_LINUX})
+RUN_DEPENDS+=	${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
+.	else
+.		if ${USE_LINUX} == "7"
+RUN_DEPENDS+= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
+.		else
+RUN_DEPENDS+=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-8
+.		endif
+.	endif
 .endif

 .if defined(USE_MOTIF)
--- a/11
+++ b/11
@@ -13,6 +13,17 @@ upgrades.
  Location of awstats changed from /usr/local/www to /usr/local/www/awstats.
  Please update configuration according instructions in pkg-message.

+20041231:
+  AFFECTS: users of the linux compatibility environment
+  AUTHOR: netchild@FreeBSD.org
+
+  The default linux_base was changed from v7 to v8. You need to update from
+  v7 to v8 and rebuild every linux port. To update run:
+	portupgrade -rf -o emulators/linux_base-8 emulators/linux_base
+
+  In case you already use linux_base-8 you have to run:
+	portupgrade -rf emulators/linux_base-8
+
 20041229:
  AFFECTS: users of x11/kdebase3, x11/xorg-server
  AUTHOR: lofi@freebsd.org
--- a/accessibility/linux-atk/Makefile
+++ b/accessibility/linux-atk/Makefile
@@ -7,26 +7,18 @@

 PORTNAME=	atk
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility

-MAINTAINER=	trevor@FreeBSD.org
+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

 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/plist
-RESTRICTED=	"binary under GNU LGPL without accompanying source"
+PLIST=		${PKGDIR}/pkg-plist
 RPM_SET=	atk-1.2.0-2.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}
-	${ECHO_CMD} @dirrm usr/share/doc/atk-1.2.0 >> ${PLIST}
-
 .include "../../x11-toolkits/linux-gtk/Makefile"
--- a/accessibility/linux-atk/pkg-plist
+++ b/accessibility/linux-atk/pkg-plist
@@ -0,0 +1,22 @@
+usr/lib/libatk-1.0.so.0
+usr/lib/libatk-1.0.so.0.200.0
+usr/share/doc/atk-1.2.0/AUTHORS
+usr/share/doc/atk-1.2.0/COPYING
+usr/share/doc/atk-1.2.0/ChangeLog
+usr/share/doc/atk-1.2.0/README
+usr/share/locale/bg/LC_MESSAGES/atk10.mo
+usr/share/locale/cs/LC_MESSAGES/atk10.mo
+usr/share/locale/da/LC_MESSAGES/atk10.mo
+usr/share/locale/de/LC_MESSAGES/atk10.mo
+usr/share/locale/en_GB/LC_MESSAGES/atk10.mo
+usr/share/locale/es/LC_MESSAGES/atk10.mo
+usr/share/locale/he/LC_MESSAGES/atk10.mo
+usr/share/locale/hu/LC_MESSAGES/atk10.mo
+usr/share/locale/ms/LC_MESSAGES/atk10.mo
+usr/share/locale/nl/LC_MESSAGES/atk10.mo
+usr/share/locale/no/LC_MESSAGES/atk10.mo
+usr/share/locale/ru/LC_MESSAGES/atk10.mo
+usr/share/locale/sv/LC_MESSAGES/atk10.mo
+usr/share/locale/uk/LC_MESSAGES/atk10.mo
+usr/share/locale/vi/LC_MESSAGES/atk10.mo
+@dirrm usr/share/doc/atk-1.2.0
--- a/accessibility/linux-f10-atk/Makefile
+++ b/accessibility/linux-f10-atk/Makefile
@@ -7,26 +7,18 @@

 PORTNAME=	atk
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility

-MAINTAINER=	trevor@FreeBSD.org
+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

 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/plist
-RESTRICTED=	"binary under GNU LGPL without accompanying source"
+PLIST=		${PKGDIR}/pkg-plist
 RPM_SET=	atk-1.2.0-2.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}
-	${ECHO_CMD} @dirrm usr/share/doc/atk-1.2.0 >> ${PLIST}
-
 .include "../../x11-toolkits/linux-gtk/Makefile"
--- a/accessibility/linux-f10-atk/pkg-plist
+++ b/accessibility/linux-f10-atk/pkg-plist
@@ -0,0 +1,22 @@
+usr/lib/libatk-1.0.so.0
+usr/lib/libatk-1.0.so.0.200.0
+usr/share/doc/atk-1.2.0/AUTHORS
+usr/share/doc/atk-1.2.0/COPYING
+usr/share/doc/atk-1.2.0/ChangeLog
+usr/share/doc/atk-1.2.0/README
+usr/share/locale/bg/LC_MESSAGES/atk10.mo
+usr/share/locale/cs/LC_MESSAGES/atk10.mo
+usr/share/locale/da/LC_MESSAGES/atk10.mo
+usr/share/locale/de/LC_MESSAGES/atk10.mo
+usr/share/locale/en_GB/LC_MESSAGES/atk10.mo
+usr/share/locale/es/LC_MESSAGES/atk10.mo
+usr/share/locale/he/LC_MESSAGES/atk10.mo
+usr/share/locale/hu/LC_MESSAGES/atk10.mo
+usr/share/locale/ms/LC_MESSAGES/atk10.mo
+usr/share/locale/nl/LC_MESSAGES/atk10.mo
+usr/share/locale/no/LC_MESSAGES/atk10.mo
+usr/share/locale/ru/LC_MESSAGES/atk10.mo
+usr/share/locale/sv/LC_MESSAGES/atk10.mo
+usr/share/locale/uk/LC_MESSAGES/atk10.mo
+usr/share/locale/vi/LC_MESSAGES/atk10.mo
+@dirrm usr/share/doc/atk-1.2.0
--- a/accessibility/linux-f8-atk/Makefile
+++ b/accessibility/linux-f8-atk/Makefile
@@ -7,26 +7,18 @@

 PORTNAME=	atk
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility

-MAINTAINER=	trevor@FreeBSD.org
+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

 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/plist
-RESTRICTED=	"binary under GNU LGPL without accompanying source"
+PLIST=		${PKGDIR}/pkg-plist
 RPM_SET=	atk-1.2.0-2.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}
-	${ECHO_CMD} @dirrm usr/share/doc/atk-1.2.0 >> ${PLIST}
-
 .include "../../x11-toolkits/linux-gtk/Makefile"
--- a/accessibility/linux-f8-atk/pkg-plist
+++ b/accessibility/linux-f8-atk/pkg-plist
@@ -0,0 +1,22 @@
+usr/lib/libatk-1.0.so.0
+usr/lib/libatk-1.0.so.0.200.0
+usr/share/doc/atk-1.2.0/AUTHORS
+usr/share/doc/atk-1.2.0/COPYING
+usr/share/doc/atk-1.2.0/ChangeLog
+usr/share/doc/atk-1.2.0/README
+usr/share/locale/bg/LC_MESSAGES/atk10.mo
+usr/share/locale/cs/LC_MESSAGES/atk10.mo
+usr/share/locale/da/LC_MESSAGES/atk10.mo
+usr/share/locale/de/LC_MESSAGES/atk10.mo
+usr/share/locale/en_GB/LC_MESSAGES/atk10.mo
+usr/share/locale/es/LC_MESSAGES/atk10.mo
+usr/share/locale/he/LC_MESSAGES/atk10.mo
+usr/share/locale/hu/LC_MESSAGES/atk10.mo
+usr/share/locale/ms/LC_MESSAGES/atk10.mo
+usr/share/locale/nl/LC_MESSAGES/atk10.mo
+usr/share/locale/no/LC_MESSAGES/atk10.mo
+usr/share/locale/ru/LC_MESSAGES/atk10.mo
+usr/share/locale/sv/LC_MESSAGES/atk10.mo
+usr/share/locale/uk/LC_MESSAGES/atk10.mo
+usr/share/locale/vi/LC_MESSAGES/atk10.mo
+@dirrm usr/share/doc/atk-1.2.0
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	stuffit
 PORTVERSION=	5.2.0.611
+PORTREVISION=	1
 CATEGORIES=	archivers linux
 MASTER_SITES=	http://www.allume.com/downloads/files/
 DISTNAME=	stuffit520.611linux-i386
--- a/astro/linux-setiathome/Makefile
+++ b/astro/linux-setiathome/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$

 PORTVERSION=	3.08
+PORTREVISION=	1
 CATEGORIES=	astro linux
 PKGNAMEPREFIX=	linux-

--- a/audio/baudline/Makefile
+++ b/audio/baudline/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	baudline
 PORTVERSION=	0.99
+PORTREVISION=	1
 CATEGORIES=	audio linux
 MASTER_SITES=	http://www.baudline.com/
 PKGNAMEPREFIX=	linux-
@@ -15,7 +16,8 @@ DISTNAME=	baudline_${PORTVERSION:S/.p/pre/}_i686
 MAINTAINER=	dyeske@yahoo.com
 COMMENT=	A real-time signal analysis tool and an offline time-frequency browser

-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123 \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

 USE_X_PREFIX=	yes
 ONLY_FOR_ARCHS=	i386
--- a/audio/linux-arts/Makefile
+++ b/audio/linux-arts/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=		arts
 PORTVERSION=		1.0.3
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		audio kde linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX}
 MASTER_SITE_SUBDIR=	8.0/en/os/${MACHINE_ARCH}/RedHat/RPMS
@@ -20,8 +20,8 @@ MAINTAINER=		bms@FreeBSD.org
 COMMENT=		Audio system for the KDE integrated X11 desktop

 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=		${LINUXBASE}/var/lib/rpm/packages.rpm:${PORTSDIR}/emulators/linux_base-8

+USE_LINUX=		yes
 PREFIX?=		${LINUXBASE}
 NO_MTREE=		yes
 LDCONFIG_LINUX=		${LINUXBASE}/sbin/ldconfig
--- a/audio/linux-esound/Makefile
+++ b/audio/linux-esound/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	esound
 CATEGORIES=	audio linux
 PORTVERSION=	0.2.22
-PORTREVISION=	2
+PORTREVISION=	3

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of esound

 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
--- a/audio/linux-f10-arts/Makefile
+++ b/audio/linux-f10-arts/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=		arts
 PORTVERSION=		1.0.3
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		audio kde linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX}
 MASTER_SITE_SUBDIR=	8.0/en/os/${MACHINE_ARCH}/RedHat/RPMS
@@ -20,8 +20,8 @@ MAINTAINER=		bms@FreeBSD.org
 COMMENT=		Audio system for the KDE integrated X11 desktop

 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=		${LINUXBASE}/var/lib/rpm/packages.rpm:${PORTSDIR}/emulators/linux_base-8

+USE_LINUX=		yes
 PREFIX?=		${LINUXBASE}
 NO_MTREE=		yes
 LDCONFIG_LINUX=		${LINUXBASE}/sbin/ldconfig
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	esound
 CATEGORIES=	audio linux
 PORTVERSION=	0.2.22
-PORTREVISION=	2
+PORTREVISION=	3

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of esound

 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
--- a/audio/linux-f10-libaudiofile/Makefile
+++ b/audio/linux-f10-libaudiofile/Makefile
@@ -7,10 +7,10 @@

 PORTNAME=	libaudiofile
 PORTVERSION=	0.1.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio linux

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of audiofile

 RPM_SET=	audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
--- a/audio/linux-f8-arts/Makefile
+++ b/audio/linux-f8-arts/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=		arts
 PORTVERSION=		1.0.3
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		audio kde linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX}
 MASTER_SITE_SUBDIR=	8.0/en/os/${MACHINE_ARCH}/RedHat/RPMS
@@ -20,8 +20,8 @@ MAINTAINER=		bms@FreeBSD.org
 COMMENT=		Audio system for the KDE integrated X11 desktop

 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=		${LINUXBASE}/var/lib/rpm/packages.rpm:${PORTSDIR}/emulators/linux_base-8

+USE_LINUX=		yes
 PREFIX?=		${LINUXBASE}
 NO_MTREE=		yes
 LDCONFIG_LINUX=		${LINUXBASE}/sbin/ldconfig
--- a/audio/linux-f8-esound/Makefile
+++ b/audio/linux-f8-esound/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	esound
 CATEGORIES=	audio linux
 PORTVERSION=	0.2.22
-PORTREVISION=	2
+PORTREVISION=	3

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of esound

 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
--- a/audio/linux-f8-libaudiofile/Makefile
+++ b/audio/linux-f8-libaudiofile/Makefile
@@ -7,10 +7,10 @@

 PORTNAME=	libaudiofile
 PORTVERSION=	0.1.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio linux

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of audiofile

 RPM_SET=	audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
--- a/audio/linux-libaudiofile/Makefile
+++ b/audio/linux-libaudiofile/Makefile
@@ -7,10 +7,10 @@

 PORTNAME=	libaudiofile
 PORTVERSION=	0.1.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio linux

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of audiofile

 RPM_SET=	audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
--- a/audio/linux-vsound/Makefile
+++ b/audio/linux-vsound/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	linux-vsound
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	audio linux
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kris
--- a/cad/linux-eagle/Makefile
+++ b/cad/linux-eagle/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	linux-eagle
 EAGLEVERSION?=	4.13
 EAGLELANG?=	eng
 PORTVERSION=	${EAGLEVERSION:S/r/./}
+PORTREVISION=	1
 CATEGORIES?=	cad linux
 MASTER_SITES=	ftp://ftp.cadsoft.de/pub/program/${EAGLEVERSION}/
 DISTNAME=	${PORTNAME:S/linux-//}-lin-${EAGLELANG}-${EAGLEVERSION}
@@ -17,8 +18,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER?=	riggs@rrr.de
 COMMENT?=	An easy to use, yet powerful tool for designing printed circuit boards

-RUN_DEPENDS=	${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base
-
 CONFLICTS?=	de-linux-eagle-*

 ONLY_FOR_ARCHS=	i386
@@ -29,6 +28,7 @@ DATADIR=	${PREFIX}/share/${PORTNAME:S/linux-//}
 RESTRICTED=	"Usage permitted for non-commercial purposes only"
 NO_CDROM=	"Sale for profit is not permitted"

+USE_LINUX=	yes
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message

--- a/cad/linux-eagle5/Makefile
+++ b/cad/linux-eagle5/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	linux-eagle
 EAGLEVERSION?=	4.13
 EAGLELANG?=	eng
 PORTVERSION=	${EAGLEVERSION:S/r/./}
+PORTREVISION=	1
 CATEGORIES?=	cad linux
 MASTER_SITES=	ftp://ftp.cadsoft.de/pub/program/${EAGLEVERSION}/
 DISTNAME=	${PORTNAME:S/linux-//}-lin-${EAGLELANG}-${EAGLEVERSION}
@@ -17,8 +18,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER?=	riggs@rrr.de
 COMMENT?=	An easy to use, yet powerful tool for designing printed circuit boards

-RUN_DEPENDS=	${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base
-
 CONFLICTS?=	de-linux-eagle-*

 ONLY_FOR_ARCHS=	i386
@@ -29,6 +28,7 @@ DATADIR=	${PREFIX}/share/${PORTNAME:S/linux-//}
 RESTRICTED=	"Usage permitted for non-commercial purposes only"
 NO_CDROM=	"Sale for profit is not permitted"

+USE_LINUX=	yes
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message

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

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

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

--- 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
--- 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
--- 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
--- 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"
--- a/devel/linux-glib2/pkg-plist
+++ 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
--- 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
--- 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
--- 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"

--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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-*
--- 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
--- 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"
--- a/editors/edith/Makefile
+++ b/editors/edith/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	edith
 PORTVERSION=	1.58
+PORTREVISION=	1
 CATEGORIES=	editors linux
 MASTER_SITES=	ftp://ftp.eidetica.com/pub/edith/x11/
 DISTFILES=	edith1.55.common.tar.gz \
@@ -15,6 +16,8 @@ DISTFILES=	edith1.55.common.tar.gz \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A X11 GUI editor for binary and plain text files

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 USE_LINUX=	yes
 USE_X_PREFIX=	yes
 ONLY_FOR_ARCHS=	i386
--- a/editors/staroffice5/Makefile
+++ b/editors/staroffice5/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	staroffice
 PORTVERSION=	5.1a
+PORTREVISION=	1
 CATEGORIES=	editors linux
 MASTER_SITES=	http://afug.hypermart.net/files/ \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/
@@ -18,6 +19,7 @@ MAINTAINER=	mb@imp.ch
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser

 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

 NO_LATEST_LINK=	yes
 ONLY_FOR_ARCHS=	i386
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	staroffice
 PORTVERSION=	5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors linux
 MASTER_SITES=	ftp://ftp.csua.berkeley.edu/pub/.1/ports/distfiles/staroffice52/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
@@ -32,8 +32,10 @@ EXTRACT_ONLY=	109939-03.tar.Z
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser

-FETCH_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
+FETCH_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

+USE_LINUX=	yes
 NO_LATEST_LINK=	yes
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	staroffice
 PORTVERSION=	6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors linux
 MASTER_SITES=	ftp://ftp.sunsite.auc.dk/disk6/sun-patches/:patch \
 		ftp://ftp.math.ohio-state.edu/private/sun/.../:patch \
@@ -26,6 +26,8 @@ EXTRACT_ONLY=	112887-04.tar
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Wordprocessor/dbase/spreadheet/drawing/chart

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 NO_LATEST_LINK=	yes
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be bought and downloaded direct from Sun via www interface'
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	staroffice
 PORTVERSION=	7.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors linux
 MASTER_SITES=	ftp://patches.sun.com/patchroot/all_unsigned/:patch \
 		ftp://ftp.sun.co.uk/pub/patches/:patch \
@@ -30,6 +30,8 @@ EXTRACT_ONLY=	116518-06.tar
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Wordprocessor/dbase/spreadheet/drawing/chart

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be bought and downloaded direct from Sun via www interface'

--- a/emulators/linux-geepee32/Makefile
+++ b/emulators/linux-geepee32/Makefile
@@ -6,7 +6,7 @@

 PORTNAME=	geepee32
 PORTVERSION=	30
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://users.skynet.be/firefly/gp32/project/geepee32/
 PKGNAMEPREFIX=	linux-
@@ -15,11 +15,12 @@ DISTNAME=	${PORTNAME}_linux_sdl_${PORTVERSION}
 MAINTAINER=	arundel@h3c.de
 COMMENT=	The only GP32 emulator for i386

-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
--- a/emulators/linux-peops-softgpu/Makefile
+++ b/emulators/linux-peops-softgpu/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	peops-softgpu
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://home.t-online.de/home/PeteBernert/
 PKGNAMEPREFIX=	linux-
@@ -19,6 +20,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux

 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+USE_LINUX=	yes

 ONLY_FOR_ARCHS=	i386

--- a/emulators/linux-peops-spu/Makefile
+++ b/emulators/linux-peops-spu/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	peops-spu
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://home.t-online.de/home/PeteBernert/
 PKGNAMEPREFIX=	linux-
@@ -19,6 +20,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux

 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+USE_LINUX=	yes

 ONLY_FOR_ARCHS=	i386

--- a/emulators/linux-pete-mesagpu/Makefile
+++ b/emulators/linux-pete-mesagpu/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	pete-mesagpu
 PORTVERSION=	1.75
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://home.t-online.de/home/PeteBernert/
 PKGNAMEPREFIX=	linux-
@@ -20,6 +21,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux

 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+USE_LINUX=	yes

 ONLY_FOR_ARCHS=	i386

--- a/emulators/linux-vmware-toolbox2/Makefile
+++ b/emulators/linux-vmware-toolbox2/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	vmware-toolbox
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	# bundled with VMware itself
 PKGNAMEPREFIX=	linux-
@@ -15,6 +16,8 @@ DISTNAME=	vmware-linux-tools
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=VMware toolbox for guest OS (for VMware 2.x, Linux version)

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 PLIST_FILES=	bin/linux-vmware-toolbox
 USE_LINUX=	yes
--- a/emulators/linux-vmware-toolbox4/Makefile
+++ b/emulators/linux-vmware-toolbox4/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	vmware-toolbox
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	# bundled with VMware itself
 PKGNAMEPREFIX=	linux-
@@ -15,6 +16,8 @@ DISTNAME=	vmware-linux-tools
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=VMware toolbox for guest OS (for VMware 4.x, Linux version)

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 DISTDIR=	${MOUNT_PT}
 IGNOREFILES=	${DISTFILES}
 PLIST_FILES=	bin/linux-vmware-toolbox
--- a/emulators/linux-vmware-toolbox5/Makefile
+++ b/emulators/linux-vmware-toolbox5/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	vmware-toolbox
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	# bundled with VMware itself
 PKGNAMEPREFIX=	linux-
@@ -15,6 +16,8 @@ DISTNAME=	vmware-linux-tools
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=VMware toolbox for guest OS (for VMware 4.x, Linux version)

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 DISTDIR=	${MOUNT_PT}
 IGNOREFILES=	${DISTFILES}
 PLIST_FILES=	bin/linux-vmware-toolbox
--- a/emulators/linux-vmware-toolbox6/Makefile
+++ b/emulators/linux-vmware-toolbox6/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	vmware-toolbox
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	# bundled with VMware itself
 PKGNAMEPREFIX=	linux-
@@ -15,6 +16,8 @@ DISTNAME=	vmware-linux-tools
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=VMware toolbox for guest OS (for VMware 4.x, Linux version)

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 DISTDIR=	${MOUNT_PT}
 IGNOREFILES=	${DISTFILES}
 PLIST_FILES=	bin/linux-vmware-toolbox
--- a/emulators/linux-winetools/Makefile
+++ b/emulators/linux-winetools/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	winetools
 PORTVERSION=	1.25a
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/winetools/}
 PKGNAMEPREFIX=	linux-
@@ -15,7 +16,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	blackend@FreeBSD.org
 COMMENT=	A setup and configuration tool for WINE

-RUN_DEPENDS=	wine:${PORTSDIR}/emulators/wine
+RUN_DEPENDS=	wine:${PORTSDIR}/emulators/wine \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -11,7 +11,8 @@ PORTVERSION=		8.0
 PORTREVISION=		4
 CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX} \
-			${MASTER_SITE_REDHAT_LINUX:S/$/:new/}
+			${MASTER_SITE_REDHAT_LINUX:S/$/:new/} \
+			ftp://mirror.switch.ch/mirror/ximian/mono/redhat-80-i386/:ft
 MASTER_SITE_SUBDIR=    \
 			${PORTVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS \
 			updates/${PORTVERSION}/${LANG}/os/${ARCH}/:new
@@ -46,17 +47,16 @@ DISTFILES=		redhat-release-8.0-8.noarch.rpm \
 			sh-utils-2.0.12-3.${ARCH}.rpm \
 			rpm-4.1-1.06.${ARCH}.rpm \
 			libgcc-3.2-7.${ARCH}.rpm \
-			freetype-2.1.2-7.${ARCH}.rpm \
+			freetype-2.1.5-0.ximian.5.1.${ARCH}.rpm:ft \
 			zlib-1.1.4-8.8x.${ARCH}.rpm:new

-MAINTAINER=		trevor@FreeBSD.org
+MAINTAINER=		freebsd-emulation@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode (only for i386)

 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm

 CONFLICTS=	linux_base-6* linux_base-7* linux_base-deb* linux_base-gen* \
 		linux_base-rh* linux_base-suse*
-RESTRICTED=		"binaries under GNU GPL without accompanying source"
 ONLY_FOR_ARCHS=		i386 amd64
 DIST_SUBDIR=		rpm/${ARCH}/${PORTVERSION}
 PREFIX=			${LINUXBASE}
@@ -120,7 +120,7 @@ do-extract:
 # Also, set the ELF fallback brand to Linux, so that we don't have to do
 # anything special to run staticly linked binaries.
 	@/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${LINUX_ELF}
-	@for R in ${DISTFILES:S/:new//}; do \
+	@for R in ${DISTFILES:S/:new//:S/:ft//}; do \
 		${ECHO} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
@@ -153,7 +153,7 @@ pre-install:
 		&& ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST}

 do-install:
-	cd ${WRKSRC} && ${FIND} * | ${CPIO} -dlmp ${PREFIX}
+	cd ${WRKSRC} && ${FIND} * | ${CPIO} -dmp ${PREFIX}
 	${FIND} ${PREFIX} -type d -exec ${CHMOD} 755 \{\} \;

 post-install:
--- a/emulators/linux_base-8/distinfo.i386
+++ b/emulators/linux_base-8/distinfo.i386
@@ -1,67 +1,66 @@
-$FreeBSD$
-MD5 (rpm/i386/8.0/basesystem-8.0-1.noarch.rpm) = d66629eeffdc61de69395be8c43f4f7d
-MD5 (rpm/i386/8.0/bash-2.05b-5.i386.rpm) = ffea80578086373dda7d7e98ec42b294
-MD5 (rpm/i386/8.0/bzip2-1.0.2-5.i386.rpm) = 05674cb719aef022396581808669105d
-MD5 (rpm/i386/8.0/bzip2-libs-1.0.2-5.i386.rpm) = a96d125105d1eb56c0b71bc699b84288
-MD5 (rpm/i386/8.0/compat-db-3.3.11-2.i386.rpm) = c8ec0b5bce196a8f6dcc2b559d5fd625
-MD5 (rpm/i386/8.0/compat-libstdc++-7.3-2.96.110.i386.rpm) = 298aaa504398f2b7298f805e4f751afe
-MD5 (rpm/i386/8.0/db4-4.0.14-14.i386.rpm) = 2b31e1ac5ccc23f0dbd37e299ed91661
-MD5 (rpm/i386/8.0/filesystem-2.1.6-5.noarch.rpm) = f9f4c4e31668216e5cd98c05c3e4751f
-MD5 (rpm/i386/8.0/fileutils-4.1.9-11.i386.rpm) = 7d6f449488f8e7360c74101c20e4052c
-MD5 (rpm/i386/8.0/freetype-2.1.2-7.i386.rpm) = 1d11846f80741cf629908fff77565c1d
-MD5 (rpm/i386/8.0/gdbm-1.8.0-18.i386.rpm) = 247aa33363cdf4ac0c01a17893221ac7
-MD5 (rpm/i386/8.0/glib-1.2.10-8.i386.rpm) = cad221120dd2aa32dbbf274f694e982b
-MD5 (rpm/i386/8.0/glibc-2.3.2-4.80.8.i386.rpm) = 8058c50430bca5ee527c3521b8cd5019
-MD5 (rpm/i386/8.0/glibc-common-2.3.2-4.80.8.i386.rpm) = 62019c1ecff44880be70871a9b52c4bc
-MD5 (rpm/i386/8.0/grep-2.5.1-4.i386.rpm) = d47cb3261cca975b1b177acec30d1b88
-MD5 (rpm/i386/8.0/info-4.2-5.i386.rpm) = d273ca4e7d607f0df77179e6493211fb
-MD5 (rpm/i386/8.0/libacl-2.0.11-2.i386.rpm) = 4c925ae8eb502c2102e7fcee40e78b3e
-MD5 (rpm/i386/8.0/libattr-2.0.8-3.i386.rpm) = 6e96282afe6ebaf2caf2d0022f5e7063
-MD5 (rpm/i386/8.0/libelf-0.8.2-2.i386.rpm) = 7a4ea791d46ca45f9e398a9732216c17
-MD5 (rpm/i386/8.0/libgcc-3.2-7.i386.rpm) = db9ca2ea377a30e7a7ab0c95fb538b00
-MD5 (rpm/i386/8.0/libstdc++-3.2-7.i386.rpm) = 1593270df028b4225818f4cb08cb0b40
-MD5 (rpm/i386/8.0/libtermcap-2.0.8-31.i386.rpm) = 64426510f27078a3f35a3a02ee4da7fc
-MD5 (rpm/i386/8.0/ncurses-5.2-28.i386.rpm) = 1240c14ba8fe20b5e9cc8c3591f0a533
-MD5 (rpm/i386/8.0/popt-1.7-1.06.i386.rpm) = 158c59ec88320586ce0100b2eec140ab
-MD5 (rpm/i386/8.0/readline-4.3-3.i386.rpm) = 6a41eba752dee08222b99cce58552fea
 MD5 (rpm/i386/8.0/redhat-release-8.0-8.noarch.rpm) = 7cbf42500f3f91c7df1e1495b5f1ee1d
-MD5 (rpm/i386/8.0/rpm-4.1-1.06.i386.rpm) = fc0f9967e7dd7b4bf3f4e1e25d5047aa
-MD5 (rpm/i386/8.0/setserial-2.17-9.i386.rpm) = 132160b9a4718d86eb14b86f780de3a5
-MD5 (rpm/i386/8.0/setup-2.5.20-1.noarch.rpm) = 94168e9cd5d2c6601167d55e50e70bc0
-MD5 (rpm/i386/8.0/sh-utils-2.0.12-3.i386.rpm) = 1b9d53f5a86d2dcb1ed7ce2647274476
-MD5 (rpm/i386/8.0/slang-1.4.5-11.i386.rpm) = eb551fe40c244f750c089d6d450cd0e7
-MD5 (rpm/i386/8.0/termcap-11.0.1-13.noarch.rpm) = 80354e467c784ad660edcd9ec9eb0148
-MD5 (rpm/i386/8.0/zlib-1.1.4-8.8x.i386.rpm) = fb1db2a01b5366cb40f98fda4507024e
-SIZE (rpm/i386/8.0/basesystem-8.0-1.noarch.rpm) = 2565
-SIZE (rpm/i386/8.0/bash-2.05b-5.i386.rpm) = 746649
-SIZE (rpm/i386/8.0/bzip2-1.0.2-5.i386.rpm) = 45007
-SIZE (rpm/i386/8.0/bzip2-libs-1.0.2-5.i386.rpm) = 34311
-SIZE (rpm/i386/8.0/compat-db-3.3.11-2.i386.rpm) = 2830894
-SIZE (rpm/i386/8.0/compat-libstdc++-7.3-2.96.110.i386.rpm) = 1051183
-SIZE (rpm/i386/8.0/db4-4.0.14-14.i386.rpm) = 687874
-SIZE (rpm/i386/8.0/filesystem-2.1.6-5.noarch.rpm) = 12340
-SIZE (rpm/i386/8.0/fileutils-4.1.9-11.i386.rpm) = 990084
-SIZE (rpm/i386/8.0/freetype-2.1.2-7.i386.rpm) = 587226
-SIZE (rpm/i386/8.0/gdbm-1.8.0-18.i386.rpm) = 27594
-SIZE (rpm/i386/8.0/glib-1.2.10-8.i386.rpm) = 138265
-SIZE (rpm/i386/8.0/glibc-2.3.2-4.80.8.i386.rpm) = 3121676
-SIZE (rpm/i386/8.0/glibc-common-2.3.2-4.80.8.i386.rpm) = 12526068
-SIZE (rpm/i386/8.0/grep-2.5.1-4.i386.rpm) = 187800
-SIZE (rpm/i386/8.0/info-4.2-5.i386.rpm) = 166638
-SIZE (rpm/i386/8.0/libacl-2.0.11-2.i386.rpm) = 69938
-SIZE (rpm/i386/8.0/libattr-2.0.8-3.i386.rpm) = 16741
-SIZE (rpm/i386/8.0/libelf-0.8.2-2.i386.rpm) = 41069
-SIZE (rpm/i386/8.0/libgcc-3.2-7.i386.rpm) = 111856
-SIZE (rpm/i386/8.0/libstdc++-3.2-7.i386.rpm) = 1478392
-SIZE (rpm/i386/8.0/libtermcap-2.0.8-31.i386.rpm) = 11472
-SIZE (rpm/i386/8.0/ncurses-5.2-28.i386.rpm) = 852255
-SIZE (rpm/i386/8.0/popt-1.7-1.06.i386.rpm) = 69622
-SIZE (rpm/i386/8.0/readline-4.3-3.i386.rpm) = 193685
 SIZE (rpm/i386/8.0/redhat-release-8.0-8.noarch.rpm) = 391224
-SIZE (rpm/i386/8.0/rpm-4.1-1.06.i386.rpm) = 2220042
-SIZE (rpm/i386/8.0/setserial-2.17-9.i386.rpm) = 21432
+MD5 (rpm/i386/8.0/glibc-common-2.3.2-4.80.8.i386.rpm) = 62019c1ecff44880be70871a9b52c4bc
+SIZE (rpm/i386/8.0/glibc-common-2.3.2-4.80.8.i386.rpm) = 12526068
+MD5 (rpm/i386/8.0/glibc-2.3.2-4.80.8.i386.rpm) = 8058c50430bca5ee527c3521b8cd5019
+SIZE (rpm/i386/8.0/glibc-2.3.2-4.80.8.i386.rpm) = 3121676
+MD5 (rpm/i386/8.0/setup-2.5.20-1.noarch.rpm) = 94168e9cd5d2c6601167d55e50e70bc0
 SIZE (rpm/i386/8.0/setup-2.5.20-1.noarch.rpm) = 27220
-SIZE (rpm/i386/8.0/sh-utils-2.0.12-3.i386.rpm) = 250662
-SIZE (rpm/i386/8.0/slang-1.4.5-11.i386.rpm) = 196297
+MD5 (rpm/i386/8.0/filesystem-2.1.6-5.noarch.rpm) = f9f4c4e31668216e5cd98c05c3e4751f
+SIZE (rpm/i386/8.0/filesystem-2.1.6-5.noarch.rpm) = 12340
+MD5 (rpm/i386/8.0/basesystem-8.0-1.noarch.rpm) = d66629eeffdc61de69395be8c43f4f7d
+SIZE (rpm/i386/8.0/basesystem-8.0-1.noarch.rpm) = 2565
+MD5 (rpm/i386/8.0/libattr-2.0.8-3.i386.rpm) = 6e96282afe6ebaf2caf2d0022f5e7063
+SIZE (rpm/i386/8.0/libattr-2.0.8-3.i386.rpm) = 16741
+MD5 (rpm/i386/8.0/libacl-2.0.11-2.i386.rpm) = 4c925ae8eb502c2102e7fcee40e78b3e
+SIZE (rpm/i386/8.0/libacl-2.0.11-2.i386.rpm) = 69938
+MD5 (rpm/i386/8.0/libelf-0.8.2-2.i386.rpm) = 7a4ea791d46ca45f9e398a9732216c17
+SIZE (rpm/i386/8.0/libelf-0.8.2-2.i386.rpm) = 41069
+MD5 (rpm/i386/8.0/bzip2-libs-1.0.2-5.i386.rpm) = a96d125105d1eb56c0b71bc699b84288
+SIZE (rpm/i386/8.0/bzip2-libs-1.0.2-5.i386.rpm) = 34311
+MD5 (rpm/i386/8.0/termcap-11.0.1-13.noarch.rpm) = 80354e467c784ad660edcd9ec9eb0148
 SIZE (rpm/i386/8.0/termcap-11.0.1-13.noarch.rpm) = 241495
+MD5 (rpm/i386/8.0/compat-db-3.3.11-2.i386.rpm) = c8ec0b5bce196a8f6dcc2b559d5fd625
+SIZE (rpm/i386/8.0/compat-db-3.3.11-2.i386.rpm) = 2830894
+MD5 (rpm/i386/8.0/db4-4.0.14-14.i386.rpm) = 2b31e1ac5ccc23f0dbd37e299ed91661
+SIZE (rpm/i386/8.0/db4-4.0.14-14.i386.rpm) = 687874
+MD5 (rpm/i386/8.0/gdbm-1.8.0-18.i386.rpm) = 247aa33363cdf4ac0c01a17893221ac7
+SIZE (rpm/i386/8.0/gdbm-1.8.0-18.i386.rpm) = 27594
+MD5 (rpm/i386/8.0/glib-1.2.10-8.i386.rpm) = cad221120dd2aa32dbbf274f694e982b
+SIZE (rpm/i386/8.0/glib-1.2.10-8.i386.rpm) = 138265
+MD5 (rpm/i386/8.0/libtermcap-2.0.8-31.i386.rpm) = 64426510f27078a3f35a3a02ee4da7fc
+SIZE (rpm/i386/8.0/libtermcap-2.0.8-31.i386.rpm) = 11472
+MD5 (rpm/i386/8.0/bash-2.05b-5.i386.rpm) = ffea80578086373dda7d7e98ec42b294
+SIZE (rpm/i386/8.0/bash-2.05b-5.i386.rpm) = 746649
+MD5 (rpm/i386/8.0/bzip2-1.0.2-5.i386.rpm) = 05674cb719aef022396581808669105d
+SIZE (rpm/i386/8.0/bzip2-1.0.2-5.i386.rpm) = 45007
+MD5 (rpm/i386/8.0/compat-libstdc++-7.3-2.96.110.i386.rpm) = 298aaa504398f2b7298f805e4f751afe
+SIZE (rpm/i386/8.0/compat-libstdc++-7.3-2.96.110.i386.rpm) = 1051183
+MD5 (rpm/i386/8.0/ncurses-5.2-28.i386.rpm) = 1240c14ba8fe20b5e9cc8c3591f0a533
+SIZE (rpm/i386/8.0/ncurses-5.2-28.i386.rpm) = 852255
+MD5 (rpm/i386/8.0/info-4.2-5.i386.rpm) = d273ca4e7d607f0df77179e6493211fb
+SIZE (rpm/i386/8.0/info-4.2-5.i386.rpm) = 166638
+MD5 (rpm/i386/8.0/grep-2.5.1-4.i386.rpm) = d47cb3261cca975b1b177acec30d1b88
+SIZE (rpm/i386/8.0/grep-2.5.1-4.i386.rpm) = 187800
+MD5 (rpm/i386/8.0/fileutils-4.1.9-11.i386.rpm) = 7d6f449488f8e7360c74101c20e4052c
+SIZE (rpm/i386/8.0/fileutils-4.1.9-11.i386.rpm) = 990084
+MD5 (rpm/i386/8.0/popt-1.7-1.06.i386.rpm) = 158c59ec88320586ce0100b2eec140ab
+SIZE (rpm/i386/8.0/popt-1.7-1.06.i386.rpm) = 69622
+MD5 (rpm/i386/8.0/readline-4.3-3.i386.rpm) = 6a41eba752dee08222b99cce58552fea
+SIZE (rpm/i386/8.0/readline-4.3-3.i386.rpm) = 193685
+MD5 (rpm/i386/8.0/setserial-2.17-9.i386.rpm) = 132160b9a4718d86eb14b86f780de3a5
+SIZE (rpm/i386/8.0/setserial-2.17-9.i386.rpm) = 21432
+MD5 (rpm/i386/8.0/libstdc++-3.2-7.i386.rpm) = 1593270df028b4225818f4cb08cb0b40
+SIZE (rpm/i386/8.0/libstdc++-3.2-7.i386.rpm) = 1478392
+MD5 (rpm/i386/8.0/slang-1.4.5-11.i386.rpm) = eb551fe40c244f750c089d6d450cd0e7
+SIZE (rpm/i386/8.0/slang-1.4.5-11.i386.rpm) = 196297
+MD5 (rpm/i386/8.0/sh-utils-2.0.12-3.i386.rpm) = 1b9d53f5a86d2dcb1ed7ce2647274476
+SIZE (rpm/i386/8.0/sh-utils-2.0.12-3.i386.rpm) = 250662
+MD5 (rpm/i386/8.0/rpm-4.1-1.06.i386.rpm) = fc0f9967e7dd7b4bf3f4e1e25d5047aa
+SIZE (rpm/i386/8.0/rpm-4.1-1.06.i386.rpm) = 2220042
+MD5 (rpm/i386/8.0/libgcc-3.2-7.i386.rpm) = db9ca2ea377a30e7a7ab0c95fb538b00
+SIZE (rpm/i386/8.0/libgcc-3.2-7.i386.rpm) = 111856
+MD5 (rpm/i386/8.0/freetype-2.1.5-0.ximian.5.1.i386.rpm) = bf0bb06fcc300b0087ef5d602ecde088
+SIZE (rpm/i386/8.0/freetype-2.1.5-0.ximian.5.1.i386.rpm) = 593618
+MD5 (rpm/i386/8.0/zlib-1.1.4-8.8x.i386.rpm) = fb1db2a01b5366cb40f98fda4507024e
 SIZE (rpm/i386/8.0/zlib-1.1.4-8.8x.i386.rpm) = 36749
--- a/emulators/linux_base-8/pkg-install
+++ b/emulators/linux_base-8/pkg-install
@@ -26,7 +26,7 @@ POST-INSTALL)
 		echo 'Re-mounting linprocfs...'
 		mount linprocfs
 	fi
-	if [ -n "`grep -w ^linprocfs /etc/fstab`" ]; then
+	if [ -n "`grep -w ^linproc /etc/fstab`" ]; then
 		echo 'Re-mounting linproc...'
 		mount linproc
 	fi
--- a/emulators/vmware2/Makefile
+++ b/emulators/vmware2/Makefile
@@ -8,6 +8,7 @@

 PORTNAME=	vmware2
 PORTVERSION=	2.0.4.1142
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	${FREEBSD_MODULE_SITES} \
 		${VMWARE_MIRROR_SITES}
@@ -20,7 +21,8 @@ DISTFILES=	VMware-${PORTVERSION:R}-${PORTVERSION:E}${EXTRACT_SUFX}:vmware \
 MAINTAINER=	vsilyaev@mindspring.com
 COMMENT=	A virtual machine emulator - a full PC in a window

-RUN_DEPENDS=	${LINUXBASE}/dev/rtc:${PORTSDIR}/emulators/rtc
+RUN_DEPENDS=	${LINUXBASE}/dev/rtc:${PORTSDIR}/emulators/rtc \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

 RESTRICTED=	"Not sure if we can redistribute it"

--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	vmware3
 PORTVERSION=	3.2.1.2242
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://www4.vmware.com/software/ \
@@ -22,7 +22,8 @@ DISTFILES=	VMware-workstation-${PORTVERSION:R}-${PORTVERSION:E}${EXTRACT_SUFX}:v
 MAINTAINER=	orlando@break.net
 COMMENT=	A virtual machine emulator - a full PC in a window

-RUN_DEPENDS=	/dev/rtc:${PORTSDIR}/emulators/rtc
+RUN_DEPENDS=	/dev/rtc:${PORTSDIR}/emulators/rtc \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

 RESTRICTED=	"Not sure if we can redistribute it"

--- a/emulators/winetools/Makefile
+++ b/emulators/winetools/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	winetools
 PORTVERSION=	1.25a
+PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/winetools/}
 PKGNAMEPREFIX=	linux-
@@ -15,7 +16,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	blackend@FreeBSD.org
 COMMENT=	A setup and configuration tool for WINE

-RUN_DEPENDS=	wine:${PORTSDIR}/emulators/wine
+RUN_DEPENDS=	wine:${PORTSDIR}/emulators/wine \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
--- a/french/gibi/Makefile
+++ b/french/gibi/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	gibi
 PORTVERSION=	2000
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french cad linux
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.${ARCH}
@@ -23,9 +23,9 @@ COMMENT=	GIBI est la partie mailleur et post de CASTEM
 #			zsh (default), bash or ksh.
 #-----------------------------------------------------------------------

-BUILD_DEPENDS=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base \
-		${LOCALBASE}/aster/${vaster}/asteru.exe:${PORTSDIR}/french/aster
+BUILD_DEPENDS=	${LOCALBASE}/aster/${vaster}/asteru.exe:${PORTSDIR}/french/aster
 RUN_DEPENDS=	${LOCALBASE}/aster/${vaster}/asteru.exe:${PORTSDIR}/french/aster \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs \
 		${SHELL_RUN_GIBI}:${PORTSDIR}/shells/${SHRGDEP}

 RESTRICTED=	"Toute personne chargeant le logiciel GIBI s'engage à ne\
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	homard
 PORTVERSION=	6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french cad linux python
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.${ARCH}
--- a/french/staroffice52/Makefile
+++ b/french/staroffice52/Makefile
@@ -8,7 +8,7 @@

 PORTNAME=	staroffice
 PORTVERSION=	5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	french editors linux
 MASTER_SITES=	ftp://ftp.cem2.univ-montp2.fr/pub/linux/soft/StarOffice/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/staroffice/francais/ \
@@ -32,8 +32,10 @@ EXTRACT_ONLY=	109939-03.tar.Z
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Suite bureautique intégrée

-FETCH_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
+FETCH_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

+USE_LINUX=	yes
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Doit être téléchargé depuis le site web de Sun'
 CD_MOUNTPT=	'/cdrom'
--- a/games/HeroesOfMightAndMagic/Makefile
+++ b/games/HeroesOfMightAndMagic/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	HeroesOfMightAndMagic
 PORTVERSION=	3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=
 DISTFILES=
@@ -14,12 +15,12 @@ DISTFILES=
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	BSD Installation of the Linux game "Heroes of Might and Magic III"

-RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
-		${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk

 PLIST=		${WRKDIR}/PLIST
 IS_INTERACTIVE=	yes
 ONLY_FOR_ARCHS=	i386
+USE_LINUX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 NO_CDROM=	Software is commercial
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	adom
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.adom.de/adom/download/linux/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-elf
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-elf
 MAINTAINER=	sr-13@mail.ru
 COMMENT=	An rogue-like advanced rpg with color support (binary port)

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 NO_CDROM=	Copy of CD must be sent to author

 ONLY_FOR_ARCHS=	i386
--- a/games/atitd/Makefile
+++ b/games/atitd/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	atitd
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games graphics linux
 MASTER_SITES=	http://www.atitd.com/
 DISTNAME=	eClient-linux.run
--- a/games/dsnake/Makefile
+++ b/games/dsnake/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	dsnake
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://bitblaze.com/downloads/
 DISTNAME=	${PORTNAME}-linux-${PORTVERSION}
@@ -20,7 +21,8 @@ NO_PACKAGE=	Licence forbids any repacking and reselling

 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
+USE_LINUX=	yes
 WRKSRC=		${WRKDIR}/DeluxeSnake

 do-install:
--- a/games/halflifeserver/Makefile
+++ b/games/halflifeserver/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	hlds
 PORTVERSION=	3.1.1.1.d
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.isis.de/members/~hmenze/cs/server/linux/
 DISTFILES=	hlds_l_3111_full.tar.gz \
@@ -17,6 +18,7 @@ COMMENT=	Half-Life Dedicated Server for Linux

 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
--- a/games/hlserver-cs/Makefile
+++ b/games/hlserver-cs/Makefile
@@ -7,6 +7,7 @@

 PORTNAME?=	cs
 PORTVERSION?=	1.5
+PORTREVISION?=	1
 CATEGORIES?=	games linux
 MASTER_SITES?=	http://files.redphive.org/ \
 		http://www.jetstreamgames.co.nz/files/pub/halflife/cstrike/ \
@@ -25,6 +26,7 @@ USE_SUBMAKE=	yes

 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
--- a/games/hohlin/Makefile
+++ b/games/hohlin/Makefile
@@ -17,6 +17,8 @@ DISTNAME=	${PORTNAME}-${SHORTPORTVERSION}
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Remake of the classic spectrum game Head over Heels

+RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs
+
 WRKSRC=		${WRKDIR}/hoh-install-${PORTVERSION}/

 USE_BZIP2=	YES
@@ -25,12 +27,7 @@ ONLY_FOR_ARCHS=	i386
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/}

 .include <bsd.port.pre.mk>
-.if exists(${LINUXBASE}/lib/libc-2.3.2.so) || defined(WITH_LINUX8)
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs
-WITH_LINUX8=	YES
-.else
 USE_LINUX=	YES
-.endif

 do-install:
 	${MKDIR} ${DATADIR}
--- a/games/linux-enemyterritory/Makefile
+++ b/games/linux-enemyterritory/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	enemyterritory
 PORTVERSION=	2.56.2
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://ftp.wireplay.co.uk/enemyterritory/server/linux/ \
 		ftp://3dgamers.in-span.net/pub/3dgamers4/games/wolfensteinet/ \
@@ -22,6 +23,7 @@ COMMENT=	Wolfenstein: Enemy Territory (Linux version)

 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 NO_PACKAGE=	Distfile is 258MB, set FORCE_PACKAGE if you really want to build this package
 RESTRICTED=	Redistribution is limited, see license
 NO_BUILD=	yes
--- a/games/linux-nwnclient/Makefile
+++ b/games/linux-nwnclient/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	nwnclient
 PORTVERSION=	1.65
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://content.bioware.com/neverwinternights/linux/${PORTVERSION:S/.//}/
 PKGNAMEPREFIX=	linux-
--- a/games/linux-nwserver/Makefile
+++ b/games/linux-nwserver/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	nwserver
 PORTVERSION=	1.32
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://nwdownloads.bioware.com/neverwinternights/linux/${PORTVERSION:S/.//}/
 PKGNAMEPREFIX=	linux-
--- a/games/linux-q3ademo/Makefile
+++ b/games/linux-q3ademo/Makefile
@@ -10,7 +10,7 @@

 PORTNAME=	linux-q3ademo
 PORTVERSION=	1.11.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games graphics linux
 # fetch manually
 MASTER_SITES=
@@ -21,10 +21,9 @@ EXTRACT_SUFX=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux 3d shooter from id Software / Loki Software (demo version)

-RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
 USE_GL=		yes
+USE_LINUX=	yes

 .include <bsd.port.pre.mk>

--- a/games/linux-quake3-demo/Makefile
+++ b/games/linux-quake3-demo/Makefile
@@ -10,7 +10,7 @@

 PORTNAME=	linux-q3ademo
 PORTVERSION=	1.11.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games graphics linux
 # fetch manually
 MASTER_SITES=
@@ -21,10 +21,9 @@ EXTRACT_SUFX=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux 3d shooter from id Software / Loki Software (demo version)

-RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
 USE_GL=		yes
+USE_LINUX=	yes

 .include <bsd.port.pre.mk>

--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	q3ded
 PORTVERSION=	1.32b
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	ftp://ftp.bluesnews.com/idstuff/quake3/linux/ \
 		ftp://ftp.idsoftware.com/idstuff/quake3/linux/
@@ -18,6 +19,7 @@ COMMENT=	Quake III Arena Dedicated Server for Linux

 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
--- a/games/linux-ssamtse/Makefile
+++ b/games/linux-ssamtse/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	ssamtse
 PORTVERSION=	b1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	# must fetch manually
 DISTFILES=	${PORTNAME}-${PORTVERSION:S|b|beta|}.sh.bin
@@ -15,10 +16,12 @@ EXTRACT_ONLY=
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Serious Sam - The Second Encounter

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 NO_BUILD=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_LINUX=	yes
 INSTALLS_SHLIB=	yes
--- a/games/linux-steam/Makefile
+++ b/games/linux-steam/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	steam
 PORTVERSION=	1.0
+PORTREVISOIN=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.coreblack.com/files/
 PKGNAMEPREFIX=	linux-
@@ -14,6 +15,8 @@ PKGNAMEPREFIX=	linux-
 MAINTAINER=	hido@coreblack.com
 COMMENT=	Half Life dedicated server running on steam

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
+
 IS_INTERACTIVE=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_LINUX=	yes
--- a/games/q3server/Makefile
+++ b/games/q3server/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	q3ded
 PORTVERSION=	1.32b
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	ftp://ftp.bluesnews.com/idstuff/quake3/linux/ \
 		ftp://ftp.idsoftware.com/idstuff/quake3/linux/
@@ -18,6 +19,7 @@ COMMENT=	Quake III Arena Dedicated Server for Linux

 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
--- a/games/rt2-demo/Makefile
+++ b/games/rt2-demo/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	rt2_demo
 PORTVERSION=	1.54b
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	ftp://ftp.linuxgames.com/loki/demos/rt2/
 DISTNAME=	rt2-demo
@@ -18,6 +19,7 @@ COMMENT=	The free demo of Railroad Tycoon II

 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+USE_LINUX=	yes

 do-install:
 		@${SH} ${FILESDIR}/do-install ${PREFIX} ${DISTDIR}
--- a/games/rtcw-paks/Makefile
+++ b/games/rtcw-paks/Makefile
@@ -24,6 +24,7 @@ BUILD_DEPENDS=	${PREFIX}/usr/games/rtcw/wolf.x86:${PORTSDIR}/games/rtcw

 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 EXTRACT_ONLY=	# Don't extract anything
 STRIP=

--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	rtcw
 PORTVERSION=	1.1b
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/wolf/linux/old/
 DISTNAME=	wolf-linux-${PORTVERSION}.x86
@@ -17,6 +18,7 @@ COMMENT=	Return to Castle Wolfenstein for Linux

 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
--- a/games/ssamtse/Makefile
+++ b/games/ssamtse/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	ssamtse
 PORTVERSION=	b1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	# must fetch manually
 DISTFILES=	${PORTNAME}-${PORTVERSION:S|b|beta|}.sh.bin
@@ -15,10 +16,12 @@ EXTRACT_ONLY=
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Serious Sam - The Second Encounter

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 NO_BUILD=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_LINUX=	yes
 INSTALLS_SHLIB=	yes
--- a/games/stvef-paks/Makefile
+++ b/games/stvef-paks/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	stvef-paks
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	#
 DISTFILES=	pak0.pk3
@@ -22,6 +23,7 @@ BUILD_DEPENDS=	${PREFIX}/usr/games/stvef/linuxstvefded_1.2-static:${PORTSDIR}/ga

 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 EXTRACT_ONLY=	# Don't extract anything
 STRIP=

--- a/games/stvef-server/Makefile
+++ b/games/stvef-server/Makefile
@@ -6,6 +6,7 @@

 PORTNAME=	stvef-server
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	ftp://3dgamers.in-span.net/pub/3dgamers/games/stveliteforce/
 DISTFILES=	stveflinuxdedicated120.zip
@@ -16,6 +17,7 @@ COMMENT=	Star Trek Voyager: Elite Forces dedicated server for Linux
 ONLY_FOR_ARCHS=	i386
 USE_ZIP=	yes
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/Linux
 STRIP=
--- a/games/utserver-to/Makefile
+++ b/games/utserver-to/Makefile
@@ -7,6 +7,7 @@

 PORTNAME?=	to
 PORTVERSION?=	2.2.0
+PORTREVISION?=	1
 CATEGORIES=	games linux
 MASTER_SITES?=	http://www.netreachgames.com/downloads/to/ \
 		http://downloads.fragism.com/ \
@@ -25,6 +26,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/games/ut-server/System/ucc-bin:${UTSERVER_PORT}

 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
--- a/games/utserver/Makefile
+++ b/games/utserver/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	utserver
 PORTVERSION=	436
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games linux
 MASTER_SITES=	http://public.planetmirror.com/pub/lokigames/installers/ut/ \
 		http://fileserver.talkware.net/ut/
@@ -21,6 +21,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}

 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
--- a/german/citrix_ica/Makefile
+++ b/german/citrix_ica/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	citrix_ica
 PORTVERSION=	6.30.1054
+PORTREVISION=	1
 CATEGORIES=	german net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-de
@@ -14,14 +15,13 @@ DISTNAME=	${PORTNAME}-linuxx86-de
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Citrix(R) client for the Microsoft Windows Terminal Server

-RUN_DEPENDS=    /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
 ONLY_FOR_ARCHS=	i386
 RESTRICTED=	"License prohibits redistribution"
 IS_INTERACTIVE=	"Noisy license agreement ignores stdin"

 NO_WRKSUBDIR=	Yes
 NO_BUILD=       Yes
+USE_LINUX=	yes

 CDIR=	${PREFIX}/ICAClient
 BINDIR=		${PREFIX}/bin
--- a/german/citrix_xenapp/Makefile
+++ b/german/citrix_xenapp/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	citrix_ica
 PORTVERSION=	6.30.1054
+PORTREVISION=	1
 CATEGORIES=	german net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-de
@@ -14,14 +15,13 @@ DISTNAME=	${PORTNAME}-linuxx86-de
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Citrix(R) client for the Microsoft Windows Terminal Server

-RUN_DEPENDS=    /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
 ONLY_FOR_ARCHS=	i386
 RESTRICTED=	"License prohibits redistribution"
 IS_INTERACTIVE=	"Noisy license agreement ignores stdin"

 NO_WRKSUBDIR=	Yes
 NO_BUILD=       Yes
+USE_LINUX=	yes

 CDIR=	${PREFIX}/ICAClient
 BINDIR=		${PREFIX}/bin
--- a/german/staroffice5/Makefile
+++ b/german/staroffice5/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	staroffice
 PORTVERSION=	5.1a
+PORTREVISION=	1
 CATEGORIES=	german editors linux
 MASTER_SITES=	ftp://ftp.hagenhomes.com/pub/  \
 		ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/  \
@@ -20,11 +21,12 @@ MAINTAINER=	mb@imp.ch
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser

 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

 NO_LATEST_LINK=	yes
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Sie muessen StarOffice manuell via WWW-Interface herunterladen.'
+USE_LINUX=	yes
 IS_INTERACTIVE=	yes
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_CMD=	${CAT}
--- a/german/staroffice52/Makefile
+++ b/german/staroffice52/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	staroffice
 PORTVERSION=	5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	german editors linux
 MASTER_SITES=	ftp://ftp.hu-berlin.de/pub/linux/staroffice/german/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/staroffice/deutsch/ \
@@ -30,8 +30,10 @@ EXTRACT_ONLY=	109939-03.tar.Z
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser

-FETCH_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
+FETCH_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

+USE_LINUX=	yes
 NO_LATEST_LINK=	yes
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Sie muessen StarOffice manuell via WWW-Interface herunterladen.'
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -7,7 +7,7 @@

 PORTNAME=	staroffice
 PORTVERSION=	7.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	german editors linux
 MASTER_SITES=	ftp://patches.sun.com/patchroot/all_unsigned/:patch \
 		ftp://ftp.sun.co.uk/pub/patches/:patch \
@@ -30,6 +30,8 @@ EXTRACT_ONLY=	116518-06.tar
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Wordprocessor/dbase/spreadheet/drawing/chart

+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be bought and downloaded direct from Sun via www interface'

--- a/graphics/linux-ac3d/Makefile
+++ b/graphics/linux-ac3d/Makefile
@@ -7,6 +7,7 @@

 PORTNAME=	ac3d
 PORTVERSION=	4.0f
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 MASTER_SITES=	http://inivis.swmirror.com/
 PKGNAMEPREFIX=	linux-
@@ -19,6 +20,7 @@ COMMENT=	Easy to use and powerful 3D graphics modeller (trial version)
 .ifdef(INSTALL_DYNLINKED_VERSION)
 LIB_DEPENDS=	${LINUXBASE}/usr/X11R6/libGLU.so.1:${PORTSDIR}/graphics/linux_mesa3
 .endif
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs

 USE_LINUX=	yes
 NO_BUILD=	yes
--- a/Show More
+++ b/Show More