Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Aug 2004 17:20:44 +0200 (CEST)
From:      Alexander Leidinger <netchild@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        portmgr@FreeBSD.org
Subject:   ports/70539: Change the default linux_base and a little bit of cleanup
Message-ID:  <200408161520.i7GFKiFD067316@Magellan.Leidinger.net>
Resent-Message-ID: <200408161530.i7GFUDK0001001@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         70539
>Category:       ports
>Synopsis:       Change the default linux_base and a little bit of cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 16 15:30:13 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Leidinger
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD Magellan.Leidinger.net 5.2-CURRENT FreeBSD 5.2-CURRENT #115: Sun Jul 18 12:19:54 CEST 2004 root@Magellan.Leidinger.net:/big/usr/src/sys/i386/compile/WORK i386


	
>Description:
This patch changes the default linux_base version to emulators/linux_base-8.
It also contains a patch which removes the implicit use of USE_LINUX in the
USE_LINUX_PREFIX case (change not yet documented in the patch, since I've
changed the comments from 4 column tabs to 8 column tabs; I will document it
in the 4 column tabs version if I get approval to commit the patch).

The linux_base-8 port ist marked RESTRICTED with "binaries under GNU GPL
without accompanying source". Either this can be removed, or the actual
linux_base has to marked as RESTRICTED too. I didn't changed this in my
patch (yet).

The patch contains the necessary changes to linux ports too (and a
little bit of cleanup regarding the linux bits). It's based upon
guesswork (the linux X11 lib dependencies, I haven't installed/tested
all ports).

It also fixes some ports which are marked BROKEN because of dependencies
to v7 and v8 of linux_base.

Additionally it contains a patch similar to the one in the follow-up to
PR 69997. There's no auto-detection, since this suggests every linux port
is supposed to work with every linux_base. We can't guarantee this.

Rationale for the removing the implicit USE_LINUX in the USE_LINUX_PREFIX
case:
I want to modernize the linux_base when I get time for it. Since I
want to modularize it at the same time (linux_base as a meta-port), I
need a way to be able to do what USE_LINUX_PREFIX does without the
implicit USE_LINUX. USE_LINUX should add a dependency to the linux_base
port of the day, so using it in the components which make up linux_base
would create a circular dependency. I could do what USE_LINUX_PREFIX
does by hand in every port, but I don't think we should go this route.

The rationale for splitting up linux_base: we don't need to portupgrade
the entire linux_base when we update one particular part (e.g. because
of a security fix), and it should be more easy to take care when
security issues show up.

>How-To-Repeat:
	
>Fix:

--- linux_update.diff begins here ---
Index: ./Mk/bsd.port.mk
===================================================================
RCS file: /big/FreeBSD-CVS/ports/Mk/bsd.port.mk,v
retrieving revision 1.497
diff -u -u -r1.497 bsd.port.mk
--- ./Mk/bsd.port.mk	3 Aug 2004 19:03:58 -0000	1.497
+++ ./Mk/bsd.port.mk	16 Aug 2004 14:40:28 -0000
@@ -1043,9 +1067,6 @@
 .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)
@@ -1386,7 +1407,11 @@
 .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
+RUN_DEPENDS+=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-8
+.	endif
 .endif
 
 .if defined(USE_MOTIF)
Index: ./audio/baudline/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/audio/baudline/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- ./audio/baudline/Makefile	12 Aug 2004 08:25:00 -0000	1.13
+++ ./audio/baudline/Makefile	14 Aug 2004 13:23:48 -0000
@@ -15,7 +15,8 @@
 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
Index: ./audio/linux-arts/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/audio/linux-arts/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- ./audio/linux-arts/Makefile	4 Feb 2004 05:18:32 -0000	1.6
+++ ./audio/linux-arts/Makefile	14 Aug 2004 14:39:08 -0000
@@ -20,8 +20,8 @@
 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
Index: ./cad/linux-eagle/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/cad/linux-eagle/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- ./cad/linux-eagle/Makefile	13 Nov 2003 14:44:58 -0000	1.12
+++ ./cad/linux-eagle/Makefile	14 Aug 2004 14:39:54 -0000
@@ -17,8 +17,6 @@
 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 +27,7 @@
 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
 
Index: ./devel/linux-runrev/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/devel/linux-runrev/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./devel/linux-runrev/Makefile	4 Apr 2003 05:34:47 -0000	1.4
+++ ./devel/linux-runrev/Makefile	14 Aug 2004 13:47:00 -0000
@@ -18,7 +18,8 @@
 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"
 
Index: ./devel/linux-sdl12/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/devel/linux-sdl12/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- ./devel/linux-sdl12/Makefile	2 Mar 2004 21:44:12 -0000	1.8
+++ ./devel/linux-sdl12/Makefile	14 Aug 2004 14:40:45 -0000
@@ -21,6 +21,7 @@
 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
Index: ./devel/linux-understand_ada/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/devel/linux-understand_ada/Makefile,v
retrieving revision 1.49
diff -u -u -r1.49 Makefile
--- ./devel/linux-understand_ada/Makefile	8 Feb 2004 01:13:49 -0000	1.49
+++ ./devel/linux-understand_ada/Makefile	14 Aug 2004 13:46:33 -0000
@@ -16,6 +16,8 @@
 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
 USE_SIZE=	yes
Index: ./devel/linux-understand_c/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/devel/linux-understand_c/Makefile,v
retrieving revision 1.68
diff -u -u -r1.68 Makefile
--- ./devel/linux-understand_c/Makefile	8 Feb 2004 01:13:49 -0000	1.68
+++ ./devel/linux-understand_c/Makefile	14 Aug 2004 13:47:56 -0000
@@ -17,6 +17,8 @@
 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
 USE_SIZE=	yes
Index: ./devel/linux-understand_java/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/devel/linux-understand_java/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- ./devel/linux-understand_java/Makefile	8 Feb 2004 01:13:49 -0000	1.3
+++ ./devel/linux-understand_java/Makefile	14 Aug 2004 13:47:35 -0000
@@ -16,6 +16,8 @@
 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
 USE_SIZE=	yes
Index: ./devel/linux_devtools/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/devel/linux_devtools/Makefile,v
retrieving revision 1.42
diff -u -u -r1.42 Makefile
--- ./devel/linux_devtools/Makefile	10 Apr 2004 17:26:32 -0000	1.42
+++ ./devel/linux_devtools/Makefile	14 Aug 2004 14:41:42 -0000
@@ -33,10 +33,10 @@
 COMMENT=		Packages needed for doing development in Linux mode
 
 EXTRACT_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-*
