- Replace Mk/bsd.linux-apps.mk and Mk/bsd.linux-rpm.mk with

  Mk/Uses/linux.mk.
- Replace USE_LINUX=yes with USES+=linux and USE_LINUX=(.*) with
  USES+=linux:\1 in all ports.
- Replace USE_LINUX_APPS with USE_LINUX in all ports.
- Use INSTALL_SCRIPT instead of INSTALL_PROGRAM to install scripts in some
  ports.
- When USE_LINUX_RPM is defined, simplify the way DISTFILES and EXTRACT_ONLY
  are defined.
- Remove BRANDELF_DIRS and BRANDELF_FILES handling.  In the very rare cases
  that it is still necessary ports can run ${BRANDELF} from post-patch.
- Remove AUTOMATIC_PLIST handling.  Only one port used it.
- Fix Linux MASTER_SITES.
- Replace OVERRIDE_LINUX_BASE_PORT and OVERRIDE_LINUX_NONBASE_PORTS with
  default versions framework.
- bsd.port.mk:
  - Move Linux related bits to Uses/linux.mk, except USE_LINUX_PREFIX.
  - Put USE_LINUX_PREFIX handling after USES processing.
  - Define DOCSDIR, DATADIR, etc. after handling USE_LINUX_PREFIX so it can
    give these variables a different default value.
  - When a package needs to run Linux ldconfig check before installation if
    Linux support is enabled.
- emulators/linux_base-*:
  - Use USES=linux and remove duplication.
  - Remove files/lp.  FreeBSD or CUPS lp(1) should work.
  - Remove files/yp.conf.  No longer seems to be used.
  - Remove pkg-deinstall and move pkg-install into pkg-plist.
  - Update pkg-descr and pkg-message.
  - Fix handling of ldconfig cache in pkg-plist.
- devel/fb-adb: Use a Linux shell to run a Linux script but patch the script
  to use FreeBSD mkdir so mkdir -p $path creates $path and not
  /compat/linux/$path.

PR:		211645
Exp-run by:	antoine
Approved by:	portmgr (antoine)

20 files changed, 433 insertions, 928 deletions

diff --git a/emulators/linux-c6/Makefile b/emulators/linux-c6/Makefile
index b1a267c76062..ef5cd3c0c0ed 100644
--- a/emulators/linux-c6/Makefile
+++ b/emulators/linux-c6/Makefile
@@ -1,93 +1,88 @@
 # Created by: Johannes Jost Meixner <xmj@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	linux-${USE_LINUX}
-PORTVERSION=	6.8
+PORTNAME=	linux-c6
+PORTVERSION=	${LINUX_DIST_VER}
 CATEGORIES=	emulators linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Meta-port for all things CentOS ${LINUX_DIST_VER}
 
-USES=	metaport
+RUN_DEPENDS=	linux-c6-libasyncns>0:dns/linux-c6-libasyncns \
+		linux-c6-tk85>0:x11-toolkits/linux-c6-tk85 \
+		linux-c6-gtk2>0:x11-toolkits/linux-c6-gtk2 \
+		linux-c6-hicolor-icon-theme>0:x11-themes/linux-c6-hicolor-icon-theme \
+		linux-c6-qt47-x11>0:x11-toolkits/linux-c6-qt47-x11 \
+		linux-c6-pango>0:x11-toolkits/linux-c6-pango \
+		linux-c6-openmotif>0:x11-toolkits/linux-c6-openmotif \
+		linux-c6-atk>0:accessibility/linux-c6-atk \
+		linux-c6-sqlite>0:databases/linux-c6-sqlite3 \
+		linux-c6-tcl85>0:lang/linux-c6-tcl85 \
+		linux-c6-nspr>0:devel/linux-c6-nspr \
+		linux-c6-libsigc++20>0:devel/linux-c6-libsigc++20 \
+		linux-c6-sdl>0:devel/linux-c6-sdl12 \
+		linux-c6-libpciaccess>0:devel/linux-c6-libpciaccess \
+		linux-c6-libglade2>0:devel/linux-c6-libglade2 \
+		linux-c6-devtools>0:devel/linux-c6-devtools \
+		linux-c6-dbus-libs>0:devel/linux-c6-dbus-libs \
+		linux-c6-qt47>0:devel/linux-c6-qt47 \
+		linux-c6-dbus-glib>0:devel/linux-c6-dbus-glib \
+		linux-c6-ncurses-base>0:devel/linux-c6-ncurses-base \
+		linux-c6-xorg-libs>0:x11/linux-c6-xorg-libs \
+		linux-c6-fontconfig>0:x11-fonts/linux-c6-fontconfig \
+		linux-c6-cups-libs>0:print/linux-c6-cups-libs \
+		linux-c6-flac>0:audio/linux-c6-flac \
+		linux-c6-alsa-utils>0:audio/linux-c6-alsa-utils \
+		linux-c6-alsa-lib>0:audio/linux-c6-alsa-lib \
+		linux-c6-libaudiofile>0:audio/linux-c6-libaudiofile \
+		linux-c6-esound>0:audio/linux-c6-esound \
+		linux-c6-alsa-plugins-oss>0:audio/linux-c6-alsa-plugins-oss \
+		linux-c6-sdl_mixer>0:audio/linux-c6-sdl_mixer \
+		linux-c6-alsa-plugins-pulseaudio>0:audio/linux-c6-alsa-plugins-pulseaudio \
+		linux-c6-libsndfile>0:audio/linux-c6-libsndfile \
+		linux-c6-libogg>0:audio/linux-c6-libogg \
+		linux-c6-arts>0:audio/linux-c6-arts \
+		linux-c6-pulseaudio-utils>0:audio/linux-c6-pulseaudio-utils \
+		linux-c6-pulseaudio-libs>0:audio/linux-c6-pulseaudio-libs \
+		linux-c6-mikmod>0:audio/linux-c6-mikmod \
+		linux-c6-openal-soft>0:audio/linux-c6-openal-soft \
+		linux-c6-libvorbis>0:audio/linux-c6-libvorbis \
+		linux-c6-nas-libs>0:audio/linux-c6-nas-libs \
+		linux-c6-libtheora>0:multimedia/linux-c6-libtheora \
+		linux-c6-libv4l>0:multimedia/linux-c6-libv4l \
+		linux-c6-qt47-webkit>0:www/linux-c6-qt47-webkit \
+		linux-c6-flashplugin>0:www/linux-c6-flashplugin11 \
+		linux-c6-cyrus-sasl2>0:security/linux-c6-cyrus-sasl2 \
+		linux-c6-libssh2>0:security/linux-c6-libssh2 \
+		linux-c6-openssl-compat>0:security/linux-c6-openssl-compat \
+		linux-c6-openssl>0:security/linux-c6-openssl \
+		linux-c6-gnutls>0:security/linux-c6-gnutls \
+		linux-c6-libgcrypt>0:security/linux-c6-libgcrypt \
+		linux-c6-nss>0:security/linux-c6-nss \
+		linux-c6-libtasn1>0:security/linux-c6-libtasn1 \
+		linux-c6-libgpg-error>0:security/linux-c6-libgpg-error \
+		linux-c6-curl>0:ftp/linux-c6-curl \
+		linux-c6-tcp_wrappers-libs>0:net/linux-c6-tcp_wrappers-libs \
+		linux-c6-openldap>0:net/linux-c6-openldap \
+		linux-c6-avahi-libs>0:net/linux-c6-avahi-libs \
+		linux-c6-expat>0:textproc/linux-c6-expat \
+		linux-c6-aspell>0:textproc/linux-c6-aspell \
+		linux-c6-libxml2>0:textproc/linux-c6-libxml2 \
+		linux-c6-sdl_image>0:graphics/linux-c6-sdl_image \
+		linux-c6-sdl_ttf>0:graphics/linux-c6-sdl_ttf \
+		linux-c6-png>0:graphics/linux-c6-png \
+		linux-c6-tiff>0:graphics/linux-c6-tiff \
+		linux-c6-jpeg>0:graphics/linux-c6-jpeg \
+		linux-c6-glx-utils>0:graphics/linux-c6-glx-utils \
+		linux-c6-gdk-pixbuf2>0:graphics/linux-c6-gdk-pixbuf2 \
+		linux-c6-cairo>0:graphics/linux-c6-cairo
 
-# base
-USE_LINUX=	c6
-
-# non-base
-
-RUN_DEPENDS+=	linux-${USE_LINUX}-libasyncns>0:dns/linux-c6-libasyncns \
-		linux-${USE_LINUX}-tk85>0:x11-toolkits/linux-c6-tk85 \
-		linux-${USE_LINUX}-gtk2>0:x11-toolkits/linux-c6-gtk2 \
-		linux-${USE_LINUX}-hicolor-icon-theme>0:x11-themes/linux-c6-hicolor-icon-theme \
-		linux-${USE_LINUX}-qt47-x11>0:x11-toolkits/linux-c6-qt47-x11 \
-		linux-${USE_LINUX}-pango>0:x11-toolkits/linux-c6-pango \
-		linux-${USE_LINUX}-openmotif>0:x11-toolkits/linux-c6-openmotif \
-		linux-${USE_LINUX}-atk>0:accessibility/linux-c6-atk \
-		linux-${USE_LINUX}-sqlite>0:databases/linux-c6-sqlite3 \
-		linux-${USE_LINUX}-tcl85>0:lang/linux-c6-tcl85 \
-		linux-${USE_LINUX}-nspr>0:devel/linux-c6-nspr \
-		linux-${USE_LINUX}-libsigc++20>0:devel/linux-c6-libsigc++20 \
-		linux-${USE_LINUX}-sdl>0:devel/linux-c6-sdl12 \
-		linux-${USE_LINUX}-libpciaccess>0:devel/linux-c6-libpciaccess \
-		linux-${USE_LINUX}-libglade2>0:devel/linux-c6-libglade2 \
-		linux-${USE_LINUX}-devtools>0:devel/linux-c6-devtools \
-		linux-${USE_LINUX}-dbus-libs>0:devel/linux-c6-dbus-libs \
-		linux-${USE_LINUX}-qt47>0:devel/linux-c6-qt47 \
-		linux-${USE_LINUX}-dbus-glib>0:devel/linux-c6-dbus-glib \
-		linux-${USE_LINUX}-ncurses-base>0:devel/linux-c6-ncurses-base \
-		linux-${USE_LINUX}-xorg-libs>0:x11/linux-c6-xorg-libs \
-		linux-${USE_LINUX}-fontconfig>0:x11-fonts/linux-c6-fontconfig \
-		linux-${USE_LINUX}-cups-libs>0:print/linux-c6-cups-libs \
-		linux-${USE_LINUX}-flac>0:audio/linux-c6-flac \
-		linux-${USE_LINUX}-alsa-utils>0:audio/linux-c6-alsa-utils \
-		linux-${USE_LINUX}-alsa-lib>0:audio/linux-c6-alsa-lib \
-		linux-${USE_LINUX}-libaudiofile>0:audio/linux-c6-libaudiofile \
-		linux-${USE_LINUX}-esound>0:audio/linux-c6-esound \
-		linux-${USE_LINUX}-alsa-plugins-oss>0:audio/linux-c6-alsa-plugins-oss \
-		linux-${USE_LINUX}-sdl_mixer>0:audio/linux-c6-sdl_mixer \
-		linux-${USE_LINUX}-alsa-plugins-pulseaudio>0:audio/linux-c6-alsa-plugins-pulseaudio \
-		linux-${USE_LINUX}-libsndfile>0:audio/linux-c6-libsndfile \
-		linux-${USE_LINUX}-libogg>0:audio/linux-c6-libogg \
-		linux-${USE_LINUX}-arts>0:audio/linux-c6-arts \
-		linux-${USE_LINUX}-pulseaudio-utils>0:audio/linux-c6-pulseaudio-utils \
-		linux-${USE_LINUX}-pulseaudio-libs>0:audio/linux-c6-pulseaudio-libs \
-		linux-${USE_LINUX}-mikmod>0:audio/linux-c6-mikmod \
-		linux-${USE_LINUX}-openal-soft>0:audio/linux-c6-openal-soft \
-		linux-${USE_LINUX}-libvorbis>0:audio/linux-c6-libvorbis \
-		linux-${USE_LINUX}-nas-libs>0:audio/linux-c6-nas-libs \
-		linux-${USE_LINUX}-libtheora>0:multimedia/linux-c6-libtheora \
-		linux-${USE_LINUX}-libv4l>0:multimedia/linux-c6-libv4l \
-		linux-${USE_LINUX}-qt47-webkit>0:www/linux-c6-qt47-webkit \
-		linux-${USE_LINUX}-flashplugin>0:www/linux-c6-flashplugin11 \
-		linux-${USE_LINUX}-cyrus-sasl2>0:security/linux-c6-cyrus-sasl2 \
-		linux-${USE_LINUX}-libssh2>0:security/linux-c6-libssh2 \
-		linux-${USE_LINUX}-openssl-compat>0:security/linux-c6-openssl-compat \
-		linux-${USE_LINUX}-openssl>0:security/linux-c6-openssl \
-		linux-${USE_LINUX}-gnutls>0:security/linux-c6-gnutls \
-		linux-${USE_LINUX}-libgcrypt>0:security/linux-c6-libgcrypt \
-		linux-${USE_LINUX}-nss>0:security/linux-c6-nss \
-		linux-${USE_LINUX}-libtasn1>0:security/linux-c6-libtasn1 \
-		linux-${USE_LINUX}-libgpg-error>0:security/linux-c6-libgpg-error \
-		linux-${USE_LINUX}-curl>0:ftp/linux-c6-curl \
-		linux-${USE_LINUX}-tcp_wrappers-libs>0:net/linux-c6-tcp_wrappers-libs \
-		linux-${USE_LINUX}-openldap>0:net/linux-c6-openldap \
-		linux-${USE_LINUX}-avahi-libs>0:net/linux-c6-avahi-libs \
-		linux-${USE_LINUX}-expat>0:textproc/linux-c6-expat \
-		linux-${USE_LINUX}-aspell>0:textproc/linux-c6-aspell \
-		linux-${USE_LINUX}-libxml2>0:textproc/linux-c6-libxml2 \
-		linux-${USE_LINUX}-sdl_image>0:graphics/linux-c6-sdl_image \
-		linux-${USE_LINUX}-sdl_ttf>0:graphics/linux-c6-sdl_ttf \
-		linux-${USE_LINUX}-png>0:graphics/linux-c6-png \
-		linux-${USE_LINUX}-tiff>0:graphics/linux-c6-tiff \
-		linux-${USE_LINUX}-jpeg>0:graphics/linux-c6-jpeg \
-		linux-${USE_LINUX}-glx-utils>0:graphics/linux-c6-glx-utils \
-		linux-${USE_LINUX}-gdk-pixbuf2>0:graphics/linux-c6-gdk-pixbuf2 \
-		linux-${USE_LINUX}-cairo>0:graphics/linux-c6-cairo
+USES=		linux:c6 metaport
 
 OPTIONS_DEFINE=	NVIDIA_GL
 
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver \
-			linux-${USE_LINUX}-libGLU>0:graphics/linux-c6-libGLU
-NVIDIA_GL_RUN_DEPENDS_OFF=	linux-${USE_LINUX}-dri>0:graphics/linux-c6-dri
+			linux-c6-libGLU>0:graphics/linux-c6-libGLU
+NVIDIA_GL_RUN_DEPENDS_OFF=	linux-c6-dri>0:graphics/linux-c6-dri
 
 .include <bsd.port.mk>
