Mega-patch to cleanup the ports infrastructure regarding our linux bits:

  - USE_LINUX now implies NO_FILTER_SHLIBS=yes. It also doesn't use FreeBSD
    tools to strip binaries anymore, so it's not neccesary anymore to override
    STRIP and STRIP_CMD.
  - USE_LINUX_PREFIX implies NO_MTREE now.
  - In the USE_LINUX case, USE_XLIB now depends upon the linux X11 libraries
    instead upon the native FreeBSD libraries.
  - The variable LINUX_BASE_PORT contains a string which is suitable as an
    item in *_DEPENDS, so if a port BATCH_DEPENDS or FETCH_DEPENDS upon the
    default (or overriden) linux base, ${LINUX_BASE_PORT} should be used
    instead of a hardcoded reference.
  - Change all ports to comply to the "new world order".
  - The Ports Collection now allows to override the default linux_base port.
    Specify e.g. OVERRIDE_LINUX_BASE_PORT=rh-9 in /etc/make.conf to use
    ${PORTSDIR}/emulators/linux_base-rh-9 (the logic is to use
    ${PORTSDIR}/emulators/linux_base-${OVERRIDE_LINUX_BASE_PORT}).
  - If USE_LINUX or OVERRIDE_LINUX_BASE doesn't point to an existing linux_base
    port and if USE_LINUX isn't set to "yes" (case insensitive), the port will
    be marked as IGNORE. [1]
  - Readd USE_LINUX knobs into several ports and make several uses of a
    conditional dependency ("USE_LINUX?=") into an unconditional one
    ("USE_LINUX=") which where removed/changed by Trevor to allow the use of
    alternative linux_base ports. While this is a nice goal, the implementation
    resulted in missing dependencies. The OVERRIDE_LINUX_BASE_PORT knob
    in this commit is supposed to fix the problem while keeping the feature.
    Basicaly this includes a backout of Trevor's commit, to prevent confusion
    I mention it here explicitely.
  - Use the correct prefix (X11- instead of LOCAL- or LINUX-) for some ports.
    Chase dependencies for this.
  - Changes to make linux_devtools installable on amd64, remove some stray
    device nodes (they don't work on recent OS versions and aren't really
    needed).
  - Make linux_base-8 PREFIX clean and remove some stray device nodes.
    Additionally tell a little bit more about how to setup NIS/YP [2].
  - Update the PGSQL dependency in the linux-opengroupware port to a recent
    version (the old one isn't available anymore), I don't know if this
    works (at least it isn't more broken than before).
  - Use PREFIX/usr/share/doc instead of PREFIX/usr/doc in the divx4linux
    ports, the former path exists already and gets populated by other
    packages too (PREFIX=LINUXPREFIX!).
  - Fix some obvious (non-linuxolator) bugs in some linux ports while being
    there.
  - Bump PORTREVISION where neccesary.

Requested by:	portmgr (linimon) [1]
Submittted by:	Gerrit Kuehn <gerrit_huehn@gruft.fido.de [2]
Approved by:	portmgr (kris, linimon), maintainers (or maintainer timeout)
Tested on:	ports cluster (kris)
Reviewed by:	silence on emulation@
Superseedes PR:	69997

Maintainer approval from:
	chris@chrisburkert.de
	cracauer@cons.org
	des
	girgen
	jamie@bishopston.net
	mezz
	mi
	nivit@users.sf.net
        pat
	simond@irrelevant.org
	riggs@rrr.de
	Udo.Schweigert@Siemens.com

6 files changed, 23 insertions, 23 deletions

diff --git a/math/dislin/Makefile b/math/dislin/Makefile
index cc31541939b3..67ef1708441e 100644
--- a/math/dislin/Makefile
+++ b/math/dislin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dislin
 PORTVERSION=	8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math linux
 MASTER_SITES=	ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${MACHINE_ARCH}/
 PKGNAMEPREFIX=	linux-
@@ -17,13 +17,12 @@ DIST_SUBDIR=	${MACHINE_ARCH}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scientific data plotting package
 
-RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
 BROKEN=		Unfetchable
 
 ONLY_FOR_ARCHS=	i386 alpha
+USE_LINUX=	yes
+USE_X_PREFIX=	yes
 NO_BUILD=	yes
-INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	${DISLIN_DIR}/lib
 
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
@@ -39,6 +38,8 @@ do-configure:
 	${SED} -e 's,%%DISLIN_DIR%%,${DISLIN_DIR},' \
 	    <${FILESDIR}/pkg-message >${WRKDIR}/pkg-message
 
+# XXX: this is missing "${BRANDELF} -t Linux <executable>"
+
 do-install:
 	(cd ${WRKSRC} && ${ENV} DISLIN=${DISLIN_DIR} ${SH} INSTALL)
 	${INSTALL_SCRIPT} ${WRKDIR}/dislin.sh ${DISLIN_DIR}/bin
diff --git a/math/linux-dislin/Makefile b/math/linux-dislin/Makefile
index cc31541939b3..67ef1708441e 100644
--- a/math/linux-dislin/Makefile
+++ b/math/linux-dislin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dislin
 PORTVERSION=	8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math linux
 MASTER_SITES=	ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${MACHINE_ARCH}/
 PKGNAMEPREFIX=	linux-
@@ -17,13 +17,12 @@ DIST_SUBDIR=	${MACHINE_ARCH}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scientific data plotting package
 
-RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
-
 BROKEN=		Unfetchable
 
 ONLY_FOR_ARCHS=	i386 alpha
+USE_LINUX=	yes
+USE_X_PREFIX=	yes
 NO_BUILD=	yes
-INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	${DISLIN_DIR}/lib
 
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
@@ -39,6 +38,8 @@ do-configure:
 	${SED} -e 's,%%DISLIN_DIR%%,${DISLIN_DIR},' \
 	    <${FILESDIR}/pkg-message >${WRKDIR}/pkg-message
 
+# XXX: this is missing "${BRANDELF} -t Linux <executable>"
+
 do-install:
 	(cd ${WRKSRC} && ${ENV} DISLIN=${DISLIN_DIR} ${SH} INSTALL)
 	${INSTALL_SCRIPT} ${WRKDIR}/dislin.sh ${DISLIN_DIR}/bin
diff --git a/math/linux-relview/Makefile b/math/linux-relview/Makefile
index d6a659195797..e51c3f99abb5 100644
--- a/math/linux-relview/Makefile
+++ b/math/linux-relview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	relview
 PORTVERSION=	7.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math linux
 MASTER_SITES=	ftp://ftp.informatik.uni-kiel.de/pub/kiel/relview/RELVIEW_7.0/LINUX/
 PKGNAMEPREFIX=	linux-
@@ -19,6 +19,8 @@ COMMENT=	An interactive tool for manipulation of relations
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
 ONLY_FOR_ARCHS=	i386
+USE_LINUX=	yes
+USE_X_PREFIX=	yes
 
 NO_WRKSUBDIR=	yes
 EXTRACT_AFTER_ARGS=	> ${DISTNAME}
@@ -27,10 +29,6 @@ NO_BUILD=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-# Linux binary should not be stripped by INSTALL_PROGRAM
-# because as a side effect it brands the binary as FreeBSD.
-STRIP=	# empty
-
 do-install:
 	${BRANDELF} -t Linux ${WRKDIR}/${DISTNAME}
 	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME} ${PREFIX}/bin
diff --git a/math/mupad/Makefile b/math/mupad/Makefile
index 10054f365caa..e8e70eb02214 100644
--- a/math/mupad/Makefile
+++ b/math/mupad/Makefile
@@ -20,11 +20,9 @@ EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
 NO_CDROM=	"unsure to sell for profit"
 
-USE_LINUX?=		yes
+USE_LINUX=		yes
 ONLY_FOR_ARCHS=		i386
 
-INSTALLS_SHLIB=		yes
-NO_FILTER_SHLIBS=	yes
 NO_WRKSUBDIR=		yes
 
 MAN1=		mmg.1 mmgd.1 mupad.1 xmupad.1
diff --git a/math/wingz/Makefile b/math/wingz/Makefile
index 975b924b34b0..9355b4379f39 100644
--- a/math/wingz/Makefile
+++ b/math/wingz/Makefile
@@ -16,12 +16,13 @@ EXTRACT_SUFX=	.tgz
 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
+USE_X_PREFIX=	yes
 
 NO_WRKSUBDIR=	yes
-USE_X_PREFIX=	yes
+
+# XXX: this is missing "${BRANDELF} -t Linux <executables>"
 
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile
index d0f61b176af9..bbd34b89187f 100644
--- a/math/wingz3/Makefile
+++ b/math/wingz3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wingzpro
 PORTVERSION=	311
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math linux
 MASTER_SITES=	netu
 EXTRACT_ONLY=
@@ -15,13 +15,12 @@ EXTRACT_ONLY=
 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
-
+USE_LINUX=	yes
 USE_X_PREFIX=	yes
+
 NO_BUILD=	yes
 
 do-fetch:
@@ -33,6 +32,8 @@ do-fetch:
 	# download the ${DISTFILES} and save it to ${DISTDIR}.
 	#
 
+# XXX: this is missing "${BRANDELF} -t Linux <executables>"
+
 do-install:
 	${TAR} -xzp -C ${X11BASE} -f ${DISTDIR}/${DISTFILES}
 	${SED} 's%_X11BASE_%${X11BASE}%' \