Index: ./devel/zendstudio/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/devel/zendstudio/Makefile,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile
--- ./devel/zendstudio/Makefile	31 Jul 2004 18:06:48 -0000	1.1
+++ ./devel/zendstudio/Makefile	14 Aug 2004 13:48:18 -0000
@@ -13,6 +13,8 @@
 MAINTAINER=	tux@pinguru.net
 COMMENT=	A PHP IDE
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 NO_BUILD=	yes
 RESTRICTED=	"Redistribution is not permitted"
 
Index: ./editors/edith/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/editors/edith/Makefile,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile
--- ./editors/edith/Makefile	30 Jul 2003 22:30:46 -0000	1.7
+++ ./editors/edith/Makefile	14 Aug 2004 13:24:17 -0000
@@ -15,6 +15,8 @@
 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
Index: ./editors/staroffice5/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/editors/staroffice5/Makefile,v
retrieving revision 1.19
diff -u -u -r1.19 Makefile
--- ./editors/staroffice5/Makefile	15 May 2004 11:39:35 -0000	1.19
+++ ./editors/staroffice5/Makefile	14 Aug 2004 13:48:43 -0000
@@ -18,6 +18,7 @@
 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
Index: ./editors/staroffice52/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/editors/staroffice52/Makefile,v
retrieving revision 1.44
diff -u -u -r1.44 Makefile
--- ./editors/staroffice52/Makefile	15 May 2004 11:39:35 -0000	1.44
+++ ./editors/staroffice52/Makefile	14 Aug 2004 14:43:43 -0000
@@ -32,8 +32,10 @@
 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'
Index: ./editors/staroffice60/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/editors/staroffice60/Makefile,v
retrieving revision 1.55
diff -u -u -r1.55 Makefile
--- ./editors/staroffice60/Makefile	15 May 2004 11:39:35 -0000	1.55
+++ ./editors/staroffice60/Makefile	14 Aug 2004 13:49:02 -0000
@@ -26,6 +26,8 @@
 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'
Index: ./editors/staroffice70/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/editors/staroffice70/Makefile,v
retrieving revision 1.58
diff -u -u -r1.58 Makefile
--- ./editors/staroffice70/Makefile	5 Jul 2004 13:26:39 -0000	1.58
+++ ./editors/staroffice70/Makefile	14 Aug 2004 13:49:22 -0000
@@ -30,6 +30,8 @@
 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'
 
Index: ./emulators/linux-geepee32/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/emulators/linux-geepee32/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./emulators/linux-geepee32/Makefile	16 Aug 2004 01:13:13 -0000	1.4
+++ ./emulators/linux-geepee32/Makefile	16 Aug 2004 09:05:40 -0000
@@ -15,11 +15,12 @@
 MAINTAINER=	ports@FreeBSD.org
 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