diff --git a/emulators/linux-f10/Makefile b/emulators/linux-f10/Makefile
index 0eefa795d165..108913b23665 100644
--- a/emulators/linux-f10/Makefile
+++ b/emulators/linux-f10/Makefile
@@ -2,20 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	linux-f10
-PORTVERSION=	0.2
+PORTVERSION=	${LINUX_DIST_VER}
 CATEGORIES=	emulators linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Meta-port for all things Fedora ${LINUX_DIST_VER}
 
-USES=	metaport
-
-# base
-USE_LINUX=	f10
-
-# non-base
-
-RUN_DEPENDS+=	linux-f10-libasyncns>0:dns/linux-f10-libasyncns \
+RUN_DEPENDS=	linux-f10-libasyncns>0:dns/linux-f10-libasyncns \
 		linux-f10-gtk2>0:x11-toolkits/linux-f10-gtk2 \
 		linux-f10-tk85>0:x11-toolkits/linux-f10-tk85 \
 		linux-f10-qt45>0:x11-toolkits/linux-f10-qt45 \
@@ -36,7 +29,6 @@ RUN_DEPENDS+=	linux-f10-libasyncns>0:dns/linux-f10-libasyncns \
 		linux-f10-dbus-glib>0:devel/linux-f10-dbus-glib \
 		linux-f10-libsigc++20>0:devel/linux-f10-libsigc++20 \
 		linux-f10-ncurses-base>0:devel/linux-f10-ncurses-base \
-		linux_base-f10>0:emulators/linux_base-f10 \
 		linux-f10-xorg-libs>0:x11/linux-f10-xorg-libs \
 		linux-f10-fontconfig>0:x11-fonts/linux-f10-fontconfig \
 		linux-f10-cups-libs>0:print/linux-f10-cups-libs \
@@ -90,6 +82,8 @@ RUN_DEPENDS+=	linux-f10-libasyncns>0:dns/linux-f10-libasyncns \
 		linux-f10-cairo>0:graphics/linux-f10-cairo
 # don't pull in graphics/linux-f10-libGLU -- conflicts with graphics/linux-f10-dri
 
+USES=		linux:f10 metaport
+
 OPTIONS_DEFINE=	NVIDIA_GL
 
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index a1e30df4d14a..70bfd4887134 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -2,111 +2,93 @@
 # $FreeBSD$
 
 PORTNAME=	c6
-PORTVERSION=	6.8
+PORTVERSION=	${LINUX_DIST_VER}
+PORTREVISION=	1
 CATEGORIES=	emulators linux
-MASTER_SITES=	CENTOS_LINUX CENTOS_LINUX_UPDATES
-MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/\
-			centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/
-
 PKGNAMEPREFIX=	linux_base-
-DISTFILES=	${PRE_BIN_DISTFILES} ${BIN_DISTFILES} ${SRC_DISTFILES}
-EXTRACT_ONLY=	${BIN_DISTFILES}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode for i386/amd64 (Linux CentOS 6)
 
-LINUX_DIST=	centos
-LINUX_DIST_VER= ${PORTVERSION}
-DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/${LINUX_DIST}/${LINUX_DIST_VER}
-
-# these get extracted from pre-extract, then some directory permissions
-# get fixed up
-PRE_BIN_DISTFILES=	filesystem-2.4.30-3.el6.${LINUX_RPM_ARCH}.rpm \
-			setup-2.8.14-20.el6_4.1.noarch.rpm
-
 BIN_DISTFILES=	basesystem-10.0-4.el6.noarch.rpm \
-		bash-4.1.2-40.el6.${LINUX_RPM_ARCH}.rpm \
-		bzip2-1.0.5-7.el6_0.${LINUX_RPM_ARCH}.rpm \
-		centos-release-6-8.el6.centos.12.3.${LINUX_RPM_ARCH}.rpm \
-		coreutils-8.4-43.el6.${LINUX_RPM_ARCH}.rpm \
-		e2fsprogs-1.41.12-22.el6.${LINUX_RPM_ARCH}.rpm \
-		elfutils-0.164-2.el6.${LINUX_RPM_ARCH}.rpm \
-		findutils-4.4.2-9.el6.${LINUX_RPM_ARCH}.rpm \
-		glibc-common-2.12-1.192.el6.${LINUX_RPM_ARCH}.rpm \
-		grep-2.20-3.el6_7.1.${LINUX_RPM_ARCH}.rpm \
-		info-4.13a-8.el6.${LINUX_RPM_ARCH}.rpm \
-		keyutils-1.4-5.el6.${LINUX_RPM_ARCH}.rpm \
-		less-436-13.el6.${LINUX_RPM_ARCH}.rpm \
-		ncurses-5.7-4.20090207.el6.${LINUX_RPM_ARCH}.rpm \
-		sed-4.2.1-10.el6.${LINUX_RPM_ARCH}.rpm \
-		setserial-2.17-25.el6.${LINUX_RPM_ARCH}.rpm \
-		which-2.19-6.el6.${LINUX_RPM_ARCH}.rpm \
-		compat-libstdc++-296-2.96-144.el6.i686.rpm
-LIB_DISTFILES=	bzip2-libs-1.0.5-7.el6_0.${LINUX_RPM_ARCH}.rpm \
-		compat-db43-4.3.29-15.el6.${LINUX_RPM_ARCH}.rpm \
-		compat-libstdc++-33-3.2.3-69.el6.${LINUX_RPM_ARCH}.rpm \
-		db4-4.7.25-20.el6_7.${LINUX_RPM_ARCH}.rpm \
-		e2fsprogs-libs-1.41.12-22.el6.${LINUX_RPM_ARCH}.rpm \
-		freetype-2.3.11-17.el6.${LINUX_RPM_ARCH}.rpm \
-		gamin-0.1.10-9.el6.${LINUX_RPM_ARCH}.rpm \
-		gdbm-1.8.0-39.el6.${LINUX_RPM_ARCH}.rpm \
-		glib2-2.28.8-5.el6.${LINUX_RPM_ARCH}.rpm \
-		glibc-2.12-1.192.el6.${LINUX_RPM_ARCH}.rpm \
-		gmp-4.3.1-10.el6.${LINUX_RPM_ARCH}.rpm \
-		keyutils-libs-1.4-5.el6.${LINUX_RPM_ARCH}.rpm \
-		krb5-libs-1.10.3-57.el6.${LINUX_RPM_ARCH}.rpm \
-		libacl-2.2.49-6.el6.${LINUX_RPM_ARCH}.rpm \
-		libattr-2.4.44-7.el6.${LINUX_RPM_ARCH}.rpm \
-		libblkid-2.17.2-12.24.el6.${LINUX_RPM_ARCH}.rpm \
-		libcap-2.16-5.5.el6.${LINUX_RPM_ARCH}.rpm \
-		libcom_err-1.41.12-22.el6.${LINUX_RPM_ARCH}.rpm \
-		libgcc-4.4.7-17.el6.${LINUX_RPM_ARCH}.rpm \
-		libidn-1.18-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libselinux-2.0.94-7.el6.${LINUX_RPM_ARCH}.rpm \
-		libsepol-2.0.41-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libstdc++-4.4.7-17.el6.${LINUX_RPM_ARCH}.rpm \
-		libuuid-2.17.2-12.24.el6.${LINUX_RPM_ARCH}.rpm \
-		ncurses-libs-5.7-4.20090207.el6.${LINUX_RPM_ARCH}.rpm \
-		pcre-7.8-7.el6.${LINUX_RPM_ARCH}.rpm \
-		popt-1.13-7.el6.${LINUX_RPM_ARCH}.rpm \
-		readline-6.0-4.el6.${LINUX_RPM_ARCH}.rpm \
-		redhat-lsb-core-4.0-7.el6.centos.${LINUX_RPM_ARCH}.rpm \
-		slang-2.2.1-1.el6.${LINUX_RPM_ARCH}.rpm \
-		util-linux-ng-2.17.2-12.24.el6.${LINUX_RPM_ARCH}.rpm \
-		zlib-1.2.3-29.el6.${LINUX_RPM_ARCH}.rpm
-
-BIN_DISTFILES+=	${LIB_DISTFILES}
-
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	basesystem-10.0-4.el6.src.rpm:SOURCE \
+		bash-4.1.2-40.el6${EXTRACT_SUFX} \
+		bzip2-1.0.5-7.el6_0${EXTRACT_SUFX} \
+		centos-release-6-8.el6.centos.12.3${EXTRACT_SUFX} \
+		compat-libstdc++-296-2.96-144.el6.i686.rpm \
+		coreutils-8.4-43.el6${EXTRACT_SUFX} \
+		e2fsprogs-1.41.12-22.el6${EXTRACT_SUFX} \
+		elfutils-0.164-2.el6${EXTRACT_SUFX} \
+		findutils-4.4.2-9.el6${EXTRACT_SUFX} \
+		glibc-common-2.12-1.192.el6${EXTRACT_SUFX} \
+		grep-2.20-3.el6_7.1${EXTRACT_SUFX} \
+		info-4.13a-8.el6${EXTRACT_SUFX} \
+		keyutils-1.4-5.el6${EXTRACT_SUFX} \
+		less-436-13.el6${EXTRACT_SUFX} \
+		ncurses-5.7-4.20090207.el6${EXTRACT_SUFX} \
+		sed-4.2.1-10.el6${EXTRACT_SUFX} \
+		setserial-2.17-25.el6${EXTRACT_SUFX} \
+		setup-2.8.14-20.el6_4.1.noarch.rpm \
+		which-2.19-6.el6${EXTRACT_SUFX} \
+		filesystem-2.4.30-3.el6${EXTRACT_SUFX}
+LIB_DISTFILES=	bzip2-libs-1.0.5-7.el6_0${EXTRACT_SUFX} \
+		compat-db43-4.3.29-15.el6${EXTRACT_SUFX} \
+		compat-libstdc++-33-3.2.3-69.el6${EXTRACT_SUFX} \
+		db4-4.7.25-20.el6_7${EXTRACT_SUFX} \
+		e2fsprogs-libs-1.41.12-22.el6${EXTRACT_SUFX} \
+		freetype-2.3.11-17.el6${EXTRACT_SUFX} \
+		gamin-0.1.10-9.el6${EXTRACT_SUFX} \
+		gdbm-1.8.0-39.el6${EXTRACT_SUFX} \
+		glib2-2.28.8-5.el6${EXTRACT_SUFX} \
+		glibc-2.12-1.192.el6${EXTRACT_SUFX} \
+		gmp-4.3.1-10.el6${EXTRACT_SUFX} \
+		keyutils-libs-1.4-5.el6${EXTRACT_SUFX} \
+		krb5-libs-1.10.3-57.el6${EXTRACT_SUFX} \
+		libacl-2.2.49-6.el6${EXTRACT_SUFX} \
+		libattr-2.4.44-7.el6${EXTRACT_SUFX} \
+		libblkid-2.17.2-12.24.el6${EXTRACT_SUFX} \
+		libcap-2.16-5.5.el6${EXTRACT_SUFX} \
+		libcom_err-1.41.12-22.el6${EXTRACT_SUFX} \
+		libgcc-4.4.7-17.el6${EXTRACT_SUFX} \
+		libidn-1.18-2.el6${EXTRACT_SUFX} \
+		libselinux-2.0.94-7.el6${EXTRACT_SUFX} \
+		libsepol-2.0.41-4.el6${EXTRACT_SUFX} \
+		libstdc++-4.4.7-17.el6${EXTRACT_SUFX} \
+		libuuid-2.17.2-12.24.el6${EXTRACT_SUFX} \
+		ncurses-libs-5.7-4.20090207.el6${EXTRACT_SUFX} \
+		pcre-7.8-7.el6${EXTRACT_SUFX} \
+		popt-1.13-7.el6${EXTRACT_SUFX} \
+		readline-6.0-4.el6${EXTRACT_SUFX} \
+		redhat-lsb-core-4.0-7.el6.centos${EXTRACT_SUFX} \
+		slang-2.2.1-1.el6${EXTRACT_SUFX} \
+		util-linux-ng-2.17.2-12.24.el6${EXTRACT_SUFX} \
+		zlib-1.2.3-29.el6${EXTRACT_SUFX}
+SRC_DISTFILES=	acl-2.2.49-6.el6.src.rpm:SOURCE \
+		attr-2.4.44-7.el6.src.rpm:SOURCE \
+		basesystem-10.0-4.el6.src.rpm:SOURCE \
 		bash-4.1.2-40.el6.src.rpm:SOURCE \
 		bzip2-1.0.5-7.el6_0.src.rpm:SOURCE \
