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

14 files changed, 43 insertions, 53 deletions

diff --git a/www/aswedit/Makefile b/www/aswedit/Makefile
index 84900aba82c6..663997341485 100644
--- a/www/aswedit/Makefile
+++ b/www/aswedit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asWedit
 PORTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	www editors linux
 MASTER_SITES=	http://www.advasoft.com/asWedit/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/www/asWedit/ \
@@ -17,6 +18,8 @@ DISTNAME=	asWedit-4.0-i386.linux
 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
 
diff --git a/www/linux-beonex/Makefile b/www/linux-beonex/Makefile
index 03ca11e0e093..6b21c90744c8 100644
--- a/www/linux-beonex/Makefile
+++ b/www/linux-beonex/Makefile
@@ -34,8 +34,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 PLIST=		${WRKDIR}/pkg-plist
 USE_BZIP2=	yes
 USE_LINUX=	yes
-USE_XLIB=	yes
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
 WRKSRC=		${WRKDIR}/beonex-comm
 
 post-extract:
diff --git a/www/linux-flashplugin/Makefile b/www/linux-flashplugin/Makefile
index b32c9acbf490..f99e1b1539df 100644
--- a/www/linux-flashplugin/Makefile
+++ b/www/linux-flashplugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	5.0r51
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
@@ -17,6 +17,8 @@ DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 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
 
diff --git a/www/linux-flashplugin6/Makefile b/www/linux-flashplugin6/Makefile
index 0c12e0147ee0..9cce9ddbd88a 100644
--- a/www/linux-flashplugin6/Makefile
+++ b/www/linux-flashplugin6/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	6.0r79
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
@@ -17,6 +17,8 @@ DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 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
 
diff --git a/www/linux-flashplugin7/Makefile b/www/linux-flashplugin7/Makefile
index fc172ea6d2c2..f85e9235636c 100644
--- a/www/linux-flashplugin7/Makefile
+++ b/www/linux-flashplugin7/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	7.0r25
+PORTREVISION=	1
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
@@ -16,6 +17,8 @@ DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 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
 
diff --git a/www/linux-flashplugin9/Makefile b/www/linux-flashplugin9/Makefile
index fc172ea6d2c2..f85e9235636c 100644
--- a/www/linux-flashplugin9/Makefile
+++ b/www/linux-flashplugin9/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flashplugin
 PORTVERSION=	7.0r25
+PORTREVISION=	1
 CATEGORIES=	www multimedia linux
 MASTER_SITES=	http://download.macromedia.com/pub/shockwave/flash/english/linux/${PORTVERSION}/
 PKGNAMEPREFIX=	linux-
@@ -16,6 +17,8 @@ DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 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
 
diff --git a/www/linux-lesstif-ns/Makefile b/www/linux-lesstif-ns/Makefile
index 39b0078de645..f8ee74e43096 100644
--- a/www/linux-lesstif-ns/Makefile
+++ b/www/linux-lesstif-ns/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lesstif
 PORTVERSION=	0.92.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www x11-toolkits linux
 MASTER_SITES=	ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/ \
 		ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/obsolete/ \
@@ -26,6 +26,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clone of the Motif library mostly for linux-netscape4
 
 BUILD_DEPENDS=	${LINUXBASE}/usr/bin/cc:${PORTSDIR}/devel/linux_devtools-7
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
 
 USE_BZIP2=	yes
 USE_LINUX_PREFIX=	yes
diff --git a/www/linux-mozilla-devel/Makefile b/www/linux-mozilla-devel/Makefile
index 47526bec6105..c38136a4b6a8 100644
--- a/www/linux-mozilla-devel/Makefile
+++ b/www/linux-mozilla-devel/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.8a5
+PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${PORTVERSION}/linux-xpi
@@ -24,7 +25,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 ONLY_FOR_ARCHS=	i386
-USE_XLIB=	yes
+PREFIX?=	${X11BASE}
 USE_ZIP=	yes
 USE_LINUX=	yes
 WRKSRC=	${WRKDIR}/xpi
diff --git a/www/linux-mozilla/Makefile b/www/linux-mozilla/Makefile
index af746db97957..3203afbec9da 100644
--- a/www/linux-mozilla/Makefile
+++ b/www/linux-mozilla/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.7.3
+PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${PORTVERSION}/linux-xpi
@@ -23,7 +24,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 ONLY_FOR_ARCHS=	i386
-USE_XLIB=	yes
+PREFIX?=	${X11BASE}
 USE_ZIP=	yes
 USE_LINUX=	yes
 WRKSRC=	${WRKDIR}/xpi
diff --git a/www/linux-mozillafirebird/Makefile b/www/linux-mozillafirebird/Makefile
index e125d9328423..dce6313709db 100644
--- a/www/linux-mozillafirebird/Makefile
+++ b/www/linux-mozillafirebird/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mozillafirebird
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES?=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR?=	firebird/releases/${PORTVERSION}
@@ -28,8 +29,7 @@ MD5_FILE=	${.CURDIR}/distinfo
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PLIST=		${WRKDIR}/pkg-plist
 USE_LINUX=	yes
-USE_XLIB=	yes
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
 WRKSRC=		${WRKDIR}/MozillaFirebird
 
 do-patch:
@@ -79,10 +79,10 @@ NEW_LIBSTDCXX=	${LINUXBASE}/usr/lib/libstdc++-libc6.2-2.so.3
 OLD_LIBSTDCXX=	libstdc++-libc6.1-1.so.2
 
 post-install:
