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

2 files changed, 12 insertions, 9 deletions

diff --git a/sysutils/linux-acu/Makefile b/sysutils/linux-acu/Makefile
index 6c90599fcbd9..ec9180a25979 100644
--- a/sysutils/linux-acu/Makefile
+++ b/sysutils/linux-acu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	acu
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils linux
 MASTER_SITES=	# fetch manually
 PKGNAMEPREFIX=	linux-
@@ -30,9 +30,9 @@ IGNORE=		may not be automatically fetched due to licensing\
 .endif
 
 ONLY_FOR_ARCHS=	i386
-PREFIX?=	${X11BASE}
+USE_LINUX=	yes
+USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
 NO_CDROM=	"Redistribution not allowed"
 
 LINPROCFS!=	/sbin/mount | ${GREP} linprocfs | ${AWK} '{print $1}'
@@ -55,6 +55,9 @@ post-extract:
 	@${FALSE}
 .endif
 
+do-build:
+	@${BRANDELF} -t Linux ${WRKSRC}/utilities/acu
+
 do-install:
 	@${MKDIR} ${PREFIX}/bin
 	@${MKDIR} ${LINUXBASE}/proc/aironet
diff --git a/sysutils/linux-afaapps/Makefile b/sysutils/linux-afaapps/Makefile
index 319d1eec68d3..973355f41e8b 100644
--- a/sysutils/linux-afaapps/Makefile
+++ b/sysutils/linux-afaapps/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		afaapps
 PORTVERSION=		2.7
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		sysutils linux
 MASTER_SITES=		ftp://ftp.us.dell.com/scsi-raid/
 PKGNAMEPREFIX=		linux-
@@ -26,12 +26,11 @@ RESTRICTED=		"binary redistribution license needs clarification"
 NO_BUILD=		yes
 NO_WRKSUBDIR=		yes
 
-USE_LINUX_PREFIX=	yes
-NO_MTREE=		yes
+USE_LINUX=		yes
+USE_LINUX_PREFIX=       yes
 LDCONFIG_LINUX=		${LINUXBASE}/sbin/ldconfig
 
 ONLY_FOR_ARCHS=		i386
-NO_FILTER_SHLIBS=	yes
 PLIST=			${MASTERDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
@@ -43,8 +42,9 @@ RPMFLAGS=		--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
 
 do-install:
 	@${LOCALBASE}/bin/rpm -U ${RPMFLAGS} ${WRKDIR}/${RPMFILE}
-	@${RM} ${LINUXBASE}/usr/sbin/afacli
-	@${MV} ${LINUXBASE}/usr/sbin/afacli.bin ${LINUXBASE}/usr/sbin/afacli
+	@${RM} ${PREFIX}/usr/sbin/afacli
+	@${MV} ${PREFIX}/usr/sbin/afacli.bin ${PREFIX}/usr/sbin/afacli
+	@${BRANDELF} -t Linux ${PREFIX}/usr/sbin/afacli
 	@${LDCONFIG_LINUX}
 
 .include <bsd.port.mk>