-		coreutils-8.4-43.el6.src.rpm:SOURCE \
+		centos-release-6-8.el6.centos.12.3.src.rpm:SOURCE \
 		compat-db-4.6.21-15.el6.src.rpm:SOURCE \
 		compat-gcc-296-2.96-144.el6.src.rpm:SOURCE \
 		compat-gcc-32-3.2.3-69.el6.src.rpm:SOURCE \
+		coreutils-8.4-43.el6.src.rpm:SOURCE \
 		db4-4.7.25-20.el6_7.src.rpm:SOURCE \
 		e2fsprogs-1.41.12-22.el6.src.rpm:SOURCE \
 		elfutils-0.164-2.el6.src.rpm:SOURCE \
-		centos-release-6-8.el6.centos.12.3.src.rpm:SOURCE \
 		filesystem-2.4.30-3.el6.src.rpm:SOURCE \
 		findutils-4.4.2-9.el6.src.rpm:SOURCE \
 		freetype-2.3.11-17.el6.src.rpm:SOURCE \
 		gamin-0.1.10-9.el6.src.rpm:SOURCE \
+		gcc-4.4.7-17.el6.src.rpm:SOURCE \
 		gdbm-1.8.0-39.el6.src.rpm:SOURCE \
 		glib2-2.28.8-5.el6.src.rpm:SOURCE \
 		glibc-2.12-1.192.el6.src.rpm:SOURCE \
 		gmp-4.3.1-10.el6.src.rpm:SOURCE \
 		grep-2.20-3.el6_7.1.src.rpm:SOURCE \
-		texinfo-4.13a-8.el6.src.rpm:SOURCE \
 		keyutils-1.4-5.el6.src.rpm:SOURCE \
 		krb5-1.10.3-57.el6.src.rpm:SOURCE \
 		less-436-13.el6.src.rpm:SOURCE \
-		acl-2.2.49-6.el6.src.rpm:SOURCE \
-		attr-2.4.44-7.el6.src.rpm:SOURCE \
 		libcap-2.16-5.5.el6.src.rpm:SOURCE \
-		gcc-4.4.7-17.el6.src.rpm:SOURCE \
 		libidn-1.18-2.el6.src.rpm:SOURCE \
 		libselinux-2.0.94-7.el6.src.rpm:SOURCE \
 		libsepol-2.0.41-4.el6.src.rpm:SOURCE \
@@ -119,158 +101,62 @@ SRC_DISTFILES=	basesystem-10.0-4.el6.src.rpm:SOURCE \
 		setserial-2.17-25.el6.src.rpm:SOURCE \
 		setup-2.8.14-20.el6_4.1.src.rpm:SOURCE \
 		slang-2.2.1-1.el6.src.rpm:SOURCE \
+		texinfo-4.13a-8.el6.src.rpm:SOURCE \
 		util-linux-ng-2.17.2-12.24.el6.src.rpm:SOURCE \
 		which-2.19-6.el6.src.rpm:SOURCE \
 		zlib-1.2.3-29.el6.src.rpm:SOURCE
 
-ALWAYS_KEEP_DISTFILES=	yes
-.endif
-
-CONFLICTS=		linux_base-gentoo* linux_base-f10-[0-9]* linux-glib2-*
-
-ONLY_FOR_ARCHS=		i386 amd64
-.	if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64"
-PKGNAMESUFFIX=		_64
-LINUX_RPM_ARCH=	x86_64
-LINUX_REPO_ARCH=	x86_64
+CONFLICTS=	linux_base-gentoo* linux_base-f10-[0-9]* linux-glib2-*
+PLIST_SUB=	LINUXBASE=${LINUXBASE} SYSCTLMIB=${SYSCTLMIB}
+USES=		linux:c6
+USE_LINUX=	# empty
+USE_LINUX_RPM=	yes
 
-# hack to add i686 distfiles
-
-_32BIT_LINUX_RPM_ARCH=  i686
-_32BIT_DISTFILES=   ${LIB_DISTFILES:S/${LINUX_RPM_ARCH}/${_32BIT_LINUX_RPM_ARCH}/g}
-.       if ${_32BIT_DISTFILES} != ${LIB_DISTFILES}
-# they could be the same if above regexp doesn't match
-BIN_DISTFILES+=         ${_32BIT_DISTFILES}
-.       endif
-
-
-.	else
-LINUX_RPM_ARCH=		i686
-LINUX_REPO_ARCH=	i386
-.	endif
-
-
-USE_LINUX_PREFIX=	yes
-NO_WRKSUBDIR=		yes
-DISTINFO_FILE?=		${MASTERDIR}/distinfo.${LINUX_REPO_ARCH}
-PLIST=			${PKGDIR}/pkg-plist.${LINUX_REPO_ARCH}
-PLIST_SUB=		GLIBCVER="2.12" LINUXBASE=${LINUXBASE}
-USES=	shebangfix
-SHEBANG_FILES=	bin/redhat_lsb_init sbin/mount.tmpfs
-# bash scripts need to work in chroot /compat/linux, so use env instead.
-bash_CMD=	/usr/bin/env bash
+REMOVE_DIRS=	boot home media root tmp usr/lib/pm-utils usr/lib64/pm-utils \
+		usr/local var/log var/run var/tmp
+REMOVE_FILES=	bin/df bin/su etc/exports etc/group etc/gshadow etc/motd \
+		etc/passwd etc/printcap etc/protocols etc/services etc/shadow \
+		usr/tmp
 
 .include <bsd.port.pre.mk>
 