-	if [ ! -f ${NEW_LIBSTDCXX} ]; then \
+	if [ ! -e ${NEW_LIBSTDCXX} ]; then \
 		${LN} -s ${OLD_LIBSTDCXX} ${NEW_LIBSTDCXX}; \
 	fi
-	${ECHO_CMD} "@exec if [ ! -f ${NEW_LIBSTDCXX} ]; then ${LN} -s ${OLD_LIBSTDCXX} ${NEW_LIBSTDCXX}; fi" >> ${TMPPLIST}
+	${ECHO_CMD} "@exec if [ ! -e ${NEW_LIBSTDCXX} ]; then ${LN} -s ${OLD_LIBSTDCXX} ${NEW_LIBSTDCXX}; fi" >> ${TMPPLIST}
 	${ECHO_CMD} "@unexec if [ -L ${NEW_LIBSTDCXX} ]; then ${RM} -f ${NEW_LIBSTDCXX}; fi" >> ${TMPPLIST}
 	@${ECHO_CMD} \*\* After adding plugins to \(Linux\) Beonex,
 	@${ECHO_CMD} \*\* Mozilla or Netscape, run\
diff --git a/www/linux-nvu/Makefile b/www/linux-nvu/Makefile
index 6009a1c3838a..9012499c2aee 100644
--- a/www/linux-nvu/Makefile
+++ b/www/linux-nvu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nvu
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	http://cvs.nvu.com/download/
 PKGNAMEPREFIX=	linux-
@@ -16,7 +17,6 @@ MAINTAINER=	ilya@space.rootshell.ru
 COMMENT=	A complete Web Authoring System
 
 RUN_DEPENDS=	\
-	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
 	${LINUXBASE}/usr/lib/libgobject-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \
 	${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
 	${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 384f2e457ace..c4c983e9f4e3 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
+PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \
 		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \
@@ -24,12 +25,17 @@ DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
 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 \
+		${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell \
+		${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3:${PORTSDIR}/x11-toolkits/linux-openmotif
+
 RESTRICTED=	"not redistributable; commercial software"
 
 USE_BZIP2=	yes
 WANT_GNOME=	yes
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
 USE_REINPLACE=	yes
+WITH_LINUX=	yes
 ONLY_FOR_ARCHS=	i386
 
 NO_BUILD=	yes
@@ -42,18 +48,6 @@ DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
 .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 \
-		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
-		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
-		${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell \
-		${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-WITH_LINUX8=	yes
-.else
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-USE_LINUX=	yes
-.endif
-
 .if ${HAVE_GNOME:Mgnomehier}!=""
 PLIST_SUB+=	GNOME:=""
 .else
@@ -66,13 +60,6 @@ PLIST_SUB+=	KDE:=""
 PLIST_SUB+=	KDE:="@comment "
 .endif
 
-pre-everything::
-.if !defined(WITH_LINUX8)
-	@${ECHO_MSG} "You may specify the following on the command line:"
-	@${ECHO_MSG} " "
-	@${ECHO_MSG} "WITH_LINUX8=yes to use Xft2 and enable spell checker (requires linux_base-8)."
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 384f2e457ace..c4c983e9f4e3 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
+PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \
 		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \
@@ -24,12 +25,17 @@ DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
 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 \
+		${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell \
+		${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3:${PORTSDIR}/x11-toolkits/linux-openmotif
+
 RESTRICTED=	"not redistributable; commercial software"
 
 USE_BZIP2=	yes
 WANT_GNOME=	yes
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
 USE_REINPLACE=	yes
+WITH_LINUX=	yes
 ONLY_FOR_ARCHS=	i386
 
 NO_BUILD=	yes
@@ -42,18 +48,6 @@ DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
 .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 \
-		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
-		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
-		${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell \
-		${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-WITH_LINUX8=	yes
-.else
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-USE_LINUX=	yes
-.endif
-
 .if ${HAVE_GNOME:Mgnomehier}!=""
 PLIST_SUB+=	GNOME:=""
 .else
@@ -66,13 +60,6 @@ PLIST_SUB+=	KDE:=""
 PLIST_SUB+=	KDE:="@comment "
 .endif
 
-pre-everything::
-.if !defined(WITH_LINUX8)
-	@${ECHO_MSG} "You may specify the following on the command line:"
-	@${ECHO_MSG} " "
-	@${ECHO_MSG} "WITH_LINUX8=yes to use Xft2 and enable spell checker (requires linux_base-8)."
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 46fa27c1909a..6b925e3c7df2 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	netscape7
 PORTVERSION?=	7.2
+PORTREVISION?=	1
 CATEGORIES?=	www linux
 MASTER_SITES=	${MASTER_SITE_NETSCAPE}
 DIST_SUBDIR=	${MAJ}/${NETSCAPE_LANG}/${VER}
@@ -30,7 +31,7 @@ ONLY_FOR_ARCHS=	i386
 RESTRICTED=	"no redistribution"
 NO_CDROM=	${RESTRICTED}
 USE_LINUX=	yes
-USE_XLIB=	yes
+PREFIX?=	${X11BASE}
 USE_ZIP=	yes
 VER?=		${PORTVERSION}
 WRKSRC=	${WRKDIR}/netscape-installer/xpi