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, 15 insertions, 10 deletions

diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index 4b2e1cd958d8..756cf87721e6 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -60,7 +60,7 @@ CONFLICTS=	linux_base-7* linux_base-deb* linux_base-gentoo* \
 		linux_base-rh* linux_base-suse*
 ONLY_FOR_ARCHS=		i386 amd64
 DIST_SUBDIR=		rpm/${ARCH}/${PORTVERSION}
-PREFIX=			${LINUXBASE}
+PREFIX?=		${LINUXBASE}
 NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
 NO_MTREE=		yes
@@ -106,12 +106,6 @@ pre-install:
 	@cd ${WRKSRC}/lib && ${LN} -sf libtermcap.so.2.0.8 libtermcap.so.2
 	@${RPM} --initdb --root ${WRKSRC} --dbpath ${DBPATH}
 #
-# Make sure we have a /dev/null in the chrooted environment.
-	@${MKDIR} ${WRKSRC}/dev
-	@${RM} -f ${WRKSRC}/dev/null
-	@mknod ${WRKSRC}/dev/null c 2 2
-	@${CHMOD} 666 ${WRKSRC}/dev/null
-#
 # Install all packages. Ignore dependencies just like the Red Hat installer.
 # Also, set the ELF fallback brand to Linux, so that we don't have to do
 # anything special to run staticly linked binaries.
@@ -121,7 +115,7 @@ pre-install:
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
 	@for F in ${BRAND_FILES}; do \
-		brandelf -t Linux ${WRKSRC}/$$F; \
+		${BRANDELF} -t Linux ${WRKSRC}/$$F; \
 	done
 	@/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${PREVIOUS_ELF}
 #
diff --git a/emulators/linux_base-8/pkg-message b/emulators/linux_base-8/pkg-message
index b7d8d197ca8f..29791da973dc 100644
--- a/emulators/linux_base-8/pkg-message
+++ b/emulators/linux_base-8/pkg-message
@@ -8,5 +8,16 @@ is now enabled. Linux mode can be enabled
 permanently with the linux_enable variable
 of rc.conf(5).
 
-When using NIS, don't forget to edit
-yp.conf in /compat/linux/etc.
+To make use of NIS you have to adjust yp.conf and nsswitch.conf in
+/compat/linux/etc/ accordingly. For example:
+
+Set your yp-server and yp-domainname in yp.conf:
+domainname     my.yp.domainname
+ypserver       my.yp.server                                               
+
+Let your lists for hosts, passwd and group be resolved via nsswitch.conf:
+passwd:     files nis
+shadow:     files nis
+group:      files nis
+hosts:      files dns nis
+