-.if !defined(PACKAGE_BUILDING) || (defined(PACKAGE_BUILDING) && !defined(LINUX_OSRELEASE) )
-LINUX_OSRELEASE!=	${ECHO_CMD} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null`
-.endif
-
-.if ${LINUX_OSRELEASE}x == "x"
-IGNORE=			linuxulator is not (kld)loaded
-.elif ${LINUX_OSRELEASE} == "2.6.16"
-IGNORE=			compat.linux.osrelease: ${LINUX_OSRELEASE} is not supported, please use 2.6.18, BEWARE this is highly experimental
-.endif
-
-REMOVE_DIRS=		boot dev etc/fonts home initrd media root tmp var/log var/run var/tmp \
-			usr/local usr/tmp
-REMOVE_FILES=		bin/df bin/su etc/exports etc/group etc/localtime \
-			etc/motd etc/passwd etc/printcap etc/services \
-			etc/protocols
-ADD_DIRS=		usr/X11R6/share usr/X11R6/man usr/X11R6/lib/tls \
-			usr/X11R6/include usr/X11R6/bin
-ADD_FILES=		#empty
-
-.if (${MACHINE_ARCH} == "amd64")
-FALLBACK_ELF_MIB=	kern.elf32.fallback_brand
+.if ${LINUX_ARCH} == x86_64 && ${OPSYS} == FreeBSD && ${OSVERSION} >= 11000105
+SYSCTLMIB=	kern.features.linux64
 .else
-FALLBACK_ELF_MIB=	kern.fallback_elf_brand
+SYSCTLMIB=	compat.linux.osrelease
 .endif
 
-.if (${ARCH} == "amd64")
-.	if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} != "c6_64"
-ARCH=			i386
-.	endif
+post-extract:
+# Fix permissions so a regular user can run make clean.
+.if ${LINUX_ARCH} == x86_64
+	@${CHMOD} 755 ${WRKSRC}/usr/lib64/pm-utils
+.else
+	@${CHMOD} 755 ${WRKSRC}/usr/lib/pm-utils
 .endif
 
-pre-extract:
-	@for file in ${PRE_BIN_DISTFILES}; do \
-	    if ! (cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
-	    then \
-	        exit 1; \
-	    fi; \
-	done
-	# now fix up broken permissions
-.	if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64"
-	@${CHMOD} -R u+rwX ${WRKSRC}/lib64 ${WRKSRC}/usr/lib64
-.	endif
-	@${CHMOD} -R u+rwX ${WRKSRC}/bin ${WRKSRC}/lib ${WRKSRC}/sbin ${WRKSRC}/usr/bin ${WRKSRC}/usr/lib ${WRKSRC}/usr/sbin
-	@${CHMOD} 400 ${WRKSRC}/etc/*shadow
-
-do-build:
-	@for D in ${REMOVE_DIRS}; do \
-		${RM} -rf ${WRKSRC}/$$D; \
-	done
-	@for F in ${REMOVE_FILES}; do \
-		${RM} -f ${WRKSRC}/$$F; \
-	done
-	@for F in ${ADD_DIRS}; do \
-		${MKDIR} ${WRKSRC}/$$F; \
-	done
-	@for F in ${ADD_FILES}; do \
-		${TOUCH} ${WRKSRC}/$$F; \
-	done
-#
-# Create a good ld.so.conf and touch ld.so.cache
-#
-	@${ECHO_CMD} -e '/lib\n/usr/lib\n/usr/lib64\n${X11BASE}/lib' >> \
-		${WRKSRC}/etc/ld.so.conf
-	@${TOUCH} ${WRKSRC}/etc/ld.so.cache
-#
-# Create yp.conf as a hint to NIS users and make sure there's a
-# mtab in etc, albeit an empty one. This is needed in a couple of
-# cases. Most notably staroffice6. If yp.conf exists install only
-# yp.conf.sample
-#
-	@${INSTALL} ${COPY} -m 644 ${FILESDIR}/yp.conf.sample ${WRKSRC}/etc
-	@${TOUCH} ${WRKSRC}/etc/mtab
-#
-# If ${PREFIX}/etc/krb5.conf exists, don't touch it
-#
-	@${MV} ${WRKSRC}/etc/krb5.conf ${WRKSRC}/etc/krb5.conf.sample
-
-	@${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \
-		${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \
-		| ${GREP} ELF | ${CUT} -d : -f 1 \
-		| ${XARGS} ${BRANDELF} -t Linux
-.	if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64"
-	@${BRANDELF} -t Linux ${WRKSRC}/lib64/ld-2.12.so
-.	else
+post-patch:
+	@${RM} -r ${REMOVE_DIRS:S|^|${WRKSRC}/|}
+	@${RM} ${REMOVE_FILES:S|^|${WRKSRC}/|}
+	@${LN} -sfh centos-release-6 ${WRKSRC}/usr/share/doc/redhat-release
 	@${BRANDELF} -t Linux ${WRKSRC}/lib/ld-2.12.so
-.	endif
-
-# Install locales
-	@${MV} ${WRKSRC}/usr/lib/locale/locale-archive.tmpl \
-		${WRKSRC}/usr/lib/locale/locale-archive
-
-do-install:
-#
-# Do install without using linux rpm system
-#
-	@cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;
-	@cd ${WRKSRC} && ${FIND} * ! -type d \
-		| ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX}
+.if ${LINUX_ARCH} == x86_64
+	@${BRANDELF} -t Linux ${WRKSRC}/lib64/ld-2.12.so
+.endif
 
-	@${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp
-	@${LN} -sf ../usr/bin/[ ${STAGEDIR}${PREFIX}/bin/[
-	@${LN} -sf ../usr/bin/expr ${STAGEDIR}${PREFIX}/bin/expr
-	@${LN} -sf ../usr/bin/test ${STAGEDIR}${PREFIX}/bin/test
-	@${LN} -sf ../usr/bin/uuidgen ${STAGEDIR}${PREFIX}/bin/uuidgen
-	@${LN} -sf ../../lib/librt.so.1 ${STAGEDIR}${PREFIX}/usr/lib/librt.so.1
-	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/var/lock ${STAGEDIR}${PREFIX}/var/spool/mail
-#
-# Let some linux applications (e.g. print/acroread8) print with default settings
-#
-	@${INSTALL_SCRIPT} ${FILESDIR}/lp ${STAGEDIR}${PREFIX}/usr/bin
+post-install:
+	${TOUCH} ${STAGEDIR}${PREFIX}/etc/mtab
+	${MV} ${STAGEDIR}${PREFIX}/etc/krb5.conf \
+		${STAGEDIR}${PREFIX}/etc/krb5.conf.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/nsswitch.conf \
+		${STAGEDIR}${PREFIX}/etc/nsswitch.conf.sample
+	${MV} ${STAGEDIR}${PREFIX}/usr/lib/locale/locale-archive.tmpl \
+		${STAGEDIR}${PREFIX}/usr/lib/locale/locale-archive
+	${LN} -sf /tmp ${STAGEDIR}${PREFIX}/dev/shm
+	${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp
+	${LN} -sf ../usr/bin/[ ${STAGEDIR}${PREFIX}/bin/[
+	${LN} -sf ../usr/bin/expr ${STAGEDIR}${PREFIX}/bin/expr
+	${LN} -sf ../usr/bin/test ${STAGEDIR}${PREFIX}/bin/test
+	${LN} -sf ../usr/bin/uuidgen ${STAGEDIR}${PREFIX}/bin/uuidgen
+	${LN} -sf ../../lib/librt.so.1 ${STAGEDIR}${PREFIX}/usr/lib/librt.so.1
 
 .include <bsd.port.post.mk>
diff --git a/emulators/linux_base-c6/files/lp b/emulators/linux_base-c6/files/lp
deleted file mode 100644
index d1e0b5509eed..000000000000
--- a/emulators/linux_base-c6/files/lp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh -
-exec /usr/bin/lpr "$@"
diff --git a/emulators/linux_base-c6/files/yp.conf.sample b/emulators/linux_base-c6/files/yp.conf.sample
deleted file mode 100644
index 64faed4de3fa..000000000000
--- a/emulators/linux_base-c6/files/yp.conf.sample
+++ /dev/null
@@ -1,15 +0,0 @@
-# sample yp.conf file
-#
-# Legal entries are:
-#
-#	domainname <domain>		Override the default YP domain
-#					(If not set uses the one from
-#					the getdomainname() syscall)
-#
-#	ypserver <grape> [<domain>]	Define which host to contact
-#					for YP service. If the <domain>
-#					argument is included then this
-#					host service the specified YP
-#					domain.
-#domainname	my.domain
-#ypserver	localhost
diff --git a/emulators/linux_base-c6/pkg-deinstall b/emulators/linux_base-c6/pkg-deinstall
deleted file mode 100644
index 176d678141fc..000000000000
--- a/emulators/linux_base-c6/pkg-deinstall
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# a deinstallation script for linux_base
-
-case "$2" in
-DEINSTALL)
-	if [ -n "`mount | grep ^linproc`" ] || \
-		[ -d /compat/linux/proc ]; then
-		echo ""
-		echo "You may need to do by hand:"
-		echo "  o  unmount linprocfs if mounted"
-		echo "  o  delete ${PKG_PREFIX}/proc if present"
-		echo "  o  remove/comment linprocfs from /etc/fstab if present"
-		echo ""
-	fi
-	;;
-esac
-
-exit 0
diff --git a/emulators/linux_base-c6/pkg-descr b/emulators/linux_base-c6/pkg-descr
index 64baa3a21eee..2ebaa2ee031d 100644
--- a/emulators/linux_base-c6/pkg-descr
+++ b/emulators/linux_base-c6/pkg-descr
@@ -5,10 +5,3 @@ provide a nice user experience by using the FreeBSD configuration for
 corresponding Linux stuff where possible. Because of this any work which
 needs to chroot into the Linux base may not work as expected (no fallthrough
 to the FreeBSD config possible).
-
-This port is only available for the i386/amd64 architecture (i386/32 bit mode).
-
-If you want to run X11 applications, install the x11/linux-xorg-libs port.
-
-For cross-development this port is not suitable, you should use a linux_dist
-port instead in this case.
diff --git a/emulators/linux_base-c6/pkg-install b/emulators/linux_base-c6/pkg-install
deleted file mode 100644
index 825df544ca2f..000000000000
--- a/emulators/linux_base-c6/pkg-install
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# an installation script for linux_base
-
-case "$2" in
-PRE-INSTALL)
-	if [ "`/sbin/sysctl -n compat.linux.osrelease`"x = "x" ]; then
-		echo 'linuxulator is not (kld)loaded, exiting'
-		exit 1
-	fi
-	if [ "`/sbin/sysctl -n compat.linux.osrelease`" = "2.6.16" ]; then
-		echo 'compat.linux.osrelease: 2.6.16 is not supported, exiting'
-		exit 1
-	fi
-	;;
-POST-INSTALL)
-	if [ -z "`grep ^linproc /etc/fstab`" ]; then
-		echo ''
-		echo '+++ Some programs may need linprocfs, please add it to /etc/fstab! +++'
-	else
-		if [ -z "`mount | grep -w ^linprocfs`" ]; then
-			echo ''
-			echo '+++ Please mount linprocfs manually! +++'
-		fi
-	fi
-	if [ ! -f ${PKG_PREFIX}/etc/nsswitch.conf ]; then
-		cp ${PKG_PREFIX}/etc/nsswitch.conf.dist \
-			${PKG_PREFIX}/etc/nsswitch.conf
-	fi
-	if [ ! -f ${PKG_PREFIX}/etc/krb5.conf ]; then
-		
-		if [ -f /etc/krb5.conf ]; then
-			ln -s /etc/krb5.conf ${PKG_PREFIX}/etc
-		else
-			cp ${PKG_PREFIX}/etc/krb5.conf.dist \
-				${PKG_PREFIX}/etc/krb5.conf
-		fi
-
-	fi
-	if [ ! -f ${PKG_PREFIX}/etc/yp.conf ]; then
-		cp ${PKG_PREFIX}/etc/yp.conf.sample ${PKG_PREFIX}/etc/yp.conf
-	fi
-#
-# This is needed when updating to ensure that already installed libraries
-# are recorded in ${PKG_PREFIX}/etc/ld.so.cache
-#
-	echo ''
-	echo 'Running linux ldconfig...'
-	${PKG_PREFIX}/sbin/ldconfig -r ${PKG_PREFIX}
-	;;
-esac
-
-exit 0
diff --git a/emulators/linux_base-c6/pkg-message b/emulators/linux_base-c6/pkg-message
index f043f4089ef0..0801cdb665d8 100644
--- a/emulators/linux_base-c6/pkg-message
+++ b/emulators/linux_base-c6/pkg-message
@@ -1,37 +1,6 @@
-This software is based in part on the work of the FreeType Team.
-See <URL:http://www.freetype.org/>.
+Some programs need linprocfs mounted on /compat/linux/proc.  Add the following
+line to /etc/fstab:
 
-Installation of the Linux base system is finished. The Linux kernel
-mode, which must be enabled for Linux binaries to run, is now
-enabled. Linux mode can be enabled permanently with the linux_enable
-variable of rc.conf(5).
+linprocfs   /compat/linux/proc	linprocfs	rw	0	0
 
-----------------------
-You should enable Linux mode with the linux_enable variable of rc.conf(5).
-Depending on the version of FreeBSD you are using you may have to increase
-the emulated linux version via compat.linux.osrelease=2.6.18 in
-sysctl.conf(5). Check via "sysctl compat.linux.osrelease" that it shows a
-lower version number before setting it.
-----------------------
-
-If you want to use shared memory in Linux applications, you need to set up
-a link from /dev/shm to a suitable place, e.g. by adding the following line
-to /etc/devfs.conf (takes effect on each boot):
-	link /tmp shm
-
-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
-
-WARNING: doing work which needs to chroot into the linux base may not work.
-In such cases (e.g. cross-development) you are better suited with a linux_dist
-port.
+Then run "mount linprocfs".
diff --git a/emulators/linux_base-c6/pkg-plist.i386 b/emulators/linux_base-c6/pkg-plist.i386
index 1bb8c73b4afa..1c4626368a09 100644
--- a/emulators/linux_base-c6/pkg-plist.i386
+++ b/emulators/linux_base-c6/pkg-plist.i386
@@ -1,3 +1,4 @@
+@preexec [ -n "`/sbin/sysctl -q %%SYSCTLMIB%%`" ] || ( echo "Cannot install package: kernel missing Linux support"; exit 1 )
 bin/[
 bin/arch
 bin/basename
@@ -56,6 +57,7 @@ bin/umount
 bin/uname
 bin/unlink
 bin/uuidgen
+dev/shm
 etc/DIR_COLORS
 etc/DIR_COLORS.256color
 etc/DIR_COLORS.lightbgcolor
@@ -69,7 +71,6 @@ etc/default/nss
 etc/environment
 etc/filesystems
 etc/gai.conf
-etc/gshadow
 etc/host.conf
 etc/hosts
 etc/hosts.allow
@@ -77,7 +78,8 @@ etc/hosts.deny
 etc/inputrc
 etc/issue
 etc/issue.net
-etc/ld.so.cache
+@sample etc/krb5.conf.sample
+@rmtry etc/ld.so.cache
 etc/ld.so.conf
 etc/lsb-release.d/base-4.0-ia32
 etc/lsb-release.d/base-4.0-noarch
@@ -85,7 +87,7 @@ etc/lsb-release.d/core-4.0-ia32
 etc/lsb-release.d/core-4.0-noarch
 etc/mke2fs.conf
 etc/mtab
-etc/nsswitch.conf
+@sample etc/nsswitch.conf.sample
 etc/pam.d/chfn
 etc/pam.d/chsh
 etc/pam.d/login
@@ -115,7 +117,6 @@ etc/request-key.conf
 etc/rpc
 etc/rpm/macros.dist
 etc/securetty
-etc/shadow
 etc/shells
 etc/skel/.bash_logout
 etc/skel/.bash_profile
@@ -129,25 +130,25 @@ etc/yum.repos.d/CentOS-Media.repo
 etc/yum.repos.d/CentOS-Vault.repo
 etc/yum.repos.d/CentOS-fasttrack.repo
 etc/yum/vars/infra
-lib/i686/nosegneg/libc-%%GLIBCVER%%.so
+lib/i686/nosegneg/libc-2.12.so
 lib/i686/nosegneg/libc.so.6
-lib/i686/nosegneg/libm-%%GLIBCVER%%.so
+lib/i686/nosegneg/libm-2.12.so
 lib/i686/nosegneg/libm.so.6
-lib/i686/nosegneg/libpthread-%%GLIBCVER%%.so
+lib/i686/nosegneg/libpthread-2.12.so
 lib/i686/nosegneg/libpthread.so.0
-lib/i686/nosegneg/librt-%%GLIBCVER%%.so
+lib/i686/nosegneg/librt-2.12.so
 lib/i686/nosegneg/librt.so.1
 lib/i686/nosegneg/libthread_db-1.0.so
 lib/i686/nosegneg/libthread_db.so.1
-lib/ld-%%GLIBCVER%%.so
+lib/ld-2.12.so
 lib/ld-linux.so.2
 lib/ld-lsb.so.3
-lib/libBrokenLocale-%%GLIBCVER%%.so
+lib/libBrokenLocale-2.12.so
 lib/libBrokenLocale.so.1
 lib/libSegFault.so
 lib/libacl.so.1
 lib/libacl.so.1.1.0
-lib/libanl-%%GLIBCVER%%.so
+lib/libanl-2.12.so
 lib/libanl.so.1
 lib/libattr.so.1
 lib/libattr.so.1.1.0
@@ -155,20 +156,20 @@ lib/libblkid.so.1
 lib/libblkid.so.1.1.0
 lib/libbz2.so.1
 lib/libbz2.so.1.0.4
-lib/libc-%%GLIBCVER%%.so
+lib/libc-2.12.so
 lib/libc.so.6
 lib/libcap.so.2
 lib/libcap.so.2.16
-lib/libcidn-%%GLIBCVER%%.so
+lib/libcidn-2.12.so
 lib/libcidn.so.1
 lib/libcom_err.so.2
 lib/libcom_err.so.2.1
-lib/libcrypt-%%GLIBCVER%%.so
+lib/libcrypt-2.12.so
 lib/libcrypt.so.1
 lib/libdb-4.3.so
 lib/libdb-4.7.so
 lib/libdb_cxx-4.3.so
-lib/libdl-%%GLIBCVER%%.so
+lib/libdl-2.12.so
 lib/libdl.so.2
 lib/libe2p.so.2
 lib/libe2p.so.2.3
@@ -200,7 +201,7 @@ lib/libkrb5.so.3
 lib/libkrb5.so.3.3
 lib/libkrb5support.so.0
 lib/libkrb5support.so.0.1
-lib/libm-%%GLIBCVER%%.so
+lib/libm-2.12.so
 lib/libm.so.6
 lib/libmount.so.1
 lib/libmount.so.1.1.0
@@ -208,31 +209,31 @@ lib/libncurses.so.5
 lib/libncurses.so.5.7
 lib/libncursesw.so.5
 lib/libncursesw.so.5.7
-lib/libnsl-%%GLIBCVER%%.so
+lib/libnsl-2.12.so
 lib/libnsl.so.1
-lib/libnss_compat-%%GLIBCVER%%.so
+lib/libnss_compat-2.12.so
 lib/libnss_compat.so.2
-lib/libnss_dns-%%GLIBCVER%%.so
+lib/libnss_dns-2.12.so
 lib/libnss_dns.so.2
-lib/libnss_files-%%GLIBCVER%%.so
+lib/libnss_files-2.12.so
 lib/libnss_files.so.2
-lib/libnss_hesiod-%%GLIBCVER%%.so
+lib/libnss_hesiod-2.12.so
 lib/libnss_hesiod.so.2
-lib/libnss_nis-%%GLIBCVER%%.so
+lib/libnss_nis-2.12.so
 lib/libnss_nis.so.2
-lib/libnss_nisplus-%%GLIBCVER%%.so
+lib/libnss_nisplus-2.12.so
 lib/libnss_nisplus.so.2
 lib/libpcre.so.0
 lib/libpcre.so.0.0.1
 lib/libpopt.so.0
 lib/libpopt.so.0.0.0
-lib/libpthread-%%GLIBCVER%%.so
+lib/libpthread-2.12.so
 lib/libpthread.so.0
 lib/libreadline.so.6
 lib/libreadline.so.6.0
-lib/libresolv-%%GLIBCVER%%.so
+lib/libresolv-2.12.so
 lib/libresolv.so.2
-lib/librt-%%GLIBCVER%%.so
+lib/librt-2.12.so
 lib/librt.so.1
 lib/libselinux.so.1
 lib/libsepol.so.1
@@ -240,7 +241,7 @@ lib/libthread_db-1.0.so
 lib/libthread_db.so.1
 lib/libtinfo.so.5
 lib/libtinfo.so.5.7
-lib/libutil-%%GLIBCVER%%.so
+lib/libutil-2.12.so
 lib/libutil.so.1
 lib/libuuid.so.1
 lib/libuuid.so.1.3.0
@@ -248,9 +249,9 @@ lib/libz.so.1
 lib/libz.so.1.2.3
 lib/lsb/init-functions
 lib/rtkaio/i686/nosegneg/librt.so.1
-lib/rtkaio/i686/nosegneg/librtkaio-%%GLIBCVER%%.so
+lib/rtkaio/i686/nosegneg/librtkaio-2.12.so
 lib/rtkaio/librt.so.1
-lib/rtkaio/librtkaio-%%GLIBCVER%%.so
+lib/rtkaio/librtkaio-2.12.so
 lib/security/pam_cap.so
 sbin/addpart
 sbin/agetty
@@ -418,7 +419,6 @@ usr/bin/localedef
 usr/bin/logger
 usr/bin/logname
 usr/bin/look
-usr/bin/lp
 usr/bin/lsattr
 usr/bin/lsb_release
 usr/bin/lscpu
@@ -933,25 +933,25 @@ usr/share/doc/glib2-2.28.8/AUTHORS
 usr/share/doc/glib2-2.28.8/COPYING
 usr/share/doc/glib2-2.28.8/NEWS
 usr/share/doc/glib2-2.28.8/README
-usr/share/doc/glibc-%%GLIBCVER%%/BUGS
-usr/share/doc/glibc-%%GLIBCVER%%/CONFORMANCE
-usr/share/doc/glibc-%%GLIBCVER%%/COPYING
-usr/share/doc/glibc-%%GLIBCVER%%/COPYING.LIB
-usr/share/doc/glibc-%%GLIBCVER%%/FAQ
-usr/share/doc/glibc-%%GLIBCVER%%/INSTALL
-usr/share/doc/glibc-%%GLIBCVER%%/LICENSES
-usr/share/doc/glibc-%%GLIBCVER%%/NEWS
-usr/share/doc/glibc-%%GLIBCVER%%/NOTES
-usr/share/doc/glibc-%%GLIBCVER%%/PROJECTS
-usr/share/doc/glibc-%%GLIBCVER%%/README
-usr/share/doc/glibc-%%GLIBCVER%%/README.hesiod
-usr/share/doc/glibc-%%GLIBCVER%%/README.libm
-usr/share/doc/glibc-common-%%GLIBCVER%%/ChangeLog.15.bz2
-usr/share/doc/glibc-common-%%GLIBCVER%%/ChangeLog.16.bz2
-usr/share/doc/glibc-common-%%GLIBCVER%%/ChangeLog.bz2
-usr/share/doc/glibc-common-%%GLIBCVER%%/README.timezone
-usr/share/doc/glibc-common-%%GLIBCVER%%/README.ufc-crypt
-usr/share/doc/glibc-common-%%GLIBCVER%%/gai.conf
+usr/share/doc/glibc-2.12/BUGS
+usr/share/doc/glibc-2.12/CONFORMANCE
+usr/share/doc/glibc-2.12/COPYING
+usr/share/doc/glibc-2.12/COPYING.LIB
+usr/share/doc/glibc-2.12/FAQ
+usr/share/doc/glibc-2.12/INSTALL
+usr/share/doc/glibc-2.12/LICENSES
+usr/share/doc/glibc-2.12/NEWS
+usr/share/doc/glibc-2.12/NOTES
+usr/share/doc/glibc-2.12/PROJECTS
+usr/share/doc/glibc-2.12/README
+usr/share/doc/glibc-2.12/README.hesiod
+usr/share/doc/glibc-2.12/README.libm
+usr/share/doc/glibc-common-2.12/ChangeLog.15.bz2
+usr/share/doc/glibc-common-2.12/ChangeLog.16.bz2
+usr/share/doc/glibc-common-2.12/ChangeLog.bz2
+usr/share/doc/glibc-common-2.12/README.timezone
+usr/share/doc/glibc-common-2.12/README.ufc-crypt
+usr/share/doc/glibc-common-2.12/gai.conf
 usr/share/doc/gmp-4.3.1/COPYING
 usr/share/doc/gmp-4.3.1/COPYING.LIB
 usr/share/doc/gmp-4.3.1/NEWS
@@ -2344,11 +2344,8 @@ usr/share/man/man8/tunelp.8.gz
 usr/share/man/man8/umount.8.gz
 usr/share/man/man8/wipefs.8.gz
 usr/tmp
-@unexec rm -f %D/var/cache/ldconfig/aux-cache
+@rmtry var/cache/ldconfig/aux-cache
 var/mail
-@sample etc/krb5.conf.sample
-@sample etc/yp.conf.sample
-@dir %%LINUXBASE%%
 @dir etc/X11/applnk
 @dir etc/X11/fontpath.d
 @dir etc/blkid
@@ -2363,8 +2360,6 @@ var/mail
 @dir etc/xdg/autostart
 @dir etc/xinetd.d
 @dir lib/modules
-@dir lib/rtkaio
-@dir lib/security
 @dir lib/tls
 @dir mnt
 @dir opt
@@ -2372,11 +2367,6 @@ var/mail
 @dir selinux
 @dir srv
 @dir sys
-@dir usr/X11R6/bin
-@dir usr/X11R6/include
-@dir usr/X11R6/lib/tls
-@dir usr/X11R6/man
-@dir usr/X11R6/share
 @dir usr/etc
 @dir usr/games
 @dir usr/lib/X11
@@ -2384,10 +2374,6 @@ var/mail
 @dir usr/lib/krb5/plugins/authdata
 @dir usr/lib/krb5/plugins/libkrb5
 @dir usr/lib/krb5/plugins/preauth
-@dir usr/lib/pm-utils/module.d
-@dir usr/lib/pm-utils/power.d
-@dir usr/lib/pm-utils/sleep.d
-@dir usr/lib/sse2
 @dir usr/lib/tls
 @dir usr/share/X11
 @dir usr/share/applications
@@ -2877,7 +2863,6 @@ var/mail
 @dir usr/share/locale/zxx/LC_MESSAGES
 @dir usr/share/locale/zza/LC_MESSAGES
 @dir usr/share/man/man0p
-@dir usr/share/man/man1
 @dir usr/share/man/man1p
 @dir usr/share/man/man1x
 @dir usr/share/man/man2
@@ -2887,13 +2872,10 @@ var/mail
 @dir usr/share/man/man3x
 @dir usr/share/man/man4
 @dir usr/share/man/man4x
-@dir usr/share/man/man5
 @dir usr/share/man/man5x
 @dir usr/share/man/man6
 @dir usr/share/man/man6x
-@dir usr/share/man/man7
 @dir usr/share/man/man7x
-@dir usr/share/man/man8
 @dir usr/share/man/man8x
 @dir usr/share/man/man9
 @dir usr/share/man/man9x
@@ -2921,3 +2903,5 @@ var/mail
 @dir var/spool/lpd
 @dir var/spool/mail
 @dir var/yp
+@dir %%LINUXBASE%%
+@postexec %D/sbin/ldconfig
diff --git a/emulators/linux_base-c6/pkg-plist.x86_64 b/emulators/linux_base-c6/pkg-plist.x86_64
index cf5f28229726..144c2e2517fd 100644
--- a/emulators/linux_base-c6/pkg-plist.x86_64
+++ b/emulators/linux_base-c6/pkg-plist.x86_64
@@ -1,3 +1,4 @@
+@preexec [ -n "`/sbin/sysctl -q %%SYSCTLMIB%%`" ] || ( echo "Cannot install package: kernel missing 64-bit Linux support"; exit 1 )
 bin/[
 bin/arch
 bin/basename
@@ -56,6 +57,7 @@ bin/umount
 bin/uname
 bin/unlink
 bin/uuidgen
+dev/shm
 etc/DIR_COLORS
 etc/DIR_COLORS.256color
 etc/DIR_COLORS.lightbgcolor
@@ -69,7 +71,6 @@ etc/default/nss
 etc/environment
 etc/filesystems
 etc/gai.conf
-etc/gshadow
 etc/host.conf
 etc/hosts
 etc/hosts.allow
@@ -77,7 +78,8 @@ etc/hosts.deny
 etc/inputrc
 etc/issue
 etc/issue.net
-etc/ld.so.cache
+@sample etc/krb5.conf.sample
+@rmtry etc/ld.so.cache
 etc/ld.so.conf
 etc/lsb-release.d/base-4.0-amd64
 etc/lsb-release.d/base-4.0-ia32
@@ -87,7 +89,7 @@ etc/lsb-release.d/core-4.0-ia32
 etc/lsb-release.d/core-4.0-noarch
 etc/mke2fs.conf
 etc/mtab
-etc/nsswitch.conf
+@sample etc/nsswitch.conf.sample
 etc/pam.d/chfn
 etc/pam.d/chsh
 etc/pam.d/login
@@ -117,7 +119,6 @@ etc/request-key.conf
 etc/rpc
 etc/rpm/macros.dist
 etc/securetty
-etc/shadow
 etc/shells
 etc/skel/.bash_logout
 etc/skel/.bash_profile
@@ -131,25 +132,25 @@ etc/yum.repos.d/CentOS-Media.repo
 etc/yum.repos.d/CentOS-Vault.repo
 etc/yum.repos.d/CentOS-fasttrack.repo
 etc/yum/vars/infra
-lib/i686/nosegneg/libc-%%GLIBCVER%%.so
+lib/i686/nosegneg/libc-2.12.so
 lib/i686/nosegneg/libc.so.6
-lib/i686/nosegneg/libm-%%GLIBCVER%%.so
+lib/i686/nosegneg/libm-2.12.so
 lib/i686/nosegneg/libm.so.6
-lib/i686/nosegneg/libpthread-%%GLIBCVER%%.so
+lib/i686/nosegneg/libpthread-2.12.so
 lib/i686/nosegneg/libpthread.so.0
-lib/i686/nosegneg/librt-%%GLIBCVER%%.so
+lib/i686/nosegneg/librt-2.12.so
 lib/i686/nosegneg/librt.so.1
 lib/i686/nosegneg/libthread_db-1.0.so
 lib/i686/nosegneg/libthread_db.so.1
-lib/ld-%%GLIBCVER%%.so
+lib/ld-2.12.so
 lib/ld-linux.so.2
 lib/ld-lsb.so.3
-lib/libBrokenLocale-%%GLIBCVER%%.so
+lib/libBrokenLocale-2.12.so
 lib/libBrokenLocale.so.1
 lib/libSegFault.so
 lib/libacl.so.1
 lib/libacl.so.1.1.0
-lib/libanl-%%GLIBCVER%%.so
+lib/libanl-2.12.so
 lib/libanl.so.1
 lib/libattr.so.1
 lib/libattr.so.1.1.0
@@ -157,20 +158,20 @@ lib/libblkid.so.1
 lib/libblkid.so.1.1.0
 lib/libbz2.so.1
 lib/libbz2.so.1.0.4
-lib/libc-%%GLIBCVER%%.so
+lib/libc-2.12.so
 lib/libc.so.6
 lib/libcap.so.2
 lib/libcap.so.2.16
-lib/libcidn-%%GLIBCVER%%.so
+lib/libcidn-2.12.so
 lib/libcidn.so.1
 lib/libcom_err.so.2
 lib/libcom_err.so.2.1
-lib/libcrypt-%%GLIBCVER%%.so
+lib/libcrypt-2.12.so
 lib/libcrypt.so.1
 lib/libdb-4.3.so
 lib/libdb-4.7.so
 lib/libdb_cxx-4.3.so
-lib/libdl-%%GLIBCVER%%.so
+lib/libdl-2.12.so
 lib/libdl.so.2
 lib/libe2p.so.2
 lib/libe2p.so.2.3
@@ -202,7 +203,7 @@ lib/libkrb5.so.3
 lib/libkrb5.so.3.3
 lib/libkrb5support.so.0
 lib/libkrb5support.so.0.1
-lib/libm-%%GLIBCVER%%.so
+lib/libm-2.12.so
 lib/libm.so.6
 lib/libmount.so.1
 lib/libmount.so.1.1.0
@@ -210,31 +211,31 @@ lib/libncurses.so.5
 lib/libncurses.so.5.7
 lib/libncursesw.so.5
 lib/libncursesw.so.5.7
-lib/libnsl-%%GLIBCVER%%.so
+lib/libnsl-2.12.so
 lib/libnsl.so.1
-lib/libnss_compat-%%GLIBCVER%%.so
+lib/libnss_compat-2.12.so
 lib/libnss_compat.so.2
-lib/libnss_dns-%%GLIBCVER%%.so
+lib/libnss_dns-2.12.so
 lib/libnss_dns.so.2
-lib/libnss_files-%%GLIBCVER%%.so
+lib/libnss_files-2.12.so
 lib/libnss_files.so.2
-lib/libnss_hesiod-%%GLIBCVER%%.so
+lib/libnss_hesiod-2.12.so
 lib/libnss_hesiod.so.2
-lib/libnss_nis-%%GLIBCVER%%.so
+lib/libnss_nis-2.12.so
 lib/libnss_nis.so.2
-lib/libnss_nisplus-%%GLIBCVER%%.so
+lib/libnss_nisplus-2.12.so
 lib/libnss_nisplus.so.2
 lib/libpcre.so.0
 lib/libpcre.so.0.0.1
 lib/libpopt.so.0
 lib/libpopt.so.0.0.0
-lib/libpthread-%%GLIBCVER%%.so
+lib/libpthread-2.12.so
 lib/libpthread.so.0
 lib/libreadline.so.6
 lib/libreadline.so.6.0
-lib/libresolv-%%GLIBCVER%%.so
+lib/libresolv-2.12.so
 lib/libresolv.so.2
-lib/librt-%%GLIBCVER%%.so
+lib/librt-2.12.so
 lib/librt.so.1
 lib/libselinux.so.1
 lib/libsepol.so.1
@@ -242,7 +243,7 @@ lib/libthread_db-1.0.so
 lib/libthread_db.so.1
 lib/libtinfo.so.5
 lib/libtinfo.so.5.7
-lib/libutil-%%GLIBCVER%%.so
+lib/libutil-2.12.so
 lib/libutil.so.1
 lib/libuuid.so.1
 lib/libuuid.so.1.3.0
@@ -250,19 +251,19 @@ lib/libz.so.1
 lib/libz.so.1.2.3
 lib/lsb/init-functions
 lib/rtkaio/i686/nosegneg/librt.so.1
-lib/rtkaio/i686/nosegneg/librtkaio-%%GLIBCVER%%.so
+lib/rtkaio/i686/nosegneg/librtkaio-2.12.so
 lib/rtkaio/librt.so.1
-lib/rtkaio/librtkaio-%%GLIBCVER%%.so
+lib/rtkaio/librtkaio-2.12.so
 lib/security/pam_cap.so
-lib64/ld-%%GLIBCVER%%.so
+lib64/ld-2.12.so
 lib64/ld-linux-x86-64.so.2
 lib64/ld-lsb-x86-64.so.3
-lib64/libBrokenLocale-%%GLIBCVER%%.so
+lib64/libBrokenLocale-2.12.so
 lib64/libBrokenLocale.so.1
 lib64/libSegFault.so
 lib64/libacl.so.1
 lib64/libacl.so.1.1.0
-lib64/libanl-%%GLIBCVER%%.so
+lib64/libanl-2.12.so
 lib64/libanl.so.1
 lib64/libattr.so.1
 lib64/libattr.so.1.1.0
@@ -270,20 +271,20 @@ lib64/libblkid.so.1
 lib64/libblkid.so.1.1.0
 lib64/libbz2.so.1
 lib64/libbz2.so.1.0.4
-lib64/libc-%%GLIBCVER%%.so
+lib64/libc-2.12.so
 lib64/libc.so.6
 lib64/libcap.so.2
 lib64/libcap.so.2.16
-lib64/libcidn-%%GLIBCVER%%.so
+lib64/libcidn-2.12.so
 lib64/libcidn.so.1
 lib64/libcom_err.so.2
 lib64/libcom_err.so.2.1
-lib64/libcrypt-%%GLIBCVER%%.so
+lib64/libcrypt-2.12.so
 lib64/libcrypt.so.1
 lib64/libdb-4.3.so
 lib64/libdb-4.7.so
 lib64/libdb_cxx-4.3.so
-lib64/libdl-%%GLIBCVER%%.so
+lib64/libdl-2.12.so
 lib64/libdl.so.2
 lib64/libe2p.so.2
 lib64/libe2p.so.2.3
@@ -315,7 +316,7 @@ lib64/libkrb5.so.3
 lib64/libkrb5.so.3.3
 lib64/libkrb5support.so.0
 lib64/libkrb5support.so.0.1
-lib64/libm-%%GLIBCVER%%.so
+lib64/libm-2.12.so
 lib64/libm.so.6
 lib64/libmount.so.1
 lib64/libmount.so.1.1.0
@@ -323,31 +324,31 @@ lib64/libncurses.so.5
 lib64/libncurses.so.5.7
 lib64/libncursesw.so.5
 lib64/libncursesw.so.5.7
-lib64/libnsl-%%GLIBCVER%%.so
+lib64/libnsl-2.12.so
 lib64/libnsl.so.1
-lib64/libnss_compat-%%GLIBCVER%%.so
+lib64/libnss_compat-2.12.so
 lib64/libnss_compat.so.2
-lib64/libnss_dns-%%GLIBCVER%%.so
+lib64/libnss_dns-2.12.so
 lib64/libnss_dns.so.2
-lib64/libnss_files-%%GLIBCVER%%.so
+lib64/libnss_files-2.12.so
 lib64/libnss_files.so.2
-lib64/libnss_hesiod-%%GLIBCVER%%.so
+lib64/libnss_hesiod-2.12.so
 lib64/libnss_hesiod.so.2
-lib64/libnss_nis-%%GLIBCVER%%.so
+lib64/libnss_nis-2.12.so
 lib64/libnss_nis.so.2
-lib64/libnss_nisplus-%%GLIBCVER%%.so
+lib64/libnss_nisplus-2.12.so
 lib64/libnss_nisplus.so.2
 lib64/libpcre.so.0
 lib64/libpcre.so.0.0.1
 lib64/libpopt.so.0
 lib64/libpopt.so.0.0.0
-lib64/libpthread-%%GLIBCVER%%.so
+lib64/libpthread-2.12.so
 lib64/libpthread.so.0
 lib64/libreadline.so.6
 lib64/libreadline.so.6.0
-lib64/libresolv-%%GLIBCVER%%.so
+lib64/libresolv-2.12.so
 lib64/libresolv.so.2
-lib64/librt-%%GLIBCVER%%.so
+lib64/librt-2.12.so
 lib64/librt.so.1
 lib64/libselinux.so.1
 lib64/libsepol.so.1
@@ -355,14 +356,14 @@ lib64/libthread_db-1.0.so
 lib64/libthread_db.so.1
 lib64/libtinfo.so.5
 lib64/libtinfo.so.5.7
-lib64/libutil-%%GLIBCVER%%.so
+lib64/libutil-2.12.so
 lib64/libutil.so.1
 lib64/libuuid.so.1
 lib64/libuuid.so.1.3.0
 lib64/libz.so.1
 lib64/libz.so.1.2.3
 lib64/rtkaio/librt.so.1
-lib64/rtkaio/librtkaio-%%GLIBCVER%%.so
+lib64/rtkaio/librtkaio-2.12.so
 lib64/security/pam_cap.so
 sbin/addpart
 sbin/agetty
@@ -530,7 +531,6 @@ usr/bin/localedef
 usr/bin/logger
 usr/bin/logname
 usr/bin/look
-usr/bin/lp
 usr/bin/lsattr
 usr/bin/lsb_release
 usr/bin/lscpu
@@ -1359,25 +1359,25 @@ usr/share/doc/glib2-2.28.8/AUTHORS
 usr/share/doc/glib2-2.28.8/COPYING
 usr/share/doc/glib2-2.28.8/NEWS
 usr/share/doc/glib2-2.28.8/README
-usr/share/doc/glibc-%%GLIBCVER%%/BUGS
-usr/share/doc/glibc-%%GLIBCVER%%/CONFORMANCE
-usr/share/doc/glibc-%%GLIBCVER%%/COPYING
-usr/share/doc/glibc-%%GLIBCVER%%/COPYING.LIB
-usr/share/doc/glibc-%%GLIBCVER%%/FAQ
-usr/share/doc/glibc-%%GLIBCVER%%/INSTALL
-usr/share/doc/glibc-%%GLIBCVER%%/LICENSES
-usr/share/doc/glibc-%%GLIBCVER%%/NEWS
-usr/share/doc/glibc-%%GLIBCVER%%/NOTES
-usr/share/doc/glibc-%%GLIBCVER%%/PROJECTS
-usr/share/doc/glibc-%%GLIBCVER%%/README
-usr/share/doc/glibc-%%GLIBCVER%%/README.hesiod
-usr/share/doc/glibc-%%GLIBCVER%%/README.libm
-usr/share/doc/glibc-common-%%GLIBCVER%%/ChangeLog.15.bz2
-usr/share/doc/glibc-common-%%GLIBCVER%%/ChangeLog.16.bz2
-usr/share/doc/glibc-common-%%GLIBCVER%%/ChangeLog.bz2
-usr/share/doc/glibc-common-%%GLIBCVER%%/README.timezone
-usr/share/doc/glibc-common-%%GLIBCVER%%/README.ufc-crypt
-usr/share/doc/glibc-common-%%GLIBCVER%%/gai.conf
+usr/share/doc/glibc-2.12/BUGS
+usr/share/doc/glibc-2.12/CONFORMANCE
+usr/share/doc/glibc-2.12/COPYING
+usr/share/doc/glibc-2.12/COPYING.LIB
+usr/share/doc/glibc-2.12/FAQ
+usr/share/doc/glibc-2.12/INSTALL
+usr/share/doc/glibc-2.12/LICENSES
+usr/share/doc/glibc-2.12/NEWS
+usr/share/doc/glibc-2.12/NOTES
+usr/share/doc/glibc-2.12/PROJECTS
+usr/share/doc/glibc-2.12/README
+usr/share/doc/glibc-2.12/README.hesiod
+usr/share/doc/glibc-2.12/README.libm
+usr/share/doc/glibc-common-2.12/ChangeLog.15.bz2
+usr/share/doc/glibc-common-2.12/ChangeLog.16.bz2
+usr/share/doc/glibc-common-2.12/ChangeLog.bz2
+usr/share/doc/glibc-common-2.12/README.timezone
+usr/share/doc/glibc-common-2.12/README.ufc-crypt
+usr/share/doc/glibc-common-2.12/gai.conf
 usr/share/doc/gmp-4.3.1/COPYING
 usr/share/doc/gmp-4.3.1/COPYING.LIB
 usr/share/doc/gmp-4.3.1/NEWS
@@ -2771,11 +2771,8 @@ usr/share/man/man8/umount.8.gz
 usr/share/man/man8/wipefs.8.gz
 usr/share/man/man8/x86_64.8.gz
 usr/tmp
-@unexec rm -f %D/var/cache/ldconfig/aux-cache
+@rmtry var/cache/ldconfig/aux-cache
 var/mail
-@sample etc/krb5.conf.sample
-@sample etc/yp.conf.sample
-@dir %%LINUXBASE%%
 @dir etc/X11/applnk
 @dir etc/X11/fontpath.d
 @dir etc/blkid
@@ -2799,11 +2796,6 @@ var/mail
 @dir selinux
 @dir srv
 @dir sys
-@dir usr/X11R6/bin
-@dir usr/X11R6/include
-@dir usr/X11R6/lib/tls
-@dir usr/X11R6/man
-@dir usr/X11R6/share
 @dir usr/etc
 @dir usr/games
 @dir usr/lib/games
@@ -2816,9 +2808,6 @@ var/mail
 @dir usr/lib64/krb5/plugins/authdata
 @dir usr/lib64/krb5/plugins/libkrb5
 @dir usr/lib64/krb5/plugins/preauth
-@dir usr/lib64/pm-utils/module.d
-@dir usr/lib64/pm-utils/power.d
-@dir usr/lib64/pm-utils/sleep.d
 @dir usr/lib64/sse2
 @dir usr/lib64/tls
 @dir usr/share/X11
@@ -3353,3 +3342,5 @@ var/mail
 @dir var/spool/lpd
 @dir var/spool/mail
 @dir var/yp
+@dir %%LINUXBASE%%
+@postexec %D/sbin/ldconfig
diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile
index b6a44183871d..476b35825716 100644
--- a/emulators/linux_base-f10/Makefile
+++ b/emulators/linux_base-f10/Makefile
@@ -1,221 +1,127 @@
 # Created by: bsam
 # $FreeBSD$
 
-PORTNAME=		f10
-PORTVERSION=		10
-PORTREVISION=		10
-CATEGORIES=		emulators linux
-MASTER_SITES=		LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${PORTVERSION} \
-			FEDORA_LINUX/../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Packages/
-PKGNAMEPREFIX=		linux_base-
-DISTFILES=		${BIN_DISTFILES} ${SRC_DISTFILES}
-DIST_SUBDIR=		rpm/${LINUX_RPM_ARCH}/fedora/${PORTVERSION}
-EXTRACT_ONLY=		${BIN_DISTFILES}
+PORTNAME=	f10
+PORTVERSION=	${LINUX_DIST_VER}
+PORTREVISION=	11
+CATEGORIES=	emulators linux
+PKGNAMEPREFIX=	linux_base-
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode for i386/amd64 (Linux Fedora 10)
 
 BIN_DISTFILES=	basesystem-10.0-1.noarch.rpm \
-		bash-3.2-30.fc10.${LINUX_RPM_ARCH}.rpm \
-		bzip2-1.0.5-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		bzip2-libs-1.0.5-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		compat-db-4.6.21-5.fc10.${LINUX_RPM_ARCH}.rpm \
-		compat-libstdc++-296-2.96-141.${LINUX_RPM_ARCH}.rpm \
-		compat-libstdc++-33-3.2.3-64.${LINUX_RPM_ARCH}.rpm \
-		coreutils-6.12-20.fc10.${LINUX_RPM_ARCH}.rpm \
-		db4-4.7.25-7.fc10.${LINUX_RPM_ARCH}.rpm \
-		e2fsprogs-1.41.4-6.fc10.${LINUX_RPM_ARCH}.rpm \
-		e2fsprogs-libs-1.41.4-6.fc10.${LINUX_RPM_ARCH}.rpm \
-		elfutils-0.142-1.fc10.${LINUX_RPM_ARCH}.rpm \
+		bash-3.2-30.fc10${EXTRACT_SUFX} \
+		bzip2-1.0.5-3.fc10${EXTRACT_SUFX} \
+		bzip2-libs-1.0.5-3.fc10${EXTRACT_SUFX} \
+		compat-db-4.6.21-5.fc10${EXTRACT_SUFX} \
+		compat-libstdc++-296-2.96-141${EXTRACT_SUFX} \
+		compat-libstdc++-33-3.2.3-64${EXTRACT_SUFX} \
+		coreutils-6.12-20.fc10${EXTRACT_SUFX} \
+		db4-4.7.25-7.fc10${EXTRACT_SUFX} \
+		e2fsprogs-1.41.4-6.fc10${EXTRACT_SUFX} \
+		e2fsprogs-libs-1.41.4-6.fc10${EXTRACT_SUFX} \
+		elfutils-0.142-1.fc10${EXTRACT_SUFX} \
 		fedora-release-10-1.noarch.rpm \
-		filesystem-2.4.19-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		freetype-2.3.7-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		gamin-0.1.9-6.fc10.${LINUX_RPM_ARCH}.rpm \
-		gdbm-1.8.0-29.fc10.${LINUX_RPM_ARCH}.rpm \
-		glib-1.2.10-32.fc10.${LINUX_RPM_ARCH}.rpm \
-		glib2-2.18.4-2.fc10.${LINUX_RPM_ARCH}.rpm \
-		glibc-2.9-3.${LINUX_RPM_ARCH}.rpm \
-		glibc-common-2.9-3.${LINUX_RPM_ARCH}.rpm \
-		gmp-4.2.2-8.fc10.${LINUX_RPM_ARCH}.rpm \
-		grep-2.5.1a-61.fc10.${LINUX_RPM_ARCH}.rpm \
-		info-4.12-4.fc10.${LINUX_RPM_ARCH}.rpm \
-		keyutils-libs-1.2-3.fc9.${LINUX_RPM_ARCH}.rpm \
-		krb5-libs-1.6.3-18.fc10.${LINUX_RPM_ARCH}.rpm \
-		libacl-2.2.47-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		libattr-2.4.43-2.fc10.${LINUX_RPM_ARCH}.rpm \
-		libcap-2.10-2.fc10.${LINUX_RPM_ARCH}.rpm \
-		libgcc-4.3.2-7.${LINUX_RPM_ARCH}.rpm \
-		libidn-0.6.14-8.${LINUX_RPM_ARCH}.rpm \
-		libselinux-2.0.78-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libsepol-2.0.33-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libstdc++-4.3.2-7.${LINUX_RPM_ARCH}.rpm \
-		ncurses-5.6-20.20080927.fc10.${LINUX_RPM_ARCH}.rpm \
-		ncurses-libs-5.6-20.20080927.fc10.${LINUX_RPM_ARCH}.rpm \
-		pcre-7.8-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		popt-1.13-4.fc10.${LINUX_RPM_ARCH}.rpm \
-		readline-5.2-13.fc9.${LINUX_RPM_ARCH}.rpm \
-		setserial-2.17-22.fc9.${LINUX_RPM_ARCH}.rpm \
+		filesystem-2.4.19-1.fc10${EXTRACT_SUFX} \
+		freetype-2.3.7-3.fc10${EXTRACT_SUFX} \
+		gamin-0.1.9-6.fc10${EXTRACT_SUFX} \
+		gdbm-1.8.0-29.fc10${EXTRACT_SUFX} \
+		glib-1.2.10-32.fc10${EXTRACT_SUFX} \
+		glib2-2.18.4-2.fc10${EXTRACT_SUFX} \
+		glibc-2.9-3${EXTRACT_SUFX} \
+		glibc-common-2.9-3${EXTRACT_SUFX} \
+		gmp-4.2.2-8.fc10${EXTRACT_SUFX} \
+		grep-2.5.1a-61.fc10${EXTRACT_SUFX} \
+		info-4.12-4.fc10${EXTRACT_SUFX} \
+		keyutils-libs-1.2-3.fc9${EXTRACT_SUFX} \
+		krb5-libs-1.6.3-18.fc10${EXTRACT_SUFX} \
+		libacl-2.2.47-3.fc10${EXTRACT_SUFX} \
+		libattr-2.4.43-2.fc10${EXTRACT_SUFX} \
+		libcap-2.10-2.fc10${EXTRACT_SUFX} \
+		libgcc-4.3.2-7${EXTRACT_SUFX} \
+		libidn-0.6.14-8${EXTRACT_SUFX} \
+		libselinux-2.0.78-1.fc10${EXTRACT_SUFX} \
+		libsepol-2.0.33-1.fc10${EXTRACT_SUFX} \
+		libstdc++-4.3.2-7${EXTRACT_SUFX} \
+		ncurses-5.6-20.20080927.fc10${EXTRACT_SUFX} \
+		ncurses-libs-5.6-20.20080927.fc10${EXTRACT_SUFX} \
+		pcre-7.8-1.fc10${EXTRACT_SUFX} \
+		popt-1.13-4.fc10${EXTRACT_SUFX} \
+		readline-5.2-13.fc9${EXTRACT_SUFX} \
+		setserial-2.17-22.fc9${EXTRACT_SUFX} \
 		setup-2.7.4-4.fc10.noarch.rpm \
-		slang-2.1.4-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		zlib-1.2.3-18.fc9.${LINUX_RPM_ARCH}.rpm
-
-.if defined(PACKAGE_BUILDING)
-MASTER_SITES+=	FEDORA_LINUX
-MASTER_SITE_SUBDIR+= ../updates/${PORTVERSION}/SRPMS \
-		../releases/${PORTVERSION}/Everything/source/SRPMS/
-
-SRC_DISTFILES+=	acl-2.2.47-3.fc10.src.rpm \
-		attr-2.4.43-1.fc10.src.rpm \
-		basesystem-10.0-1.src.rpm \
-		bash-3.2-29.fc10.src.rpm \
-		bzip2-1.0.5-3.fc10.src.rpm \
-		compat-db-4.6.21-5.fc10.src.rpm \
-		coreutils-6.12-17.fc10.src.rpm \
-		db4-4.7.25-5.fc10.src.rpm \
-		e2fsprogs-1.41.4-6.fc10.src.rpm \
-		elfutils-0.142-1.fc10.src.rpm \
-		fedora-release-10-1.src.rpm \
-		filesystem-2.4.19-1.fc10.src.rpm \
-		freetype-2.3.7-1.fc10.src.rpm \
-		gamin-0.1.9-6.fc10.src.rpm \
-		gcc-4.3.2-7.src.rpm \
-		gdbm-1.8.0-29.fc10.src.rpm \
-		glib-1.2.10-32.fc10.src.rpm \
-		glib2-2.18.2-3.fc10.src.rpm \
-		glibc-2.9-2.src.rpm \
-		gmp-4.2.2-8.fc10.src.rpm \
-		grep-2.5.1a-61.fc10.src.rpm \
-		keyutils-1.2-3.fc9.src.rpm \
-		krb5-1.6.3-16.fc10.src.rpm \
-		libcap-2.10-2.fc10.src.rpm \
-		libidn-0.6.14-8.src.rpm \
-		libselinux-2.0.73-1.fc10.src.rpm \
-		libsepol-2.0.33-1.fc10.src.rpm \
-		ncurses-5.6-20.20080927.fc10.src.rpm \
-		pcre-7.8-1.fc10.src.rpm \
-		readline-5.2-13.fc9.src.rpm \
-		setserial-2.17-22.fc9.src.rpm \
-		setup-2.7.4-1.fc10.src.rpm \
-		slang-2.1.4-1.fc10.src.rpm \
-		texinfo-4.12-4.fc10.src.rpm \
-		zlib-1.2.3-18.fc9.src.rpm
-
-ALWAYS_KEEP_DISTFILES=	yes
-.endif
-
-CONFLICTS=		linux_base-gentoo* linux_base-fc4-[0-9]* linux_base-fc6-[0-9]* \
-			linux_base-f7-[0-9]* linux_base-f8-[0-9]* linux_base-f9-[0-9]* \
-			linux_base-c* linux-glib2-*
-ONLY_FOR_ARCHS=		i386 amd64
-LINUX_RPM_ARCH=		i386
-USE_LINUX_PREFIX=	yes
-NO_WRKSUBDIR=		yes
-DISTINFO_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
-PLIST_SUB=		GLIBCVER="2.9" LINUXBASE=${LINUXBASE}
-
-EXTRACT_ONLY=		${BIN_DISTFILES}
-
-.include <bsd.port.pre.mk>
-
-.if !defined(PACKAGE_BUILDING) || (defined(PACKAGE_BUILDING) && !defined(LINUX_OSRELEASE) )
-LINUX_OSRELEASE!=	${ECHO_CMD} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null`
-.endif
-
-.if ${LINUX_OSRELEASE}x == "x"
-IGNORE=			linuxulator is not (kld)loaded
-.endif
-
-REMOVE_DIRS=		boot dev etc/fonts home initrd media root tmp var/log var/run var/tmp \
-			usr/local usr/tmp
-REMOVE_FILES=		bin/df bin/su etc/exports etc/group etc/localtime \
-			etc/motd etc/passwd etc/printcap etc/services \
-			etc/protocols
-# These are shared directories that some linux packages (e.g. linux-f10-gtk2)
-# use but aren't in any of the distfiles above.
-ADD_DIRS=		usr/X11R6/share usr/X11R6/man usr/X11R6/lib/tls \
-			usr/X11R6/include usr/X11R6/bin \
-			usr/share/locale/ca@valencia/LC_MESSAGES \
-			usr/share/locale/sr@Latn/LC_MESSAGES \
-			usr/share/locale/uz@cyrillic/LC_MESSAGES
-ADD_FILES=		#empty
-
-.if (${MACHINE_ARCH} == "amd64")
-FALLBACK_ELF_MIB=	kern.elf32.fallback_brand
-.else
-FALLBACK_ELF_MIB=	kern.fallback_elf_brand
-.endif
-
-.if (${ARCH} == "amd64")
-ARCH=			i386
-.endif
-
-do-build:
-	@for D in ${REMOVE_DIRS}; do \
-		${RM} -rf ${WRKSRC}/$$D; \
-	done
-	@for F in ${REMOVE_FILES}; do \
-		${RM} -f ${WRKSRC}/$$F; \
-	done
-	@for F in ${ADD_DIRS}; do \
-		${MKDIR} ${WRKSRC}/$$F; \
-	done
-	@for F in ${ADD_FILES}; do \
-		${TOUCH} ${WRKSRC}/$$F; \
-	done
-#
-# Create a good ld.so.conf and touch ld.so.cache
-#
-	@${ECHO_CMD} -e '/lib\n/usr/lib\n${X11BASE}/lib' >> \
-		${WRKSRC}/etc/ld.so.conf
-	@${TOUCH} ${WRKSRC}/etc/ld.so.cache
-#
-# Create yp.conf as a hint to NIS users and make sure there's a
-# mtab in etc, albeit an empty one. This is needed in a couple of
-# cases. Most notably staroffice6. If yp.conf exists install only
-# yp.conf.sample
-#
-	@${INSTALL} ${COPY} -m 644 ${FILESDIR}/yp.conf.sample ${WRKSRC}/etc
-	@${TOUCH} ${WRKSRC}/etc/mtab
-#
-# If ${PREFIX}/etc/nsswitch.conf exists, don't touch it,
-# install only ${PREFIX}/etc/nsswitch.conf.dist
-#
-	@${MV} ${WRKSRC}/etc/nsswitch.conf ${WRKSRC}/etc/nsswitch.conf.dist
-	@${MV} ${WRKSRC}/etc/krb5.conf ${WRKSRC}/etc/krb5.conf.dist
-
-# Fix usr/bin/*db4* permissions to allow "portupgrade -s"
-#	@${CHMOD} u+w ${WRKSRC}/usr/bin/*db4*
-
-	@${FIND} ${WRKSRC}/bin ${WRKSRC}/sbin/ ${WRKSRC}/usr/bin \
-		${WRKSRC}/usr/sbin -type f -print0 | ${XARGS} -0 ${FILE} \
-		| ${GREP} ELF | ${CUT} -d : -f 1 \
-		| ${XARGS} ${BRANDELF} -t Linux
+		slang-2.1.4-1.fc10${EXTRACT_SUFX} \
+		zlib-1.2.3-18.fc9${EXTRACT_SUFX}
+SRC_DISTFILES=	acl-2.2.47-3.fc10.src.rpm:SOURCE \
+		attr-2.4.43-1.fc10.src.rpm:SOURCE \
+		basesystem-10.0-1.src.rpm:SOURCE \
+		bash-3.2-29.fc10.src.rpm:SOURCE \
+		bzip2-1.0.5-3.fc10.src.rpm:SOURCE \
+		compat-db-4.6.21-5.fc10.src.rpm:SOURCE \
+		coreutils-6.12-17.fc10.src.rpm:SOURCE \
+		db4-4.7.25-5.fc10.src.rpm:SOURCE \
+		e2fsprogs-1.41.4-6.fc10.src.rpm:SOURCE \
+		elfutils-0.142-1.fc10.src.rpm:SOURCE \
+		fedora-release-10-1.src.rpm:SOURCE \
+		filesystem-2.4.19-1.fc10.src.rpm:SOURCE \
+		freetype-2.3.7-1.fc10.src.rpm:SOURCE \
+		gamin-0.1.9-6.fc10.src.rpm:SOURCE \
+		gcc-4.3.2-7.src.rpm:SOURCE \
+		gdbm-1.8.0-29.fc10.src.rpm:SOURCE \
+		glib-1.2.10-32.fc10.src.rpm:SOURCE \
+		glib2-2.18.2-3.fc10.src.rpm:SOURCE \
+		glibc-2.9-2.src.rpm:SOURCE \
+		gmp-4.2.2-8.fc10.src.rpm:SOURCE \
+		grep-2.5.1a-61.fc10.src.rpm:SOURCE \
+		keyutils-1.2-3.fc9.src.rpm:SOURCE \
+		krb5-1.6.3-16.fc10.src.rpm:SOURCE \
+		libcap-2.10-2.fc10.src.rpm:SOURCE \
+		libidn-0.6.14-8.src.rpm:SOURCE \
+		libselinux-2.0.73-1.fc10.src.rpm:SOURCE \
+		libsepol-2.0.33-1.fc10.src.rpm:SOURCE \
+		ncurses-5.6-20.20080927.fc10.src.rpm:SOURCE \
+		pcre-7.8-1.fc10.src.rpm:SOURCE \
+		readline-5.2-13.fc9.src.rpm:SOURCE \
+		setserial-2.17-22.fc9.src.rpm:SOURCE \
+		setup-2.7.4-1.fc10.src.rpm:SOURCE \
+		slang-2.1.4-1.fc10.src.rpm:SOURCE \
+		texinfo-4.12-4.fc10.src.rpm:SOURCE \
+		zlib-1.2.3-18.fc9.src.rpm:SOURCE
+
+CONFLICTS=	linux_base-gentoo* linux_base-fc4-[0-9]* linux_base-fc6-[0-9]* \
+		linux_base-f7-[0-9]* linux_base-f8-[0-9]* linux_base-f9-[0-9]* \
+		linux_base-c* linux-glib2-*
+ONLY_FOR_ARCHS=	i386 amd64
+PLIST_SUB=	LINUXBASE=${LINUXBASE}
+USES=		linux:f10
+USE_LINUX=	# empty
+USE_LINUX_RPM=	nolib
+
+REMOVE_DIRS=	boot etc/fonts home media root tmp var/log var/run var/tmp \
+		usr/local
+REMOVE_FILES=	bin/df bin/su etc/exports etc/group etc/localtime \
+		etc/motd etc/passwd etc/printcap etc/protocols etc/services \
+		usr/tmp
+
+post-patch:
+	@${RM} -r ${REMOVE_DIRS:S|^|${WRKSRC}/|}
+	@${RM} ${REMOVE_FILES:S|^|${WRKSRC}/|}
 	@${BRANDELF} -t Linux ${WRKSRC}/lib/ld-2.9.so
 