Index: ./emulators/linux-mupen64/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/emulators/linux-mupen64/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- ./emulators/linux-mupen64/Makefile	17 Jun 2004 19:12:57 -0000	1.6
+++ ./emulators/linux-mupen64/Makefile	14 Aug 2004 14:44:36 -0000
@@ -17,14 +17,13 @@
 MAINTAINER=	tlp@liquidx.org
 COMMENT=	A Nintendo 64 emulator (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
-		${LINUXBASE}/usr/X11R6/lib/libXi.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXi.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
 		${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri \
 		${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
 		${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
 USE_BZIP2=	yes
-
+USE_LINUX=	yes
 USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
 INSTALLS_SHLIB=	yes
Index: ./emulators/linux-vmware-toolbox2/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/emulators/linux-vmware-toolbox2/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- ./emulators/linux-vmware-toolbox2/Makefile	6 Feb 2004 15:33:18 -0000	1.13
+++ ./emulators/linux-vmware-toolbox2/Makefile	14 Aug 2004 13:25:43 -0000
@@ -15,6 +15,8 @@
 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
Index: ./emulators/linux-vmware-toolbox4/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/emulators/linux-vmware-toolbox4/Makefile,v
retrieving revision 1.18
diff -u -u -r1.18 Makefile
--- ./emulators/linux-vmware-toolbox4/Makefile	23 Jun 2004 19:01:58 -0000	1.18
+++ ./emulators/linux-vmware-toolbox4/Makefile	14 Aug 2004 13:26:07 -0000
@@ -15,6 +15,8 @@
 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
Index: ./emulators/linux-winetools/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/emulators/linux-winetools/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- ./emulators/linux-winetools/Makefile	6 Feb 2004 13:11:16 -0000	1.5
+++ ./emulators/linux-winetools/Makefile	14 Aug 2004 13:49:47 -0000
@@ -15,7 +15,8 @@
 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
Index: ./emulators/vmware2/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/emulators/vmware2/Makefile,v
retrieving revision 1.60
diff -u -u -r1.60 Makefile
--- ./emulators/vmware2/Makefile	10 Jan 2004 07:18:54 -0000	1.60
+++ ./emulators/vmware2/Makefile	14 Aug 2004 13:24:42 -0000
@@ -20,7 +20,8 @@
 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"
 
Index: ./emulators/vmware3/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/emulators/vmware3/Makefile,v
retrieving revision 1.80
diff -u -u -r1.80 Makefile
--- ./emulators/vmware3/Makefile	4 Aug 2004 22:24:11 -0000	1.80
+++ ./emulators/vmware3/Makefile	14 Aug 2004 13:25:06 -0000
@@ -22,7 +22,8 @@
 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"
 
Index: ./french/gibi/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/french/gibi/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./french/gibi/Makefile	23 May 2004 08:11:10 -0000	1.4
+++ ./french/gibi/Makefile	14 Aug 2004 14:01:12 -0000
@@ -23,9 +23,9 @@
 #			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\
Index: ./french/staroffice52/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/french/staroffice52/Makefile,v
retrieving revision 1.22
diff -u -u -r1.22 Makefile
--- ./french/staroffice52/Makefile	20 Nov 2003 15:05:56 -0000	1.22
+++ ./french/staroffice52/Makefile	14 Aug 2004 14:45:17 -0000
@@ -32,8 +32,10 @@
 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'
Index: ./games/HeroesOfMightAndMagic/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/games/HeroesOfMightAndMagic/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- ./games/HeroesOfMightAndMagic/Makefile	21 Feb 2003 12:05:41 -0000	1.3
+++ ./games/HeroesOfMightAndMagic/Makefile	14 Aug 2004 14:46:04 -0000
@@ -14,12 +14,12 @@
 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
Index: ./games/adom/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/games/adom/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- ./games/adom/Makefile	21 Feb 2003 12:05:41 -0000	1.13
+++ ./games/adom/Makefile	14 Aug 2004 13:50:23 -0000
@@ -14,6 +14,8 @@
 MAINTAINER=	rover@lglobus.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
Index: ./games/halflifeserver/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/games/halflifeserver/Makefile,v
retrieving revision 1.38
diff -u -u -r1.38 Makefile
--- ./games/halflifeserver/Makefile	22 Jan 2004 11:05:55 -0000	1.38
+++ ./games/halflifeserver/Makefile	14 Aug 2004 12:23:28 -0000
@@ -17,6 +17,7 @@
 
 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
Index: ./games/linux-enemyterritory/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/games/linux-enemyterritory/Makefile,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile
--- ./games/linux-enemyterritory/Makefile	30 Jan 2004 13:14:50 -0000	1.2
+++ ./games/linux-enemyterritory/Makefile	14 Aug 2004 12:28:54 -0000
@@ -22,6 +22,7 @@
 
 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
Index: ./games/linux-nwnclient/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/games/linux-nwnclient/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./games/linux-nwnclient/Makefile	25 May 2004 06:07:08 -0000	1.4
+++ ./games/linux-nwnclient/Makefile	14 Aug 2004 13:51:44 -0000
@@ -18,8 +18,8 @@
 COMMENT=	Neverwinter Nights Linux (x86) Client
 
 RUN_DEPENDS=	${LOCALBASE}/share/nwndata/NWNv129.txt:${PORTSDIR}/games/nwndata \
-		/compat/linux/usr/X11R6/lib/libGL.so.1.2:${PORTSDIR}/graphics/linux_dri \
-		/compat/linux/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
+		${LINUXBASE}/usr/X11R6/lib/libGL.so.1.2:${PORTSDIR}/graphics/linux_dri \
+		${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
 
 USE_LINUX=	yes
 NO_BUILD=	yes
Index: ./games/linux-q3ademo/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/games/linux-q3ademo/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- ./games/linux-q3ademo/Makefile	23 Jul 2004 19:10:09 -0000	1.8
+++ ./games/linux-q3ademo/Makefile	14 Aug 2004 14:47:12 -0000
@@ -21,17 +21,17 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux 3d shooter from id Software / Loki Software (demo version)
 
-RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
 
 .include <bsd.port.pre.mk>
 
 .if ${X_WINDOW_SYSTEM:L} != xfree86-3
-RUN_DEPENDS +=	/compat/linux/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
+RUN_DEPENDS +=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .else
-RUN_DEPENDS +=	/compat/linux/lib/libGL.so:${PORTSDIR}/graphics/linux_glx
+RUN_DEPENDS +=	${LINUXBASE}/lib/libGL.so:${PORTSDIR}/graphics/linux_glx
 .endif
 
 USE_X_PREFIX=	yes
+USE_LINUX=	yes
 USE_MESA=	yes
 
 # Linux binary should not be stripped by INSTALL_PROGRAM as it uses /usr/bin/strip which then brands the binary as a FreeBSD ELF one.
Index: ./games/q3server/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/games/q3server/Makefile,v
retrieving revision 1.11
diff -u -u -r1.11 Makefile
--- ./games/q3server/Makefile	18 May 2003 18:32:53 -0000	1.11
+++ ./games/q3server/Makefile	14 Aug 2004 12:26:59 -0000
@@ -18,6 +18,7 @@
 
 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
Index: ./games/rtcw/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/games/rtcw/Makefile,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile
--- ./games/rtcw/Makefile	21 Jun 2004 21:27:23 -0000	1.7
+++ ./games/rtcw/Makefile	14 Aug 2004 12:29:43 -0000
@@ -21,6 +21,7 @@
 
 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
Index: ./games/ssamtse/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/games/ssamtse/Makefile,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile
--- ./games/ssamtse/Makefile	30 Jan 2004 08:51:16 -0000	1.2
+++ ./games/ssamtse/Makefile	14 Aug 2004 13:28:25 -0000
@@ -15,10 +15,12 @@
 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
Index: ./games/stvef-server/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/games/stvef-server/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./games/stvef-server/Makefile	7 Mar 2003 06:02:53 -0000	1.4
+++ ./games/stvef-server/Makefile	14 Aug 2004 12:30:10 -0000
@@ -16,6 +16,7 @@
 ONLY_FOR_ARCHS=	i386
 USE_ZIP=	yes
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/Linux
 STRIP=
Index: ./games/utserver/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/games/utserver/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- ./games/utserver/Makefile	22 Jan 2004 11:05:55 -0000	1.13
+++ ./games/utserver/Makefile	14 Aug 2004 12:28:07 -0000
@@ -21,6 +21,7 @@
 
 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
Index: ./german/citrix_ica/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/german/citrix_ica/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- ./german/citrix_ica/Makefile	7 Mar 2003 06:03:18 -0000	1.8
+++ ./german/citrix_ica/Makefile	14 Aug 2004 14:47:49 -0000
@@ -14,14 +14,13 @@
 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
Index: ./german/staroffice5/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/german/staroffice5/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- ./german/staroffice5/Makefile	15 May 2004 11:39:05 -0000	1.14
+++ ./german/staroffice5/Makefile	14 Aug 2004 14:48:29 -0000
@@ -20,11 +20,12 @@
 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}
Index: ./german/staroffice52/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/german/staroffice52/Makefile,v
retrieving revision 1.36
diff -u -u -r1.36 Makefile
--- ./german/staroffice52/Makefile	15 May 2004 11:39:05 -0000	1.36
+++ ./german/staroffice52/Makefile	14 Aug 2004 14:49:07 -0000
@@ -30,8 +30,10 @@
 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.'
Index: ./german/staroffice70/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/german/staroffice70/Makefile,v
retrieving revision 1.58
diff -u -u -r1.58 Makefile
--- ./german/staroffice70/Makefile	5 Jul 2004 13:26:42 -0000	1.58
+++ ./german/staroffice70/Makefile	14 Aug 2004 13:16:43 -0000
@@ -30,6 +30,8 @@
 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'
 
Index: ./graphics/linux-ac3d/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/graphics/linux-ac3d/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- ./graphics/linux-ac3d/Makefile	21 Jul 2004 17:47:51 -0000	1.5
+++ ./graphics/linux-ac3d/Makefile	14 Aug 2004 13:54:15 -0000
@@ -19,6 +19,7 @@
 .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
Index: ./graphics/linux_dri/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/graphics/linux_dri/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- ./graphics/linux_dri/Makefile	6 Feb 2004 16:58:42 -0000	1.10
+++ ./graphics/linux_dri/Makefile	14 Aug 2004 12:31:45 -0000
@@ -23,6 +23,7 @@
 WRKSRC=		${WRKDIR}/lib
 NO_BUILD=	yes
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 
 ONLY_FOR_ARCHS=	i386
 
Index: ./graphics/linux_glide/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/graphics/linux_glide/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- ./graphics/linux_glide/Makefile	21 May 2003 17:37:44 -0000	1.12
+++ ./graphics/linux_glide/Makefile	14 Aug 2004 12:30:47 -0000
@@ -21,6 +21,7 @@
 ONLY_FOR_ARCHS=	i386
 
 USE_LINUX_PREFIX=yes
+USE_LINUX=	yes
 NO_MTREE=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/Glide2.4
Index: ./graphics/linux_mesa3/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/graphics/linux_mesa3/Makefile,v
retrieving revision 1.23
diff -u -u -r1.23 Makefile
--- ./graphics/linux_mesa3/Makefile	6 Feb 2004 16:58:41 -0000	1.23
+++ ./graphics/linux_mesa3/Makefile	16 Aug 2004 10:30:15 -0000
@@ -63,8 +63,10 @@
 BUILD_DEPENDS+=	${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base-6 \
 		${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools-6
 .else
-BUILD_DEPENDS+=	${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base \
-		${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools-7
+BUILD_DEPENDS+=	${LINUXBASE}/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base-8 \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs \
+		${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools
+RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 .endif
 
 post-install:
Index: ./japanese/linux-mozillafirebird-gtk2/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/japanese/linux-mozillafirebird-gtk2/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./japanese/linux-mozillafirebird-gtk2/Makefile	23 Jun 2004 21:47:12 -0000	1.4
+++ ./japanese/linux-mozillafirebird-gtk2/Makefile	14 Aug 2004 14:53:22 -0000
@@ -14,7 +14,6 @@
 COMMENT=	Firebird Web browser:  Japanese, Linux/i386, GTK+ 2.X, with Xft
 
 RUN_DEPENDS=	\
-${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
 ${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs \
 ${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
 ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
@@ -23,7 +22,5 @@
 ${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango \
 ${LINUXBASE}/usr/share/fonts/ja/TrueType:${PORTSDIR}/japanese/linux-ttfonts
 
-BROKEN=		"Inconsistent dependencies (linux_base 7.x and 8.x)"
-
 MASTERDIR=	${.CURDIR}/../../www/linux-mozillafirebird
 .include "${MASTERDIR}/Makefile"
Index: ./java/linux-blackdown-jdk12/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/java/linux-blackdown-jdk12/Makefile,v
retrieving revision 1.20
diff -u -u -r1.20 Makefile
--- ./java/linux-blackdown-jdk12/Makefile	15 Apr 2004 22:40:29 -0000	1.20
+++ ./java/linux-blackdown-jdk12/Makefile	14 Aug 2004 14:06:32 -0000
@@ -18,7 +18,8 @@
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Blackdown Java Development Kit 1.2 for Linux
 
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 NO_CDROM=	"License doesn\'t allow distribution with fee"
 NO_PACKAGE=	"License doesn\'t allow binary distributions"
Index: ./java/linux-blackdown-jdk13/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/java/linux-blackdown-jdk13/Makefile,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile
--- ./java/linux-blackdown-jdk13/Makefile	8 Mar 2004 10:37:11 -0000	1.9
+++ ./java/linux-blackdown-jdk13/Makefile	14 Aug 2004 14:05:42 -0000
@@ -20,7 +20,8 @@
 COMMENT=	Blackdown Java Development Kit 1.3 for Linux
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
-RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 WRKSRC=		${WRKDIR}/j2sdk${PORTVERSION}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///}
Index: ./java/linux-blackdown-jdk14/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/java/linux-blackdown-jdk14/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- ./java/linux-blackdown-jdk14/Makefile	15 Apr 2004 20:41:01 -0000	1.6
+++ ./java/linux-blackdown-jdk14/Makefile	14 Aug 2004 14:08:31 -0000
@@ -19,7 +19,8 @@
 COMMENT=	Blackdown Java Development Kit 1.4 for Linux
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
-RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 EXTRACT_CMD=		${TAIL}
 EXTRACT_BEFORE_ARGS=	+482
Index: ./java/linux-blackdown-jre11/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/java/linux-blackdown-jre11/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./java/linux-blackdown-jre11/Makefile	30 Jan 2004 04:17:30 -0000	1.4
+++ ./java/linux-blackdown-jre11/Makefile	14 Aug 2004 14:08:55 -0000
@@ -20,7 +20,8 @@
 MAINTAINER=	sime@logos.hr
 COMMENT=	Blackdown Linux Java Runtime Environment 1.1.8
 
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 NO_CDROM=	"License doesn\'t allow distribution with fee"
 NO_PACKAGE=     "License doesn\'t allow binary distributions"
Index: ./java/linux-ibm-jdk13/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/java/linux-ibm-jdk13/Makefile,v
retrieving revision 1.20
diff -u -u -r1.20 Makefile
--- ./java/linux-ibm-jdk13/Makefile	28 Jun 2004 18:43:41 -0000	1.20
+++ ./java/linux-ibm-jdk13/Makefile	14 Aug 2004 14:05:04 -0000
@@ -18,7 +18,8 @@
 COMMENT=	IBM Java Development Kit 1.3 for Linux
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
-RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-SDK//}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///}
Index: ./java/linux-ibm-jdk14/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/java/linux-ibm-jdk14/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- ./java/linux-ibm-jdk14/Makefile	15 Apr 2004 22:55:14 -0000	1.8
+++ ./java/linux-ibm-jdk14/Makefile	14 Aug 2004 14:05:25 -0000
@@ -17,7 +17,8 @@
 COMMENT=	IBM Java Development Kit 1.4.1 for Linux
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
-RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-SDK//}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///}
Index: ./java/linux-sun-jdk12/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/java/linux-sun-jdk12/Makefile,v
retrieving revision 1.18
diff -u -u -r1.18 Makefile
--- ./java/linux-sun-jdk12/Makefile	8 Mar 2004 10:01:12 -0000	1.18
+++ ./java/linux-sun-jdk12/Makefile	14 Aug 2004 14:06:08 -0000
@@ -18,7 +18,8 @@
 
 EXTRACT_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
 BUILD_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
-RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:R}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///}
Index: ./java/linux-sun-jdk13/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/java/linux-sun-jdk13/Makefile,v
retrieving revision 1.37
diff -u -u -r1.37 Makefile
--- ./java/linux-sun-jdk13/Makefile	8 Mar 2004 10:01:12 -0000	1.37
+++ ./java/linux-sun-jdk13/Makefile	14 Aug 2004 14:54:58 -0000
@@ -16,9 +16,10 @@
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Sun Java Development Kit 1.3 for Linux
 
-EXTRACT_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-BUILD_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+EXTRACT_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8
+BUILD_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 NO_CDROM=	"License does not allow distribution with fee"
 RESTRICTED=	"Redistribution of repackaged binaries not permitted"
Index: ./java/linux-sun-jdk14/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/java/linux-sun-jdk14/Makefile,v
retrieving revision 1.45
diff -u -u -r1.45 Makefile
--- ./java/linux-sun-jdk14/Makefile	2 Jul 2004 19:57:06 -0000	1.45
+++ ./java/linux-sun-jdk14/Makefile	14 Aug 2004 14:55:09 -0000
@@ -16,9 +16,10 @@
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Sun Java Development Kit 1.4 for Linux
 
-EXTRACT_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-BUILD_DEPENDS=  ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+EXTRACT_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8
+BUILD_DEPENDS=  ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 NO_CDROM=	"License does not allow distribution with fee"
 RESTRICTED=	"Redistribution of repackaged binaries not permitted"
Index: ./java/linux-sun-jdk15/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/java/linux-sun-jdk15/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./java/linux-sun-jdk15/Makefile	8 Mar 2004 10:01:12 -0000	1.4
+++ ./java/linux-sun-jdk15/Makefile	14 Aug 2004 14:55:18 -0000
@@ -17,9 +17,10 @@
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Sun Java Development Kit 1.5 for Linux
 
-EXTRACT_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-BUILD_DEPENDS=  ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+EXTRACT_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8
+BUILD_DEPENDS=  ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 NO_CDROM=	"License does not allow distribution with fee"
 RESTRICTED=	"Redistribution of repackaged binaries not permitted"
Index: ./korean/linux_locale/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/korean/linux_locale/Makefile,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile
--- ./korean/linux_locale/Makefile	22 Jan 2004 08:05:22 -0000	1.7
+++ ./korean/linux_locale/Makefile	14 Aug 2004 14:56:13 -0000
@@ -14,12 +14,12 @@
 MAINTAINER=	cjh@kr.freebsd.org
 COMMENT=	Glibc 2.0 Korean locale for linux compatibility
 
-BUILD_DEPENDS=  ${PREFIX}/usr/share/locale/ko:${PORTSDIR}/emulators/linux_base
-RUN_DEPENDS=	${PREFIX}/usr/share/locale/ko:${PORTSDIR}/emulators/linux_base
+BUILD_DEPENDS=  ${LINUXBASE}/usr/share/locale/ko:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=	${LINUXBASE}/usr/share/locale/ko:${PORTSDIR}/emulators/linux_base-8
 
 ONLY_FOR_ARCHS=	i386
 
-PREFIX=		/compat/linux
+USE_LINUX_PREFIX=yes
 NO_MTREE=	yes
 NO_BUILD=	yes
 EXTRACT_ONLY=	# empty
Index: ./lang/icc/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/lang/icc/Makefile,v
retrieving revision 1.72
diff -u -u -r1.72 Makefile
--- ./lang/icc/Makefile	24 Jul 2004 11:16:50 -0000	1.72
+++ ./lang/icc/Makefile	14 Aug 2004 14:56:36 -0000
@@ -21,7 +21,7 @@
 .endif
 
 EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-PATCH_DEPENDS=		${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
+PATCH_DEPENDS=		${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-8
 
 RESTRICTED=	Intel forbids any redistribution
 NO_PACKAGE=	${RESTRICTED}
Index: ./lang/ifc/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/lang/ifc/Makefile,v
retrieving revision 1.34
diff -u -u -r1.34 Makefile
--- ./lang/ifc/Makefile	15 Aug 2004 02:53:34 -0000	1.34
+++ ./lang/ifc/Makefile	16 Aug 2004 09:11:31 -0000
@@ -21,7 +21,7 @@
 .endif
 
 EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-PATCH_DEPENDS=		${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
+PATCH_DEPENDS=		${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-8
 
 RESTRICTED=	Intel forbids any redistribution
 NO_PACKAGE=	${RESTRICTED}
Index: ./mail/mulberry/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/mail/mulberry/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- ./mail/mulberry/Makefile	15 Jul 2004 06:48:19 -0000	1.12
+++ ./mail/mulberry/Makefile	14 Aug 2004 13:55:43 -0000
@@ -17,6 +17,8 @@
 MAINTAINER=	girgen@pingpong.net
 COMMENT=	A scalable high-performance GUI internet Mail User Agent
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 USE_LINUX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
Index: ./math/linux-dislin/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/math/linux-dislin/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- ./math/linux-dislin/Makefile	17 Feb 2004 12:58:26 -0000	1.3
+++ ./math/linux-dislin/Makefile	14 Aug 2004 13:56:30 -0000
@@ -16,6 +16,8 @@
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	A scientific data plotting package
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 USE_LINUX=	yes
 ONLY_FOR_ARCHS=	i386 alpha
 NO_BUILD=	yes
Index: ./math/wingz/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/math/wingz/Makefile,v
retrieving revision 1.19
diff -u -u -r1.19 Makefile
--- ./math/wingz/Makefile	20 Feb 2003 18:42:24 -0000	1.19
+++ ./math/wingz/Makefile	14 Aug 2004 13:28:55 -0000
@@ -16,6 +16,8 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Commercial Spreadsheet
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 
 USE_LINUX=	yes
Index: ./math/wingz3/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/math/wingz3/Makefile,v
retrieving revision 1.16
diff -u -u -r1.16 Makefile
--- ./math/wingz3/Makefile	7 Mar 2003 06:06:09 -0000	1.16
+++ ./math/wingz3/Makefile	14 Aug 2004 13:29:27 -0000
@@ -14,6 +14,8 @@
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	A Commercial Spreadsheet
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 NO_PACKAGE=	"nothing to build. commercial software"
 
 ONLY_FOR_ARCHS=	i386
Index: ./misc/ftree/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/misc/ftree/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./misc/ftree/Makefile	2 Feb 2004 22:53:18 -0000	1.4
+++ ./misc/ftree/Makefile	14 Aug 2004 13:30:27 -0000
@@ -16,9 +16,10 @@
 MAINTAINER=	user@unknown.nu
 COMMENT=	An X11 genealogy program
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 USE_LINUX=	yes
 USE_X_PREFIX=	yes
-USE_XLIB=	no
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	Non-commercial use only
Index: ./misc/opencyc/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/misc/opencyc/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./misc/opencyc/Makefile	11 Aug 2004 16:43:42 -0000	1.4
+++ ./misc/opencyc/Makefile	14 Aug 2004 13:56:58 -0000
@@ -15,6 +15,8 @@
 MAINTAINER=	alexs@snark.rinet.ru
 COMMENT=	General knowledge base and commonsense reasoning engine
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 NO_BUILD=	yes
 USE_LINUX=	yes
 
Index: ./multimedia/linux-divxplayer/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/multimedia/linux-divxplayer/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- ./multimedia/linux-divxplayer/Makefile	8 Feb 2004 01:13:56 -0000	1.6
+++ ./multimedia/linux-divxplayer/Makefile	14 Aug 2004 13:36:45 -0000
@@ -15,6 +15,8 @@
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	DivX(TM) Video Player for Linux from DivX.com
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 
 USE_LINUX=	yes
Index: ./multimedia/linux-realplayer/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/multimedia/linux-realplayer/Makefile,v
retrieving revision 1.31
diff -u -u -r1.31 Makefile
--- ./multimedia/linux-realplayer/Makefile	28 Jul 2004 12:18:50 -0000	1.31
+++ ./multimedia/linux-realplayer/Makefile	14 Aug 2004 14:58:47 -0000
@@ -17,8 +17,7 @@
 COMMENT=	Linux RealPlayer 8.0 from RealNetworks
 
 EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
-		${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound
 
 MAINDIST=	rp${PORTVERSION:R}_linux20_libc6_i386_${PORTVERSION:E}_rpm
 UPDATEDIST=	rv9_libc6_i386_cs2.tgz
@@ -45,6 +44,7 @@
 
 USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
+USE_LINUX=	yes
 NO_CDROM=	"Redistribution not allowed"
 NO_BUILD=	yes
 
Index: ./multimedia/linux-xmovie/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/multimedia/linux-xmovie/Makefile,v
retrieving revision 1.27
diff -u -u -r1.27 Makefile
--- ./multimedia/linux-xmovie/Makefile	11 Apr 2004 22:42:11 -0000	1.27
+++ ./multimedia/linux-xmovie/Makefile	14 Aug 2004 13:37:41 -0000
@@ -19,6 +19,7 @@
 COMMENT=	A movie player for AVI, MPEG-2/4 and MOV movies
 
 EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
Index: ./multimedia/mtv/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/multimedia/mtv/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- ./multimedia/mtv/Makefile	12 Jul 2003 10:26:38 -0000	1.13
+++ ./multimedia/mtv/Makefile	14 Aug 2004 14:59:07 -0000
@@ -14,14 +14,13 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High-performance MPEG video player (shareware)
 
-RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 NO_PACKAGE=	"No redistribution"
 NO_CDROM=	"No redistribution"
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 ONLY_FOR_ARCHS=	i386
+USE_LINUX=	yes
 WRKSRC=		${WRKDIR}/mtv
 
 MAN1=	mtv.1
Index: ./multimedia/netshow/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/multimedia/netshow/Makefile,v
retrieving revision 1.21
diff -u -u -r1.21 Makefile
--- ./multimedia/netshow/Makefile	19 Apr 2004 06:15:26 -0000	1.21
+++ ./multimedia/netshow/Makefile	14 Aug 2004 13:37:10 -0000
@@ -15,6 +15,8 @@
 MAINTAINER=	dburr@FreeBSD.org
 COMMENT=	Microsoft NetShow video stream player
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 RESTRICTED=	"Commercial software"
 
 ONLY_FOR_ARCHS=	i386
Index: ./net/aim/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/net/aim/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- ./net/aim/Makefile	27 Feb 2004 01:21:39 -0000	1.6
+++ ./net/aim/Makefile	14 Aug 2004 15:00:16 -0000
@@ -15,13 +15,12 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	AOL's Instant Messenger (AIM) client
 
-RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
-		/compat/linux/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
 
 ONLY_FOR_ARCHS=	i386
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USE_XLIB=	yes
+USE_LINUX=	yes
 INSTALLS_SHLIB=	yes
 # must not strip
 STRIP=
Index: ./net/citrix_ica/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/net/citrix_ica/Makefile,v
retrieving revision 1.30
diff -u -u -r1.30 Makefile
--- ./net/citrix_ica/Makefile	11 Aug 2003 14:57:12 -0000	1.30
+++ ./net/citrix_ica/Makefile	14 Aug 2004 15:00:40 -0000
@@ -15,14 +15,13 @@
 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
Index: ./net/linux-agsatellite/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/net/linux-agsatellite/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- ./net/linux-agsatellite/Makefile	8 Feb 2004 01:14:01 -0000	1.10
+++ ./net/linux-agsatellite/Makefile	14 Aug 2004 13:57:36 -0000
@@ -16,6 +16,8 @@
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Client that allows you to share your music on Audiogalaxy(TM)
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 WRKSRC=	${WRKDIR}/${DISTNAME:C/-.*//}
 
 USE_LINUX=	yes
Index: ./portuguese/staroffice52/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/portuguese/staroffice52/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- ./portuguese/staroffice52/Makefile	20 Nov 2003 15:06:09 -0000	1.5
+++ ./portuguese/staroffice52/Makefile	14 Aug 2004 15:01:09 -0000
@@ -27,13 +27,14 @@
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Sistema integrado de processador de texto/planilha/e muito mais
 
-FETCH_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
+FETCH_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8
 
 ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Deve ser obtido diretamente do site da Sun via interface www'
 CD_MOUNTPT=	'/cdrom'
 IS_INTERACTIVE=	yes
 NO_BUILD=	yes
+USE_LINUX=	yes
 USE_PERL5_BUILD=yes
 DIST_SUBDIR=	staroffice52
 WRKSRC=		${WRKDIR}/office52
Index: ./print/acroread5/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/print/acroread5/Makefile,v
retrieving revision 1.53
diff -u -u -r1.53 Makefile
--- ./print/acroread5/Makefile	15 Aug 2004 17:32:03 -0000	1.53
+++ ./print/acroread5/Makefile	16 Aug 2004 09:32:17 -0000
@@ -20,13 +20,12 @@
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	View, distribute and print PDF documents
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 
-.if (exists(${LINUXBASE}/lib/libc-2.3.2.so))
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
-.else
 USE_LINUX=	yes
-.endif
+NO_BUILD=	yes
 
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i '' -E
@@ -37,9 +36,6 @@
 .endif
 WRKSRC=		${WRKDIR}
 
-do-build:
-	@${ECHO_MSG} "Do a \`make install' as root."
-
 do-install:
 	@${MKDIR} ${PREFIX}/Acrobat5
 	@ReadInstallDir=${PREFIX}/Acrobat5 ${WRKDIR}/INSTALL
Index: ./print/bjfiltercom/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/print/bjfiltercom/Makefile,v
retrieving revision 1.19
diff -u -u -r1.19 Makefile
--- ./print/bjfiltercom/Makefile	21 Jun 2004 21:27:38 -0000	1.19
+++ ./print/bjfiltercom/Makefile	14 Aug 2004 15:02:38 -0000
@@ -28,14 +28,14 @@
 RUN_DEPENDS=	stsmon:${PORTSDIR}/print/bjfiltercom \
 		pstops:${PORTSDIR}/print/psutils-${PAPERSIZE}
 .else
-RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
-		${LINUXBASE}/usr/lib/libxml.so.1:${PORTSDIR}/textproc/linux-libxml \
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libxml.so.1:${PORTSDIR}/textproc/linux-libxml \
 		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
 		${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff \
 		${LINUXBASE}/usr/lib/libglade.so.0:${PORTSDIR}/devel/linux-libglade \
 		${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
 BIN_FILES=	bjcmd  bjfilter  bjprn  lgmon  printui  stsmon
+USE_LINUX=	yes
 .endif
 
 EXTRACT_CMD=	rpm2cpio.pl
Index: ./print/pips800/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/print/pips800/Makefile,v
retrieving revision 1.22
diff -u -u -r1.22 Makefile
--- ./print/pips800/Makefile	10 Jul 2004 22:02:48 -0000	1.22
+++ ./print/pips800/Makefile	14 Aug 2004 15:03:42 -0000
@@ -33,8 +33,7 @@
 DEPRECATED=	"has failed to fetch since September 2002"
 EXPIRATION_DATE=	"August 23, 2004"
 
-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 \
 		pstops:${PORTSDIR}/print/psutils-${PAPERSIZE} \
 		${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png10
 .if ${PORTVERSION} == 2.0 || ${PORTVERSION} == 2.1
@@ -45,6 +44,7 @@
 .endif
 
 ONLY_FOR_ARCHS= i386
+USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 PLIST_SUB=	BASE_NAME=${BASE_NAME} PRTYPE=${PRTYPE} LIB_DIR_FILE=usr/lib/${LIB_FILE} LIB_README=${LIB_README} ETC_RC_D=${ETC_RC_D}
 MD5_FILE=	${.CURDIR}/distinfo
Index: ./russian/linux-mozillafirebird/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/russian/linux-mozillafirebird/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./russian/linux-mozillafirebird/Makefile	23 Jun 2004 21:47:12 -0000	1.4
+++ ./russian/linux-mozillafirebird/Makefile	14 Aug 2004 15:04:06 -0000
@@ -13,7 +13,6 @@
 COMMENT=		Firebird Web browser:  Russian Linux/i386 version
 
 RUN_DEPENDS=	\
-${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
 ${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs \
 ${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
 ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
@@ -22,8 +21,6 @@
 ${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango \
 ${LINUXBASE}/usr/share/fonts/default:${PORTSDIR}/x11-fonts/linux-urw-fonts
 
-BROKEN=		"Inconsistent dependencies (linux_base 7.x and 8.x)"
-
 USE_BZIP2=	yes
 
 MASTERDIR=	${.CURDIR}/../../www/linux-mozillafirebird
Index: ./sysutils/linux-acu/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/sysutils/linux-acu/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- ./sysutils/linux-acu/Makefile	21 Feb 2003 13:28:45 -0000	1.3
+++ ./sysutils/linux-acu/Makefile	14 Aug 2004 15:04:50 -0000
@@ -15,8 +15,7 @@
 MAINTAINER=	matt@peterson.org
 COMMENT=	Aironet Cisco Utilities for 802.11 wireless NIC's
 
-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
 
 .include <bsd.port.pre.mk>
 
@@ -30,7 +29,7 @@
 .endif
 
 ONLY_FOR_ARCHS=	i386
-USE_XLIB=	yes
+USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_CDROM=	"Redistribution not allowed"
Index: ./sysutils/linux-afaapps/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/sysutils/linux-afaapps/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- ./sysutils/linux-afaapps/Makefile	4 Feb 2004 05:09:02 -0000	1.5
+++ ./sysutils/linux-afaapps/Makefile	14 Aug 2004 15:05:35 -0000
@@ -17,15 +17,15 @@
 COMMENT=		DELL PowerEdge Raid Controller 2 (apps)
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=		${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts \
-			${LINUXBASE}/usr/lib/libncurses.so.5:${PORTSDIR}/emulators/linux_base-8
+RUN_DEPENDS=		${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts
 
 RESTRICTED=		"binary redistribution license needs clarification"
 
 NO_BUILD=		yes
 NO_WRKSUBDIR=		yes
 
-PREFIX?=		${LINUXBASE}
+USE_LINUX=		yes
+USE_LINUX_PREFIX=	yes
 NO_MTREE=		yes
 LDCONFIG_LINUX=		${LINUXBASE}/sbin/ldconfig
 
Index: ./textproc/linux-aspell/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/textproc/linux-aspell/Makefile,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile
--- ./textproc/linux-aspell/Makefile	14 May 2004 02:35:42 -0000	1.1
+++ ./textproc/linux-aspell/Makefile	14 Aug 2004 15:06:02 -0000
@@ -22,12 +22,12 @@
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm \
 		bzip2:${PORTSDIR}/archivers/bzip2
-RUN_DEPENDS=	${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8
 
 NO_BUILD=		yes
 USE_REINPLACE=		yes
 ONLY_FOR_ARCHS=		i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=		yes
 NO_FILTER_SHLIBS=	yes
 LDCONFIG_LINUX=		${LINUXBASE}/sbin/ldconfig
 
Index: ./www/aswedit/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/www/aswedit/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- ./www/aswedit/Makefile	30 Jul 2003 22:24:59 -0000	1.14
+++ ./www/aswedit/Makefile	14 Aug 2004 14:03:03 -0000
@@ -17,6 +17,8 @@
 MAINTAINER=	brett@peloton.runet.edu
 COMMENT=	An easy to use HTML and text editor
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 RESTRICTED=	"Commercial software"
 NO_BUILD=	yes
 
Index: ./www/linux-beonex/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/www/linux-beonex/Makefile,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile
--- ./www/linux-beonex/Makefile	10 Jul 2004 22:02:48 -0000	1.9
+++ ./www/linux-beonex/Makefile	14 Aug 2004 13:34:28 -0000
@@ -33,7 +33,6 @@
 PLIST=		${WRKDIR}/pkg-plist
 USE_BZIP2=	yes
 USE_LINUX=	yes
-USE_XLIB=	yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/beonex-comm
 
Index: ./www/linux-flashplugin/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/www/linux-flashplugin/Makefile,v
retrieving revision 1.19
diff -u -u -r1.19 Makefile
--- ./www/linux-flashplugin/Makefile	28 Feb 2004 08:27:02 -0000	1.19
+++ ./www/linux-flashplugin/Makefile	14 Aug 2004 14:04:09 -0000
@@ -17,6 +17,8 @@
 MAINTAINER=	ports@brandon.dvalentine.com
 COMMENT=	The official Macromedia Flash Player for Linux Netscape and Opera
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
 
Index: ./www/linux-flashplugin6/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/www/linux-flashplugin6/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- ./www/linux-flashplugin6/Makefile	28 Feb 2004 08:27:02 -0000	1.4
+++ ./www/linux-flashplugin6/Makefile	14 Aug 2004 14:04:30 -0000
@@ -17,6 +17,8 @@
 MAINTAINER=	ports@brandon.dvalentine.com
 COMMENT=	The official Macromedia Flash Player for Linux Mozilla and Netscape 6+
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
 
Index: ./www/linux-flashplugin7/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/www/linux-flashplugin7/Makefile,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile
--- ./www/linux-flashplugin7/Makefile	6 Jun 2004 04:39:29 -0000	1.7
+++ ./www/linux-flashplugin7/Makefile	14 Aug 2004 14:04:46 -0000
@@ -16,6 +16,8 @@
 MAINTAINER=	jamie@bishopston.net
 COMMENT=	The official Macromedia Flash Player for Linux Mozilla and Netscape 6+
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
 
Index: ./www/linux-mozilla-devel/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/www/linux-mozilla-devel/Makefile,v
retrieving revision 1.31
diff -u -u -r1.31 Makefile
--- ./www/linux-mozilla-devel/Makefile	22 Jan 2004 11:06:02 -0000	1.31
+++ ./www/linux-mozilla-devel/Makefile	14 Aug 2004 13:34:49 -0000
@@ -28,7 +28,7 @@
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 ONLY_FOR_ARCHS=	i386
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_ZIP=	yes
 USE_LINUX=	yes
 WRKSRC=	${WRKDIR}/xpi
Index: ./www/linux-mozilla/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/www/linux-mozilla/Makefile,v
retrieving revision 1.30
diff -u -u -r1.30 Makefile
--- ./www/linux-mozilla/Makefile	22 Jan 2004 11:06:02 -0000	1.30
+++ ./www/linux-mozilla/Makefile	14 Aug 2004 13:35:27 -0000
@@ -27,7 +27,7 @@
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 ONLY_FOR_ARCHS=	i386
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_ZIP=	yes
 USE_LINUX=	yes
 WRKSRC=	${WRKDIR}/xpi
Index: ./www/linux-opera/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/www/linux-opera/Makefile,v
retrieving revision 1.52
diff -u -u -r1.52 Makefile
--- ./www/linux-opera/Makefile	5 Aug 2004 19:14:52 -0000	1.52
+++ ./www/linux-opera/Makefile	14 Aug 2004 13:33:43 -0000
@@ -24,6 +24,8 @@
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 RESTRICTED=	"not redistributable; commercial software"
 
 USE_BZIP2=	yes
Index: ./www/netscape48-communicator/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/www/netscape48-communicator/Makefile,v
retrieving revision 1.88
diff -u -u -r1.88 Makefile
--- ./www/netscape48-communicator/Makefile	25 Jul 2004 10:37:34 -0000	1.88
+++ ./www/netscape48-communicator/Makefile	14 Aug 2004 13:33:17 -0000
@@ -14,12 +14,13 @@
 MAINTAINER=	sada@FreeBSD.org
 COMMENT?=	Netscape ver 4 communicator web-surfboard
 
-RUN_DEPENDS+=	netscape:${PORTSDIR}/www/netscape-wrapper
+RUN_DEPENDS+=	netscape:${PORTSDIR}/www/netscape-wrapper \
+		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 WRKSRC=		${WRKDIR}/${BROWSER_NAME}-v${BROWSER_V}.${NETSCAPE_DIST_TAG}
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 STRIP=		# null
Index: ./x11/linux-XFree86-libs/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/x11/linux-XFree86-libs/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- ./x11/linux-XFree86-libs/Makefile	11 Mar 2004 19:24:56 -0000	1.8
+++ ./x11/linux-XFree86-libs/Makefile	14 Aug 2004 15:07:00 -0000
@@ -21,16 +21,16 @@
 COMMENT=	XFree86 libraries, Linux/i386 binary
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8
 
 BASEVERSION=	9
 CONFLICTS=	linux_base-6* linux_base-7* linux_base-deb* linux_base-gentoo*
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
+USE_LINUX=	yes
+USE_LINUX_PREFIX=yes
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 ONLY_FOR_ARCHS=	i386
 PLIST=		${WRKDIR}/plist
-PREFIX=		${LINUXBASE}
 
 pre-install:
 	@${RM} -rf ${WRKSRC}/tmp
Index: ./x11/nvidia-driver/Makefile
===================================================================
RCS file: /big/FreeBSD-CVS/ports/x11/nvidia-driver/Makefile,v
retrieving revision 1.16
diff -u -u -r1.16 Makefile
--- ./x11/nvidia-driver/Makefile	10 Aug 2004 07:51:48 -0000	1.16
+++ ./x11/nvidia-driver/Makefile	14 Aug 2004 13:36:19 -0000
@@ -36,6 +36,7 @@
 
 .if !defined(WITHOUT_LINUX)
 USE_LINUX=	yes
+RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 .endif
 
 .if ${OSVERSION} < 470000
--- linux_update.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408161520.i7GFKiFD067316>