-# Restore the status quo for usr/bin/*db4* files
-#	@${CHMOD} u-w ${WRKSRC}/usr/bin/*db4*
-
-# Install locales
-	@${MV} ${WRKSRC}/usr/lib/locale/locale-archive.tmpl \
-		${WRKSRC}/usr/lib/locale/locale-archive
-
-do-install:
-#
-# Do install without using linux rpm system
-#
-	@cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;
-	@cd ${WRKSRC} && ${FIND} * ! -type d \
-		| ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX}
-
-	@${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp
-	@${LN} -sf ../usr/bin/[ ${STAGEDIR}${PREFIX}/bin/[
-	@${LN} -sf ../usr/bin/expr ${STAGEDIR}${PREFIX}/bin/expr
-	@${LN} -sf ../usr/bin/test ${STAGEDIR}${PREFIX}/bin/test
-	@${LN} -sf ../usr/bin/uuidgen ${STAGEDIR}${PREFIX}/bin/uuidgen
-	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/var/lock ${STAGEDIR}${PREFIX}/var/spool/mail
-#
-# Let some linux applications (e.g. print/acroread8) print with default settings
-#
-	@${INSTALL_SCRIPT} ${FILESDIR}/lp ${STAGEDIR}${PREFIX}/usr/bin
-
-.include <bsd.port.post.mk>
+post-install:
+	${TOUCH} ${STAGEDIR}${PREFIX}/etc/mtab
+	${MV} ${STAGEDIR}${PREFIX}/etc/krb5.conf \
+		${STAGEDIR}${PREFIX}/etc/krb5.conf.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/nsswitch.conf \
+		${STAGEDIR}${PREFIX}/etc/nsswitch.conf.sample
+	${MV} ${STAGEDIR}${PREFIX}/usr/lib/locale/locale-archive.tmpl \
+		${STAGEDIR}${PREFIX}/usr/lib/locale/locale-archive
+	${LN} -sf /tmp ${STAGEDIR}${PREFIX}/dev/shm
+	${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp
+	${LN} -sf ../usr/bin/[ ${STAGEDIR}${PREFIX}/bin/[
+	${LN} -sf ../usr/bin/expr ${STAGEDIR}${PREFIX}/bin/expr
+	${LN} -sf ../usr/bin/test ${STAGEDIR}${PREFIX}/bin/test
+	${LN} -sf ../usr/bin/uuidgen ${STAGEDIR}${PREFIX}/bin/uuidgen
+
+.include <bsd.port.mk>
diff --git a/emulators/linux_base-f10/files/lp b/emulators/linux_base-f10/files/lp
deleted file mode 100644
index d1e0b5509eed..000000000000
--- a/emulators/linux_base-f10/files/lp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh -
-exec /usr/bin/lpr "$@"
diff --git a/emulators/linux_base-f10/files/yp.conf.sample b/emulators/linux_base-f10/files/yp.conf.sample
deleted file mode 100644
index 64faed4de3fa..000000000000
--- a/emulators/linux_base-f10/files/yp.conf.sample
+++ /dev/null
@@ -1,15 +0,0 @@
-# sample yp.conf file
-#
-# Legal entries are:
-#
-#	domainname <domain>		Override the default YP domain
-#					(If not set uses the one from
-#					the getdomainname() syscall)
-#
-#	ypserver <grape> [<domain>]	Define which host to contact
-#					for YP service. If the <domain>
-#					argument is included then this
-#					host service the specified YP
-#					domain.
-#domainname	my.domain
-#ypserver	localhost
diff --git a/emulators/linux_base-f10/pkg-deinstall b/emulators/linux_base-f10/pkg-deinstall
deleted file mode 100644
index 176d678141fc..000000000000
--- a/emulators/linux_base-f10/pkg-deinstall
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# a deinstallation script for linux_base
-
-case "$2" in
-DEINSTALL)
-	if [ -n "`mount | grep ^linproc`" ] || \
-		[ -d /compat/linux/proc ]; then
-		echo ""
-		echo "You may need to do by hand:"
-		echo "  o  unmount linprocfs if mounted"
-		echo "  o  delete ${PKG_PREFIX}/proc if present"
-		echo "  o  remove/comment linprocfs from /etc/fstab if present"
-		echo ""
-	fi
-	;;
-esac
-
-exit 0
diff --git a/emulators/linux_base-f10/pkg-descr b/emulators/linux_base-f10/pkg-descr
index c3076e385445..c0a15f625d53 100644
--- a/emulators/linux_base-f10/pkg-descr
+++ b/emulators/linux_base-f10/pkg-descr
@@ -5,10 +5,3 @@ provide a nice user experience by using the FreeBSD configuration for
 corresponding Linux stuff where possible. Because of this any work which
 needs to chroot into the Linux base may not work as expected (no fallthrough
 to the FreeBSD config possible).
-
-This port is only available for the i386/amd64 architecture (i386/32 bit mode).
-
-If you want to run X11 applications, install the x11/linux-xorg-libs port.
-
-For cross-development this port is not suitable, you should use a linux_dist
-port instead in this case.
diff --git a/emulators/linux_base-f10/pkg-install b/emulators/linux_base-f10/pkg-install
deleted file mode 100644
index 29a79d65e682..000000000000
--- a/emulators/linux_base-f10/pkg-install
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# an installation script for linux_base
-
-case "$2" in
-PRE-INSTALL)
-	if [ "`/sbin/sysctl -n compat.linux.osrelease`"x = "x" ]; then
-		echo 'linuxulator is not (kld)loaded, exiting'
-		exit 1
-	fi
-	;;
-POST-INSTALL)
-	if [ -z "`grep ^linproc /etc/fstab`" ]; then
-		echo ''
-		echo '+++ Some programs may need linprocfs, please add it to /etc/fstab! +++'
-	else
-		if [ -z "`mount | grep -w ^linprocfs`" ]; then
-			echo ''
-			echo '+++ Please mount linprocfs manually! +++'
-		fi
-	fi
-	if [ ! -f ${PKG_PREFIX}/etc/nsswitch.conf ]; then
-		cp ${PKG_PREFIX}/etc/nsswitch.conf.dist \
-			${PKG_PREFIX}/etc/nsswitch.conf
-	fi
-	if [ ! -f ${PKG_PREFIX}/etc/krb5.conf ]; then
-		
-		if [ -f /etc/krb5.conf ]; then
-			ln -s /etc/krb5.conf ${PKG_PREFIX}/etc
-		else
-			cp ${PKG_PREFIX}/etc/krb5.conf.dist \
-				${PKG_PREFIX}/etc/krb5.conf
-		fi
-
-	fi
-	if [ ! -f ${PKG_PREFIX}/etc/yp.conf ]; then
-		cp ${PKG_PREFIX}/etc/yp.conf.sample ${PKG_PREFIX}/etc/yp.conf
-	fi
-#
-# This is needed when updating to ensure that already installed libraries
-# are recorded in ${PKG_PREFIX}/etc/ld.so.cache
-#
-	echo ''
-	echo 'Running linux ldconfig...'
-	${PKG_PREFIX}/sbin/ldconfig -r ${PKG_PREFIX}
-	;;
-esac
-
-exit 0
diff --git a/emulators/linux_base-f10/pkg-message b/emulators/linux_base-f10/pkg-message
index 09499e314444..0801cdb665d8 100644
--- a/emulators/linux_base-f10/pkg-message
+++ b/emulators/linux_base-f10/pkg-message
@@ -1,29 +1,6 @@
-This software is based in part on the work of the FreeType Team.
-See <URL:http://www.freetype.org/>.
+Some programs need linprocfs mounted on /compat/linux/proc.  Add the following
+line to /etc/fstab:
 
-Installation of the Linux base system is finished. The Linux kernel
-mode, which must be enabled for Linux binaries to run, is now
-enabled. Linux mode can be enabled permanently with the linux_enable
-variable of rc.conf(5).
+linprocfs   /compat/linux/proc	linprocfs	rw	0	0
 
-If you want to use shared memory in Linux applications, you need to set up
-a link from /dev/shm to a suitable place, e.g. by adding the following line
-to /etc/devfs.conf (takes effect on each boot):
-	link /tmp shm
-
-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
-
-WARNING: doing work which needs to chroot into the linux base may not work.
-In such cases (e.g. cross-development) you are better suited with a linux_dist
-port.
+Then run "mount linprocfs".
diff --git a/emulators/linux_base-f10/pkg-plist b/emulators/linux_base-f10/pkg-plist
index ea7f88e49648..815e98a695f1 100644
--- a/emulators/linux_base-f10/pkg-plist
+++ b/emulators/linux_base-f10/pkg-plist
@@ -1,4 +1,4 @@
-@comment file listing
+@preexec [ -n "`/sbin/sysctl -q compat.linux.osrelease`" ] || ( echo "Cannot install package: kernel missing Linux support"; exit 1 )
 bin/[
 bin/arch
 bin/basename
@@ -41,6 +41,7 @@ bin/true
 bin/uname
 bin/unlink
 bin/uuidgen
+dev/shm
 etc/DIR_COLORS
 etc/DIR_COLORS.256color
 etc/DIR_COLORS.xterm
@@ -58,14 +59,12 @@ etc/hosts.deny
 etc/inputrc
 etc/issue
 etc/issue.net
-@unexec if cmp -s %D/etc/krb5.conf.dist %D/etc/krb5.conf; then rm -f %D/etc/krb5.conf; fi
-etc/krb5.conf.dist
-etc/ld.so.cache
+@sample etc/krb5.conf.sample
+@rmtry etc/ld.so.cache
 etc/ld.so.conf
 etc/mke2fs.conf
 etc/mtab
-@unexec if cmp -s %D/etc/nsswitch.conf.dist %D/etc/nsswitch.conf; then rm -f %D/etc/nsswitch.conf; fi
-etc/nsswitch.conf.dist
+@sample etc/nsswitch.conf.sample
 etc/pam.d/runuser
 etc/pam.d/runuser-l
 etc/pam.d/su
@@ -101,8 +100,6 @@ etc/skel/.bash_profile
 etc/skel/.bashrc
 etc/system-release
 etc/system-release-cpe
-@unexec if cmp -s %D/etc/yp.conf.sample %D/etc/yp.conf; then rm -f %D/etc/yp.conf; fi
-etc/yp.conf.sample
 etc/yum.repos.d/fedora-rawhide.repo
 etc/yum.repos.d/fedora-updates-testing.repo
 etc/yum.repos.d/fedora-updates.repo
@@ -296,7 +293,6 @@ usr/bin/lddlibc4
 usr/bin/locale
 usr/bin/localedef
 usr/bin/logname
-usr/bin/lp
 usr/bin/lsattr
 usr/bin/md5sum
 usr/bin/mkfifo
@@ -2011,9 +2007,7 @@ usr/share/man/man8/setserial.8.gz
 usr/share/man/man8/tune2fs.8.gz
 usr/tmp
 var/mail
-@dir %%LINUXBASE%%
 @rmtry var/cache/ldconfig/aux-cache
-@comment empty directory listing
 @dir var/yp
 @dir var/spool/mail
 @dir var/spool/lpd
@@ -2077,7 +2071,6 @@ var/mail
 @dir usr/share/locale/vo/LC_MESSAGES
 @dir usr/share/locale/ve/LC_MESSAGES
 @dir usr/share/locale/vai/LC_MESSAGES
-@dir usr/share/locale/uz@cyrillic/LC_MESSAGES
 @dir usr/share/locale/uz@Latn/LC_MESSAGES
 @dir usr/share/locale/uz/LC_MESSAGES
 @dir usr/share/locale/ur/LC_MESSAGES
@@ -2126,7 +2119,6 @@ var/mail
 @dir usr/share/locale/ss/LC_MESSAGES
 @dir usr/share/locale/srr/LC_MESSAGES
 @dir usr/share/locale/srn/LC_MESSAGES
-@dir usr/share/locale/sr@Latn/LC_MESSAGES
 @dir usr/share/locale/sq_AL/LC_MESSAGES
 @dir usr/share/locale/son/LC_MESSAGES
 @dir usr/share/locale/sog/LC_MESSAGES
@@ -2458,7 +2450,6 @@ var/mail
 @dir usr/share/locale/cad/LC_MESSAGES
 @dir usr/share/locale/ca_ES@valencian/LC_MESSAGES
 @dir usr/share/locale/ca_ES/LC_MESSAGES
-@dir usr/share/locale/ca@valencia/LC_MESSAGES
 @dir usr/share/locale/byn/LC_MESSAGES
 @dir usr/share/locale/bug/LC_MESSAGES
 @dir usr/share/locale/bua/LC_MESSAGES
@@ -2537,11 +2528,6 @@ var/mail
 @dir usr/include
 @dir usr/games
 @dir usr/etc
-@dir usr/X11R6/share
-@dir usr/X11R6/man
-@dir usr/X11R6/lib/tls
-@dir usr/X11R6/include
-@dir usr/X11R6/bin
 @dir sys
 @dir srv
 @dir selinux
@@ -2559,3 +2545,5 @@ var/mail
 @dir etc/blkid
 @dir etc/X11/fontpath.d
 @dir etc/X11/applnk
+@dir %%LINUXBASE%%
+@postexec %D/sbin/ldconfig
diff --git a/emulators/rtc/Makefile b/emulators/rtc/Makefile
index d18b4df42cca..3a48f4f31b37 100644
--- a/emulators/rtc/Makefile
+++ b/emulators/rtc/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Kernel module which provides /dev/rtc device support
 WRKSRC=		${WRKDIR}/files
 
 NO_FETCH=	yes
-USE_LINUX=	yes	# because of ${DEVDIR}
 
 KMODDIR=	${PREFIX}/modules
 
@@ -26,7 +25,7 @@ MAKE_ARGS=	KMODDIR="${KMODDIR}" CDEV_MAJOR="${CDEV_MAJOR}"
 PLIST_SUB=	DEVDIR="${DEVDIR}" CDEV_MAJOR="${CDEV_MAJOR}" \
 		RTC_H_DIR="${RTC_H_DIR}"
 
-USES=		kmod uidfix
+USES=		kmod linux uidfix
 
 do-extract:
 	@${MKDIR} ${WRKSRC}