- 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)

305 files changed, 2410 insertions, 4195 deletions

diff --git a/Mk/Scripts/functions.sh b/Mk/Scripts/functions.sh
index 7c6122a..24bfd55 100644
--- a/Mk/Scripts/functions.sh
+++ b/Mk/Scripts/functions.sh
@@ -180,7 +180,6 @@ export_ports_env() {
 		ARCH \
 		CONFIGURE_MAX_CMD_LEN \
 		HAVE_COMPAT_IA32_KERN \
-		LINUX_OSRELEASE \
 		OPSYS \
 		OSREL \
 		OSVERSION \
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
new file mode 100644
index 0000000..90f081b
--- /dev/null
+++ b/Mk/Uses/linux.mk
@@ -0,0 +1,277 @@
+# $FreeBSD$
+#
+# Ports Linux compatibility framework
+#
+# Feature:	linux:args
+# Usage:	USES=linux or USES=linux:args
+# Valid args:	f10	Depend on Fedora 10 packages (deprecated)
+#		c6	Depend on CentOS 6 packages (default)
+#		c7	Depend on CentOS 7 packages
+# Additional variables:
+# USE_LINUX	List of Linux packages to depend on.
+# USE_LINUX_RPM	When defined, additional variables and targets useful to Linux
+#		infrastructure ports are made available.  Possible values:
+#		yes	Default LIB_DISTFILES and empty BIN_DISTFILES.
+#		nolib	Default BIN_DISTFILES and empty LIB_DISTFILES.
+# Additional variables when USE_LINUX_RPM is defined:
+# BIN_DISTFILES	List of distfiles to install.
+# LIB_DISTFILES	List of distfiles to install both the 32 and 64 bit version of.
+# SRC_DISTFILES	List of source distfiles that need to be distributed with
+#		binary packages to comply with some licenses.
+#
+# MAINTAINER: emulation@FreeBSD.org
+
+.ifndef _INCLUDE_USES_LINUX_MK
+_INCLUDE_USES_LINUX_MK=	yes
+_USES_POST+=		linux
+
+.if empty(linux_ARGS)
+linux_ARGS=		${LINUX_DEFAULT:S/_64//}
+.endif
+
+.if ${linux_ARGS} == f10
+LINUX_DIST_VER?=	10
+.elif ${linux_ARGS} == c6
+LINUX_DIST_VER?=	6.8
+.elif ${linux_ARGS} == c7
+LINUX_DIST_VER?=	7.2.1511
+.else
+IGNORE=			Invalid Linux distribution: ${linux_ARGS}
+.endif
+
+.if ${linux_ARGS} == f10
+LINUX_ARCH=		i386
+DEPRECATED=		Fedora 10 is unsupported and vulnerable
+EXPIRATION_DATE=	2016-12-31
+.else
+.if ${LINUX_DEFAULT:M*_64}
+LINUX_ARCH=		x86_64
+.if ${ARCH} != amd64 || ${OPSYS} != FreeBSD || ${OSVERSION} < 1002507 \
+ || ( ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100105 )
+IGNORE=			Linux ${LINUX_DEFAULT} only supported on FreeBSD/amd64 10.3 or higher
+.endif
+.else
+LINUX_ARCH=		i386
+.endif
+.endif
+
+linux_allegro_DEP=		linux-${linux_ARGS}-allegro>0:devel/linux-${linux_ARGS}-allegro
+linux_alsa-plugins-oss_DEP=	linux-${linux_ARGS}-alsa-plugins-oss>0:audio/linux-${linux_ARGS}-alsa-plugins-oss
+linux_alsa-plugins-pulseaudio_DEP=linux-${linux_ARGS}-alsa-plugins-pulseaudio>0:audio/linux-${linux_ARGS}-alsa-plugins-pulseaudio
+linux_alsalib_DEP=		linux-${linux_ARGS}-alsa-lib>0:audio/linux-${linux_ARGS}-alsa-lib
+linux_arts_DEP=			linux-${linux_ARGS}-arts>0:audio/linux-${linux_ARGS}-arts
+linux_atk_DEP=			linux-${linux_ARGS}-atk>0:accessibility/linux-${linux_ARGS}-atk
+linux_avahi-libs_DEP=		linux-${linux_ARGS}-avahi-libs>0:net/linux-${linux_ARGS}-avahi-libs
+linux_base_DEP=			linux_base-${linux_ARGS}>0:emulators/linux_base-${linux_ARGS}
+linux_cairo_DEP=		linux-${linux_ARGS}-cairo>0:graphics/linux-${linux_ARGS}-cairo
+linux_cups-libs_DEP=		linux-${linux_ARGS}-cups-libs>0:print/linux-${linux_ARGS}-cups-libs
+linux_curl_DEP=			linux-${linux_ARGS}-curl>0:ftp/linux-${linux_ARGS}-curl
+linux_cyrus-sasl2_DEP=		linux-${linux_ARGS}-cyrus-sasl2>0:security/linux-${linux_ARGS}-cyrus-sasl2
+linux_dbusglib_DEP=		linux-${linux_ARGS}-dbus-glib>0:devel/linux-${linux_ARGS}-dbus-glib
+linux_dbuslibs_DEP=		linux-${linux_ARGS}-dbus-libs>0:devel/linux-${linux_ARGS}-dbus-libs
+linux_devtools_DEP=		linux-${linux_ARGS}-devtools>0:devel/linux-${linux_ARGS}-devtools
+linux_dri_DEP=			linux-${linux_ARGS}-dri>0:graphics/linux-${linux_ARGS}-dri
+linux_esound_DEP=		linux-${linux_ARGS}-esound>0:audio/linux-${linux_ARGS}-esound
+linux_expat_DEP=		linux-${linux_ARGS}-expat>0:textproc/linux-${linux_ARGS}-expat
+linux_flac_DEP=			linux-${linux_ARGS}-flac>0:audio/linux-${linux_ARGS}-flac
+linux_fontconfig_DEP=		linux-${linux_ARGS}-fontconfig>0:x11-fonts/linux-${linux_ARGS}-fontconfig
+.if ${linux_ARGS:Mf10}
+linux_gdkpixbuf2_DEP=		linux-${linux_ARGS}-gtk2>0:x11-toolkits/linux-${linux_ARGS}-gtk2
+.else
+linux_gdkpixbuf2_DEP=		linux-${linux_ARGS}-gdk-pixbuf2>0:graphics/linux-${linux_ARGS}-gdk-pixbuf2
+.endif
+linux_gnutls_DEP=		linux-${linux_ARGS}-gnutls>0:security/linux-${linux_ARGS}-gnutls
+linux_gtk2_DEP=			linux-${linux_ARGS}-gtk2>0:x11-toolkits/linux-${linux_ARGS}-gtk2
+linux_hicontheme_DEP=		linux-${linux_ARGS}-hicolor-icon-theme>0:x11-themes/linux-${linux_ARGS}-hicolor-icon-theme
+linux_jasper_DEP=		linux-${linux_ARGS}-jasper>0:graphics/linux-${linux_ARGS}-jasper
+linux_jpeg_DEP=			linux-${linux_ARGS}-jpeg>0:graphics/linux-${linux_ARGS}-jpeg
+linux_libasyncns_DEP=		linux-${linux_ARGS}-libasyncns>0:dns/linux-${linux_ARGS}-libasyncns
+linux_libaudiofile_DEP=		linux-${linux_ARGS}-libaudiofile>0:audio/linux-${linux_ARGS}-libaudiofile
+linux_libgcrypt_DEP=		linux-${linux_ARGS}-libgcrypt>0:security/linux-${linux_ARGS}-libgcrypt
+linux_libgfortran_DEP=		linux-${linux_ARGS}-libgfortran>0:devel/linux-${linux_ARGS}-libgfortran
+linux_libglu_DEP=		linux-${linux_ARGS}-libGLU>0:graphics/linux-${linux_ARGS}-libGLU
+linux_libgpg-error_DEP=		linux-${linux_ARGS}-libgpg-error>0:security/linux-${linux_ARGS}-libgpg-error
+linux_libmng_DEP=		linux-${linux_ARGS}-libmng>0:graphics/linux-${linux_ARGS}-libmng
+linux_libogg_DEP=		linux-${linux_ARGS}-libogg>0:audio/linux-${linux_ARGS}-libogg
+linux_libpciaccess_DEP=		linux-${linux_ARGS}-libpciaccess>0:devel/linux-${linux_ARGS}-libpciaccess
+linux_libsndfile_DEP=		linux-${linux_ARGS}-libsndfile>0:audio/linux-${linux_ARGS}-libsndfile
+linux_libssh2_DEP=		linux-${linux_ARGS}-libssh2>0:security/linux-${linux_ARGS}-libssh2
+linux_libtasn1_DEP=		linux-${linux_ARGS}-libtasn1>0:security/linux-${linux_ARGS}-libtasn1
+linux_libthai_DEP=		linux-${linux_ARGS}-libthai>0:devel/linux-${linux_ARGS}-libthai
+linux_libtheora_DEP=		linux-${linux_ARGS}-libtheora>0:multimedia/linux-${linux_ARGS}-libtheora
+linux_libv4l_DEP=		linux-${linux_ARGS}-libv4l>0:multimedia/linux-${linux_ARGS}-libv4l
+linux_libvorbis_DEP=		linux-${linux_ARGS}-libvorbis>0:audio/linux-${linux_ARGS}-libvorbis
+linux_libxml2_DEP=		linux-${linux_ARGS}-libxml2>0:textproc/linux-${linux_ARGS}-libxml2
+linux_mikmod_DEP=		linux-${linux_ARGS}-mikmod>0:audio/linux-${linux_ARGS}-mikmod
+linux_naslibs_DEP=		linux-${linux_ARGS}-nas-libs>0:audio/linux-${linux_ARGS}-nas-libs
+linux_ncurses-base_DEP=		linux-${linux_ARGS}-ncurses-base>0:devel/linux-${linux_ARGS}-ncurses-base
+linux_nspr_DEP=			linux-${linux_ARGS}-nspr>0:devel/linux-${linux_ARGS}-nspr
+linux_nss_DEP=			linux-${linux_ARGS}-nss>0:security/linux-${linux_ARGS}-nss
+linux_openal_DEP=		linux-${linux_ARGS}-openal>0:audio/linux-${linux_ARGS}-openal
+linux_openal-soft_DEP=		linux-${linux_ARGS}-openal-soft>0:audio/linux-${linux_ARGS}-openal-soft
+linux_openldap_DEP=		linux-${linux_ARGS}-openldap>0:net/linux-${linux_ARGS}-openldap
+linux_openmotif_DEP=		linux-${linux_ARGS}-openmotif>0:x11-toolkits/linux-${linux_ARGS}-openmotif
+linux_openssl_DEP=		linux-${linux_ARGS}-openssl>0:security/linux-${linux_ARGS}-openssl
+linux_openssl-compat_DEP=	linux-${linux_ARGS}-openssl-compat>0:security/linux-${linux_ARGS}-openssl-compat
+linux_pango_DEP=		linux-${linux_ARGS}-pango>0:x11-toolkits/linux-${linux_ARGS}-pango
+linux_pixman_DEP=		linux-${linux_ARGS}-pixman>0:x11/linux-${linux_ARGS}-pixman
+linux_png_DEP=			linux-${linux_ARGS}-png>0:graphics/linux-${linux_ARGS}-png
+linux_pulseaudio-libs_DEP=	linux-${linux_ARGS}-pulseaudio-libs>0:audio/linux-${linux_ARGS}-pulseaudio-libs
+linux_qt47_DEP=			linux-${linux_ARGS}-qt47>0:devel/linux-${linux_ARGS}-qt47
+linux_qt47-webkit_DEP=		linux-${linux_ARGS}-qt47-webkit>0:www/linux-${linux_ARGS}-qt47-webkit
+linux_qt47-x11_DEP=		linux-${linux_ARGS}-qt47-x11>0:x11-toolkits/linux-${linux_ARGS}-qt47-x11
+linux_scimlibs_DEP=		linux-${linux_ARGS}-scim-libs>0:textproc/linux-${linux_ARGS}-scim-libs
+linux_sdl12_DEP=		linux-${linux_ARGS}-sdl>0:devel/linux-${linux_ARGS}-sdl12
+linux_sdlimage_DEP=		linux-${linux_ARGS}-sdl_image>0:graphics/linux-${linux_ARGS}-sdl_image
+linux_sdlmixer_DEP=		linux-${linux_ARGS}-sdl_mixer>0:audio/linux-${linux_ARGS}-sdl_mixer
+.if ${linux_ARGS:Mf10}
+linux_sqlite3_DEP=		linux-${linux_ARGS}-sqlite3>0:databases/linux-${linux_ARGS}-sqlite3
+.else
+linux_sqlite3_DEP=		linux-${linux_ARGS}-sqlite>0:databases/linux-${linux_ARGS}-sqlite3
+.endif
+linux_tcl85_DEP=		linux-${linux_ARGS}-tcl85>0:lang/linux-${linux_ARGS}-tcl85
+linux_tcp_wrappers-libs_DEP=	linux-${linux_ARGS}-tcp_wrappers-libs>0:net/linux-${linux_ARGS}-tcp_wrappers-libs
+linux_tiff_DEP=			linux-${linux_ARGS}-tiff>0:graphics/linux-${linux_ARGS}-tiff
+linux_tk85_DEP=			linux-${linux_ARGS}-tk85>0:x11-toolkits/linux-${linux_ARGS}-tk85
+linux_ucl_DEP=			linux-${linux_ARGS}-ucl>0:archivers/linux-${linux_ARGS}-ucl
+linux_xorglibs_DEP=		linux-${linux_ARGS}-xorg-libs>0:x11/linux-${linux_ARGS}-xorg-libs
+
+USE_LINUX?=		base
+.for i in ${USE_LINUX}
+_i:=			${i:C/\:.*//}
+_i_args:=		${i:C/^[^\:]*(\:|\$)//:S/,/ /g}
+.if ${_i_args:Mpatch}
+PATCH_DEPENDS+=		${linux_${_i}_DEP}
+.endif
+.if ${_i_args:Mbuild}
+BUILD_DEPENDS+=		${linux_${_i}_DEP}
+.endif
+.if ${_i_args:Mrun} || empty(_i_args)
+RUN_DEPENDS+=		${linux_${_i}_DEP}
+.endif
+.endfor
+
+.ifdef USE_LINUX_RPM
+
+DISTVERSIONSUFFIX?=	-${RPMVERSION}
+
+.if ${linux_ARGS} == f10
+
+.ifndef MASTER_SITES
+MASTER_SITES=		${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITE_SUBDIR=	releases/${LINUX_DIST_VER}/Everything/${LINUX_ARCH}/os/Packages \
+			updates/${LINUX_DIST_VER}/${LINUX_ARCH} \
+			releases/${LINUX_DIST_VER}/Everything/source/SRPMS/:SOURCE \
+			updates/${LINUX_DIST_VER}/SRPMS/:SOURCE
+.endif
+DIST_SUBDIR?=		rpm/${LINUX_ARCH}/fedora/${LINUX_DIST_VER}
+
+LINUX_RPM_ARCH?=	i386
+
+.elif ${linux_ARGS} == c6
+
+.ifndef MASTER_SITES
+MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}
+MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/${LINUX_ARCH}/Packages \
+			centos/${LINUX_DIST_VER}/updates/${LINUX_ARCH}/Packages \
+			centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
+			centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
+.endif
+DIST_SUBDIR?=		rpm/${LINUX_RPM_ARCH}/centos/${LINUX_DIST_VER}
+
+.if ${LINUX_ARCH} == x86_64
+LINUX_RPM_ARCH?=	x86_64
+LINUX_RPM_ARCH32?=	i686
+.else
+LINUX_RPM_ARCH?=	i686
+.endif
+
+.elif ${linux_ARGS} == c7
+
+.ifndef MASTER_SITES
+MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}
+.if ${LINUX_ARCH} == x86_64
+MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/${LINUX_ARCH}/Packages \
+			centos/${LINUX_DIST_VER}/updates/${LINUX_ARCH}/Packages
+.else
+MASTER_SITE_SUBDIR=	altarch/${LINUX_DIST_VER}/os/${LINUX_ARCH}/Packages \
+			altarch/${LINUX_DIST_VER}/updates/${LINUX_ARCH}/Packages
+.endif
+MASTER_SITE_SUBDIR+=	centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
+			centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
+.endif
+DIST_SUBDIR?=		rpm/centos/${LINUX_DIST_VER}/${LINUX_ARCH}
+
+.if ${LINUX_ARCH} == x86_64
+LINUX_RPM_ARCH?=	x86_64
+LINUX_RPM_ARCH32?=	i686
+.else
+LINUX_RPM_ARCH?=	i686
+.endif
+
+.endif # ${linux_ARGS} == *
+
+PKGNAMEPREFIX?=		linux-${linux_ARGS}-
+EXTRACT_SUFX?=		.${LINUX_RPM_ARCH}.rpm
+.ifdef LINUX_RPM_ARCH32
+EXTRACT_SUFX32?=	.${LINUX_RPM_ARCH32}.rpm
+.endif
+SRC_SUFX?=		.src.rpm
+
+NO_BUILD=		yes
+NO_WRKSUBDIR=		yes
+USE_LINUX_PREFIX=	yes
+
+.endif # USE_LINUX_RPM
+
+.endif # ! _INCLUDE_USES_LINUX_MK
+
+.ifdef _POSTMKINCLUDED && ! _INCLUDE_USES_LINUX_POST_MK
+_INCLUDE_USES_LINUX_POST_MK=	yes
+
+.ifdef USE_LINUX_RPM
+
+.if ${USE_LINUX_RPM} == nolib
+BIN_DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
+.else
+LIB_DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
+.endif
+.ifdef LINUX_RPM_ARCH32
+DISTFILES?=		${LIB_DISTFILES:S/${EXTRACT_SUFX}/${EXTRACT_SUFX32}/} \
+			${LIB_DISTFILES} ${BIN_DISTFILES}
+EXTRACT_ONLY?=		${LIB_DISTFILES:S/${EXTRACT_SUFX}/${EXTRACT_SUFX32}/} \
+			${LIB_DISTFILES} ${BIN_DISTFILES}
+.else
+DISTFILES?=		${LIB_DISTFILES} ${BIN_DISTFILES}
+EXTRACT_ONLY?=		${LIB_DISTFILES} ${BIN_DISTFILES}
+.endif
+.ifdef PACKAGE_BUILDING
+SRC_DISTFILES?=		${LIB_DISTFILES:S/${EXTRACT_SUFX}/${SRC_SUFX}:SOURCE/} \
+			${BIN_DISTFILES:S/${EXTRACT_SUFX}/${SRC_SUFX}:SOURCE/}
+DISTFILES+=		${SRC_DISTFILES}
+ALWAYS_KEEP_DISTFILES=	yes
+.endif
+
+DISTINFO_FILE?=		${MASTERDIR}/distinfo.${LINUX_ARCH}
+
+.ifdef USE_LINUX_RPM_BAD_PERMS
+EXTRACT_DEPENDS+=	rpm2archive:archivers/rpm4
+EXTRACT_CMD=		rpm2archive
+EXTRACT_BEFORE_ARGS=	<
+EXTRACT_AFTER_ARGS=	| ${TAR} xf - --no-same-owner --no-same-permissions
+.endif
+
+ONLY_FOR_ARCHS?=	i386 amd64
+.if ${linux_ARGS} != f10
+PLIST?=			${PKGDIR}/pkg-plist.${LINUX_ARCH}
+.endif
+
+.if !target(do-install)
+do-install:
+	(cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;)
+	(cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm ${STAGEDIR}${PREFIX})
+.endif
+
+.endif # USE_LINUX_RPM
+
+.endif # _POSTMKINCLUDED && ! _INCLUDE_USES_LINUX_POST_MK
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 28b4ad4..0a9d0dd 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -32,6 +32,12 @@ FPC_DEFAULT?=		3.0.0
 GCC_DEFAULT?=		4.8
 # Possible values: 7, 8, 9, agpl
 GHOSTSCRIPT_DEFAULT?=	agpl
+# Possible values: f10, c6, c6_64, c7, c7_64
+LINUX_DEFAULT?=		c6
+.if defined(OVERRIDE_LINUX_BASE_PORT)
+LINUX_DEFAULT:=		${OVERRIDE_LINUX_BASE_PORT}
+WARNING+=		"OVERRIDE_LINUX_BASE_PORT is deprecated, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}."
+.endif
 # Possible values: 5.1, 5.2, 5.3
 LUA_DEFAULT?=		5.2
 # Possible values: 5.1, 5.5, 5.6, 5.7, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p
diff --git a/Mk/bsd.linux-apps.mk b/Mk/bsd.linux-apps.mk
deleted file mode 100644
index 98a7a8c..0000000
--- a/Mk/bsd.linux-apps.mk
+++ /dev/null
@@ -1,633 +0,0 @@
-#-*- tab-width: 4; -*-
-# ex:ts=4
-#
-# $FreeBSD$
-#
-# Please view me with 4 column tabs!
-
-# This section defines possible names of linux infrastructure ports
-# (components) and all information necessary for ports to use those components.
-# 
-# Ports can use this as follows:
-#
-# USE_LINUX_APPS=	esound xorglibs
-#
-# .include <bsd.port.mk>
-#
-# As a result proper RUN_DEPENDS will be added.
-#
-# Variables:
-# LINUX_DIST_SUFFIX	- Contains the value which is added to a port's name
-#					  (i.e. linux<this_variable>-port ) to get the right
-#					  linux infrastructure port.
-# _ALL_LINUX_APPS	- A (sorted) list of all linux infrastructure ports
-#					  (components), covered here.
-# OVERRIDE_LINUX_NONBASE_PORTS
-#			- This specifies a none-default linux infrastructure ports to use.
-#					  The valid value is "f10" to use Linux Fedora 10 ports.
-#					  This is an user-only variable. Don't use it in any port,
-#					  it's meant to be used in make.conf.
-
-.if !defined(_POSTMKINCLUDED) && !defined(Linux_APPS_Pre_Include)
-
-Linux_APPS_Include_MAINTAINER=	emulation@FreeBSD.org
-Linux_APPS_Pre_Include=			bsd.linux-apps.mk
-
-.endif
-
-.if defined(_POSTMKINCLUDED) && !defined(Linux_APPS_Post_Include)
-
-Linux_APPS_Post_Include=	bsd.linux-apps.mk
-
-#new
-. if defined(OVERRIDE_LINUX_NONBASE_PORTS)
-.        if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64"
-LINUX_DIST_SUFFIX=      -${OVERRIDE_LINUX_NONBASE_PORTS}
-LINUX_BASEPORT_NAME=	-${OVERRIDE_LINUX_NONBASE_PORTS:S/_64//}
-.        else
-IGNORE=         valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"f10\", \"c6\", and \"c6_64\"
-.        endif
-. elif defined(USE_LINUX)
-LINUX_DIST_SUFFIX=      -${USE_LINUX}
-LINUX_BASEPORT_NAME=	-${USE_LINUX:S/_64//}
-.  else
-# default to CentOS
-LINUX_DIST_SUFFIX=      -c6
-LINUX_BASEPORT_NAME=	-c6
-.  endif
-
-WEB_AUTH=			nvu
-
-# Non-version specific components
-_LINUX_APPS_ALL=	allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \
-					arts aspell atk avahi-libs cairo cups-libs curl dri devtools esound expat \
-					flac fontconfig freealut gdkpixbuf gdkpixbuf2 gnutls gtk2 hicontheme imlib jasper jpeg libaudiofile \
-					libasyncns libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \
-					libpciaccess libsigcpp20 libsndfile libtasn1 libthai libtheora libvorbis libxml2 mikmod \
-					naslibs ncurses-base openal openmotif openssl openssl-compat pango pixman png \
-					pulseaudio-libs scimgtk scimlibs sdl12 sdlimage sdlmixer sdlttf tiff \
-					tcp_wrappers-libs xorglibs ucl ungif upx webauth
-
-# 2.6.16 components
-_LINUX_26_APPS=		 blt cyrus-sasl2 dbusglib dbuslibs \
-			libidn libssh2 libv4l nspr nss openal-soft \
-			openldap qt45 sqlite3 tcl85 tk85 qt47 qt47-x11 qt47-webkit
-
-_LINUX_APPS_ALL+=	${_LINUX_26_APPS}
-
-# Component definition section
-#
-# component${LINUX_DIST_SUFFIX:S/-/_/}_FILE
-#					- Variables are used to name a file to check,
-#					  file names may differ for different LINUX_DIST_SUFFIX.
-#					  The value is LINUX_DIST_SUFFIX without the leading dash.
-# component_DETECT	- The resulting file to check for a dependency existence.
-# component_PORT	- A port which will be used to install a missing dependency.
-# component_DEPENDS	- A list of components the current component depends on.
-
-allegro_f10_FILE=	${LINUXBASE}/usr/lib/liballeg-4.2.2.so
-#FIXME: locate weird location for allegro c6 libs
-allegro_DETECT=		${allegro${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-allegro_PORT=		devel/linux${LINUX_BASEPORT_NAME}-allegro
-allegro_DEPENDS=	xorglibs
-
-alsa-plugins-oss_f10_FILE=	${LINUXBASE}/usr/lib/alsa-lib/libasound_module_pcm_oss.so
-alsa-plugins-oss_c6_FILE=	${LINUXBASE}/usr/lib/alsa-lib/libasound_module_pcm_oss.so
-alsa-plugins-oss_c6_64_FILE=	${LINUXBASE}/usr/lib64/alsa-lib/libasound_module_pcm_oss.so
-alsa-plugins-oss_DETECT=	${alsa-plugins-oss${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-alsa-plugins-oss_PORT=		audio/linux${LINUX_BASEPORT_NAME}-alsa-plugins-oss
-alsa-plugins-oss_DEPENDS=	alsalib
-
-alsa-plugins-pulseaudio_c6_FILE=	${LINUXBASE}/usr/lib/alsa-lib/libasound_module_conf_pulse.so
-alsa-plugins-pulseaudio_c6_64_FILE=	${LINUXBASE}/usr/lib64/alsa-lib/libasound_module_conf_pulse.so
-alsa-plugins-pulseaudio_DETECT=	${alsa-plugins-oss${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-alsa-plugins-pulseaudio_PORT=		audio/linux${LINUX_BASEPORT_NAME}-alsa-plugins-pulseaudio
-alsa-plugins-pulseaudio_DEPENDS=	alsalib
-
-alsalib_f10_FILE=	${LINUXBASE}/lib/libasound.so.2.0.0
-alsalib_c6_FILE=	${LINUXBASE}/lib/libasound.so.2.0.0
-alsalib_c6_64_FILE=	${LINUXBASE}/lib64/libasound.so.2.0.0
-alsalib_DETECT=		${alsalib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-alsalib_PORT=		audio/linux${LINUX_BASEPORT_NAME}-alsa-lib
-
-arts_f10_FILE=		${LINUXBASE}/usr/lib/libartsc.so.0
-arts_c6_FILE=		${LINUXBASE}/usr/lib/libartsc.so.0
-arts_c6_64_FILE=	${LINUXBASE}/usr/lib64/libartsc.so.0
-arts_DETECT=		${arts${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-arts_PORT=			audio/linux${LINUX_BASEPORT_NAME}-arts
-
-aspell_f10_FILE=	${LINUXBASE}/usr/lib/libaspell.so.15.1.4
-aspell_c6_FILE=		${LINUXBASE}/usr/lib/libaspell.so.15.1.4
-aspell_c6_64_FILE=	${LINUXBASE}/usr/lib64/libaspell.so.15.1.4
-aspell_DETECT=		${aspell${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-aspell_PORT=		textproc/linux${LINUX_BASEPORT_NAME}-aspell
-
-atk_f10_FILE=		${LINUXBASE}/usr/lib/libatk-1.0.so.0.2409.1
-atk_c6_FILE=		${LINUXBASE}/usr/lib/libatk-1.0.so.0.3009.1
-atk_c6_64_FILE=		${LINUXBASE}/usr/lib64/libatk-1.0.so.0.3009.1
-atk_DETECT=			${atk${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-atk_PORT=			accessibility/linux${LINUX_BASEPORT_NAME}-atk
-
-avahi-libs_c6_FILE=	${LINUXBASE}/usr/lib/libavahi-client.so.3.2.5
-avahi-libs_c6_64_FILE=	${LINUXBASE}/usr/lib64/libavahi-client.so.3.2.5
-avahi-libs_DETECT=	${avahi-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-avahi-libs_PORT=	net/linux${LINUX_BASEPORT_NAME}-avahi-libs
-
-blt_f10_FILE=		${LINUXBASE}/usr/lib/libBLT24.so # FIXME: deprecated, merged into tcl/tk85
-blt_DETECT=		${blt${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-blt_PORT=		x11-toolkits/linux${LINUX_BASEPORT_NAME}-blt
-blt_DEPENDS=		tcl85 tk85 xorglibs
-
-cairo_f10_FILE=		${LINUXBASE}/usr/lib/libcairo.so.2.10800.0
-cairo_c6_FILE=		${LINUXBASE}/usr/lib/libcairo.so.2.10800.8
-cairo_c6_64_FILE=	${LINUXBASE}/usr/lib64/libcairo.so.2.10800.8
-cairo_DETECT=		${cairo${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-cairo_PORT=			graphics/linux${LINUX_BASEPORT_NAME}-cairo
-cairo_DEPENDS=		fontconfig png xorglibs
-
-cups-libs_f10_FILE=	${LINUXBASE}/usr/lib/libcups.so.2
-cups-libs_c6_FILE=	${LINUXBASE}/usr/lib/libcups.so.2
-cups-libs_c6_64_FILE=	${LINUXBASE}/usr/lib64/libcups.so.2
-cups-libs_DETECT=	${cups-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-cups-libs_PORT=		print/linux${LINUX_BASEPORT_NAME}-cups-libs
-cups-libs_DEPENDS=	gnutls
-
-curl_f10_FILE=		${LINUXBASE}/usr/lib/libcurl.so.4.1.1
-curl_c6_FILE=		${LINUXBASE}/usr/lib/libcurl.so.4.1.1
-curl_c6_64_FILE=		${LINUXBASE}/usr/lib64/libcurl.so.4.1.1
-curl_DETECT=		${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-curl_PORT=		ftp/linux${LINUX_BASEPORT_NAME}-curl
-curl_DEPENDS=		cyrus-sasl2 openldap
-
-cyrus-sasl2_f10_FILE=	${LINUXBASE}/usr/lib/libsasl2.so.2.0.22
-cyrus-sasl2_c6_FILE=	${LINUXBASE}/usr/lib/libsasl2.so.2.0.23
-cyrus-sasl2_c6_64_FILE=	${LINUXBASE}/usr/lib64/libsasl2.so.2.0.23
-cyrus-sasl2_DETECT=	${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-cyrus-sasl2_PORT=	security/linux${LINUX_BASEPORT_NAME}-cyrus-sasl2
-
-dbusglib_f10_FILE=	${LINUXBASE}/usr/lib/libdbus-glib-1.so.2
-dbusglib_c6_FILE=	${LINUXBASE}/usr/lib/libdbus-glib-1.so.2
-dbusglib_c6_64_FILE=	${LINUXBASE}/usr/lib64/libdbus-glib-1.so.2
-dbusglib_DETECT=	${dbusglib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-dbusglib_PORT=		devel/linux${LINUX_BASEPORT_NAME}-dbus-glib
-dbusglib_DEPENDS=	dbuslibs expat
-
-dbuslibs_f10_FILE=	${LINUXBASE}/lib/libdbus-1.so.3
-dbuslibs_c6_FILE=	${LINUXBASE}/lib/libdbus-1.so.3
-dbuslibs_c6_64_FILE=	${LINUXBASE}/lib64/libdbus-1.so.3
-dbuslibs_DETECT=	${dbuslibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-dbuslibs_PORT=		devel/linux${LINUX_BASEPORT_NAME}-dbus-libs
-
-dri_f10_FILE=		${LINUXBASE}/usr/lib/libGL.so.1.2
-dri_c6_FILE=		${LINUXBASE}/usr/lib/libGL.so.1.2.0
-dri_c6_64_FILE=		${LINUXBASE}/usr/lib64/libGL.so.1.2.0
-dri_DETECT=			${dri${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-dri_PORT=			graphics/linux${LINUX_BASEPORT_NAME}-dri
-dri_DEPENDS=		xorglibs
-
-devtools_f10_FILE=	${LINUXBASE}/usr/bin/i386-redhat-linux-gcc
-devtools_c6_FILE=	${LINUXBASE}/usr/bin/gcc
-devtools_c6_64_FILE=	${LINUXBASE}/usr/bin/gcc
-devtools_DETECT=	${devtools${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-devtools_PORT=		devel/linux${LINUX_BASEPORT_NAME}-devtools
-
-esound_f10_FILE=	${LINUXBASE}/usr/lib/libesd.so.0.2.39
-esound_c6_FILE=		${LINUXBASE}/usr/lib/libesd.so.0.2.39
-esound_c6_64_FILE=	${LINUXBASE}/usr/lib64/libesd.so.0.2.39
-esound_DETECT=		${esound${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-esound_PORT=		audio/linux${LINUX_BASEPORT_NAME}-esound
-esound_DEPENDS=		libaudiofile
-
-expat_f10_FILE=		${LINUXBASE}/lib/libexpat.so.1
-expat_c6_FILE=		${LINUXBASE}/lib/libexpat.so.1
-expat_c6_64_FILE=	${LINUXBASE}/lib64/libexpat.so.1
-expat_DETECT=		${expat${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-expat_PORT=			textproc/linux${LINUX_BASEPORT_NAME}-expat
-
-fontconfig_f10_FILE=	${LINUXBASE}/usr/lib/libfontconfig.so.1.3.0
-fontconfig_c6_FILE=	${LINUXBASE}/usr/lib/libfontconfig.so.1.4.4
-fontconfig_c6_64_FILE=	${LINUXBASE}/usr/lib64/libfontconfig.so.1.4.4
-fontconfig_DETECT=	${fontconfig${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-fontconfig_PORT=	x11-fonts/linux${LINUX_BASEPORT_NAME}-fontconfig
-fontconfig_DEPENDS=	expat
-
-flac_c6_FILE=		${LINUXBASE}/usr/lib/libFLAC.so.8.2.0
-flac_c6_64_FILE=	${LINUXBASE}/usr/lib64/libFLAC.so.8.2.0
-flac_DETECT=		${flac${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-flac_PORT=			audio/linux${LINUX_BASEPORT_NAME}-flac
-
-freealut_f10_FILE=	${LINUXBASE}/usr/lib/libalut.so.0.1.0
-freealut_DETECT=	${freealut${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-freealut_PORT=		audio/linux${LINUX_BASEPORT_NAME}-freealut
-freealut_DEPENDS=	openal
-
-gdkpixbuf_f10_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf.so.2
-gdkpixbuf_DETECT=	${gdkpixbuf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-gdkpixbuf_PORT=		graphics/linux${LINUX_BASEPORT_NAME}-gdk-pixbuf
-
-gdkpixbuf2_f10_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
-gdkpixbuf2_c6_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
-gdkpixbuf2_c6_64_FILE=	${LINUXBASE}/usr/lib64/libgdk_pixbuf-2.0.so.0
-gdkpixbuf2_DETECT=	${gdkpixbuf2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-.if ${USE_LINUX} == "f10"
-gdkpixbuf2_PORT=	x11-toolkits/linux${LINUX_BASEPORT_NAME}-gtk2
-.else # default to CentOS 6.
-gdkpixbuf2_PORT=	graphics/linux${LINUX_BASEPORT_NAME}-gdk-pixbuf2
-.endif
-
-gnutls_f10_FILE=	${LINUXBASE}/usr/lib/libgnutls.so.26.4.6
-gnutls_c6_FILE=		${LINUXBASE}/usr/lib/libgnutls.so.26.14.12
-gnutls_c6_64_FILE=	${LINUXBASE}/usr/lib64/libgnutls.so.26.14.12
-gnutls_DETECT=		${gnutls${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-gnutls_PORT=		security/linux${LINUX_BASEPORT_NAME}-gnutls
-gnutls_DEPENDS=		libtasn1 libgcrypt libgpg-error
-
-gtk2_f10_FILE=		${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.1400.7
-gtk2_c6_FILE=		${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.2400.23
-gtk2_c6_64_FILE=	${LINUXBASE}/usr/lib64/libgtk-x11-2.0.so.0.2400.23
-gtk2_DETECT=		${gtk2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-gtk2_PORT=			x11-toolkits/linux${LINUX_BASEPORT_NAME}-gtk2
-gtk2_DEPENDS=		atk gdkpixbuf2 jpeg png pango tiff xorglibs
-
-hicontheme_f10_FILE=	${LINUXBASE}/usr/share/icons/hicolor
-hicontheme_c6_FILE=	${LINUXBASE}/usr/share/icons/hicolor
-hicontheme_c6_64_FILE=	${LINUXBASE}/usr/share/icons/hicolor
-hicontheme_DETECT=	${hicontheme${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-hicontheme_PORT=	x11-themes/linux${LINUX_BASEPORT_NAME}-hicolor-icon-theme
-
-imlib_f10_FILE=		${LINUXBASE}/usr/lib/libgdk_imlib.so.1.9.15
-imlib_DETECT=		${imlib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-imlib_PORT=			graphics/linux${LINUX_BASEPORT_NAME}-imlib
-
-jasper_c6_FILE=		${LINUXBASE}/usr/lib/libjasper.so.1.0.0
-jasper_c6_64_FILE=	${LINUXBASE}/usr/lib64/libjasper.so.1.0.0
-jasper_DETECT=		${jasper${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-jasper_PORT=		graphics/linux${LINUX_BASEPORT_NAME}-jasper
-
-jpeg_f10_FILE=		${LINUXBASE}/usr/lib/libjpeg.so.62.0.0
-jpeg_c6_FILE=		${LINUXBASE}/usr/lib/libjpeg.so.62.0.0
-jpeg_c6_64_FILE=	${LINUXBASE}/usr/lib64/libjpeg.so.62.0.0
-jpeg_DETECT=		${jpeg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-jpeg_PORT=			graphics/linux${LINUX_BASEPORT_NAME}-jpeg
-
-libasyncns_f10_FILE=	${LINUXBASE}/usr/lib/libasyncns.so.0.3.1
-libasyncns_c6_FILE=	${LINUXBASE}/usr/lib/libasyncns.so.0.3.1
-libasyncns_c6_64_FILE=	${LINUXBASE}/usr/lib64/libasyncns.so.0.3.1
-libasyncns_DETECT=	${libasyncns${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libasyncns_PORT=	dns/linux${LINUX_BASEPORT_NAME}-libasyncns
-
-libaudiofile_f10_FILE=	${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2
-libaudiofile_c6_FILE=	${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2
-libaudiofile_c6_64_FILE=${LINUXBASE}/usr/lib64/libaudiofile.so.0.0.2
-libaudiofile_DETECT=	${libaudiofile${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libaudiofile_PORT=	audio/linux${LINUX_BASEPORT_NAME}-libaudiofile
-
-libg2c_f10_FILE=	${LINUXBASE}/usr/lib/libg2c.so.0.0.0
-libg2c_DETECT=		${libg2c${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libg2c_PORT=		lang/linux${LINUX_BASEPORT_NAME}-libg2c
-
-libgcrypt_f10_FILE=	${LINUXBASE}/lib/libgcrypt.so.11.5.2
-libgcrypt_c6_FILE=	${LINUXBASE}/lib/libgcrypt.so.11.5.3
-libgcrypt_c6_64_FILE=	${LINUXBASE}/lib64/libgcrypt.so.11.5.3
-libgcrypt_DETECT=	${libgcrypt${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libgcrypt_PORT=		security/linux${LINUX_BASEPORT_NAME}-libgcrypt
-
-libglade2_f10_FILE=	${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7
-libglade2_c6_FILE=	${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7
-libglade2_c6_64_FILE=	${LINUXBASE}/usr/lib64/libglade-2.0.so.0.0.7
-libglade2_DETECT=	${libglade2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libglade2_PORT=		devel/linux${LINUX_BASEPORT_NAME}-libglade2
-
-libglu_f10_FILE=	${LINUXBASE}/usr/lib/libGLU.so.1
-libglu_c6_FILE=		${LINUXBASE}/usr/lib/libGLU.so.1
-libglu_c6_64_FILE=		${LINUXBASE}/usr/lib64/libGLU.so.1
-libglu_DETECT=		${libglu${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libglu_PORT=		graphics/linux${LINUX_BASEPORT_NAME}-libGLU
-
-libgpg-error_f10_FILE=	${LINUXBASE}/lib/libgpg-error.so.0.4.0
-libgpg-error_c6_FILE=	${LINUXBASE}/lib/libgpg-error.so.0.5.0
-libgpg-error_c6_64_FILE=${LINUXBASE}/lib64/libgpg-error.so.0.5.0
-libgpg-error_DETECT=	${libgpg-error${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libgpg-error_PORT=	security/linux${LINUX_BASEPORT_NAME}-libgpg-error
-
-# no libidn_f10_FILE (libidn is integrated into linux_base-f10 port)
-libidn_DETECT=		${libidn${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libidn_PORT=		dns/linux${LINUX_BASEPORT_NAME}-libidn
-
-libmng_f10_FILE=	${LINUXBASE}/usr/lib/libmng.so.1.0.0
-libmng_DETECT=		${libmng${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libmng_PORT=		graphics/linux${LINUX_BASEPORT_NAME}-libmng
-libmng_DEPENDS=		jpeg
-
-libogg_f10_FILE=	${LINUXBASE}/usr/lib/libogg.so.0.5.3
-libogg_c6_FILE=		${LINUXBASE}/usr/lib/libogg.so.0.6.0
-libogg_c6_64_FILE=	${LINUXBASE}/usr/lib64/libogg.so.0.6.0
-libogg_DETECT=		${libogg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libogg_PORT=		audio/linux${LINUX_BASEPORT_NAME}-libogg
-
-libpciaccess_c6_FILE=		${LINUXBASE}/usr/lib/libpciaccess.so.0.11.1
-libpciaccess_c6_64_FILE=		${LINUXBASE}/usr/lib64/libpciaccess.so.0.11.1
-libpciaccess_DETECT=		${libpciaccess${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libpciaccess_PORT=		devel/linux${LINUX_BASEPORT_NAME}-libpciaccess
-
-libsigcpp20_f10_FILE=	${LINUXBASE}/usr/lib/libsigc-2.0.so.0
-libsigcpp20_c6_FILE=	${LINUXBASE}/usr/lib/libsigc-2.0.so.0
-libsigcpp20_c6_64_FILE=	${LINUXBASE}/usr/lib64/libsigc-2.0.so.0
-libsigcpp20_DETECT=	${libsigcpp20${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libsigcpp20_PORT=	devel/linux${LINUX_BASEPORT_NAME}-libsigc++20
-
-libsndfile_c6_FILE=	${LINUXBASE}/usr/lib/libsndfile.so.1.0.20
-libsndfile_c6_64_FILE=	${LINUXBASE}/usr/lib64/libsndfile.so.1.0.20
-libsndfile_DETECT=	${libsndfile${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libsndfile_PORT=	audio/linux${LINUX_BASEPORT_NAME}-libsndfile
-
-libssh2_f10_FILE=	${LINUXBASE}/usr/lib/libssh2.so.1
-libssh2_c6_FILE=	${LINUXBASE}/usr/lib/libssh2.so.1.0.1
-libssh2_c6_64_FILE=	${LINUXBASE}/usr/lib64/libssh2.so.1.0.1
-libssh2_DETECT=		${libssh2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libssh2_PORT=		security/linux${LINUX_BASEPORT_NAME}-libssh2
-libssh2_DEPENDS=	openssl
-
-libv4l_f10_FILE=	${LINUXBASE}/usr/lib/libv4l1.so.0
-libv4l_c6_FILE=	${LINUXBASE}/usr/lib/libv4l1.so.0
-libv4l_c6_64_FILE=	${LINUXBASE}/usr/lib64/libv4l1.so.0
-libv4l_DETECT=		${libv4l${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libv4l_PORT=		multimedia/linux${LINUX_BASEPORT_NAME}-libv4l
-
-libtasn1_f10_FILE=	${LINUXBASE}/usr/lib/libtasn1.so.3.0.16
-libtasn1_c6_FILE=	${LINUXBASE}/usr/lib/libtasn1.so.3.1.6
-libtasn1_c6_64_FILE=	${LINUXBASE}/usr/lib64/libtasn1.so.3.1.6
-libtasn1_DETECT=	${libtasn1${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libtasn1_PORT=		security/linux${LINUX_BASEPORT_NAME}-libtasn1
-
-libthai_c6_FILE=	${LINUXBASE}/usr/lib/libthai.so.0.1.4
-libthai_c6_64_FILE=	${LINUXBASE}/usr/lib64/libthai.so.0.1.4
-libthai_DETECT=		${libthai${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libthai_PORT=		devel/linux${LINUX_BASEPORT_NAME}-libthai
-
-libtheora_f10_FILE=	${LINUXBASE}/usr/lib/libtheora.so.0.3.3
-libtheora_c6_FILE=	${LINUXBASE}/usr/lib/libtheora.so.0.3.9
-libtheora_c6_64_FILE=	${LINUXBASE}/usr/lib64/libtheora.so.0.3.9
-libtheora_DETECT=	${libtheora${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libtheora_PORT=		multimedia/linux${LINUX_BASEPORT_NAME}-libtheora
-
-libvorbis_f10_FILE=	${LINUXBASE}/usr/lib/libvorbis.so.0.4.0
-libvorbis_c6_FILE=	${LINUXBASE}/usr/lib/libvorbis.so.0.4.3
-libvorbis_c6_64_FILE=	${LINUXBASE}/usr/lib64/libvorbis.so.0.4.3
-libvorbis_DETECT=	${libvorbis${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libvorbis_PORT=		audio/linux${LINUX_BASEPORT_NAME}-libvorbis
-libvorbis_DEPENDS=	libogg
-
-libxml2_f10_FILE=	${LINUXBASE}/usr/lib/libxml2.so.2.7.3
-libxml2_c6_FILE=	${LINUXBASE}/usr/lib/libxml2.so.2.7.6
-libxml2_c6_64_FILE=	${LINUXBASE}/usr/lib64/libxml2.so.2.7.6
-libxml2_DETECT=		${libxml2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-libxml2_PORT=		textproc/linux${LINUX_BASEPORT_NAME}-libxml2
-
-mikmod_f10_FILE=	${LINUXBASE}/usr/lib/libmikmod.so.3.0.0
-mikmod_c6_FILE=	${LINUXBASE}/usr/lib/libmikmod.so.3.0.0
-mikmod_c6_64_FILE=	${LINUXBASE}/usr/lib64/libmikmod.so.3.0.0
-mikmod_DETECT=		${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-mikmod_PORT=		audio/linux${LINUX_BASEPORT_NAME}-mikmod
-
-naslibs_f10_FILE=	${LINUXBASE}/usr/lib/libaudio.so.2
-naslibs_c6_FILE=	${LINUXBASE}/usr/lib/libaudio.so.2
-naslibs_c6_64_FILE=	${LINUXBASE}/usr/lib64/libaudio.so.2
-naslibs_DETECT=		${naslibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-naslibs_PORT=		audio/linux${LINUX_BASEPORT_NAME}-nas-libs
-naslibs_DEPENDS=	xorglibs
-
-openldap_f10_FILE=	${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0
-openldap_c6_FILE=	${LINUXBASE}/lib/libldap-2.4.so.2.10.3
-openldap_c6_64_FILE=	${LINUXBASE}/lib64/libldap-2.4.so.2.10.3
-openldap_DETECT=	${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-openldap_PORT=		net/linux${LINUX_BASEPORT_NAME}-openldap
-
-openmotif_f10_FILE=	${LINUXBASE}/usr/lib/libXm.so.4
-openmotif_c6_FILE=	${LINUXBASE}/usr/lib/libXm.so.4.0.3
-openmotif_c6_64_FILE=	${LINUXBASE}/usr/lib64/libXm.so.4.0.3
-openmotif_DETECT=	${openmotif${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-openmotif_PORT=		x11-toolkits/linux${LINUX_BASEPORT_NAME}-openmotif
-openmotif_DEPENDS=	xorglibs
-
-ncurses-base_f10_FILE=	${LINUXBASE}/lib/terminfo/a/ansi
-ncurses-base_c6_FILE=	${LINUXBASE}/lib/terminfo/a/ansi
-ncurses-base_c6_64_FILE=${LINUXBASE}/lib64/terminfo/a/ansi
-ncurses-base_DETECT=	${ncurses-base${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-ncurses-base_PORT=	devel/linux${LINUX_BASEPORT_NAME}-ncurses-base
-
-nspr_f10_FILE=		${LINUXBASE}/lib/libnspr4.so
-nspr_c6_FILE=		${LINUXBASE}/lib/libnspr4.so
-nspr_c6_64_FILE=	${LINUXBASE}/lib64/libnspr4.so
-nspr_DETECT=		${nspr${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-nspr_PORT=		devel/linux${LINUX_BASEPORT_NAME}-nspr
-
-nss_f10_FILE=		${LINUXBASE}/lib/libnss3.so
-nss_c6_FILE=		${LINUXBASE}/usr/lib/libnss3.so
-nss_c6_64_FILE=		${LINUXBASE}/usr/lib64/libnss3.so
-nss_DETECT=		${nss${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-nss_PORT=		security/linux${LINUX_BASEPORT_NAME}-nss
-nss_DEPENDS=		nspr sqlite3
-
-openal_f10_FILE=	${LINUXBASE}/usr/lib/libopenal.so.0.0.0
-openal_DETECT=		${openal${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-openal_PORT=		audio/linux${LINUX_BASEPORT_NAME}-openal
-openal_DEPENDS=		alsalib arts esound libaudiofile libvorbis sdl12
-
-openal-soft_f10_FILE=	${LINUXBASE}/usr/lib/libopenal.so.1.8.466
-openal-soft_c6_FILE=	${LINUXBASE}/usr/lib/libopenal.so.1.12.854
-openal-soft_c6_64_FILE=	${LINUXBASE}/usr/lib64/libopenal.so.1.12.854
-openal-soft_DETECT=	${openal-soft${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-openal-soft_PORT=	audio/linux${LINUX_BASEPORT_NAME}-openal-soft
-openal-soft_DEPENDS=	alsalib arts esound
-
-openssl_f10_FILE=	${LINUXBASE}/lib/libssl.so.0.9.8g
-openssl_c6_FILE=	${LINUXBASE}/usr/lib/libssl.so.10
-openssl_c6_64_FILE=	${LINUXBASE}/usr/lib64/libssl.so.10
-openssl_DETECT=		${openssl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-openssl_PORT=		security/linux${LINUX_BASEPORT_NAME}-openssl
-
-openssl-compat_c6_FILE=	${LINUXBASE}/usr/lib/libssl.so.0.9.8e
-openssl-compat_c6_64_FILE=	${LINUXBASE}/usr/lib64/libssl.so.0.9.8e
-openssl-compat_DETECT=		${openssl-compat${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-openssl-compat_PORT=		security/linux${LINUX_BASEPORT_NAME}-openssl-compat
-
-pango_f10_FILE=		${LINUXBASE}/usr/lib/libpango-1.0.so.0.2800.3
-pango_c6_FILE=		${LINUXBASE}/usr/lib/libpango-1.0.so.0.2800.1
-pango_c6_64_FILE=	${LINUXBASE}/usr/lib64/libpango-1.0.so.0.2800.1
-pango_DETECT=		${pango${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-pango_PORT=			x11-toolkits/linux${LINUX_BASEPORT_NAME}-pango
-pango_DEPENDS=		cairo expat fontconfig xorglibs
-
-pixman_c6_FILE=		${LINUXBASE}/usr/lib/libpixman-1.so.0.32.8
-pixman_c6_64_FILE=	${LINUXBASE}/usr/lib64/libpixman-1.so.0.32.8
-pixman_DETECT=		${pixman${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-pixman_PORT=		x11/linux${LINUX_BASEPORT_NAME}-pixman
-
-png_f10_FILE=		${LINUXBASE}/usr/lib/libpng.so.3.37.0
-png_c6_FILE=		${LINUXBASE}/usr/lib/libpng.so.3.49.0
-png_c6_64_FILE=		${LINUXBASE}/usr/lib64/libpng.so.3.49.0
-png_DETECT=			${png${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-png_PORT=			graphics/linux${LINUX_BASEPORT_NAME}-png
-
-pulseaudio-libs_f10_FILE=	${LINUXBASE}/usr/lib/libpulse.so.0
-pulseaudio-libs_c6_FILE=	${LINUXBASE}/usr/lib/libpulse.so.0.12.2
-pulseaudio-libs_c6_64_FILE=	${LINUXBASE}/usr/lib64/libpulse.so.0.12.2
-pulseaudio-libs_DETECT=		${pulseaudio-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-pulseaudio-libs_PORT=		audio/linux${LINUX_BASEPORT_NAME}-pulseaudio-libs
-
-qt45_f10_FILE=		${LINUXBASE}/usr/lib/libQtCore.so.4.5.3
-qt45_DETECT=		${qt45${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-qt45_DEPENDS=		fontconfig libmng png
-
-sdl12_f10_FILE=		${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.2
-sdl12_c6_FILE=		${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.3
-sdl12_c6_64_FILE=	${LINUXBASE}/usr/lib64/libSDL-1.2.so.0.11.3
-sdl12_DETECT=		${sdl12${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-sdl12_PORT=			devel/linux${LINUX_BASEPORT_NAME}-sdl12
-sdl12_DEPENDS=		xorglibs
-
-sdlimage_f10_FILE=	${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.1.5
-sdlimage_c6_FILE=	${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.8.4
-sdlimage_c6_64_FILE=	${LINUXBASE}/usr/lib64/libSDL_image-1.2.so.0.8.4
-sdlimage_DETECT=	${sdlimage${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-sdlimage_PORT=		graphics/linux${LINUX_BASEPORT_NAME}-sdl_image
-sdlimage_DEPENDS=	jpeg png sdl12 tiff
-
-sdlmixer_f10_FILE=	${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.2.6
-sdlmixer_c6_FILE=	${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.12.0
-sdlmixer_c6_64_FILE=	${LINUXBASE}/usr/lib64/libSDL_mixer-1.2.so.0.12.0
-sdlmixer_DETECT=	${sdlmixer${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-sdlmixer_PORT=		audio/linux${LINUX_BASEPORT_NAME}-sdl_mixer
-sdlmixer_DEPENDS=	sdl12
-
-sdlttf_f10_FILE=	${LINUXBASE}/usr/lib/libSDL_ttf-2.0.so.0.6.2
-sdlttf_c6_FILE=	${LINUXBASE}/usr/lib/libSDL_ttf-2.0.so.0.10.1
-sdlttf_c6_64_FILE=	${LINUXBASE}/usr/lib64/libSDL_ttf-2.0.so.0.10.1
-sdlttf_DETECT=		${sdlttf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-sdlttf_PORT=		graphics/linux${LINUX_BASEPORT_NAME}-sdl_ttf
-sdlttf_DEPENDS=	sdl12
-
-scimgtk_f10_FILE=	${LINUXBASE}/usr/lib/gtk-2.0/immodules/im-scim.so
-scimgtk_DETECT=		${scimgtk${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-scimgtk_PORT=		textproc/linux${LINUX_BASEPORT_NAME}-scim-gtk
-scimgtk_DEPENDS=	gtk2 scimlibs
-
-scimlibs_f10_FILE=	${LINUXBASE}/usr/lib/libscim-1.0.so.8
-scimlibs_DETECT=	${scimlibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-scimlibs_PORT=		textproc/linux${LINUX_BASEPORT_NAME}-scim-libs
-scimlibs_DEPENDS=	gtk2
-
-sqlite3_f10_FILE=	${LINUXBASE}/usr/lib/libsqlite3.so.0
-sqlite3_c6_FILE=	${LINUXBASE}/usr/lib/libsqlite3.so.0
-sqlite3_c6_64_FILE=	${LINUXBASE}/usr/lib64/libsqlite3.so.0
-sqlite3_DETECT=		${sqlite3${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-sqlite3_PORT=		databases/linux${LINUX_BASEPORT_NAME}-sqlite3
-
-tcl85_f10_FILE=		${LINUXBASE}/usr/lib/libtcl8.5.so
-tcl85_c6_FILE=		${LINUXBASE}/usr/lib/libtcl8.5.so
-tcl85_c6_64_FILE=	${LINUXBASE}/usr/lib64/libtcl8.5.so
-tcl85_DETECT=		${tcl85${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-tcl85_PORT=		lang/linux${LINUX_BASEPORT_NAME}-tcl85
-
-tcp_wrappers-libs_c6_FILE=	${LINUXBASE}/lib/libwrap.so.0
-tcp_wrappers-libs_c6_64_FILE=	${LINUXBASE}/lib64/libwrap.so.0
-tcp_wrappers-libs_DETECT=	${tcp_wrappers-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-tcp_wrappers-libs_PORT=	net/linux${LINUX_BASEPORT_NAME}-tcp_wrappers-libs
-
-tiff_f10_FILE=		${LINUXBASE}/usr/lib/libtiff.so.3.8.2
-tiff_c6_FILE=		${LINUXBASE}/usr/lib/libtiff.so.3.9.4
-tiff_c6_64_FILE=	${LINUXBASE}/usr/lib64/libtiff.so.3.9.4
-tiff_DETECT=		${tiff${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-tiff_PORT=			graphics/linux${LINUX_BASEPORT_NAME}-tiff
-tiff_DEPENDS=		jpeg
-
-tk85_f10_FILE=		${LINUXBASE}/usr/lib/libtk8.5.so
-tk85_c6_FILE=		${LINUXBASE}/usr/lib/libtk8.5.so
-tk85_c6_64_FILE=	${LINUXBASE}/usr/lib64/libtk8.5.so
-tk85_DETECT=		${tk85${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-tk85_PORT=		x11-toolkits/linux${LINUX_BASEPORT_NAME}-tk85
-tk85_DEPENDS=		xorglibs
-
-xorglibs_f10_FILE=	${LINUXBASE}/usr/lib/libXrandr.so.2.1.0
-xorglibs_c6_FILE=	${LINUXBASE}/usr/lib/libXrandr.so.2.2.0
-xorglibs_c6_64_FILE=	${LINUXBASE}/usr/lib64/libXrandr.so.2.2.0
-xorglibs_DETECT=	${xorglibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-xorglibs_PORT=		x11/linux${LINUX_BASEPORT_NAME}-xorg-libs
-xorglibs_DEPENDS=	fontconfig
-
-ucl_f10_FILE=		${LINUXBASE}/usr/lib/libucl.so.1
-ucl_DETECT=		${ucl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-ucl_PORT=		archivers/linux${LINUX_BASEPORT_NAME}-ucl
-
-ungif_f10_FILE=		${LINUXBASE}/usr/lib/libgif.so.4.1.3
-ungif_DETECT=		${ungif${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-ungif_PORT=			graphics/linux${LINUX_BASEPORT_NAME}-ungif
-
-upx_f10_FILE=			${LINUXBASE}/usr/bin/upx
-upx_DETECT=			${upx${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-upx_PORT=			archivers/linux${LINUX_BASEPORT_NAME}-upx
-upx_DEPENDS=		ucl
-
-webauth_f10_FILE=	${LOCALBASE}/bin/linux-nvu
-webauth_DETECT=		${webauth${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-webauth_PORT=		www/linux-${WEB_AUTH}
-webauth_DEPENDS=	gtk2 atk pango fontconfig
-
-qt47_c6_FILE=		${LINUXBASE}/usr/lib/qt47/libQtCore.so.4.7.2
-qt47_c6_64_FILE=	${LINUXBASE}/usr/lib64/qt47/libQtCore.so.4.7.2
-qt47_DETECT=		${qt47${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-qt47_PORT=		devel/linux${LINUX_BASEPORT_NAME}-qt47
-
-qt47-x11_c6_FILE=		${LINUXBASE}/usr/lib/qt47/libQtGui.so.4.7.2
-qt47-x11_c6_64_FILE=		${LINUXBASE}/usr/lib64/qt47/libQtGui.so.4.7.2
-qt47-x11_DETECT=		${qt47-x11${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-qt47-x11_PORT=		x11-toolkits/linux${LINUX_BASEPORT_NAME}-qt47-x11
-
-qt47-webkit_c6_FILE=		${LINUXBASE}/usr/lib/qt47/libQtWebKit.so.4.7.2
-qt47-webkit_c6_64_FILE=		${LINUXBASE}/usr/lib64/qt47/libQtWebKit.so.4.7.2
-qt47-webkit_DETECT=		${qt47-webkit${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-qt47-webkit_PORT=		www/linux${LINUX_BASEPORT_NAME}-qt47-webkit
-
-# End component definition section
-
-# Let's check if components from USE_LINUX_APPS exist at _LINUX_APPS_ALL
-.  for component in ${USE_LINUX_APPS}
-.    if ${_LINUX_APPS_ALL:M${component}}==""
-IGNORE=	bsd.linux-apps.mk test failed: Invalid component USE_LINUX_APPS=${component}
-.    endif
-.  endfor
-
-# Let's check if components from USE_LINUX_APPS have corresponding <app>_DETECT
-# i.e. if a corresponding <app>_FILE defined for given LINUX_DIST_SUFFIX
-.  for component in ${USE_LINUX_APPS}
-.    if ${${component}_DETECT}==""
-.      if defined(${component}${LINUX_DIST_SUFFIX:S/-/_/}_FILE)
-IGNORE=	bsd.linux-apps.mk test failed: The component ${component} is empty for LINUX_DIST_SUFFIX=${LINUX_DIST_SUFFIX} (the corresponding variable ${component}${LINUX_DIST_SUFFIX:S/-/_/}_FILE is empty)
-.      else
-IGNORE=	bsd.linux-apps.mk test failed: The component ${component} is not defined for LINUX_DIST_SUFFIX=${LINUX_DIST_SUFFIX} (the corresponding variable ${component}${LINUX_DIST_SUFFIX:S/-/_/}_FILE is not defined). This usually means that the current port should be used with non default linux base and/or infrastructure port(s)
-.      endif
-.    endif
-.  endfor
-
-# Recursively expand all dependencies for each app at _LINUX_APPS_ALL
-.  for component in ${_LINUX_APPS_ALL}
-.    for subcomponent in ${${component}_DEPENDS}
-${component}_DEPENDS+=${${subcomponent}_DEPENDS}
-.    endfor
-.  endfor
-
-# Use just expanded dependencies (<app>_DEPENDS) to expand USE_LINUX_APPS
-.  for component in ${USE_LINUX_APPS}
-_USE_LINUX_APPS+=${${component}_DEPENDS} ${component}
-.  endfor
-
-# Set dependencies for _USE_LINUX_APPS which exists at _LINUX_APPS_ALL
-.  for component in ${_LINUX_APPS_ALL}
-.    if ${_USE_LINUX_APPS:M${component}}!=""
-.      if defined(${component}${LINUX_DIST_SUFFIX:S/-/_/}_FILE)
-RUN_DEPENDS+=   ${${component}_DETECT}:${${component}_PORT}
-.      endif
-.    endif
-.  endfor
-.endif
diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk
deleted file mode 100644
index 96fe9f3..0000000
--- a/Mk/bsd.linux-rpm.mk
+++ /dev/null
@@ -1,219 +0,0 @@
-#-*- tab-width: 4; -*-
-# ex:ts=4
-#
-# $FreeBSD$
-#
-
-# Variables:
-# LINUX_DIST		- Will be used to set some dist-specific presets.
-#					  Valid values: fedora
-# LINUX_DIST_VER	- Use depends upon the dist-specific presets.
-#					  Valid values for "fedora": all version numbers
-#					  e.g. 10 for fedora 10
-#					  Valid values for "centos": all version numbers
-#					  e.g. 6.8 for centos 6.8
-#					  This is used to set MASTER_SITE_{,SRC_}SUBDIR
-#					  if it isn't already set.
-# MASTER_SITE_SRC_SUBDIR
-#					- The subdir for the src RPM's.
-# DISTFILES			- For simple cases this will be set automatically
-#					  based upon the DISTNAME.
-# SRC_DISTFILES		- Variable which contains the corresponding src RPM's.
-#					  If there's no corresponding src RPM, it has to be
-#					  set to the empty value (SRC_DISTFILES=	"").
-# AUTOMATIC_PLIST	- Generate a dynamic plist (please have a look at the
-#					  porters handbook section which talks about plists.
-#					  This feature is reserved for rare cases).
-# BRANDELF_DIRS		- A list of directories with executables to brand
-#					  as a linux executable. The directories has to not
-#					  contain libraries.
-# BRANDELF_FILES	- A list of files to brand as a linux executable in
-#					  case BRANDELF_DIRS can't be used.
-
-.if !defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Pre_Include)
-
-Linux_RPM_Include_MAINTAINER=	emulation@FreeBSD.org
-Linux_RPM_Pre_Include=			bsd.linux-rpm.mk
-
-EXTRACT_SUFX?=		.${LINUX_RPM_ARCH}.rpm
-SRC_SUFX?=		.src.rpm
-
-USE_LINUX?=			yes
-USE_LINUX_PREFIX=	yes
-
-NO_WRKSUBDIR=		yes
-NO_BUILD=			yes
-
-.	if ${USE_LINUX} == "c6" || ${USE_LINUX} == "c6_64" || ${USE_LINUX} == "yes" # default to CentOS
-# Do not build CentOS 6 ports if overridden by f10
-.		if defined(OVERRIDE_LINUX_NONBASE_PORTS) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10"
-IGNORE=	requires CentOS ${LINUX_DIST_VER}.  Please remove OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf
-.		endif
-.	endif
-
-.endif
-
-.if defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Post_Include)
-
-Linux_RPM_Post_Include=	bsd.linux-rpm.mk
-
-.if ${USE_LINUX} == "f10"
-USE_LINUX?=	"f10"
-LINUX_DIST=	fedora
-LINUX_DIST_VER=	10
-.else			# default to CentOS
-LINUX_DIST=	centos
-LINUX_DIST_VER=	6.8
-.endif
-
-.if defined(LINUX_DIST)
-DIST_SUBDIR?=	rpm/${LINUX_RPM_ARCH}/${LINUX_DIST}/${LINUX_DIST_VER}
-
-.	if ${LINUX_DIST} == "fedora"
-# we do not want to define MASTER_SITES and MASTER_SITE_* if they are already defined
-# ex.: MASTER_SITES=file:///...
-.		ifndef MASTER_SITES
-MASTER_SITES=		${MASTER_SITE_FEDORA_LINUX}
-.			if ${LINUX_DIST_VER} == 10
-MASTER_SITE_SUBDIR?=	../releases/${LINUX_DIST_VER}/Everything/${LINUX_RPM_ARCH}/os/Packages \
-			../updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
-MASTER_SITE_SRC_SUBDIR?=	../releases/${LINUX_DIST_VER}/Everything/source/SRPMS \
-				../updates/${LINUX_DIST_VER}/SRPMS
-.			else
-MASTER_SITE_SUBDIR?=	${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
-			updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
-MASTER_SITE_SRC_SUBDIR?=	${LINUX_DIST_VER}/SRPMS \
-				updates/${LINUX_DIST_VER}/SRPMS
-.			endif
-.		endif
-.	elif ${LINUX_DIST} == "centos"
-MASTER_SITES?=		${MASTER_SITE_CENTOS_LINUX} ${MASTER_SITE_CENTOS_LINUX_UPDATES}
-MASTER_SITE_SUBDIR?=	centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/ \
-			centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/
-.		if ${LINUX_DIST_VER} == "5" #needed for Qt...
-LINUX_RPM_ARCH=		i386
-MASTER_SITE_SUBDIR=	centos/5/os/i386/Packages/
-.		endif
-.		if defined(PACKAGE_BUILDING)
-_SRC_GROUP=:SOURCE
-MASTER_SITES+=  http://vault.centos.org/%SUBDIR%/:SOURCE
-MASTER_SITE_SUBDIR+=	${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE
-.		endif
-.	endif
-.endif
-
-PKGNAMEPREFIX?=			linux-${USE_LINUX}-
-
-# DISTFILES and SRC_DISTFILES assume that there is only one bindist
-# and one src file.
-# Please, define them in the Makefile of the port in case this assumption
-# is not true.
-
-DISTVERSION=	${PORTVERSION}-${RPMVERSION}
-DISTNAME?=		${PORTNAME}-${DISTVERSION}
-DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
-BIN_DISTFILES:=		${DISTFILES} ${LIB_DISTFILES}
-SRC_DISTFILES?=		${DISTNAME}${SRC_SUFX}${_SRC_GROUP}
-EXTRACT_ONLY?=		${BIN_DISTFILES:C/:[^:]+$//}
-WRKSRC:=		${WRKSRC:S/-${RPMVERSION}$//}
-
-# Define files to install.
-# Ports can want to install 32bit things only (if OVERRIDE_LINUX_NONBASE_PORTS) is off,
-# they can want to install both 32bit and 64bit things of only one package,
-# or they can want to install a 64bit only binary and e.g. 32/64bit libraries.
-
-# The following glue is supposed to handle this.
-# FIXME: Sensibly refactor this part, it looks like spaghetti.
-
-.   if defined(OVERRIDE_LINUX_NONBASE_PORTS) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64"
-_32BIT_LINUX_RPM_ARCH=  i686
-.       if ${DISTFILES} == ${DISTNAME}${EXTRACT_SUFX} && ${USE_LINUX_RPM} != "nolib"
-_32BIT_LIB_DISTFILES:=   ${DISTFILES:S/${LINUX_RPM_ARCH}/${_32BIT_LINUX_RPM_ARCH}/g}
-.       elif defined(LIB_DISTFILES)
-_32BIT_LIB_DISTFILES=   ${LIB_DISTFILES:S/${LINUX_RPM_ARCH}/${_32BIT_LINUX_RPM_ARCH}/g}
-.       endif
-
-BIN_DISTFILES:=         ${BIN_DISTFILES} ${_32BIT_LIB_DISTFILES}
-DISTFILES+=             ${_32BIT_LIB_DISTFILES}
-.   endif
-DISTFILES+=             ${LIB_DISTFILES}
-
-
-.	if defined(PACKAGE_BUILDING)
-DISTFILES+=		${SRC_DISTFILES}
-MASTER_SITE_SUBDIR+=	${MASTER_SITE_SRC_SUBDIR}
-ALWAYS_KEEP_DISTFILES=	yes
-.	endif
-
-.if !defined(USE_LINUX_RPM_BAD_PERMS)
-EXTRACT_CMD?=			${TAR}
-EXTRACT_BEFORE_ARGS?=	--no-same-permissions --no-same-owner -xf
-EXTRACT_AFTER_ARGS?=
-.else
-EXTRACT_DEPENDS+=	rpm2archive:archivers/rpm4
-EXTRACT_CMD?=	rpm2archive
-EXTRACT_BEFORE_ARGS?=	<
-EXTRACT_AFTER_ARGS?=	| ${TAR} xf - --no-same-permissions --no-same-owner
-.endif
-
-DISTINFO_FILE?=				${MASTERDIR}/distinfo.${LINUX_REPO_ARCH}
-
-BRANDELF_DIRS?=
-BRANDELF_FILES?=
-
-# For ports that define PORTDOCS, be sure not to install
-# documentation if NOPORTDOCS is defined
-.  if defined(PORTDOCS) && defined(NOPORTDOCS)
-pre-patch: linux-rpm-clean-portdocs
-
-.		if !target(linux-rpm-clean-portdocs)
-linux-rpm-clean-portdocs:
-.			for x in ${PORTDOCS}
-	@${RM} -f ${WRKSRC}/${DOCSDIR_REL}/${x}
-.			endfor
-	@${RMDIR} ${WRKSRC}/${DOCSDIR_REL}
-.		endif
-.  endif
-
-.  if ${USE_LINUX} != "f10"
-PLIST?=		${MASTERDIR}/pkg-plist.${LINUX_REPO_ARCH}
-.  endif
-
-.  if defined(AUTOMATIC_PLIST)
-
-.	if ${USE_LINUX} == "f10"
-_LINUX_BASE_SUFFIX=		f10
-.	elif ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes"
-_LINUX_BASE_SUFFIX=		c6
-.	elif ${USE_LINUX} == "c6_64"
-_LINUX_BASE_SUFFIX=		c6
-.	else
-# other linux_base ports do not provide a pkg-plist file
-IGNORE=					uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"f10\", \"c6\", and \"c6_64\"
-.  endif
-
-PLIST?=					${WRKDIR}/.PLIST.linux-rpm
-
-pre-install: linux-rpm-generate-plist
-
-.  if !target(linux-rpm-generate-plist)
-linux-rpm-generate-plist:
-	cd ${WRKSRC} && \
-	${FIND} * ! -type d | ${SORT} > ${PLIST}
-.	endif
-.  endif
-
-.  if !target(do-install)
-do-install:
-.	if ${BRANDELF_DIRS}
-		@cd ${WRKSRC} && ${FIND} ${BRANDELF_DIRS} -type f -print0 \
-		| ${XARGS} -0 ${FILE} | ${GREP} ELF | ${CUT} -d : -f 1 \
-		| ${XARGS} ${BRANDELF} -t Linux
-.	endif
-.	if ${BRANDELF_FILES}
-		@cd ${WRKSRC} && ${BRANDELF} -t Linux ${BRANDELF_FILES}
-.	endif
-	cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;
-	cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX}
-.  endif
-.endif
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index ddffe5c..bd23061 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -408,40 +408,15 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  core, webkit).  Implies that the port needs Qt.
 #				  Implies the inclusion of bsd.qt.mk.  See bsd.qt.mk
 #				  for more details.
-#
-# USE_LINUX		- Set to yes to say the port needs the default linux base port.
-#				  Set to value <X>, if the port needs emulators/linux_base-<X>.
-#				  Implies appropriate settings for STRIP and STRIP_CMD.
+##
 # USE_LINUX_PREFIX
-#				- controls the action of PREFIX (see above). Only use this
-#				  if the port is a linux infrastructure port (e.g. contains libs
+#				- Controls the action of PREFIX (see above).  Only use this
+#				  if the port is a Linux infrastructure port (e.g. contains libs
 #				  or a sound server which supports the FreeBSD native one),
-#				  use the default or the X11 prefix if it's a leaf port
-#				  (e.g. a game or program).
-#				  Implies NO_MTREE=yes, and, if USE_LDCONFIG is defined:
-#				    - USE_LINUX=yes
-#				    - appropriate invocation of the Linux ldconfig
-# USE_LINUX_RPM	- Set to yes to pull in variables and targets useful to Linux
-#				  RPM ports.
-# 				  Set to nolib if your port does not contain an architecture-
-#				  specific library.
-#				  Implies inclusion of bsd.linux-rpm.mk.
-#
-# LINUX_OSRELEASE	- Contains the value of compat.linux.osrelease sysctl.
-#				  Will be used to distinguish which linux
-#				  infrastructure ports should be used.
-#				  Valid values: 2.6.16.
-#
-# OVERRIDE_LINUX_BASE_PORT
-#				- This specifies the default linux base to use, for valid
-#				  values have a look at the description of USE_LINUX. This is
-#				  an user-only variable. Don't use it in any port, it's meant
-#				  to be used in make.conf.
-#
-# LINUX_BASE_PORT
-#				- This is a read-only variable, it gets set to a value which is
-#				  usable in *_DEPENDS (e.g. BUILD_DEPENDS=${LINUX_BASE_PORT}).
-#				  It honors USE_LINUX=foo and OVERRIDE_LINUX_BASE_PORT.
+#				  use the default prefix if it's a leaf port (e.g. a game or
+#				  program).
+#				  Implies NO_LICENSES_INSTALL=yes, NO_MTREE=yes, and causes
+#				  Linux ldconfig to be used when USE_LDCONFIG is defined.
 ##
 # USE_XORG			- Set to a list of X.org module dependencies.
 #				  Implies inclusion of bsd.xorg.mk.
@@ -1312,20 +1287,6 @@ DISTNAME?=	${PORTNAME}-${DISTVERSIONFULL}
 
 INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
 
-DOCSDIR?=		${PREFIX}/share/doc/${PORTNAME}
-EXAMPLESDIR?=		${PREFIX}/share/examples/${PORTNAME}
-DATADIR?=		${PREFIX}/share/${PORTNAME}
-WWWDIR?=		${PREFIX}/www/${PORTNAME}
-ETCDIR?=		${PREFIX}/etc/${PORTNAME}
-
-.if defined(USE_LINUX_RPM)
-.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
-.endif
-
-.if defined(USE_LINUX_APPS)
-.include "${PORTSDIR}/Mk/bsd.linux-apps.mk"
-.endif
-
 .if defined(USE_XORG) || defined(XORG_CAT)
 .include "${PORTSDIR}/Mk/bsd.xorg.mk"
 .endif
@@ -1339,16 +1300,7 @@ FILESDIR?=		${MASTERDIR}/files
 SCRIPTDIR?=		${MASTERDIR}/scripts
 PKGDIR?=		${MASTERDIR}
 
-.if defined(USE_LINUX_PREFIX)
-PREFIX:=		${LINUXBASE}
-NO_MTREE=		yes
-.else
 PREFIX?=		${LOCALBASE}
-.endif
-
-.if defined(USE_LINUX_PREFIX)
-LDCONFIG_CMD?=			${LINUXBASE}/sbin/ldconfig -r ${LINUXBASE}
-.endif
 
 PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 
@@ -1457,6 +1409,14 @@ ${_f}_ARGS:=	${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
 
 EXTRACT_SUFX?=			.tar.gz
 
+.if defined(USE_LINUX_PREFIX)
+PREFIX=					${LINUXBASE}
+DATADIR?=				${PREFIX}/usr/share/${PORTNAME}
+DOCSDIR?=				${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
+NO_LICENSES_INSTALL=	yes
+NO_MTREE=				yes
+.endif
+
 # You can force skipping these test by defining IGNORE_PATH_CHECKS
 .if !defined(IGNORE_PATH_CHECKS)
 .if ! ${PREFIX:M/*}
@@ -1467,6 +1427,12 @@ EXTRACT_SUFX?=			.tar.gz
 .endif
 .endif
 
+DATADIR?=		${PREFIX}/share/${PORTNAME}
+DOCSDIR?=		${PREFIX}/share/doc/${PORTNAME}
+ETCDIR?=		${PREFIX}/etc/${PORTNAME}
+EXAMPLESDIR?=	${PREFIX}/share/examples/${PORTNAME}
+WWWDIR?=		${PREFIX}/www/${PORTNAME}
+
 # Owner and group of the WWW user
 WWWOWN?=	www
 WWWGRP?=	www
@@ -1763,65 +1729,6 @@ USE_LDCONFIG=	${PREFIX}/lib
 IGNORE=			has USE_LDCONFIG32 set to yes, which is not correct
 .endif
 
-.if defined(USE_LINUX_PREFIX) && defined(USE_LDCONFIG)
-# we need ${LINUXBASE}/sbin/ldconfig
-USE_LINUX?=	yes
-.endif
-
-.if defined(USE_LINUX)
-
-.  if !defined(LINUX_OSRELEASE)
-LINUX_OSRELEASE!=	${ECHO_CMD} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null`
-.  endif
-_EXPORTED_VARS+=	LINUX_OSRELEASE
-
-# install(1) also does a brandelf on strip, so don't strip with FreeBSD tools.
-STRIP=
-.	if exists(${LINUXBASE}/usr/bin/strip)
-STRIP_CMD=	${LINUXBASE}/usr/bin/strip
-.	else
-STRIP_CMD=	${TRUE}
-.	endif
-
-# Allow the user to specify another linux_base version.
-.	if defined(OVERRIDE_LINUX_BASE_PORT)
-.		if ${USE_LINUX:tl} == yes || (${USE_LINUX} == "c6" && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64")
-USE_LINUX=	${OVERRIDE_LINUX_BASE_PORT}
-.		endif
-.	endif
-
-# NOTE: when you update the default linux_base version (case "yes"),
-# don't forget to update the Handbook!
-
-.	if exists(${PORTSDIR}/emulators/linux_base-${USE_LINUX})
-LINUX_BASE_PORT=	${LINUXBASE}/bin/sh:emulators/linux_base-${USE_LINUX}
-.	else
-.		if ${USE_LINUX:tl} == "yes"
-USE_LINUX=	c6
-LINUX_BASE_PORT=	${LINUXBASE}/etc/redhat-release:emulators/linux_base-c6
-.		elif ${USE_LINUX} == "c6_64"
-LINUX_BASE_PORT=	${LINUXBASE}/etc/redhat-release:emulators/linux_base-c6
-.		else
-IGNORE=		cannot be built: there is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT
-.		endif
-.	endif
-
-.	if ${USE_LINUX} == "c6_64" || (defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64")
-.		if ${ARCH} != "amd64"
-IGNORE=		Cannot install 64 bit Linux on non-64bit platforms
-.		endif
-LINUX_RPM_ARCH?=	x86_64
-LINUX_REPO_ARCH?=	x86_64
-.	elif ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes" # default to CentOS
-LINUX_RPM_ARCH?=	i686
-LINUX_REPO_ARCH?=	i386
-.	elif ${USE_LINUX} == "f10"
-LINUX_RPM_ARCH?=	i386
-LINUX_REPO_ARCH?=	i386
-.	endif
-RUN_DEPENDS+=	${LINUX_BASE_PORT}
-.endif
-
 PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
 
 _GL_gbm_LIB_DEPENDS=		libgbm.so:graphics/gbm
@@ -1910,14 +1817,6 @@ _FORCE_POST_PATTERNS=	rmdir kldxref mkfontscale mkfontdir fc-cache \
 .include "${PORTSDIR}/Mk/bsd.ocaml.mk"
 .endif
 
-.if defined(USE_LINUX_RPM)
-.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
-.endif
-
-.if defined(USE_LINUX_APPS)
-.include "${PORTSDIR}/Mk/bsd.linux-apps.mk"
-.endif
-
 .if defined(USE_QT4) || defined(USE_QT5)
 .include "${PORTSDIR}/Mk/bsd.qt.mk"
 .endif
@@ -4469,8 +4368,9 @@ generate-plist: ${WRKDIR}
 
 .if defined(USE_LINUX_PREFIX)
 .if defined(USE_LDCONFIG)
-	@${ECHO_CMD} "@postexec ${LDCONFIG_CMD}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@postunexec ${LDCONFIG_CMD}" >> ${TMPPLIST}
+	@${ECHO_CMD} '@preexec [ -n "`/sbin/sysctl -q compat.linux.osrelease`" ] || ( echo "Cannot install package: kernel missing Linux support"; exit 1 )' >> ${TMPPLIST}
+	@${ECHO_CMD} "@postexec ${LINUXBASE}/sbin/ldconfig" >> ${TMPPLIST}
+	@${ECHO_CMD} "@postunexec ${LINUXBASE}/sbin/ldconfig" >> ${TMPPLIST}
 .endif
 .else
 .if defined(USE_LDCONFIG)
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 0551228..82577d0 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -229,167 +229,23 @@ MASTER_SITE_EXIM+= \
 
 .if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX)
 MASTER_SITE_CENTOS_LINUX+= \
-	http://mirror.centos.org/%SUBDIR%/ \
-	http://vault.centos.org/%SUBDIR%/ \
-	http://mirror.centos.org/centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/ \
-	http://vault.centos.org/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/ \
-	http://vault.centos.org/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE
-.endif
-
-.if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX)
-MASTER_SITE_CENTOS_LINUX_UPDATES+= \
-	http://mirror.centos.org/centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/ \
-	http://vault.centos.org/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/ \
-	http://vault.centos.org/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
+	http://mirror.centos.org/%SUBDIR%/:DEFAULT,SOURCE \
+	http://vault.centos.org/%SUBDIR%/:DEFAULT,SOURCE
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_EPEL)
 MASTER_SITE_EPEL+= \
-	http://dl.fedoraproject.org/pub/epel/6/${LINUX_REPO_ARCH}/ \
-	http://dl.fedoraproject.org/pub/epel/6/SRPMS/:DEFAULT,SOURCE
+	http://dl.fedoraproject.org/pub/epel/6/${LINUX_ARCH}/ \
+	http://dl.fedoraproject.org/pub/epel/6/SRPMS/:SOURCE
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_FEDORA_LINUX)
 MASTER_SITE_FEDORA_LINUX+= \
-	http://archives.fedoraproject.org/pub/archive/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.pbone.net/vol4/archive.fedoraproject.org/fedora/linux/core/%SUBDIR%/ \
-	ftp://mirror.solarvps.com/fedora/archive/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.gmd.de/archives.fedoraproject.org/fedora/linux/core/%SUBDIR%/ \
-	ftp://mirror.fraunhofer.de/archives.fedoraproject.org/fedora/linux/core/%SUBDIR%/ \
-	ftp://linuxsoft.cern.ch/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp-mirror.bi.fraunhofer.de/archives.fedoraproject.org/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.udl.es/pub/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.sunet.se/pub/Linux/distributions/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.sunet.se/pub/Linux/distributions/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.udl.es/pub/fedora/linux/core/%SUBDIR%/ \
-	http://mirrors.kernel.org/fedora/core/%SUBDIR%/ \
-	ftp://mirrors.kernel.org/fedora/core/%SUBDIR%/ \
-	http://mirror.web-ster.com/fedora/core/%SUBDIR%/ \
-	ftp://mirror.web-ster.com/fedora/core/%SUBDIR%/ \
-	http://rpmfind.net/linux/fedora/core/%SUBDIR%/ \
-	ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \
-	ftp://fedora.mirrors.tds.net/pub/fedora-core/%SUBDIR%/ \
-	http://ftp.ndlug.nd.edu/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.ndlug.nd.edu/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.belnet.be/linux/fedora/linux/core/%SUBDIR%/ \
-	http://sunsite.mff.cuni.cz/pub/fedora/%SUBDIR%/ \
-	ftp://sunsite.mff.cuni.cz/pub/fedora/%SUBDIR%/ \
-	ftp://ultra.linux.cz/pub/fedora/%SUBDIR%/ \
-	http://fr2.rpmfind.net/linux/fedora/core/%SUBDIR%/ \
-	ftp://fr2.rpmfind.net/linux/fedora/core/%SUBDIR%/ \
-	http://wftp.tu-chemnitz.de/pub/linux/fedora-core/%SUBDIR%/ \
-	ftp://ftp.tu-chemnitz.de/pub/linux/fedora-core/%SUBDIR%/ \
-	http://ftp.heanet.ie/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.heanet.ie/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://alviss.et.tudelft.nl/pub/fedora/core/%SUBDIR%/ \
-	http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.surfnet.nl/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.nluug.nl/ftp/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.uninett.no/pub/linux/Fedora/core/%SUBDIR%/ \
-	http://ftp.man.poznan.pl/pub/linux/fedora/core/%SUBDIR%/ \
-	ftp://ftp.man.poznan.pl/pub/linux/fedora/%SUBDIR%/ \
-	http://ftp.ps.pl/pub/linux/fedora-core/%SUBDIR%/ \
-	ftp://ftp.ps.pl/pub/linux/fedora-core/%SUBDIR%/ \
-	ftp://ftp.kappa.ro/pub/Linux/Distributions/fedora/%SUBDIR%/ \
-	http://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.mirrorservice.org/sites/dl.fedoraproject.org/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.hostrino.com/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.sfc.wide.ad.jp/pub/Linux/Fedora/core/%SUBDIR%/ \
-	http://ftp.kddilabs.jp/Linux/packages/fedora/core/%SUBDIR%/ \
-	ftp://ftp.kddilabs.jp/Linux/packages/fedora/core/%SUBDIR%/ \
-	ftp://ftp.riken.go.jp/pub/Linux/fedora/core/%SUBDIR%/ \
-	http://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core/%SUBDIR%/ \
-	http://www.las.ic.unicamp.br/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://www.las.ic.unicamp.br/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://mirror.netglobalis.net/pub/fedora/%SUBDIR%/ \
-	http://mirror.pacific.net.au/linux/redhat/fedora/%SUBDIR%/ \
-	ftp://mirror.pacific.net.au/linux/redhat/fedora/%SUBDIR%/ \
-	http://ftp.univie.ac.at/systems/linux/fedora/core/%SUBDIR%/ \
-	http://mirror.aarnet.edu.au/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://mirror.aarnet.edu.au/pub/fedora/linux/core/%SUBDIR%/ \
-	http://fedora.mirror.iweb.ca/core/%SUBDIR%/ \
-	ftp://fedora.mirror.iweb.ca/core/%SUBDIR%/ \
-	ftp://ftp.telus.net/pub/fedora/linux/core/%SUBDIR%/ \
-	http://fedora.arcticnetwork.ca/linux/core/%SUBDIR%/ \
-	http://www.muug.mb.ca/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.muug.mb.ca/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.solnet.ch/mirror/fedora/linux/core/%SUBDIR%/ \
-	http://mirror.karneval.cz/pub/linux/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.telmexchile.cl/Unix/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.sh.cvut.cz/MIRRORS/fedora/%SUBDIR%/ \
-	ftp://ftp.sh.cvut.cz/MIRRORS/fedora/%SUBDIR%/ \
-	http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/core/%SUBDIR%/ \
-	ftp://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/core/%SUBDIR%/ \
-	http://ftp-stud.hs-esslingen.de/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp-stud.hs-esslingen.de/pub/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.uni-erlangen.de/pub/Linux/MIRROR.fedora/core/%SUBDIR%/ \
-	http://ftp.uni-bayreuth.de/linux/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.fu-berlin.de/linux/fedora/core/%SUBDIR%/ \
-	http://ftp.uni-koeln.de/mirrors/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.informatik.uni-frankfurt.de/pub/linux/Mirror/ftp.redhat.com/fedora/core/%SUBDIR%/ \
-	http://mirrors.ircam.fr/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://mirrors.ircam.fr/pub/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.univ-pau.fr/pub/mirrors/fedora/%SUBDIR%/ \
-	ftp://ftp.lip6.fr/pub/linux/distributions/fedora/%SUBDIR%/ \
-	http://fr.rpmfind.net/linux/fedora/core/%SUBDIR%/ \
-	http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \
-	http://ftp.rhnet.is/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.rhnet.is/pub/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.unina.it/pub/linux/distributions/fedora/%SUBDIR%/ \
-	ftp://ftp.unina.it/pub/linux/distributions/fedora/%SUBDIR%/ \
-	http://ftp.iij.ad.jp/pub/linux/fedora/core/%SUBDIR%/ \
-	ftp://ftp.iij.ad.jp/pub/linux/fedora/core/%SUBDIR%/ \
-	http://ftp.dti.ad.jp/pub/Linux/Fedora/core/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/Linux/Fedora/core/%SUBDIR%/ \
-	http://ftp.nara.wide.ad.jp/pub/Linux/fedora/core/%SUBDIR%/ \
-	http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.jaist.ac.jp/pub/Linux/Fedora/core/%SUBDIR%/ \
-	ftp://ftp.jaist.ac.jp/pub/Linux/Fedora/core/%SUBDIR%/ \
-	http://ftp.riken.jp/Linux/fedora/core/%SUBDIR%/ \
-	ftp://ftp.kreonet.re.kr/pub/Linux/fedora/core/%SUBDIR%/ \
-	ftp://fedora.ifc.unam.mx/linux/fedora/core/%SUBDIR%/ \
-	ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com/core/%SUBDIR%/ \
-	ftp://ftp.uib.no/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.tpnet.pl/d17/fedora/%SUBDIR%/ \
-	http://ftp.wsisiz.edu.pl/pub/linux/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.pbone.net/pub/fedora/pub/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.pwr.wroc.pl/pub/linux/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.pwr.wroc.pl/pub/linux/fedora/linux/core/%SUBDIR%/ \
-	ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com/%SUBDIR%/ \
-	http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.rdsor.ro/pub/Linux/Distributions/Fedora/%SUBDIR%/ \
-	http://ftp.chg.ru/pub/Linux/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/Linux/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.rhd.ru/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.rhd.ru/pub/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.port80.se/fedora/core/%SUBDIR%/ \
-	ftp://ftp.port80.se/fedora/core/%SUBDIR%/ \
-	http://ftp.upjs.sk/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.upjs.sk/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.tlk-l.net/pub/mirrors/fedora.redhat.com/linux/core/%SUBDIR%/ \
-	http://limestone.uoregon.edu/ftp/fedora/%SUBDIR%/ \
-	ftp://limestone.uoregon.edu/fedora/%SUBDIR%/ \
-	ftp://fedora.bu.edu/core/%SUBDIR%/ \
-	http://mirror.anl.gov/pub/fedora-linux-core/%SUBDIR%/ \
-	ftp://mirror.anl.gov/pub/fedora-linux-core/%SUBDIR%/ \
-	ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.applios.net/pub/fedora/linux/core/%SUBDIR%/ \
-	http://mirror.steadfast.net/fedora/core/%SUBDIR%/ \
-	http://mirror.eas.muohio.edu/fedora/linux/core/%SUBDIR%/ \
-	http://mirror.engr.sjsu.edu/pub/fedora/linux/core/%SUBDIR%/ \
-	http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \
-	ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \
-	http://mirror.cogentco.com/pub/linux/fedora/linux/core/%SUBDIR%/ \
-	http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/core/%SUBDIR%/ \
-	ftp://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/core/%SUBDIR%/
+	http://archives.fedoraproject.org/pub/archive/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE \
+	ftp://ftp.pbone.net/vol4/archive.fedoraproject.org/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE \
+	ftp://ftp.gmd.de/archives.fedoraproject.org/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE \
+	ftp://mirror.fraunhofer.de/archives.fedoraproject.org/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE \
+	ftp://ftp-mirror.bi.fraunhofer.de/archives.fedoraproject.org/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_FARSIGHT)
diff --git a/accessibility/linux-c6-atk/Makefile b/accessibility/linux-c6-atk/Makefile
index fb77f2e..b6ebce0 100644
--- a/accessibility/linux-c6-atk/Makefile
+++ b/accessibility/linux-c6-atk/Makefile
@@ -12,8 +12,7 @@ LICENSE=	GPLv3
 
 CONFLICTS=	linux-atk-[0-9]* linux-f10-atk-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 RPMVERSION=	1.el6
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
diff --git a/accessibility/linux-f10-atk/Makefile b/accessibility/linux-f10-atk/Makefile
index 517ae49..9c1bb05 100644
--- a/accessibility/linux-f10-atk/Makefile
+++ b/accessibility/linux-f10-atk/Makefile
@@ -5,15 +5,13 @@ PORTNAME=	atk
 PORTVERSION=	1.24.0
 PORTREVISION=	1
 CATEGORIES=	accessibility linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary (Linux Fedora 10)
 
 CONFLICTS=	linux-atk-[0-9]* linux-f8-atk-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	1.fc10
diff --git a/archivers/kzip/Makefile b/archivers/kzip/Makefile
index d396f31..e03220c 100644
--- a/archivers/kzip/Makefile
+++ b/archivers/kzip/Makefile
@@ -16,7 +16,7 @@ RESTRICTED=	${NO_CDROM}
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USE_LINUX=	yes
+USES=		linux
 NO_BUILD=	yes
 WRKSRC_SUBDIR=	i686
 
diff --git a/archivers/linux-f10-ucl/Makefile b/archivers/linux-f10-ucl/Makefile
index 32f5c85..5831378 100644
--- a/archivers/linux-f10-ucl/Makefile
+++ b/archivers/linux-f10-ucl/Makefile
@@ -4,20 +4,18 @@
 PORTNAME=		ucl
 PORTVERSION=		1.03
 CATEGORIES=		archivers linux
-MASTER_SITES=		LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=		emulation@FreeBSD.org
 COMMENT=		UCL, a lossless data compression library (Linux Fedora 10)
 
 CONFLICTS=		linux-ucl-[0-9]* linux-f8-ucl-[0-9]*
 
-USE_LINUX=		f10
+USES=			linux:f10
 USE_LINUX_RPM=		yes
 RPMVERSION=		8.fc9
 USE_LDCONFIG=		yes
 
 PLIST_FILES=		usr/lib/libucl.so.1 usr/lib/libucl.so.1.0.0
-DOCSDIR=		${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=		COPYING NEWS README THANKS TODO
 DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/archivers/linux-f10-upx/Makefile b/archivers/linux-f10-upx/Makefile
index 9df5d31..6df5891 100644
--- a/archivers/linux-f10-upx/Makefile
+++ b/archivers/linux-f10-upx/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=		upx
 PORTVERSION=		3.03
 CATEGORIES=		archivers linux
-MASTER_SITES=		LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 PKGNAMEPREFIX=		linux-f10-
 
 MAINTAINER=		emulation@FreeBSD.org
@@ -12,14 +11,12 @@ COMMENT=		UPX, a high-performance executable packer (Linux Fedora 10)
 
 CONFLICTS=		linux-upx-[0-9]* linux-f8-upx-[0-9]*
 
-USE_LINUX=		f10
+USES=			linux:f10
 USE_LINUX_RPM=		yes
-USE_LINUX_APPS=		ucl
+USE_LINUX=		ucl
 RPMVERSION=		1.fc10
-BRANDELF_FILES=		usr/bin/upx
 
 PLIST_FILES=		usr/bin/upx usr/share/man/man1/upx.1.gz
-DOCSDIR=		${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=		BUGS COPYING LICENSE NEWS PROJECTS README README.1ST \
 			THANKS TODO elf-to-mem.txt filter.txt loader.txt selinux.txt
 DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile
index ed6642c..6bcc92a 100644
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -15,7 +15,7 @@ RESTRICTED=	Only unmodified original package can be distributed
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_LINUX=	yes
+USES=		linux
 NO_WRKSUBDIR=	yes
 STUFFIT_FILES=	bin/unstuff bin/stuff
 STUFFIT_MAN=	man/man1/stuff.1 man/man1/unstuff.1
diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index bf893b2..28abc87 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -21,16 +21,15 @@ LINUX_DRI_DESC=		libGL support via Linux DRI libraries
 NVIDIA_GL_340_DESC=	libGL support via nvidia-driver-340
 NVIDIA_GL_304_DESC=	libGL support via nvidia-driver-304
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs curl nss
-USES=		desktop-file-utils makeself perl5 shared-mime-info
+USES=		desktop-file-utils linux makeself perl5 shared-mime-info
+USE_LINUX=	xorglibs curl nss
 USE_PERL5=	patch build
 NO_WRKSUBDIR=	yes
 
 NVIDIA_GL_RUN_DEPENDS=		${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 NVIDIA_GL_340_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver-340
 NVIDIA_GL_304_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver-304
-LINUX_DRI_USE=			LINUX_APPS=dri,libpciaccess
+LINUX_DRI_USE=			LINUX=dri,libpciaccess
 
 post-extract:
 	@cd ${WRKSRC} && ${TAR} -xf googleearth-data.tar && ${RM} googleearth-data.tar
@@ -62,7 +61,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/share/mime/packages/
 	${INSTALL_DATA} ${WRKSRC}/Google-googleearth.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/googleearth.desktop
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/googleearth ${STAGEDIR}${DATADIR}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/googleearth ${STAGEDIR}${DATADIR}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/googleearth-bin ${STAGEDIR}${DATADIR}/
 	${RM} ${WRKSRC}/googleearth-mimetypes.xml \
 		${WRKSRC}/googleearth.desktop \
diff --git a/audio/baudline/Makefile b/audio/baudline/Makefile
index c88618c..bd30921 100644
--- a/audio/baudline/Makefile
+++ b/audio/baudline/Makefile
@@ -14,8 +14,8 @@ MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Real-time signal analysis and time-frequency browser
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i686/x86/}
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
 
 RESTRICTED=	author requests no distribution except from their site
diff --git a/audio/linux-c6-alsa-lib/Makefile b/audio/linux-c6-alsa-lib/Makefile
index 27fffa8..fec8f7c 100644
--- a/audio/linux-c6-alsa-lib/Makefile
+++ b/audio/linux-c6-alsa-lib/Makefile
@@ -14,10 +14,8 @@ RUN_DEPENDS=	alsa-lib>0:audio/alsa-lib
 
 CONFLICTS=	linux-f10-alsa-lib-[0-9]*
 
-BRANDELF_FILES=	usr/bin/aserver
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 RPMVERSION=	4.el6
 USE_LDCONFIG=	yes
diff --git a/audio/linux-c6-alsa-plugins-oss/Makefile b/audio/linux-c6-alsa-plugins-oss/Makefile
index 563f009..3023132 100644
--- a/audio/linux-c6-alsa-plugins-oss/Makefile
+++ b/audio/linux-c6-alsa-plugins-oss/Makefile
@@ -14,9 +14,8 @@ CONFLICTS=	linux-f10-alsa-plugins-oss-[0-9]*
 
 SRC_DISTFILES=	alsa-plugins-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_APPS=	alsalib
+USES=		linux:c6
+USE_LINUX=	alsalib
 USE_LINUX_RPM=	yes
 RPMVERSION=	1.el6
 
diff --git a/audio/linux-c6-alsa-plugins-pulseaudio/Makefile b/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
index 572454e..7b8a3c1 100644
--- a/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
+++ b/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
@@ -16,9 +16,8 @@ CONFLICTS=	linux-f10-alsa-plugins-pulseaudio-[0-9]*
 SRC_DISTFILES=	alsa-plugins-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 .endif
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_APPS=	alsalib pulseaudio-libs
+USES=		linux:c6
+USE_LINUX=	alsalib pulseaudio-libs
 USE_LINUX_RPM=	yes
 RPMVERSION=	1.el6
 
diff --git a/audio/linux-c6-alsa-utils/Makefile b/audio/linux-c6-alsa-utils/Makefile
index 9965667..85a316c 100644
--- a/audio/linux-c6-alsa-utils/Makefile
+++ b/audio/linux-c6-alsa-utils/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	alsa-utils
 PORTVERSION=	1.1.0
 CATEGORIES=	audio linux
-MASTER_SITES=	CENTOS_LINUX
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Advanced Linux Sound Architecture libraries (Linux CentOS ${LINUX_DIST_VER})
@@ -13,11 +12,9 @@ LICENSE=	GPLv3
 
 CONFLICTS=	linux-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*
 
-BRANDELF_FILES=	sbin/alsactl usr/bin/aconnect usr/bin/alsamixer usr/bin/amidi usr/bin/aplay usr/bin/aplaymidi usr/bin/arecord usr/bin/arecordmidi usr/bin/aseqdump usr/bin/aseqnet usr/bin/iecset usr/bin/speaker-test  usr/sbin/alsactl
-USE_LINUX_APPS=	alsalib alsa-plugins-oss
+USE_LINUX=	alsalib alsa-plugins-oss
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	nolib
 RPMVERSION=	8.el6
 
diff --git a/audio/linux-c6-arts/Makefile b/audio/linux-c6-arts/Makefile
index 7f6ecee..89957cc 100644
--- a/audio/linux-c6-arts/Makefile
+++ b/audio/linux-c6-arts/Makefile
@@ -11,12 +11,10 @@ COMMENT=		Audio system for the KDE integrated X11 desktop (Linux CentOS ${LINUX_
 
 CONFLICTS=		linux-arts-[0-9]* linux-f8-arts-[0-9]*
 
-ONLY_FOR_ARCHS=		i386 amd64
-USE_LINUX=		c6
+USES=			linux:c6
 USE_LINUX_RPM=		yes
 
 RPMVERSION=			10.el6
-BRANDELF_DIRS=		usr/bin
 USE_LDCONFIG=		yes
 
 post-install:
diff --git a/audio/linux-c6-esound/Makefile b/audio/linux-c6-esound/Makefile
index c4c1e26..61aec8f 100644
--- a/audio/linux-c6-esound/Makefile
+++ b/audio/linux-c6-esound/Makefile
@@ -5,21 +5,20 @@ PORTNAME=	esound
 PORTVERSION=	0.2.41
 PORTREVISION=	2
 CATEGORIES=	audio linux
-DISTNAME=	${PORTNAME}-libs-${PORTVERSION}-${RPMVERSION}
+LIB_DISTFILES=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
+SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of esound (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-esound-[0-9]* linux-f10-esound-[0-9]*
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	libaudiofile
 LINUX_NAME=	${PORTNAME}-libs
-
 RPMVERSION=	3.1.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
-SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+USE_LINUX=	libaudiofile
+USE_LINUX_RPM=	yes
 
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING.LIB ChangeLog NEWS README TIPS TODO esound.sgml
diff --git a/audio/linux-c6-flac/Makefile b/audio/linux-c6-flac/Makefile
index e2b2841..982d090 100644
--- a/audio/linux-c6-flac/Makefile
+++ b/audio/linux-c6-flac/Makefile
@@ -1,26 +1,22 @@
 # Created by: Johannes Meixner <johannes@perceivon.net>
 # $FreeBSD$
 
-PORTNAME=		flac
-PORTVERSION=		1.2.1
-PORTREVISION=		3
-CATEGORIES=		audio linux
-MASTER_SITES=		CENTOS_LINUX
+PORTNAME=	flac
+PORTVERSION=	1.2.1
+PORTREVISION=	3
+CATEGORIES=	audio linux
 
-MAINTAINER=		emulation@FreeBSD.org
-COMMENT=		Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER})
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=		linux-flac-[0-9]* linux-f10-flac-[0-9]*
+CONFLICTS=	linux-flac-[0-9]* linux-f10-flac-[0-9]*
 
-ONLY_FOR_ARCHS=		i386 amd64
-USE_LINUX=		c6
-USE_LINUX_APPS=		libogg
-USE_LINUX_RPM=		yes
+RPMVERSION=	7.el6_6
+USES=		linux:c6
+USE_LDCONFIG=	yes
+USE_LINUX=	libogg
+USE_LINUX_RPM=	yes
 
-RPMVERSION=		7.el6_6
-BRANDELF_DIRS=		usr/bin
-USE_LDCONFIG=		yes
-
-DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/audio/linux-c6-flac/pkg-plist.i386 b/audio/linux-c6-flac/pkg-plist.i386
index 0531217..4700696 100644
--- a/audio/linux-c6-flac/pkg-plist.i386
+++ b/audio/linux-c6-flac/pkg-plist.i386
@@ -4,11 +4,11 @@ usr/lib/libFLAC++.so.6
 usr/lib/libFLAC++.so.6.2.0
 usr/lib/libFLAC.so.8
 usr/lib/libFLAC.so.8.2.0
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/COPYING.FDL
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/COPYING.GPL
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/COPYING.LGPL
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/COPYING.Xiph
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.FDL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LGPL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.Xiph
+%%PORTDOCS%%%%DOCSDIR%%/README
 usr/share/man/man1/flac.1.gz
 usr/share/man/man1/metaflac.1.gz
diff --git a/audio/linux-c6-flac/pkg-plist.x86_64 b/audio/linux-c6-flac/pkg-plist.x86_64
index e51298a..340fdb7 100644
--- a/audio/linux-c6-flac/pkg-plist.x86_64
+++ b/audio/linux-c6-flac/pkg-plist.x86_64
@@ -8,11 +8,11 @@ usr/lib64/libFLAC++.so.6
 usr/lib64/libFLAC++.so.6.2.0
 usr/lib64/libFLAC.so.8
 usr/lib64/libFLAC.so.8.2.0
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/COPYING.FDL
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/COPYING.GPL
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/COPYING.LGPL
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/COPYING.Xiph
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.2.1/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.FDL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LGPL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.Xiph
+%%PORTDOCS%%%%DOCSDIR%%/README
 usr/share/man/man1/flac.1.gz
 usr/share/man/man1/metaflac.1.gz
diff --git a/audio/linux-c6-libaudiofile/Makefile b/audio/linux-c6-libaudiofile/Makefile
index d710271..0150acc 100644
--- a/audio/linux-c6-libaudiofile/Makefile
+++ b/audio/linux-c6-libaudiofile/Makefile
@@ -12,11 +12,10 @@ COMMENT=	Implementation of the Audio File Library from SGI (Linux CentOS ${LINUX
 
 CONTFLICTS=	linux-libaudiofile-[0-9]* linux-f10-libaudiofile-[0-9]*
 
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	11.1.el6
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-c6-libogg/Makefile b/audio/linux-c6-libogg/Makefile
index d33e0cf..14e2f98 100644
--- a/audio/linux-c6-libogg/Makefile
+++ b/audio/linux-c6-libogg/Makefile
@@ -11,14 +11,12 @@ COMMENT=	Ogg bitstream library (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-libogg-[0-9]* linux-f10-libogg-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	2.1.el6
 USE_LDCONFIG=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS CHANGES COPYING README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/audio/linux-c6-libsndfile/Makefile b/audio/linux-c6-libsndfile/Makefile
index 54188a8..7bad30d 100644
--- a/audio/linux-c6-libsndfile/Makefile
+++ b/audio/linux-c6-libsndfile/Makefile
@@ -11,12 +11,11 @@ COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF) (
 
 CONTFLICTS=	linux-libsndfile-[0-9]* linux-f10-libsndfile-[0-9]*
 
-USE_LINUX=	c6
-USE_LINUX_APPS=	flac libogg libvorbis
+USES=		linux:c6
+USE_LINUX=	flac libogg libvorbis
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	5.el6
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-c6-libsndfile/pkg-plist.i386 b/audio/linux-c6-libsndfile/pkg-plist.i386
index dbecb04..6739758 100644
--- a/audio/linux-c6-libsndfile/pkg-plist.i386
+++ b/audio/linux-c6-libsndfile/pkg-plist.i386
@@ -7,11 +7,11 @@ usr/bin/sndfile-play
 usr/bin/sndfile-regtest
 usr/lib/libsndfile.so.1
 usr/lib/libsndfile.so.1.0.20
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.0.20/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.0.20/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.0.20/ChangeLog
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.0.20/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.0.20/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
 usr/share/man/man1/sndfile-convert.1.gz
 usr/share/man/man1/sndfile-info.1.gz
 usr/share/man/man1/sndfile-play.1.gz
diff --git a/audio/linux-c6-libsndfile/pkg-plist.x86_64 b/audio/linux-c6-libsndfile/pkg-plist.x86_64
index d96e05f..0659773 100644
--- a/audio/linux-c6-libsndfile/pkg-plist.x86_64
+++ b/audio/linux-c6-libsndfile/pkg-plist.x86_64
@@ -9,11 +9,11 @@ usr/lib/libsndfile.so.1
 usr/lib/libsndfile.so.1.0.20
 usr/lib64/libsndfile.so.1
 usr/lib64/libsndfile.so.1.0.20
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.0.20/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.0.20/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.0.20/ChangeLog
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.0.20/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-1.0.20/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
 usr/share/man/man1/sndfile-convert.1.gz
 usr/share/man/man1/sndfile-info.1.gz
 usr/share/man/man1/sndfile-play.1.gz
diff --git a/audio/linux-c6-libvorbis/Makefile b/audio/linux-c6-libvorbis/Makefile
index ee8cb4b..374aeb6 100644
--- a/audio/linux-c6-libvorbis/Makefile
+++ b/audio/linux-c6-libvorbis/Makefile
@@ -11,10 +11,9 @@ COMMENT=	Audio compression codec library (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-libvorbis-[0-9]* linux-f10-libvorbis-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	libogg
+USE_LINUX=	libogg
 
 RPMVERSION=	4.el6_2.1
 USE_LDCONFIG=	yes
diff --git a/audio/linux-c6-mikmod/Makefile b/audio/linux-c6-mikmod/Makefile
index 3863c5a..4e57c63 100644
--- a/audio/linux-c6-mikmod/Makefile
+++ b/audio/linux-c6-mikmod/Makefile
@@ -6,20 +6,18 @@ PORTVERSION=	3.2.0
 PORTREVISION=	2
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL
-DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	MikMod Sound Library (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-mikmod-[0-9]* linux-f8-mikmod-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-
-RPMVERSION=	10.beta2.el6
 LINUX_NAME=	lib${PORTNAME}
+RPMVERSION=	10.beta2.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX_RPM=	yes
 
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING.LESSER COPYING.LIB NEWS README TODO
diff --git a/audio/linux-c6-nas-libs/Makefile b/audio/linux-c6-nas-libs/Makefile
index dca321a..31e942f 100644
--- a/audio/linux-c6-nas-libs/Makefile
+++ b/audio/linux-c6-nas-libs/Makefile
@@ -11,17 +11,16 @@ DISTNAME=	nas-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Network Audio System (Linux CentOS ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	xorglibs
-
 RPMVERSION=	7.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	xorglibs
+USE_LINUX_RPM=	yes
 
 DOCSDIR=	${PREFIX}/usr/share/doc/nas-${PORTVERSION}
 DESCR=		${.CURDIR}/../nas/pkg-descr
 
-post-extract:
+post-patch:
 	@${RM} -r ${WRKSRC}/usr/bin ${WRKSRC}/etc/rc.d ${WRKSRC}/etc/sysconfig
 
 .include <bsd.port.mk>
diff --git a/audio/linux-c6-openal-soft/Makefile b/audio/linux-c6-openal-soft/Makefile
index 2c850b5..c996103 100644
--- a/audio/linux-c6-openal-soft/Makefile
+++ b/audio/linux-c6-openal-soft/Makefile
@@ -10,15 +10,13 @@ MASTER_SITES=	EPEL
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	A 3D positional spatialized sound library (Linux CentOS ${LINUX_DIST_VER})
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	alsalib arts esound
+USE_LINUX=	alsalib arts esound
 
 RPMVERSION=	1.el6
 USE_LDCONFIG=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	COPYING
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/audio/linux-c6-pulseaudio-libs/Makefile b/audio/linux-c6-pulseaudio-libs/Makefile
index 91aece4..2306a9d 100644
--- a/audio/linux-c6-pulseaudio-libs/Makefile
+++ b/audio/linux-c6-pulseaudio-libs/Makefile
@@ -5,27 +5,19 @@ PORTNAME=	pulseaudio-libs
 PORTVERSION=	0.9.21
 PORTREVISION=	4
 CATEGORIES=	audio linux
-DISTFILES:=	# hack
-LIB_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX} \
+LIB_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-glib2-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
 
-
-
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	dbuslibs libasyncns libsndfile tcp_wrappers-libs xorglibs
-
 RPMVERSION=	24.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	dbuslibs libasyncns libsndfile tcp_wrappers-libs xorglibs
+USE_LINUX_RPM=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/pulseaudio-${PORTVERSION}
 DESCR=		${.CURDIR}/../pulseaudio/pkg-descr
 SRC_DISTFILES=	pulseaudio-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
-post-extract:
-	@${RM} -r ${WRKSRC}/usr/bin ${WRKSRC}/etc/rc.d ${WRKSRC}/etc/sysconfig
-
 .include <bsd.port.mk>
diff --git a/audio/linux-c6-pulseaudio-utils/Makefile b/audio/linux-c6-pulseaudio-utils/Makefile
index 6435bb3..b621372 100644
--- a/audio/linux-c6-pulseaudio-utils/Makefile
+++ b/audio/linux-c6-pulseaudio-utils/Makefile
@@ -9,15 +9,13 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Utils for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	xorglibs pulseaudio-libs
-
 RPMVERSION=	24.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	xorglibs pulseaudio-libs
+USE_LINUX_RPM=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/pulseaudio-${PORTVERSION}
-DESCR=		${PORTSDIR}/audio/pulseaudio/pkg-descr
+DESCR=		${.CURDIR}/../pulseaudio/pkg-descr
 
 SRC_DISTFILES=	pulseaudio-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
diff --git a/audio/linux-c6-sdl_mixer/Makefile b/audio/linux-c6-sdl_mixer/Makefile
index 5362f05..dba0508 100644
--- a/audio/linux-c6-sdl_mixer/Makefile
+++ b/audio/linux-c6-sdl_mixer/Makefile
@@ -6,25 +6,21 @@ PORTVERSION=	1.2.12
 PORTREVISION=	2
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL
-DISTNAME=	SDL_mixer-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Sample multi-channel audio mixer library (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-sdl_mixer-[0-9]* linux-f8-sdl_mixer-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	sdl12 mikmod
 LINUX_NAME=	SDL_mixer
-
 RPMVERSION=	1.el6
-BRANDELF_FILES=	usr/bin/playmus usr/bin/playwave
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	sdl12 mikmod
+USE_LINUX_RPM=	yes
 
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
 PORTDOCS=	CHANGES COPYING README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/audio/linux-f10-alsa-lib/Makefile b/audio/linux-f10-alsa-lib/Makefile
index 2be5e61..e3686f9 100644
--- a/audio/linux-f10-alsa-lib/Makefile
+++ b/audio/linux-f10-alsa-lib/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	alsa-lib
 PORTVERSION=	1.0.21
 PORTREVISION=	5
 CATEGORIES=	audio linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Advanced Linux Sound Architecture libraries (Linux Fedora 10)
@@ -14,12 +13,10 @@ RUN_DEPENDS=	alsa-lib>0:audio/alsa-lib
 
 CONFLICTS=	linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	2.fc10
-BRANDELF_FILES=	usr/bin/aserver
 USE_LDCONFIG=	yes
 
 # We will use native configuration file, so delete a linux one
diff --git a/audio/linux-f10-alsa-plugins-oss/Makefile b/audio/linux-f10-alsa-plugins-oss/Makefile
index db187f5..cb48be9 100644
--- a/audio/linux-f10-alsa-plugins-oss/Makefile
+++ b/audio/linux-f10-alsa-plugins-oss/Makefile
@@ -9,13 +9,12 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	OSS plugin for ALSA (Linux Fedora 10)
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	alsalib
+USE_LINUX=	alsalib
 
 RPMVERSION=	3.fc10
-SRC_DISTFILES=	${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
+SRC_DISTFILES=	${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 USE_LDCONFIG=	yes
 
 # We will use native configuration file, so delete a linux one
diff --git a/audio/linux-f10-arts/Makefile b/audio/linux-f10-arts/Makefile
index b65e81f..8b7b63c 100644
--- a/audio/linux-f10-arts/Makefile
+++ b/audio/linux-f10-arts/Makefile
@@ -5,19 +5,16 @@ PORTNAME=		arts
 PORTVERSION=		1.5.10
 PORTREVISION=		1
 CATEGORIES=		audio kde linux
-MASTER_SITES=		LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=		emulation@FreeBSD.org
 COMMENT=		Audio system for the KDE integrated X11 desktop (Linux Fedora 10)
 
 CONFLICTS=		linux-arts-[0-9]* linux-f8-arts-[0-9]*
 
-ONLY_FOR_ARCHS=		i386 amd64
-USE_LINUX=	f10
+USES=			linux:f10
 USE_LINUX_RPM=		yes
 
 RPMVERSION=		1.fc10
-BRANDELF_DIRS=		usr/bin
 USE_LDCONFIG=		yes
 
 post-install:
diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile
index 11e47c74..6740b2b 100644
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	esound
 PORTVERSION=	0.2.41
 CATEGORIES=	audio linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	${PORTNAME}-libs-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -12,14 +11,14 @@ COMMENT=	RPM of esound (Linux Fedora 10)
 
 CONFLICTS=	linux-esound-[0-9]* linux-f8-esound-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	libaudiofile
+USE_LINUX=	libaudiofile
 LINUX_NAME=	${PORTNAME}-libs
 
 RPMVERSION=	1.fc10
 USE_LDCONFIG=	yes
-SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
+SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
 PLIST_FILES=	etc/esd.conf usr/lib/libesd.so.0 usr/lib/libesd.so.0.2.39 \
 		usr/lib/libesddsp.so.0 usr/lib/libesddsp.so.0.2.39
diff --git a/audio/linux-f10-freealut/Makefile b/audio/linux-f10-freealut/Makefile
index 7474017..151c1f4 100644
--- a/audio/linux-f10-freealut/Makefile
+++ b/audio/linux-f10-freealut/Makefile
@@ -4,23 +4,20 @@
 PORTNAME=	freealut
 PORTVERSION=	1.1.0
 CATEGORIES=	audio linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Free implementation of OpenAL's ALUT standard (Linux Fedora 10)
 
 CONFLICTS=	linux-freealut-[0-9]* linux-f8-freealut-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	openal
+USE_LINUX=	openal
 
 RPMVERSION=	6.fc9
 USE_LDCONFIG=	yes
-ONLY_FOR_ARCHS=	i386 amd64
 
 PLIST_FILES=	usr/lib/libalut.so.0 usr/lib/libalut.so.0.1.0
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING ChangeLog README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/audio/linux-f10-libaudiofile/Makefile b/audio/linux-f10-libaudiofile/Makefile
index 6ac6e8d..7c44ebf 100644
--- a/audio/linux-f10-libaudiofile/Makefile
+++ b/audio/linux-f10-libaudiofile/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	lib${LINUX_NAME}
 PORTVERSION=	0.2.6
 CATEGORIES=	audio linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -12,12 +11,11 @@ COMMENT=	Implementation of the Audio File Library from SGI (Linux Fedora 10)
 
 CONFLICTS=	linux-libaudiofile-[0-9]* linux-f8-libaudiofile-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 LINUX_NAME=	audiofile
 
 RPMVERSION=	9.fc10
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 PLIST=		${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
 
diff --git a/audio/linux-f10-libogg/Makefile b/audio/linux-f10-libogg/Makefile
index 70c25bc..cf25f3d 100644
--- a/audio/linux-f10-libogg/Makefile
+++ b/audio/linux-f10-libogg/Makefile
@@ -4,22 +4,19 @@
 PORTNAME=	libogg
 PORTVERSION=	1.1.3
 CATEGORIES=	audio linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Ogg bitstream library (Linux Fedora 10)
 
 CONFLICTS=	linux-libogg-[0-9]* linux-f8-libogg-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	9.fc9
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/lib/libogg.so.0 usr/lib/libogg.so.0.5.3
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS CHANGES COPYING README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/audio/linux-f10-libvorbis/Makefile b/audio/linux-f10-libvorbis/Makefile
index f07f541..c6bc7a5 100644
--- a/audio/linux-f10-libvorbis/Makefile
+++ b/audio/linux-f10-libvorbis/Makefile
@@ -4,17 +4,15 @@
 PORTNAME=	libvorbis
 PORTVERSION=	1.2.0
 CATEGORIES=	audio linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux Fedora 10)
 
 CONFLICTS=	linux-libvorbis-[0-9]* linux-f8-libvorbis-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	libogg
+USE_LINUX=	libogg
 
 RPMVERSION=	5.fc10
 USE_LDCONFIG=	yes
@@ -22,7 +20,6 @@ USE_LDCONFIG=	yes
 PLIST_FILES=	usr/lib/libvorbis.so.0 usr/lib/libvorbis.so.0.4.0 \
 		usr/lib/libvorbisenc.so.2 usr/lib/libvorbisenc.so.2.0.3 \
 		usr/lib/libvorbisfile.so.3 usr/lib/libvorbisfile.so.3.2.0
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/audio/linux-f10-mikmod/Makefile b/audio/linux-f10-mikmod/Makefile
index a1d68bd..7d6cd49 100644
--- a/audio/linux-f10-mikmod/Makefile
+++ b/audio/linux-f10-mikmod/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	mikmod
 PORTVERSION=	3.2.0
 CATEGORIES=	audio linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -12,8 +11,7 @@ COMMENT=	MikMod Sound Library (Linux Fedora 10)
 
 CONFLICTS=	linux-mikmod-[0-9]* linux-f8-mikmod-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	3.beta2.fc9
diff --git a/audio/linux-f10-nas-libs/Makefile b/audio/linux-f10-nas-libs/Makefile
index 07c425d..cfb1a02 100644
--- a/audio/linux-f10-nas-libs/Makefile
+++ b/audio/linux-f10-nas-libs/Makefile
@@ -5,21 +5,19 @@ PORTNAME=	nas-libs
 PORTVERSION=	1.9.1
 PORTREVISION=	1
 CATEGORIES=	audio linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Runtime libraries for NAS (Linux Fedora 10)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	xorglibs
+USE_LINUX=	xorglibs
 
 RPMVERSION=	4.fc9
 USE_LDCONFIG=	yes
-SRC_DISTFILES=	nas-${PORTVERSION}-${RPMVERSION}.src.rpm
+SRC_DISTFILES=	nas-${PORTVERSION}-${RPMVERSION}.src.rpm:SOURCE
 
 PLIST_FILES=	usr/lib/libaudio.so.2 usr/lib/libaudio.so.2.4
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	FAQ HISTORY README TODO
 DESCR=		${.CURDIR}/../nas/pkg-descr
 
diff --git a/audio/linux-f10-openal-soft/Makefile b/audio/linux-f10-openal-soft/Makefile
index 12b8a6d..96406d4 100644
--- a/audio/linux-f10-openal-soft/Makefile
+++ b/audio/linux-f10-openal-soft/Makefile
@@ -9,17 +9,15 @@ CATEGORIES=	audio linux
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A 3D positional spatialized sound library (Linux Fedora 10)
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	alsalib arts esound
+USE_LINUX=	alsalib arts esound
 
 RPMVERSION=	7.fc10
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/lib/libopenal.so.1 usr/lib/libopenal.so.${PORTVERSION} \
 		usr/bin/openal-info
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	COPYING
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/audio/linux-f10-openal/Makefile b/audio/linux-f10-openal/Makefile
index 592d186..abadb52 100644
--- a/audio/linux-f10-openal/Makefile
+++ b/audio/linux-f10-openal/Makefile
@@ -4,23 +4,20 @@
 PORTNAME=	openal
 PORTVERSION=	0.0.9
 CATEGORIES=	audio linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	3D positional spatialized sound library (Linux Fedora 10)
 
 CONFLICTS=	linux-openal-[0-9]* linux-f8-openal-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	alsalib arts esound libaudiofile libvorbis sdl12
+USE_LINUX=	alsalib arts esound libaudiofile libvorbis sdl12
 
 RPMVERSION=	0.15.20060204cvs.fc9
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	etc/openalrc usr/lib/libopenal.so.0 usr/lib/libopenal.so.0.0.0
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING ChangeLog NOTES README TODO
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/audio/linux-f10-pulseaudio-libs/Makefile b/audio/linux-f10-pulseaudio-libs/Makefile
index 512f1fb..8dc31a1 100644
--- a/audio/linux-f10-pulseaudio-libs/Makefile
+++ b/audio/linux-f10-pulseaudio-libs/Makefile
@@ -4,18 +4,17 @@
 PORTNAME=	pulseaudio-libs
 PORTVERSION=	0.9.14
 CATEGORIES=	audio linux
-MASTER_SITES=	LOCAL/netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
+MASTER_SITES=	LOCAL/netchild/rpms/fedora10
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries for PulseAudio clients (Linux Fedora 10)
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	libasyncns xorglibs
+USE_LINUX=	libasyncns xorglibs
 
 RPMVERSION=	4.fc10
-SRC_DISTFILES=	${PORTNAME:S/-libs//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
+SRC_DISTFILES=	${PORTNAME:S/-libs//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 USE_LDCONFIG=	yes
 
 post-extract:
diff --git a/audio/linux-f10-sdl_mixer/Makefile b/audio/linux-f10-sdl_mixer/Makefile
index 82cc871..0f3b8df 100644
--- a/audio/linux-f10-sdl_mixer/Makefile
+++ b/audio/linux-f10-sdl_mixer/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	sdl_mixer
 PORTVERSION=	1.2.8
 PORTREVISION=	1
 CATEGORIES=	audio linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	SDL_mixer-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -13,14 +12,12 @@ COMMENT=	Sample multi-channel audio mixer library (Linux Fedora 10)
 
 CONFLICTS=	linux-sdl_mixer-[0-9]* linux-f8-sdl_mixer-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	sdl12 mikmod
+USE_LINUX=	sdl12 mikmod
 LINUX_NAME=	SDL_mixer
 
 RPMVERSION=	9.fc10
-BRANDELF_FILES=	usr/bin/playmus usr/bin/playwave
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/bin/playmus usr/lib/libSDL_mixer-1.2.so.0 \
diff --git a/audio/linux-genpuid/Makefile b/audio/linux-genpuid/Makefile
index 643485b..7d0de9d 100644
--- a/audio/linux-genpuid/Makefile
+++ b/audio/linux-genpuid/Makefile
@@ -11,9 +11,8 @@ DISTNAME=	${PORTNAME}_linux_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application for generating MusicIP puids
 
-USES=		tar:tgz
+USES=		linux tar:tgz
 
-USE_LINUX=		yes
 NO_BUILD=		yes
 IA32_BINARY_PORT=	yes
 
diff --git a/audio/linux-laudio/Makefile b/audio/linux-laudio/Makefile
index 8df20d4..3b75f8e 100644
--- a/audio/linux-laudio/Makefile
+++ b/audio/linux-laudio/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Free lossless audio codec
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		tar:bzip2
-USE_LINUX=	yes
+USES=		linux tar:bzip2
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/laudio
diff --git a/audio/linux-mbrola/Makefile b/audio/linux-mbrola/Makefile
index 305fa67..699df83 100644
--- a/audio/linux-mbrola/Makefile
+++ b/audio/linux-mbrola/Makefile
@@ -20,7 +20,7 @@ CONFLICTS=	mbrola-*
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	amd64 i386
 NO_WRKSUBDIR=	yes
-USE_LINUX=	yes
+USES=		linux
 RESTRICTED=	for non-commercial, non-military applications only
 
 PLIST_FILES=	bin/mbrola
diff --git a/audio/linux-neroaaccodec/Makefile b/audio/linux-neroaaccodec/Makefile
index b32cd3d..5afe8b8 100644
--- a/audio/linux-neroaaccodec/Makefile
+++ b/audio/linux-neroaaccodec/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	NeroAACCodec-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nero AAC reference quality MPEG-4 and 3GPP audio codec
 
-USES=		dos2unix zip
-USE_LINUX=	yes
+USES=		dos2unix linux zip
 DOS2UNIX_REGEX=	.*\.txt
 ONLY_FOR_ARCHS=	i386 amd64
 NO_BUILD=	yes
diff --git a/audio/linux-skype_oss_wrapper/Makefile b/audio/linux-skype_oss_wrapper/Makefile
index 2ea133f..74d0bc2 100644
--- a/audio/linux-skype_oss_wrapper/Makefile
+++ b/audio/linux-skype_oss_wrapper/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LINUXBASE}/usr/bin/gcc:devel/linux-c6-devtools
 USE_GITHUB=	yes
 GH_ACCOUNT=	s3erios
 
-USE_LINUX=	yes
+USES=		linux
 USE_LINUX_PREFIX=	yes
 # do not define USE_LDCONFIG, it's not for global use
 
diff --git a/audio/lpac/Makefile b/audio/lpac/Makefile
index 696fc7a..23bea1c 100644
--- a/audio/lpac/Makefile
+++ b/audio/lpac/Makefile
@@ -15,7 +15,7 @@ ONLY_FOR_ARCHS=	amd64 i386
 
 NO_CDROM=	No commercial use
 NO_BUILD=	yes
-USE_LINUX=	yes
+USES=		linux
 PLIST_FILES=	bin/lpac
 
 do-install:
diff --git a/biology/consed/Makefile b/biology/consed/Makefile
index 19d4b93..8d8d997 100644
--- a/biology/consed/Makefile
+++ b/biology/consed/Makefile
@@ -18,9 +18,8 @@ CONFLICTS_INSTALL=	phd2fasta-[0-9]*
 
 SUB_FILES=	pkg-message
 
-USES=		perl5 shebangfix
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux perl5 shebangfix
+USE_LINUX=	xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
 MYSHEBANG=	bin/ace2Fasta.perl \
 		bin/tagRepeats.perl \
diff --git a/biology/linux-foldingathome/Makefile b/biology/linux-foldingathome/Makefile
index 5f2eaad..f8641b1 100644
--- a/biology/linux-foldingathome/Makefile
+++ b/biology/linux-foldingathome/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.exe
 MAINTAINER=	onatan@gmail.com
 COMMENT=	Distributed client for Protein Folding
 
-USE_LINUX=	yes
+USES=		linux
 ONLY_FOR_ARCHS=	i386 amd64
 REINPLACE_ARGS=
 PLIST_FILES=	share/${PORTNAME}/${DISTNAME}${EXTRACT_SUFX} \
diff --git a/cad/linux-eagle5/Makefile b/cad/linux-eagle5/Makefile
index 2d28309..ad19335 100644
--- a/cad/linux-eagle5/Makefile
+++ b/cad/linux-eagle5/Makefile
@@ -34,8 +34,8 @@ EAGLEBASEVERSION=	5.12
 EAGLEBUGFIX=	0
 EAGLEVERSION=	${EAGLEBASEVERSION}.${EAGLEBUGFIX}
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs jpeg png
+USES=		linux
+USE_LINUX=	xorglibs jpeg png
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-deinstall pkg-message
diff --git a/comms/kvasd/Makefile b/comms/kvasd/Makefile
index 4716d5d..020d22c 100644
--- a/comms/kvasd/Makefile
+++ b/comms/kvasd/Makefile
@@ -19,8 +19,8 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 BUILD_DEPENDS=	${KVASD_DEPENDS}
 RUN_DEPENDS=	${KVASD_DEPENDS}
 
-KVASD_DEPENDS=	linux-${USE_LINUX}-libgfortran>0:devel/linux-c6-libgfortran
-USE_LINUX=	c6
+KVASD_DEPENDS=	linux-c6-libgfortran>0:devel/linux-c6-libgfortran
+USES=		linux:c6
 NO_BUILD=	yes
 PLIST_FILES=	bin/kvasd
 
diff --git a/comms/rxtx/Makefile b/comms/rxtx/Makefile
index 66031f8..a0b50f5 100644
--- a/comms/rxtx/Makefile
+++ b/comms/rxtx/Makefile
@@ -13,8 +13,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/pre/}
 MAINTAINER=	james@elstone.net
 COMMENT=	Native interface to serial ports in Java
 
-USES=		gmake libtool zip
-USE_LINUX=	c6
+USES=		gmake libtool linux:c6 zip
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/databases/linux-c6-sqlite3/Makefile b/databases/linux-c6-sqlite3/Makefile
index 181b214..99052c9 100644
--- a/databases/linux-c6-sqlite3/Makefile
+++ b/databases/linux-c6-sqlite3/Makefile
@@ -11,14 +11,11 @@ COMMENT=	Library that implements an embeddable SQL database engine (Linux CentOS
 
 CONFLICTS=	linux-f8-sqlite3-[0-9]* linux-f10-sqlite3-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
 RPMVERSION=	1.el6_7.2
-USE_LINUX_RPM=	yes
-BRANDELF_FILES=	usr/bin/sqlite3
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX_RPM=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/sqlite-${PORTVERSION}
 PORTDOCS=	README
 DESCR=		${.CURDIR}/../${PORTNAME}3/pkg-descr
 
diff --git a/databases/linux-f10-sqlite3/Makefile b/databases/linux-f10-sqlite3/Makefile
index c7128fe..88c8a5e 100644
--- a/databases/linux-f10-sqlite3/Makefile
+++ b/databases/linux-f10-sqlite3/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	sqlite3
 PORTVERSION=	3.5.9
 PORTREVISION=	2
 CATEGORIES=	databases linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	sqlite-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -13,11 +12,10 @@ COMMENT=	Library that implements an embeddable SQL database engine (Linux Fedora
 
 CONFLICTS=	linux-f8-sqlite3-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	4.fc10
-BRANDELF_FILES=	usr/bin/sqlite3
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/bin/sqlite3 usr/lib/libsqlite3.so.0 \
diff --git a/databases/linux-oracle-instantclient-basic/Makefile b/databases/linux-oracle-instantclient-basic/Makefile
index 5c0bed4..3ecd70e 100644
--- a/databases/linux-oracle-instantclient-basic/Makefile
+++ b/databases/linux-oracle-instantclient-basic/Makefile
@@ -20,8 +20,7 @@ DISTINFO_FILE=		${MASTERDIR}/distinfo.i386
 
 RESTRICTED=		Packaging prohibited by Oracle license
 
-USES=			zip
-USE_LINUX=		yes
+USES=			linux zip
 USE_LINUX_PREFIX=	yes
 
 ORACLEVERSION=		10.2.0.3
diff --git a/databases/linux-oracle-instantclient-sqlplus/Makefile b/databases/linux-oracle-instantclient-sqlplus/Makefile
index 105ed09..6374a51 100644
--- a/databases/linux-oracle-instantclient-sqlplus/Makefile
+++ b/databases/linux-oracle-instantclient-sqlplus/Makefile
@@ -23,8 +23,7 @@ RESTRICTED=		Packaging prohibited by Oracle license
 # base
 RUN_DEPENDS+=		linux-oracle-instantclient-basic>0:databases/linux-oracle-instantclient-basic
 
-USES=			zip
-USE_LINUX=		c6
+USES=			linux:c6 zip
 USE_LINUX_PREFIX=	yes
 
 ORACLEVERSION=		10.2.0.3
diff --git a/devel/fb-adb/Makefile b/devel/fb-adb/Makefile
index 5d438d2..a61eeb2 100644
--- a/devel/fb-adb/Makefile
+++ b/devel/fb-adb/Makefile
@@ -54,15 +54,14 @@ NDK_MASTER_SITES=	https://dl.google.com/android/ndk/:ndk,p7zip
 # Prefer NDK from environment
 WRKSRC_ndk=		${ANDROID_NDK}
 .else
-NDK_DISTFILES=		${NDK_DISTFILES_${LINUX_RPM_ARCH}}
-NDK_DISTFILES_i686=	android-ndk-r10e-linux-x86.bin:ndk,p7zip
+NDK_DISTFILES=		${NDK_DISTFILES_${LINUX_ARCH}}
+NDK_DISTFILES_i386=	android-ndk-r10e-linux-x86.bin:ndk,p7zip
 NDK_DISTFILES_x86_64=	android-ndk-r11c-linux-x86_64.zip:ndk
 WRKSRC_ndk=		${WRKDIR}/${NDK_DISTFILES:R:C/(-[^-]+){2}$//}
 .endif
-NDK_BUILD_DEPENDS=	${LINUX_BASE_PORT}
-NDK_USES=		7z:partial
-NDK_USE=		LINUX=yes # build
-NDK_SHELL=		${SETENV} UNAME_s=Linux UNAME_m=${LINUX_RPM_ARCH} ${SH}
+NDK_USES=		7z:partial linux
+NDK_USE=		LINUX=base:build
+NDK_SHELL=		${LINUXBASE}/bin/sh
 NDK_CONFIGURE_ENV=	ANDROID_NDK="${WRKSRC_ndk}" \
 			ANDROID_NDK_SHELL="${NDK_SHELL}" \
 			NDK_TMPDIR="${WRKDIR}"
@@ -85,15 +84,13 @@ post-patch:
 # XXX Decouple -Werror from --enable-checking (ASSERT=on)
 	@${REINPLACE_CMD} -e '/CPPFLAGS.*-Werror/d' ${WRKSRC}/configure.ac
 
+post-patch-NDK-on:
+	@${REINPLACE_CMD} 's,mkdir,/compat/linux/../../bin/mkdir,' \
+		${WRKSRC_ndk}/build/tools/make-standalone-toolchain.sh \
+		${WRKSRC_ndk}/build/tools/ndk-common.sh
+
 post-patch-NDK-off:
 	@${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-android/aux-&/' \
 		${WRKSRC}/stub-*/configure
 
 .include <bsd.port.mk>
-
-# XXX Bug 204615: Teach USE_LINUX about build-only deps
-.if defined(.PARSEDIR)
-RUN_DEPENDS:=	${RUN_DEPENDS:N${LINUX_BASE_PORT}}
-.else
-RUN_DEPENDS:=	${RUN_DEPENDS:N*linux_base*}
-.endif
diff --git a/devel/linux-c6-dbus-glib/Makefile b/devel/linux-c6-dbus-glib/Makefile
index 8df7879..8162b34 100644
--- a/devel/linux-c6-dbus-glib/Makefile
+++ b/devel/linux-c6-dbus-glib/Makefile
@@ -9,15 +9,12 @@ CATEGORIES=	devel linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GLib bindings for D-Bus (Linux CentOS ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	dbuslibs expat
-
 RPMVERSION=	6.el6
-BRANDELF_FILES=	usr/bin/dbus-binding-tool
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	dbuslibs expat
+USE_LINUX_RPM=	yes
 
-DOCSDIR=	usr/share/doc/dbus-glib-0.86
 PORTDOCS=	COPYING ChangeLog NEWS
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/devel/linux-c6-dbus-libs/Makefile b/devel/linux-c6-dbus-libs/Makefile
index 8d6f4a1..e92e403 100644
--- a/devel/linux-c6-dbus-libs/Makefile
+++ b/devel/linux-c6-dbus-libs/Makefile
@@ -5,14 +5,12 @@ PORTNAME=	dbus-libs
 PORTVERSION=	1.2.24
 PORTREVISION=	4
 CATEGORIES=	devel linux
-MASTER_SITES=	CENTOS_LINUX
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries for accessing D-BUS (Linux CentOS ${LINUX_DIST_VER})
 
-ONLY_FOR_ARCHS=	i386 amd64
 
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 RPMVERSION=	8.el6_6
 USE_LDCONFIG=	yes
diff --git a/devel/linux-c6-devtools/Makefile b/devel/linux-c6-devtools/Makefile
index 9465533..cc1149e 100644
--- a/devel/linux-c6-devtools/Makefile
+++ b/devel/linux-c6-devtools/Makefile
@@ -2,53 +2,50 @@
 # $FreeBSD$
 
 PORTNAME=	devtools
-PORTVERSION=	6.8
+PORTVERSION=	${LINUX_DIST_VER}
 CATEGORIES=	devel
-DISTFILES=	binutils-2.20.51.0.2-5.44.el6.${LINUX_RPM_ARCH}.rpm \
-		glibc-headers-2.12-1.192.el6.${LINUX_RPM_ARCH}.rpm \
-		kernel-headers-2.6.32-642.1.1.el6.${LINUX_RPM_ARCH}.rpm \
-		mpfr-2.4.1-6.el6.${LINUX_RPM_ARCH}.rpm \
-		cpp-4.4.7-17.el6.${LINUX_RPM_ARCH}.rpm \
-		gcc-4.4.7-17.el6.${LINUX_RPM_ARCH}.rpm \
-		gcc-c++-4.4.7-17.el6.${LINUX_RPM_ARCH}.rpm \
-		gcc-gfortran-4.4.7-17.el6.${LINUX_RPM_ARCH}.rpm
-
-LIB_DISTFILES=	binutils-devel-2.20.51.0.2-5.44.el6.${LINUX_RPM_ARCH}.rpm \
-		glibc-devel-2.12-1.192.el6.${LINUX_RPM_ARCH}.rpm \
-		libstdc++-devel-4.4.7-17.el6.${LINUX_RPM_ARCH}.rpm \
-		libgomp-4.4.7-17.el6.${LINUX_RPM_ARCH}.rpm \
+BIN_DISTFILES=	binutils-2.20.51.0.2-5.44.el6${EXTRACT_SUFX} \
+		glibc-headers-2.12-1.192.el6${EXTRACT_SUFX} \
+		kernel-headers-2.6.32-642.1.1.el6${EXTRACT_SUFX} \
+		mpfr-2.4.1-6.el6${EXTRACT_SUFX} \
+		cpp-4.4.7-17.el6${EXTRACT_SUFX} \
+		gcc-4.4.7-17.el6${EXTRACT_SUFX} \
+		gcc-c++-4.4.7-17.el6${EXTRACT_SUFX} \
+		gcc-gfortran-4.4.7-17.el6${EXTRACT_SUFX}
+
+LIB_DISTFILES=	binutils-devel-2.20.51.0.2-5.44.el6${EXTRACT_SUFX} \
+		glibc-devel-2.12-1.192.el6${EXTRACT_SUFX} \
+		libstdc++-devel-4.4.7-17.el6${EXTRACT_SUFX} \
+		libgomp-4.4.7-17.el6${EXTRACT_SUFX} \
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Linux compilers and base libraries (CentOS ${LINUX_DIST_VER})
 
 # LICENSE=	Various GNU
 
-RUN_DEPENDS+=	linux-${USE_LINUX}-libgfortran>0:devel/linux-c6-libgfortran
-
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
+USE_LINUX=	libgfortran
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 
-PLIST_SUB+=	NLS=""
-
 SRC_DISTFILES=	binutils-2.20.51.0.2-5.44.el6.src.rpm:SOURCE \
 		glibc-2.12-1.192.el6.src.rpm:SOURCE \
 		kernel-2.6.32-642.1.1.el6.src.rpm:SOURCE \
 		mpfr-2.4.1-6.el6.src.rpm:SOURCE \
 		gcc-4.4.7-17.el6.src.rpm:SOURCE
 
+.include <bsd.port.pre.mk>
+
 post-install:
-.	if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64"
+.if ${LINUX_ARCH} == x86_64
 	${LN} -sf ${LINUXBASE}/lib64/libgcc_s.so.1 \
 	${STAGEDIR}${PREFIX}/usr/lib/gcc/x86_64-redhat-linux/4.4.4/libgcc_s.so
 
 	${LN} -sf ${LINUXBASE}/lib/libgcc_s.so.1 \
 	${STAGEDIR}${PREFIX}/usr/lib/gcc/x86_64-redhat-linux/4.4.4/32/libgcc_s.so
-
-.	else
+.else
 	${LN} -sf ${LINUXBASE}/lib/libgcc_s.so.1 \
 	${STAGEDIR}${PREFIX}/usr/lib/gcc/i686-redhat-linux/4.4.4/libgcc_s.so
-.	endif
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/linux-c6-libgfortran/Makefile b/devel/linux-c6-libgfortran/Makefile
index 8cc2fd6..bb2839d 100644
--- a/devel/linux-c6-libgfortran/Makefile
+++ b/devel/linux-c6-libgfortran/Makefile
@@ -8,11 +8,11 @@ CATEGORIES=	devel linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of runtime libs for gfortran (Linux Centos ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	17.el6
 USE_LDCONFIG=	yes
-SRC_DISTFILES=	gcc-${DISTVERSION}${SRC_SUFX}:SOURCE
+SRC_DISTFILES=	gcc-${DISTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
 .include <bsd.port.mk>
diff --git a/devel/linux-c6-libglade2/Makefile b/devel/linux-c6-libglade2/Makefile
index cf47162..0f02884 100644
--- a/devel/linux-c6-libglade2/Makefile
+++ b/devel/linux-c6-libglade2/Makefile
@@ -11,13 +11,12 @@ COMMENT=	RPM of libglade2 (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-libglade2-[0-9]* linux-f10-libglade2-[0-9]*
 
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	3.1.el6
 USE_LDCONFIG=	yes
 
-DOCSDIR=	usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING NEWS README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/devel/linux-c6-libpciaccess/Makefile b/devel/linux-c6-libpciaccess/Makefile
index 6a89aff..2c2cee6 100644
--- a/devel/linux-c6-libpciaccess/Makefile
+++ b/devel/linux-c6-libpciaccess/Makefile
@@ -10,8 +10,7 @@ COMMENT=	Generic PCI access library (CentOS ${LINUX_DIST_VER})
 
 # LICENSE=	Various GNU
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 RPMVERSION=	1.el6
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/linux-c6-libsigc++20/Makefile b/devel/linux-c6-libsigc++20/Makefile
index 83013f4..121e1c6 100644
--- a/devel/linux-c6-libsigc++20/Makefile
+++ b/devel/linux-c6-libsigc++20/Makefile
@@ -11,13 +11,12 @@ COMMENT=	Callback Framework for C++(Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-f10-libsigc++20-[0-9]*
 
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	1.el6
 USE_LDCONFIG=	yes
 
-DOCSDIR=	usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/devel/linux-c6-libthai/Makefile b/devel/linux-c6-libthai/Makefile
index 1dfa3ad..3ff1cc8 100644
--- a/devel/linux-c6-libthai/Makefile
+++ b/devel/linux-c6-libthai/Makefile
@@ -7,14 +7,11 @@ CATEGORIES=	devel linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Thai language support library (Linux CentOS ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-
 RPMVERSION=	3.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX_RPM=	yes
 
-DATADIR=	${PREFIX}/usr/share/${PORTNAME}
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/devel/linux-c6-ncurses-base/Makefile b/devel/linux-c6-ncurses-base/Makefile
index 89c564d..79bb46f8 100644
--- a/devel/linux-c6-ncurses-base/Makefile
+++ b/devel/linux-c6-ncurses-base/Makefile
@@ -9,12 +9,12 @@ CATEGORIES=	devel linux
 MAINTAINER=	bacon4000@gmail.com
 COMMENT=	Terminfo database required by Linux ncurses programs
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	nolib
 LINUX_NAME=	ncurses
-
 RPMVERSION=	4.20090207.el6
+USES=		linux:c6
+USE_LINUX_RPM=	nolib
+
 SRC_DISTFILES=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-DESCR=	${.CURDIR}/../${LINUX_NAME}/pkg-descr
+DESCR=		${.CURDIR}/../${LINUX_NAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/devel/linux-c6-nspr/Makefile b/devel/linux-c6-nspr/Makefile
index c03324a..e5adea9 100644
--- a/devel/linux-c6-nspr/Makefile
+++ b/devel/linux-c6-nspr/Makefile
@@ -10,9 +10,8 @@ COMMENT=	Netscape Portable Runtime (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-f10-nspr-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
 RPMVERSION=	1.el6
-USE_LINUX=	c6
+USES=		linux:c6
 
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/linux-c6-qt47/Makefile b/devel/linux-c6-qt47/Makefile
index 466b9b0..e694ad7 100644
--- a/devel/linux-c6-qt47/Makefile
+++ b/devel/linux-c6-qt47/Makefile
@@ -13,14 +13,13 @@ DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/atrpms/6
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of QT4 (Linux CentOS 6)
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_APPS=	fontconfig png dbuslibs sqlite3 hicontheme openssl
-USE_LINUX_RPM=	yes
 RPMVERSION=	1_18.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
-DESCR=		${.CURDIR}/../../devel/qt4/pkg-descr
+USE_LINUX=	fontconfig png dbuslibs sqlite3 hicontheme openssl
+USE_LINUX_RPM=	yes
 
-SRC_DISTFILES:=	# no file available
+DESCR=		${.CURDIR}/../qt4/pkg-descr
+SRC_DISTFILES=	# no file available
 
 .include <bsd.port.mk>
diff --git a/devel/linux-c6-qt47/pkg-plist.i386 b/devel/linux-c6-qt47/pkg-plist.i386
index 8beb64a..704e65a 100644
--- a/devel/linux-c6-qt47/pkg-plist.i386
+++ b/devel/linux-c6-qt47/pkg-plist.i386
@@ -40,10 +40,10 @@ usr/lib/qt47/phrasebooks/russian.qph
 usr/lib/qt47/phrasebooks/spanish.qph
 usr/lib/qt47/phrasebooks/swedish.qph
 usr/lib/qt47/plugins/sqldrivers/libqsqlite.so
-usr/share/doc/qt47-4.7.2/LGPL_EXCEPTION.txt
-usr/share/doc/qt47-4.7.2/LICENSE.GPL3
-usr/share/doc/qt47-4.7.2/LICENSE.LGPL
-usr/share/doc/qt47-4.7.2/README
+%%DOCSDIR%%/LGPL_EXCEPTION.txt
+%%DOCSDIR%%/LICENSE.GPL3
+%%DOCSDIR%%/LICENSE.LGPL
+%%DOCSDIR%%/README
 usr/share/qt47/translations/qt_ar.qm
 usr/share/qt47/translations/qt_cs.qm
 usr/share/qt47/translations/qt_da.qm
@@ -64,4 +64,4 @@ usr/share/qt47/translations/qt_uk.qm
 usr/share/qt47/translations/qt_zh_CN.qm
 usr/share/qt47/translations/qt_zh_TW.qm
 @dir usr/lib/qt47/plugins/crypto
-%%PORTDOCS%%@dir usr/%%DOCSDIR%%/qch
+@dir usr/share/doc/qt47/qch
diff --git a/devel/linux-c6-qt47/pkg-plist.x86_64 b/devel/linux-c6-qt47/pkg-plist.x86_64
index 1da5647..755fea1 100644
--- a/devel/linux-c6-qt47/pkg-plist.x86_64
+++ b/devel/linux-c6-qt47/pkg-plist.x86_64
@@ -81,10 +81,10 @@ usr/lib64/qt47/phrasebooks/russian.qph
 usr/lib64/qt47/phrasebooks/spanish.qph
 usr/lib64/qt47/phrasebooks/swedish.qph
 usr/lib64/qt47/plugins/sqldrivers/libqsqlite.so
-usr/share/doc/qt47-4.7.2/LGPL_EXCEPTION.txt
-usr/share/doc/qt47-4.7.2/LICENSE.GPL3
-usr/share/doc/qt47-4.7.2/LICENSE.LGPL
-usr/share/doc/qt47-4.7.2/README
+%%DOCSDIR%%/LGPL_EXCEPTION.txt
+%%DOCSDIR%%/LICENSE.GPL3
+%%DOCSDIR%%/LICENSE.LGPL
+%%DOCSDIR%%/README
 usr/share/qt47/translations/qt_ar.qm
 usr/share/qt47/translations/qt_cs.qm
 usr/share/qt47/translations/qt_da.qm
@@ -106,4 +106,4 @@ usr/share/qt47/translations/qt_zh_CN.qm
 usr/share/qt47/translations/qt_zh_TW.qm
 @dir usr/lib64/qt47/plugins/crypto
 @dir usr/lib/qt47/plugins/crypto
-%%PORTDOCS%%@dir usr/%%DOCSDIR%%/qch
+@dir usr/share/doc/qt47/qch
diff --git a/devel/linux-c6-sdl12/Makefile b/devel/linux-c6-sdl12/Makefile
index ea520f7..fd0121a 100644
--- a/devel/linux-c6-sdl12/Makefile
+++ b/devel/linux-c6-sdl12/Makefile
@@ -5,27 +5,22 @@ PORTNAME=	sdl
 PORTVERSION=	1.2.14
 PORTREVISION=	3
 CATEGORIES=	devel linux
-DISTNAME=	SDL-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Cross-platform multi-media development API (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-sdl12-[0-9]* linux-f8-sdl12-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	xorglibs
-INSTALL_SHLIB=	yes
 LINUX_NAME=	SDL
-
 RPMVERSION=	7.el6_7.1
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	xorglibs
+USE_LINUX_RPM=	yes
 
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
 PORTDOCS=	BUGS COPYING CREDITS README-SDL.txt
 DESCR=		${.CURDIR}/../${PORTNAME}12/pkg-descr
 
-SRC_DISTFILES=	SDL-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-
 .include <bsd.port.mk>
diff --git a/devel/linux-f10-allegro/Makefile b/devel/linux-f10-allegro/Makefile
index 5413795..40ccad0 100644
--- a/devel/linux-f10-allegro/Makefile
+++ b/devel/linux-f10-allegro/Makefile
@@ -5,20 +5,18 @@ PORTNAME=	allegro
 PORTVERSION=	4.2.2
 PORTREVISION=	1
 CATEGORIES=	devel linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Cross-platform game programming library (Linux Fedora 10)
 
 CONFLICTS=	linux-allegro-[0-9]* linux-f8-allegro-[0-9]*
 
-USE_LINUX=	f10
-USE_LINUX_RPM=		yes
-USE_LINUX_APPS=		xorglibs
-ONLY_FOR_ARCHS=		i386 amd64
+USES=		linux:f10
+USE_LINUX_RPM=	yes
+USE_LINUX=	xorglibs
 
-RPMVERSION=		10.fc10
-USE_LDCONFIG=		yes
+RPMVERSION=	10.fc10
+USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/devel/linux-f10-dbus-glib/Makefile b/devel/linux-f10-dbus-glib/Makefile
index ffbb8f6..b245a1b 100644
--- a/devel/linux-f10-dbus-glib/Makefile
+++ b/devel/linux-f10-dbus-glib/Makefile
@@ -5,22 +5,19 @@ PORTNAME=	dbus-glib
 PORTVERSION=	0.76
 PORTREVISION=	1
 CATEGORIES=	devel linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GLib bindings for D-Bus (Linux Fedora 10)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	dbuslibs expat
+USE_LINUX=	dbuslibs expat
 
 RPMVERSION=	3.fc10
-BRANDELF_FILES=	usr/bin/dbus-binding-tool
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/bin/dbus-binding-tool usr/lib/libdbus-glib-1.so.2 \
 		usr/lib/libdbus-glib-1.so.2.1.0
-DOCSDIR=	usr/share/doc/dbus-glib-0.76
 PORTDOCS=	COPYING ChangeLog NEWS
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/devel/linux-f10-dbus-libs/Makefile b/devel/linux-f10-dbus-libs/Makefile
index ebe4bfe..9893a6e 100644
--- a/devel/linux-f10-dbus-libs/Makefile
+++ b/devel/linux-f10-dbus-libs/Makefile
@@ -5,17 +5,16 @@ PORTNAME=	dbus-libs
 PORTVERSION=	1.2.4
 PORTREVISION=	1
 CATEGORIES=	devel linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries for accessing D-BUS (Linux Fedora 10)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	4.fc10
 USE_LDCONFIG=	yes
-SRC_DISTFILES=	dbus-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
+SRC_DISTFILES=	dbus-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 DESCR=		${.CURDIR}/../dbus/pkg-descr
 
 PLIST_FILES=	lib/libdbus-1.so.3 lib/libdbus-1.so.3.4.0
diff --git a/devel/linux-f10-devtools/Makefile b/devel/linux-f10-devtools/Makefile
index 3e95695..cf531a9 100644
--- a/devel/linux-f10-devtools/Makefile
+++ b/devel/linux-f10-devtools/Makefile
@@ -5,37 +5,30 @@ PORTNAME=	devtools
 PORTVERSION=	10
 PORTREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/${PORTVERSION}/${LINUX_RPM_ARCH}/:bin \
-		http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/${PORTVERSION}/Fedora/${LINUX_RPM_ARCH}/os/Packages/:bin
-DISTFILES=	binutils-2.18.50.0.9-8.fc10.${LINUX_RPM_ARCH}.rpm:bin \
-		binutils-devel-2.18.50.0.9-8.fc10.${LINUX_RPM_ARCH}.rpm:bin \
-		glibc-devel-2.9-3.${LINUX_RPM_ARCH}.rpm:bin \
-		glibc-headers-2.9-3.${LINUX_RPM_ARCH}.rpm:bin \
-		kernel-headers-2.6.27.41-170.2.117.fc10.${LINUX_RPM_ARCH}.rpm:bin \
-		mpfr-2.3.2-1.fc10.${LINUX_RPM_ARCH}.rpm:bin \
-		cpp-4.3.2-7.${LINUX_RPM_ARCH}.rpm:bin \
-		gcc-4.3.2-7.${LINUX_RPM_ARCH}.rpm:bin \
-		gcc-c++-4.3.2-7.${LINUX_RPM_ARCH}.rpm:bin \
-		gcc-gfortran-4.3.2-7.${LINUX_RPM_ARCH}.rpm:bin
+BIN_DISTFILES=	binutils-2.18.50.0.9-8.fc10${EXTRACT_SUFX} \
+		binutils-devel-2.18.50.0.9-8.fc10${EXTRACT_SUFX} \
+		glibc-devel-2.9-3${EXTRACT_SUFX} \
+		glibc-headers-2.9-3${EXTRACT_SUFX} \
+		kernel-headers-2.6.27.41-170.2.117.fc10${EXTRACT_SUFX} \
+		mpfr-2.3.2-1.fc10${EXTRACT_SUFX} \
+		cpp-4.3.2-7${EXTRACT_SUFX} \
+		gcc-4.3.2-7${EXTRACT_SUFX} \
+		gcc-c++-4.3.2-7${EXTRACT_SUFX} \
+		gcc-gfortran-4.3.2-7${EXTRACT_SUFX}
 
 MAINTAINER=	bacon4000@gmail.com
 COMMENT=	Linux compilers and base libraries
 
-.if defined(PACKAGE_BUILDING)
-MASTER_SITES+=	http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/${PORTVERSION}/SRPMS/:src \
-		http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/${PORTVERSION}/Fedora/source/SRPMS/:src
-SRC_DISTFILES=	binutils-2.18.50.0.9-8.fc10.src.rpm:src \
-		glibc-2.9-3.src.rpm:src \
-		kernel-2.6.27.5-117.fc10.src.rpm:src \
-		mpfr-2.3.2-1.fc10.src.rpm:src \
-		gcc-4.3.2-7.src.rpm:src
-.endif
+SRC_DISTFILES=	binutils-2.18.50.0.9-8.fc10.src.rpm:SOURCE \
+		glibc-2.9-3.src.rpm:SOURCE \
+		kernel-2.6.27.5-117.fc10.src.rpm:SOURCE \
+		mpfr-2.3.2-1.fc10.src.rpm:SOURCE \
+		gcc-4.3.2-7.src.rpm:SOURCE
 
 # LICENSE=	Various GNU
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
-USE_LINUX_RPM=	yes
+USES=		linux:f10
+USE_LINUX_RPM=	nolib
 USE_LDCONFIG=	yes
 
 PLIST_SUB+=	NLS=""
diff --git a/devel/linux-f10-libglade2/Makefile b/devel/linux-f10-libglade2/Makefile
index 123cd5d..3e23ee7 100644
--- a/devel/linux-f10-libglade2/Makefile
+++ b/devel/linux-f10-libglade2/Makefile
@@ -5,14 +5,13 @@ PORTNAME=	libglade2
 PORTVERSION=	2.6.3
 PORTREVISION=	2
 CATEGORIES=	devel linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of libglade2 (Linux Fedora 10)
 
 CONFLICTS=	linux-libglade2-[0-9]* linux-f8-libglade2-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	2.fc10
@@ -21,7 +20,6 @@ USE_LDCONFIG=	yes
 PLIST_FILES=	usr/lib/libglade-2.0.so.0 usr/lib/libglade-2.0.so.0.0.7 \
 		usr/share/xml/libglade/glade-2.0.dtd
 PLIST_DIRS=	usr/lib/libglade/2.0
-DOCSDIR=	usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING NEWS README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/devel/linux-f10-libsigc++20/Makefile b/devel/linux-f10-libsigc++20/Makefile
index 1252a7e..e6f76a2 100644
--- a/devel/linux-f10-libsigc++20/Makefile
+++ b/devel/linux-f10-libsigc++20/Makefile
@@ -5,22 +5,19 @@ PORTNAME=		libsigc++20
 PORTVERSION=		2.2.2
 PORTREVISION=	1
 CATEGORIES=		devel linux
-MASTER_SITES=		LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=		emulation@FreeBSD.org
 COMMENT=		Callback Framework for C++ (Linux Fedora 10)
 
 CONFLICTS=		linux-libsigc++20-[0-9]* linux-f8-libsigc++20-[0-9]*
 
-ONLY_FOR_ARCHS=		i386 amd64
-USE_LINUX=	f10
+USES=			linux:f10
 USE_LINUX_RPM=		yes
 
 RPMVERSION=		1.fc9
 USE_LDCONFIG=		yes
 
 PLIST_FILES=		usr/lib/libsigc-2.0.so.0 usr/lib/libsigc-2.0.so.0.0.0
-DOCSDIR=		usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
 DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/devel/linux-f10-ncurses-base/Makefile b/devel/linux-f10-ncurses-base/Makefile
index 2f755e2..78d291b 100644
--- a/devel/linux-f10-ncurses-base/Makefile
+++ b/devel/linux-f10-ncurses-base/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://archives.fedoraproject.org/pub/archive/fedora/linux/release
 MAINTAINER=	bacon4000@gmail.com
 COMMENT=	Terminfo database required by Linux ncurses programs
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	20.20080927.fc10
-SRC_DISTFILES=	ncurses-${PORTVERSION}-${RPMVERSION}.src.rpm
+SRC_DISTFILES=	ncurses-${PORTVERSION}-${RPMVERSION}.src.rpm:SOURCE
 
 .include <bsd.port.mk>
diff --git a/devel/linux-f10-nspr/Makefile b/devel/linux-f10-nspr/Makefile
index 8df3895..2e6948e 100644
--- a/devel/linux-f10-nspr/Makefile
+++ b/devel/linux-f10-nspr/Makefile
@@ -5,14 +5,13 @@ PORTNAME=	nspr
 PORTVERSION=	4.7.6
 PORTREVISION=	1
 CATEGORIES=	devel linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Netscape Portable Runtime (Linux Fedora 10)
 
 CONFLICTS=	linux-f8-nspr-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	1.fc10.1
diff --git a/devel/linux-f10-sdl12/Makefile b/devel/linux-f10-sdl12/Makefile
index 5b36743..910f128 100644
--- a/devel/linux-f10-sdl12/Makefile
+++ b/devel/linux-f10-sdl12/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	sdl
 PORTVERSION=	1.2.13
 CATEGORIES=	devel linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	SDL-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -12,11 +11,9 @@ COMMENT=	Cross-platform multi-media development API (Linux Fedora 10)
 
 CONFLICTS=	linux-sdl12-[0-9]* linux-f8-sdl12-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	xorglibs
-INSTALL_SHLIB=	yes
+USE_LINUX=	xorglibs
 LINUX_NAME=	SDL
 
 RPMVERSION=	7.fc10
diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile
index 8b18be1..f42e163 100644
--- a/devel/linux_kdump/Makefile
+++ b/devel/linux_kdump/Makefile
@@ -10,11 +10,10 @@ MASTER_SITES=	LOCAL/marcel
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Linux-compatibility ktrace.out processor
 
-BUILD_DEPENDS=	${RUN_DEPENDS} # USE_LINUX_APPS only sets RUN_DEPENDS
+BUILD_DEPENDS=	${RUN_DEPENDS} # USE_LINUX only sets RUN_DEPENDS
 
-USES=		uidfix
-USE_LINUX=	yes
-USE_LINUX_APPS=	devtools
+USES=		linux uidfix
+USE_LINUX=	devtools
 
 ONLY_FOR_ARCHS=	i386 amd64
 PLIST_FILES=	bin/linux_kdump man/man1/linux_kdump.1.gz
diff --git a/dns/linux-c6-libasyncns/Makefile b/dns/linux-c6-libasyncns/Makefile
index 9eaee1c..0834f45 100644
--- a/dns/linux-c6-libasyncns/Makefile
+++ b/dns/linux-c6-libasyncns/Makefile
@@ -9,9 +9,9 @@ CATEGORIES=	dns devel linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	C library for executing DNS queries asynchronously (Linux CentOS ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
 RPMVERSION=	1.1.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX_RPM=	yes
 
 .include <bsd.port.mk>
diff --git a/dns/linux-f10-libasyncns/Makefile b/dns/linux-f10-libasyncns/Makefile
index f27306a..53ec9c1 100644
--- a/dns/linux-f10-libasyncns/Makefile
+++ b/dns/linux-f10-libasyncns/Makefile
@@ -4,15 +4,13 @@
 PORTNAME=	libasyncns
 PORTVERSION=	0.7
 CATEGORIES=	dns devel linux
-PKGNAMEPREFIX=	linux-f10-
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	C library for executing DNS queries asynchronously (Linux Fedora 10)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 RPMVERSION=	1.fc10
 USE_LDCONFIG=	yes
-AUTOMATIC_PLIST=yes
 
 .include <bsd.port.mk>
diff --git a/dns/linux-f10-libasyncns/pkg-plist b/dns/linux-f10-libasyncns/pkg-plist
new file mode 100644
index 0000000..a36ce6c
--- /dev/null
+++ b/dns/linux-f10-libasyncns/pkg-plist
@@ -0,0 +1,4 @@
+usr/lib/libasyncns.so.0
+usr/lib/libasyncns.so.0.3.1
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/editors/edith/Makefile b/editors/edith/Makefile
index a4e03d3..01b6890 100644
--- a/editors/edith/Makefile
+++ b/editors/edith/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 GUI editor for binary and plain text files
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 
 RESTRICTED=	Redistribution not allowed
 NO_BUILD=	yes
diff --git a/editors/komodo-edit/Makefile b/editors/komodo-edit/Makefile
index b918e35..82bb2a5 100644
--- a/editors/komodo-edit/Makefile
+++ b/editors/komodo-edit/Makefile
@@ -18,8 +18,8 @@ NO_PACKAGE=	Distribution not permitted
 
 ONLY_FOR_ARCHS=	i386 amd64
 NO_BUILD=	yes
-USE_LINUX=	yes
-USE_LINUX_APPS=	alsalib gtk2 jpeg dbusglib
+USES=		linux
+USE_LINUX=	alsalib gtk2 jpeg dbusglib
 
 PLIST_FILES=	bin/komodo
 PORTDATA=	*
diff --git a/editors/linux-sublime/Makefile b/editors/linux-sublime/Makefile
index a739f04..2430f7c 100644
--- a/editors/linux-sublime/Makefile
+++ b/editors/linux-sublime/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sublime
 PORTVERSION=	2.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors linux
 MASTER_SITES=	http://c758482.r82.cf2.rackcdn.com/
 DISTNAME=	Sublime%20Text%202.0.2
@@ -12,22 +12,16 @@ PKGNAMEPREFIX=	linux-
 MAINTAINER=	johannes@perceivon.net
 COMMENT=	Sublime Text is a sophisticated text editor for code, markup and prose
 
-USES=		tar:bzip2
 INSTALLS_ICONS=	yes
+USES=		linux tar:bzip2
+USE_LINUX=	xorglibs gtk2
 WRKSRC=		${WRKDIR}/"Sublime Text 2"
 
 NO_BUILD=
-STRIP=		# don't strip linux binaries.
 SUB_FILES=	sublime
 
 CONFLICTS_INSTALL=	linux-sublime3-[0-9]*
 
-USE_LINUX=	c6
-USE_LINUX_APPS=	xorglibs gtk2
-
-post-patch:
-	${BRANDELF} -t Linux ${WRKSRC}/sublime_text
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
@@ -44,6 +38,6 @@ do-install:
 	@${RM} -rf ${WRKSRC}/Icon/
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	@${CHMOD} +x ${STAGEDIR}${DATADIR}/sublime_text
-	@${INSTALL} ${WRKDIR}/sublime ${STAGEDIR}${PREFIX}/bin/sublime
+	@${INSTALL_SCRIPT} ${WRKDIR}/sublime ${STAGEDIR}${PREFIX}/bin/sublime
 
 .include <bsd.port.mk>
diff --git a/editors/linux-sublime/files/sublime.in b/editors/linux-sublime/files/sublime.in
index 4687cde..f81349b 100644
--- a/editors/linux-sublime/files/sublime.in
+++ b/editors/linux-sublime/files/sublime.in
@@ -1,2 +1,2 @@
-#!/compat/linux/bin/sh
-%%DATADIR%%/sublime_text $*
+#!/bin/sh
+exec %%DATADIR%%/sublime_text "$@"
diff --git a/editors/linux-sublime3/Makefile b/editors/linux-sublime3/Makefile
index 7f8b583..9a97f95 100644
--- a/editors/linux-sublime3/Makefile
+++ b/editors/linux-sublime3/Makefile
@@ -13,9 +13,8 @@ DISTNAME=	sublime_text_3_build_3083_x32
 MAINTAINER=	miguelmclara@gmail.com
 COMMENT=	Sophisticated text editor for code, markup and prose
 
-USES=		desktop-file-utils tar:bzip2
-USE_LINUX=	c6
-USE_LINUX_APPS=	xorglibs gtk2
+USES=		desktop-file-utils linux:c6 tar:bzip2
+USE_LINUX=	xorglibs gtk2
 
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/sublime_text_3
diff --git a/emulators/linux-c6/Makefile b/emulators/linux-c6/Makefile
index b1a267c..ef5cd3c 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 0eefa79..108913b 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 a1e30df4..70bfd48 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 d1e0b55..0000000
--- 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 64faed4..0000000
--- 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 176d678..0000000
--- 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 64baa3a..2ebaa2e 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 825df54..0000000
--- 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 f043f40..0801cdb 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 1bb8c73..1c46263 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 cf5f282..144c2e2 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 b6a4418..476b358 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 d1e0b55..0000000
--- 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 64faed4..0000000
--- 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 176d678..0000000
--- 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 c3076e3..c0a15f6 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 29a79d6..0000000
--- 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 09499e3..0801cdb 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 ea7f88e..815e98a 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 d18b4df..3a48f4f 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}
diff --git a/french/homard/Makefile b/french/homard/Makefile
index 9ff64b3..61b3e62 100644
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -17,8 +17,7 @@ RESTRICTED=	The free downloading of HOMARD software is only allowed for coupling
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_LINUX=	yes
-USES=		python
+USES=		linux python
 REINPLACE_ARGS=	-i ""
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
diff --git a/ftp/linux-c6-curl/Makefile b/ftp/linux-c6-curl/Makefile
index 1377ec7..50733de 100644
--- a/ftp/linux-c6-curl/Makefile
+++ b/ftp/linux-c6-curl/Makefile
@@ -5,26 +5,22 @@ PORTNAME=	curl
 PORTVERSION=	7.19.7
 PORTREVISION=	6
 CATEGORIES=	ftp linux
-DISTFILES=	curl-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm
-LIB_DISTFILES=	libcurl-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm
-MASTER_SITES=	CENTOS_LINUX
+LIB_DISTFILES=	lib${DISTNAME}${EXTRACT_SUFX}
+SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Command line tool for transferring files with URL syntax (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-curl-[0-9]* linux-f10-curl-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
 
-USE_LINUX=	c6
-USE_LINUX_APPS=	openldap libssh2 # cyrus-sasl2
+USES=		linux:c6
+USE_LINUX=	openldap libssh2 # cyrus-sasl2
 USE_LINUX_RPM=	nolib
 RPMVERSION=	52.el6
-BRANDELF_FILES=	usr/bin/curl
 USE_LDCONFIG=	yes
 
-DOCSDIR=	usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	BUGS COPYING FEATURES README TODO CHANGES FAQ MANUAL RESOURCES TheArtOfHttpScripting
-DESCR=	${.CURDIR}/../${PORTNAME}/pkg-descr
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/ftp/linux-f10-curl/Makefile b/ftp/linux-f10-curl/Makefile
index 285aab8..b76a878 100644
--- a/ftp/linux-f10-curl/Makefile
+++ b/ftp/linux-f10-curl/Makefile
@@ -5,32 +5,24 @@ PORTNAME=	curl
 PORTVERSION=	7.19.6
 PORTREVISION=	1
 CATEGORIES=	ftp linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-DISTFILES=	curl-${PORTVERSION}-${RPMVERSION}.i386.rpm \
-		libcurl-${PORTVERSION}-${RPMVERSION}.i386.rpm
+LIB_DISTFILES=	lib${DISTNAME}${EXTRACT_SUFX}
+SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Command line tool for transferring files with URL syntax (Linux Fedora 10)
 
 CONFLICTS=	linux-curl-[0-9]* linux-f8-curl-[0-9]*
 
-USE_LINUX=	f10
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	cyrus-sasl2 openldap
+USES=		linux:f10
+USE_LINUX=	cyrus-sasl2 openldap
+USE_LINUX_RPM=	nolib
 
 RPMVERSION=	2.fc10
 USE_LDCONFIG=	yes
-BRANDELF_FILES=	usr/bin/curl
-DESCR=	${.CURDIR}/../${PORTNAME}/pkg-descr
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 PLIST_FILES=	usr/bin/curl usr/lib/libcurl.so.4 usr/lib/libcurl.so.4.1.1 \
 		usr/share/man/man1/curl.1.gz
-DOCSDIR=	usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	BUGS COPYING FEATURES README TODO CHANGES FAQ MANUAL RESOURCES TheArtOfHttpScripting
 
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	curl-${PORTVERSION}-${RPMVERSION}.src.rpm
-ALWAYS_KEEP_DISTFILES=	YES
-.endif
-
 .include <bsd.port.mk>
diff --git a/games/adom/Makefile b/games/adom/Makefile
index 7a2f338..f2c04b9 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -21,12 +21,11 @@ NO_CDROM=	Copy of CD must be sent to author
 OPTIONS_DEFINE=	DOCS
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	ncurses-base xorglibs
+USES=		linux
+USE_LINUX=	ncurses-base xorglibs
 
 WRKSRC=		${WRKDIR}/adom
 NO_BUILD=	yes
-STRIP=		# empty: do not strip linux binary!
 
 SUB_FILES=	pkg-message
 
diff --git a/games/arkanoidsb/Makefile b/games/arkanoidsb/Makefile
index 619cc96..65ddcd4 100644
--- a/games/arkanoidsb/Makefile
+++ b/games/arkanoidsb/Makefile
@@ -12,10 +12,9 @@ COMMENT=	Arkanoid and space game
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		tar:bzip2
+USES=		linux tar:bzip2
 NO_BUILD=	yes
-USE_LINUX=	yes
-USE_LINUX_APPS=	libogg sdlmixer sdlimage
+USE_LINUX=	libogg sdlmixer sdlimage
 
 SUB_FILES=	${PORTNAME}.sh
 
diff --git a/games/dsnake/Makefile b/games/dsnake/Makefile
index 14d1c58..73ad914 100644
--- a/games/dsnake/Makefile
+++ b/games/dsnake/Makefile
@@ -14,8 +14,9 @@ COMMENT=	Deluxe Snake - snake clone with frogs and mushrooms
 RESTRICTED=	Licence forbids any repacking and reselling
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	allegro xorglibs
+STRIP=
+USES=		linux:f10
+USE_LINUX=	allegro xorglibs
 WRKSRC=		${WRKDIR}/DeluxeSnake
 
 CONFIG_FILES=	config.dat hiscores.dat stats.dat
diff --git a/games/gish-demo/Makefile b/games/gish-demo/Makefile
index 55a1de2..e853717 100644
--- a/games/gish-demo/Makefile
+++ b/games/gish-demo/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Platform game with a gelatinous 12-pound ball of tar (Demo version)
 RESTRICTED=	(c) Copyright 2004 Chronic Logic All rights reserved
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	is an i386 Linux binary
-USE_LINUX=	yes
-USE_LINUX_APPS=	libvorbis openal-soft
+USES=		linux
+USE_LINUX=	libvorbis openal-soft
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 SUB_FILES=	rungish.sh
diff --git a/games/hohlin/Makefile b/games/hohlin/Makefile
index ec39811..f4416fb 100644
--- a/games/hohlin/Makefile
+++ b/games/hohlin/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Remake of the classic spectrum game Head over Heels
 
 WRKSRC=		${WRKDIR}/hoh-install-${PORTVERSION}/
 
-USES=	tar:bzip2
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux tar:bzip2
+USE_LINUX=	xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/}
 
diff --git a/games/legends/Makefile b/games/legends/Makefile
index 61f4e51..736f3c8 100644
--- a/games/legends/Makefile
+++ b/games/legends/Makefile
@@ -18,9 +18,8 @@ COMMENT=	Fast-paced first-person-perspective online multiplayer game
 
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		makeself
-USE_LINUX=	yes
-USE_LINUX_APPS+=dri
+USES=		linux makeself
+USE_LINUX=	dri
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 DATADIR=	${PREFIX}/lib/${PORTNAME}
diff --git a/games/linux-darwinia-demo/Makefile b/games/linux-darwinia-demo/Makefile
index 425f4e9..a5b6826 100644
--- a/games/linux-darwinia-demo/Makefile
+++ b/games/linux-darwinia-demo/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Real-time action strategy with programs
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12 libogg libvorbis xorglibs
+USES=		linux
+USE_LINUX=	sdl12 libogg libvorbis xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -28,24 +28,21 @@ NVIDIA_DESC=	Enable nvidia graphics driver support
 
 .if ${PORT_OPTIONS:MNVIDIA}
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=libglu
+USE_LINUX+=	libglu
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 do-extract:
 	@cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -
 
-do-build:
-	${BRANDELF} -t Linux ${WRKSRC}/lib/darwinia.bin.x86
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/lib && \
 		${INSTALL_PROGRAM} darwinia.bin.x86 ${STAGEDIR}${DATADIR} && \
 		${INSTALL_DATA} *.dat open-www.sh ${STAGEDIR}${DATADIR}
-	${INSTALL_PROGRAM} ${WRKDIR}/darwinia \
+	${INSTALL_SCRIPT} ${WRKDIR}/darwinia \
 		${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}darwinia
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}/LICENSE
diff --git a/games/linux-defcon/Makefile b/games/linux-defcon/Makefile
index c7ae7d9..0bc60ac 100644
--- a/games/linux-defcon/Makefile
+++ b/games/linux-defcon/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Defcon for Linux
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12 libogg libvorbis xorglibs
+USES=		linux
+USE_LINUX=	sdl12 libogg libvorbis xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 
@@ -27,20 +27,17 @@ NVIDIA_DESC=	support for nvidia
 
 .if ${PORT_OPTIONS:MNVIDIA}
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=libglu
+USE_LINUX+=	libglu
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
-do-build:
-	${BRANDELF} -t Linux ${WRKSRC}/lib/defcon.bin.x86
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/lib && \
 		${INSTALL_PROGRAM} defcon.bin.x86 ${STAGEDIR}${DATADIR} && \
 		${INSTALL_DATA} *.dat open-www.sh ${STAGEDIR}${DATADIR}
-	${INSTALL_PROGRAM} ${WRKDIR}/defcon \
+	${INSTALL_SCRIPT} ${WRKDIR}/defcon \
 		${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}defcon
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/license.txt ${STAGEDIR}${DOCSDIR}/license.txt
diff --git a/games/linux-doom3-demo/Makefile b/games/linux-doom3-demo/Makefile
index c0fd23a..64cfbf9 100644
--- a/games/linux-doom3-demo/Makefile
+++ b/games/linux-doom3-demo/Makefile
@@ -17,8 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DOOM III demo for Linux
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_CDROM=	Redistribution is limited, see license; Requested by id Software
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -31,7 +31,7 @@ SUB_LIST=	DOOMDIR="${DOOMDIR}"
 OPTIONS_DEFINE=	DOCS NVIDIA_GL
 
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE_OFF=	linux_apps=dri
+NVIDIA_GL_USE_OFF=	LINUX=dri
 
 
 do-extract:
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index a463e9d..4decf5e 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -13,8 +13,8 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Doom III for Linux
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_CDROM=	Redistribution is limited, see license; Requested by id Software
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -60,7 +60,7 @@ do-install:
 .endif
 	${INSTALL_DATA} ${WRKSRC}/doom3.png ${STAGEDIR}${PREFIX}/share/pixmaps
 .for f in doom3 doom3-ded
-	${INSTALL_PROGRAM} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${f}
+	${INSTALL_SCRIPT} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${f}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/games/linux-enemyterritory-etpro/Makefile b/games/linux-enemyterritory-etpro/Makefile
index 40560d7..b3bfb31 100644
--- a/games/linux-enemyterritory-etpro/Makefile
+++ b/games/linux-enemyterritory-etpro/Makefile
@@ -18,8 +18,7 @@ COMMENT=	ET Pro - Enemy Territory Competition Mod
 
 RUN_DEPENDS=	et:games/linux-enemyterritory
 
-USES=		zip
-USE_LINUX=	yes
+USES=		linux zip
 NO_WRKSUBDIR=	yes
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
diff --git a/games/linux-enemyterritory-jaymod-21/Makefile b/games/linux-enemyterritory-jaymod-21/Makefile
index 216c6e1..83a3b48 100644
--- a/games/linux-enemyterritory-jaymod-21/Makefile
+++ b/games/linux-enemyterritory-jaymod-21/Makefile
@@ -17,10 +17,9 @@ VERSTR=		${PORTVERSION:C/([0-9])\.([0-9])\.([0-9]+)/\1\2\3/}
 PKGNAMESUFFIX=	-${VERSTR}
 PLIST_SUB=	VERSTR="${VERSTR}"
 
-USES=		shebangfix
+USES=		linux shebangfix
 SHEBANG_FILES=	linux/convert_shrub
 perl_OLD_CMD=	"/bin/env perl"
-USE_LINUX=	yes
 
 PORTSCOUT=	limit:^2\.1\.7
 
diff --git a/games/linux-enemyterritory-jaymod/Makefile b/games/linux-enemyterritory-jaymod/Makefile
index 98a24d4..975b831 100644
--- a/games/linux-enemyterritory-jaymod/Makefile
+++ b/games/linux-enemyterritory-jaymod/Makefile
@@ -14,10 +14,9 @@ COMMENT=	Jaymod - An Enemy Territory Modification
 
 RUN_DEPENDS=	et:games/linux-enemyterritory
 
-USES=		shebangfix
+USES=		linux shebangfix
 SHEBANG_FILES=	linux/convert_shrub
 perl_OLD_CMD=	"/bin/env perl"
-USE_LINUX=	yes
 
 OPTIONS_DEFINE=	DOCS OMNIBOT
 OMNIBOT_DESC=	Install Omni-Bot for bot support
diff --git a/games/linux-enemyterritory-omni-bot-0660/Makefile b/games/linux-enemyterritory-omni-bot-0660/Makefile
index 0fe9b65..9e99faa 100644
--- a/games/linux-enemyterritory-omni-bot-0660/Makefile
+++ b/games/linux-enemyterritory-omni-bot-0660/Makefile
@@ -18,8 +18,7 @@ VERSTR=	${PORTVERSION:C/([0-9])\.([0-9]+)/\1\2/}
 PKGNAMESUFFIX=	-${VERSTR}
 PLIST_SUB=	VERSTR="${VERSTR}"
 
-USES=		zip
-USE_LINUX=	yes
+USES=		linux zip
 NO_WRKSUBDIR=	yes
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}-${VERSTR}
diff --git a/games/linux-enemyterritory-omni-bot/Makefile b/games/linux-enemyterritory-omni-bot/Makefile
index 0beab12..79a6a7c 100644
--- a/games/linux-enemyterritory-omni-bot/Makefile
+++ b/games/linux-enemyterritory-omni-bot/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Omni-Bot is a bot for Enemy Territory
 
 RUN_DEPENDS=	et:games/linux-enemyterritory
 
-USES=		zip
-USE_LINUX=	yes
+USES=		linux zip
 NO_WRKSUBDIR=	yes
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
diff --git a/games/linux-enemyterritory-shrub/Makefile b/games/linux-enemyterritory-shrub/Makefile
index 24640db..ec9e291 100644
--- a/games/linux-enemyterritory-shrub/Makefile
+++ b/games/linux-enemyterritory-shrub/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Shrub - An Enemy Territory Modification
 
 RUN_DEPENDS=	et:games/linux-enemyterritory
 
-USES=		zip
-USE_LINUX=	yes
+USES=		linux zip
 NO_WRKSUBDIR=	yes
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
diff --git a/games/linux-enemyterritory-tce/Makefile b/games/linux-enemyterritory-tce/Makefile
index 5fdb304..9cda5d4 100644
--- a/games/linux-enemyterritory-tce/Makefile
+++ b/games/linux-enemyterritory-tce/Makefile
@@ -16,8 +16,7 @@ COMMENT=	Modern tactical Enemy Territory modification
 RUN_DEPENDS=	et:games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386 amd64
-USES=		zip
-USE_LINUX=	yes
+USES=		linux zip
 RESTRICTED=	Redistribution is limited, see license
 ETDIR=		${PREFIX}/lib/enemyterritory
 PORTDOCS=	*
diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile
index 539874f..d7c2849 100644
--- a/games/linux-enemyterritory/Makefile
+++ b/games/linux-enemyterritory/Makefile
@@ -15,9 +15,8 @@ MAINTAINER=	bar@FreeBSD.org
 COMMENT=	Wolfenstein: Enemy Territory (Linux version)
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
-USES=		zip:infozip
+USES=		linux zip:infozip
+USE_LINUX=	xorglibs
 NO_CDROM=	Redistribution limited
 ETDIR=		${PREFIX}/lib/${PORTNAME}
 PATCH_260B_DIR=	Enemy Territory 2.60b
@@ -25,7 +24,7 @@ PATCH_260B_DIR=	Enemy Territory 2.60b
 OPTIONS_DEFINE=	DOCS NVIDIA_GL
 
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE_OFF=	linux_apps=dri
+NVIDIA_GL_USE_OFF=	LINUX=dri
 
 .include <bsd.port.options.mk>
 
diff --git a/games/linux-etqw-demo-server/Makefile b/games/linux-etqw-demo-server/Makefile
index d874513..ba33038 100644
--- a/games/linux-etqw-demo-server/Makefile
+++ b/games/linux-etqw-demo-server/Makefile
@@ -17,8 +17,7 @@ NO_CDROM=	Redistribution is limited
 NO_BUILD=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USES=		zip:infozip
+USES=		linux zip:infozip
 
 ETQWDIR=	${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
 
@@ -37,7 +36,7 @@ post-patch:
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETQWDIR}
 
-	${INSTALL_PROGRAM} ${WRKSRC}/etqwded-demo ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/etqwded-demo ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/data/etqwded.x86 ${STAGEDIR}${ETQWDIR}
 	@cd ${WRKSRC}/data && \
 		${FIND} -E . -type f -iregex ".*\.so\.[0-9]+" \
diff --git a/games/linux-etqw-server/Makefile b/games/linux-etqw-server/Makefile
index 270b0a3..0e0fcf8 100644
--- a/games/linux-etqw-server/Makefile
+++ b/games/linux-etqw-server/Makefile
@@ -20,8 +20,7 @@ NO_CDROM=	Redistribution is limited
 NO_BUILD=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USES=		zip:infozip
+USES=		linux zip:infozip
 
 ETQWDIR=	${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
@@ -40,7 +39,7 @@ post-patch:
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETQWDIR}
 
-	${INSTALL_PROGRAM} ${WRKSRC}/etqwded ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/etqwded ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/data/etqwded.x86 ${STAGEDIR}${ETQWDIR}
 	@cd ${WRKSRC}/data && \
 		${FIND} -E . -type f -iregex ".*\.so\.[0-9]+" \
diff --git a/games/linux-nerogame/Makefile b/games/linux-nerogame/Makefile
index e3a899f..b1bba70 100644
--- a/games/linux-nerogame/Makefile
+++ b/games/linux-nerogame/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	nero2_linux_i386
 MAINTAINER=	craig001@lerwick.hopto.org
 COMMENT=	Neuro evolving robotic operatives the game
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	libvorbis sdl12 libtheora
+USES=		linux
+USE_LINUX=	libvorbis sdl12 libtheora
 NO_BUILD=	yes
 RESTRICTED=	Nero is freeware, but i am not sure of its license
 
@@ -30,7 +30,7 @@ NVIDIA_DESC=	Nvidia support
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 .	endif
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 do-install:
diff --git a/games/linux-nwnclient/Makefile b/games/linux-nwnclient/Makefile
index 3923321..6c2cb3c 100644
--- a/games/linux-nwnclient/Makefile
+++ b/games/linux-nwnclient/Makefile
@@ -23,15 +23,15 @@ RUN_DEPENDS=	${LOCALBASE}/share/nwndata/docs/readme.txt:games/nwndata
 
 NO_BUILD=	yes
 RESTRICTED=	Distribution not allowed
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12 xorglibs
+USES=		linux
+USE_LINUX=	sdl12 xorglibs
 NWNDATADIR=	${LOCALBASE}/share/nwndata
 
 .ifdef WITH_NVIDIA_GL
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=libglu
+USE_LINUX+=	libglu
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 OPTIONS_DEFINE=	NWMOVIES
@@ -50,7 +50,7 @@ NWMOVIESFILE=	nwmovies-v4-public.20090223.080954.tar.gz
 BINKPLAYERFILE=	BinkLinuxPlayer.zip
 CLIENT_NWMOVIES=${NWMOVIESFILE}:NWMOVIES \
 		${BINKPLAYERFILE}:BINK
-USE_LINUX_APPS+=mikmod sdlmixer
+USE_LINUX+=	mikmod sdlmixer
 PLIST_SUB+=	NWMOVIES=""
 .else
 PLIST_SUB+=	NWMOVIES="@comment "
diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile
index bfa45bd..080a2ce 100644
--- a/games/linux-quake3-demo/Makefile
+++ b/games/linux-quake3-demo/Makefile
@@ -18,8 +18,8 @@ RESTRICTED=	Restrictive license by Loki Software
 NO_CDROM=	${RESTRICTED}
 NO_PACKAGE=	${RESTRICTED}
 
-USE_LINUX=	yes
-USE_LINUX_APPS+=dri
+USES=		linux
+USE_LINUX=	dri
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index 3e9e3b5..b24f015 100644
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@@ -14,8 +14,7 @@ DIST_SUBDIR=	${Q3PKGNAMEPREFIX}data
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake III Arena for Linux
 
-USES=		zip:infozip
-USE_LINUX=	yes
+USES=		linux zip:infozip
 NO_WRKSUBDIR=	yes
 
 RESTRICTED=	Restrictive license by Loki Software
diff --git a/games/linux-quake4-demo/Makefile b/games/linux-quake4-demo/Makefile
index 6236828..afea8e0 100644
--- a/games/linux-quake4-demo/Makefile
+++ b/games/linux-quake4-demo/Makefile
@@ -14,8 +14,8 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake 4 for Linux Demo
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12
+USES=		linux
+USE_LINUX=	sdl12
 NO_WRKSUBDIR=	yes
 NO_CDROM=	Redistribution is limited, see license
 
diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index 45f039d..3ad22f0 100644
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@@ -15,8 +15,8 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake 4 for Linux
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12
+USES=		linux
+USE_LINUX=	sdl12
 NO_WRKSUBDIR=	yes
 NO_CDROM=	Redistribution is limited, see license
 Q4DIR=		lib/${PORTNAME}
diff --git a/games/linux-rtcw/Makefile b/games/linux-rtcw/Makefile
index 3ce406a..1f6c115 100644
--- a/games/linux-rtcw/Makefile
+++ b/games/linux-rtcw/Makefile
@@ -13,9 +13,8 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Return to Castle Wolfenstein (Linux version)
 
-USES=		makeself
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux makeself
+USE_LINUX=	xorglibs
 NO_WRKSUBDIR=	yes
 
 WRAPPERS=	wolf wolfded wolfsp
@@ -33,7 +32,7 @@ OPTIONS_DEFINE=	DOCS NVIDIA_GL
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 NVIDIA_GL_EXTVER=	'__GL_ExtensionStringVersion=18999 '
 .else
-USE_LINUX_APPS+=	dri
+USE_LINUX+=	dri
 .endif
 
 # XXX: should probably be converted to use the LICENSE framework
diff --git a/games/linux-ssamtfe/Makefile b/games/linux-ssamtfe/Makefile
index 74d597d..1aef7ab 100644
--- a/games/linux-ssamtfe/Makefile
+++ b/games/linux-ssamtfe/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Serious Sam: The First Encounter
 OPTIONS_DEFINE=	VORBIS DOCS
 OPTIONS_DEFAULT=	VORBIS
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_BUILD=	yes
 RESTRICTED=	Redistribution is limited, see license
 PORTDOCS=	README.liflg ShellSymbols.txt changes.txt notes.txt
@@ -29,7 +29,7 @@ IGNORE=		${PKGNAME} requires CDROM_MOUNT set to mount point of CD
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVORBIS}
-USE_LINUX_APPS+=libvorbis
+USE_LINUX+=	libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 PLIST_SUB+=	VORBIS="@comment "
diff --git a/games/linux-ssamtse/Makefile b/games/linux-ssamtse/Makefile
index d362fab..0c41702 100644
--- a/games/linux-ssamtse/Makefile
+++ b/games/linux-ssamtse/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Serious Sam: The Second Encounter for Linux
 OPTIONS_DEFINE=	VORBIS DOCS
 OPTIONS_DEFAULT=	VORBIS
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_BUILD=	yes
 RESTRICTED=	Redistribution is limited, see license
 PORTDOCS=	README.liflg ShellSymbols.txt changes.txt Notes_1_04.txt
@@ -29,7 +29,7 @@ IGNORE=		${PKGNAME} requires CDROM_MOUNT set to mount point of CD
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVORBIS}
-USE_LINUX_APPS+=libvorbis
+USE_LINUX+=	libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 PLIST_SUB+=	VORBIS="@comment "
diff --git a/games/linux-unigine-heaven/Makefile b/games/linux-unigine-heaven/Makefile
index d225834..2e98217 100644
--- a/games/linux-unigine-heaven/Makefile
+++ b/games/linux-unigine-heaven/Makefile
@@ -22,15 +22,15 @@ LICENSE_TEXT=	Binary only, License text not available. Free-to-use + no-redistri
 LICENSE_PERMS=	no-dist-sell no-pkg-sell no-dist-mirror no-pkg-mirror
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs openal-soft
+USES=		linux
+USE_LINUX=	xorglibs openal-soft
 USE_LDCONFIG=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
 NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_VARS_OFF=	USE_LINUX_APPS+=dri
+NVIDIA_GL_VARS_OFF=	USE_LINUX+=	dri
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-unigine-valley/Makefile b/games/linux-unigine-valley/Makefile
index 3eaef5c..b8a5a71 100644
--- a/games/linux-unigine-valley/Makefile
+++ b/games/linux-unigine-valley/Makefile
@@ -22,15 +22,15 @@ LICENSE_FILE=	${.CURDIR}/pkg-license
 LICENSE_PERMS=	no-dist-sell no-pkg-sell no-dist-mirror no-pkg-mirror
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs openal-soft
+USES=		linux
+USE_LINUX=	xorglibs openal-soft
 USE_LDCONFIG=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
 NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_VARS_OFF=	USE_LINUX_APPS+=dri
+NVIDIA_GL_VARS_OFF=	USE_LINUX+=	dri
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-unrealgold/Makefile b/games/linux-unrealgold/Makefile
index 4d03024..c5ee895 100644
--- a/games/linux-unrealgold/Makefile
+++ b/games/linux-unrealgold/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Unreal Gold for Linux
 BUILD_DEPENDS=	ut:games/linux-ut
 RUN_DEPENDS=	ut:games/linux-ut
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_BUILD=	yes
 RESTRICTED=	Redistribution is limited, see license
 
diff --git a/games/linux-uplink-demo/Makefile b/games/linux-uplink-demo/Makefile
index 94b007b..2904c30 100644
--- a/games/linux-uplink-demo/Makefile
+++ b/games/linux-uplink-demo/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	mva@FreeBSD.org
 COMMENT=	High tech computer crime and industrial espionage on the Internet
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12 jpeg sdlmixer mikmod libvorbis xorglibs
+USES=		linux
+USE_LINUX=	sdl12 jpeg sdlmixer mikmod libvorbis xorglibs
 USE_LDCONFIG=	yes
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
@@ -32,24 +32,21 @@ NVIDIA_DESC=	support for nvidia
 
 .if ${PORT_OPTIONS:MNVIDIA}
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=libglu
+USE_LINUX+=	libglu
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 do-extract:
 	@cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -
 
-do-build:
-	${BRANDELF} -t Linux ${WRKSRC}/lib/uplink.bin.x86
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/lib && \
 		${INSTALL_PROGRAM} uplink.bin.x86 libftgl.so.0 ${STAGEDIR}${DATADIR} && \
 		${INSTALL_DATA} *.dat ${STAGEDIR}${DATADIR}
-	${INSTALL_PROGRAM} ${WRKDIR}/uplink \
+	${INSTALL_SCRIPT} ${WRKDIR}/uplink \
 		${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}uplink
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${DOCFILES}
diff --git a/games/linux-ut/Makefile b/games/linux-ut/Makefile
index c074c37..3da02a8 100644
--- a/games/linux-ut/Makefile
+++ b/games/linux-ut/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	scf@FreeBSD.org
 COMMENT=	Unreal Tournament for Linux
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs sdl12
+USES=		linux
+USE_LINUX=	xorglibs sdl12
 NO_BUILD=	yes
 MANUAL_PACKAGE_BUILD=	Requires CD
 RESTRICTED=	Redistribution is limited, see license
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index f742940..c7d7228 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -12,8 +12,8 @@ EXTRACT_SUFX=	.sh.bin
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unreal Tournament 2003 demo
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12 xorglibs
+USES=		linux
+USE_LINUX=	sdl12 xorglibs
 RESTRICTED=	Redistribution is limited, see license
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -41,7 +41,7 @@ NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MNVIDIA_GL}
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 do-extract:
diff --git a/games/linux-virtual-jay-peak/Makefile b/games/linux-virtual-jay-peak/Makefile
index c2b0a81..28188e2 100644
--- a/games/linux-virtual-jay-peak/Makefile
+++ b/games/linux-virtual-jay-peak/Makefile
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=	DOCS NVIDIA
 
 WRKSRC=		${WRKDIR}/soulride
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_BUILD=	yes
 SUB_FILES=	virtual-jay-peak
 
@@ -26,7 +26,7 @@ SUB_FILES=	virtual-jay-peak
 .if ${PORT_OPTIONS:MNVIDIA}
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 .else
-USE_LINUX_APPS+=	dri
+USE_LINUX+=	dri
 .endif
 
 do-install:
diff --git a/games/linux-worldofgoo-demo/Makefile b/games/linux-worldofgoo-demo/Makefile
index 08b6997..d270d10 100644
--- a/games/linux-worldofgoo-demo/Makefile
+++ b/games/linux-worldofgoo-demo/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Demo version of incredible physics based puzzle/construction game
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	libvorbis mikmod sdl12 sdlmixer
+USES=		linux
+USE_LINUX=	libvorbis mikmod sdl12 sdlmixer
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/WorldOfGooDemo
 DATADIR=	${PREFIX}/share/WorldOfGoo
@@ -25,9 +25,9 @@ OPTIONS_DEFINE=	DOCS
 
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=	libglu
+USE_LINUX+=	libglu
 .else
-USE_LINUX_APPS+=	dri
+USE_LINUX+=	dri
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/games/mtaserver/Makefile b/games/mtaserver/Makefile
index e0c2482..aba9d10 100644
--- a/games/mtaserver/Makefile
+++ b/games/mtaserver/Makefile
@@ -19,7 +19,7 @@ LICENSE_NAME=	MTA v0.5 LICENSE AGREEMENT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror
 
-USE_LINUX=	yes
+USES=		linux
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/sampsvr/Makefile b/games/sampsvr/Makefile
index 41245f4..17ec7aa 100644
--- a/games/sampsvr/Makefile
+++ b/games/sampsvr/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	samp${PORTVERSION:S,.,,}svr
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rockstar's GTA: San Andreas multiplayer modification dedicated server
 
-USES=		dos2unix
-USE_LINUX=	yes
+USES=		dos2unix linux
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/samp03
 DOS2UNIX_GLOB=	*.txt *.pwn *.inc
diff --git a/graphics/linux-adobesvg/Makefile b/graphics/linux-adobesvg/Makefile
index 6a2303c..4e88a46 100644
--- a/graphics/linux-adobesvg/Makefile
+++ b/graphics/linux-adobesvg/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Adobe SVG browser plugin (Linux version)
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 USE_LDCONFIG=	yes
 
 RESTRICTED=	Redistribution prohibited
diff --git a/graphics/linux-c6-cairo/Makefile b/graphics/linux-c6-cairo/Makefile
index 5c90f76..9c18f02 100644
--- a/graphics/linux-c6-cairo/Makefile
+++ b/graphics/linux-c6-cairo/Makefile
@@ -5,22 +5,18 @@ PORTNAME=	cairo
 PORTVERSION=	1.8.8
 PORTREVISION=	5
 CATEGORIES=	graphics linux
-MASTER_SITES=	CENTOS_LINUX
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Vector graphics library Cairo (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-cairo-[0-9]* linux-f10-cairo-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	fontconfig pixman png xorglibs
-
 RPMVERSION=	6.el6_6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	fontconfig pixman png xorglibs
+USE_LINUX_RPM=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/cairo-${PORTVERSION}
 PORTDOCS=	AUTHORS BIBLIOGRAPHY BUGS COPYING COPYING-LGPL-2.1 \
 		COPYING-MPL-1.1 NEWS README
 
diff --git a/graphics/linux-c6-dri/Makefile b/graphics/linux-c6-dri/Makefile
index 89b7754..6fd4f5c 100644
--- a/graphics/linux-c6-dri/Makefile
+++ b/graphics/linux-c6-dri/Makefile
@@ -4,29 +4,22 @@
 PORTNAME=	dri
 PORTVERSION=	11.0.7
 CATEGORIES=	graphics linux
-DISTFILES=	#
-LIB_DISTFILES=	mesa-libGL-${PORTVERSION}-4.el6.${LINUX_RPM_ARCH}.rpm \
-		mesa-libGLU-${PORTVERSION}-4.el6.${LINUX_RPM_ARCH}.rpm \
-		mesa-dri-drivers-${PORTVERSION}-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libdrm-2.4.65-2.el6.${LINUX_RPM_ARCH}.rpm \
-		freeglut-2.6.0-1.el6.${LINUX_RPM_ARCH}.rpm
+LIB_DISTFILES=	mesa-libGL-${PORTVERSION}-4.el6${EXTRACT_SUFX} \
+		mesa-libGLU-${PORTVERSION}-4.el6${EXTRACT_SUFX} \
+		mesa-dri-drivers-${PORTVERSION}-4.el6${EXTRACT_SUFX} \
+		libdrm-2.4.65-2.el6${EXTRACT_SUFX} \
+		freeglut-2.6.0-1.el6${EXTRACT_SUFX}
+SRC_DISTFILES=	mesa-${PORTVERSION}-4.el6.src.rpm:SOURCE \
+		libdrm-2.4.65-2.el6.src.rpm:SOURCE \
+		freeglut-2.6.0-1.el6.src.rpm:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Mesa libGL runtime libraries (Linux CentOS ${LINUX_DIST_VER})
 
-ALWAYS_KEEP_DISTFILES=	YES
-
 CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-[0-9]* linux-f10-dri-[0-9]* linux-dri-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	mesa-${PORTVERSION}-4.el6.src.rpm:SOURCE \
-		libdrm-2.4.65-2.el6.src.rpm:SOURCE \
-		freeglut-2.6.0-1.el6.src.rpm:SOURCE
-.endif
-
-USE_LINUX=	c6
-USE_LINUX_APPS=	xorglibs
+USES=		linux:c6
+USE_LINUX=	xorglibs
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/graphics/linux-c6-gdk-pixbuf2/Makefile b/graphics/linux-c6-gdk-pixbuf2/Makefile
index 955aec3..a401889 100644
--- a/graphics/linux-c6-gdk-pixbuf2/Makefile
+++ b/graphics/linux-c6-gdk-pixbuf2/Makefile
@@ -9,14 +9,11 @@ CATEGORIES=	graphics linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of the gdk-pixbuf lib (Linux CentOS ${LINUX_DIST_VER})
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_APPS=	jasper jpeg png tiff xorglibs
-USE_LINUX_RPM=	yes
 RPMVERSION=	6.el6_7
-LINUX_NAME=	lib${PORTNAME}
-BRANDELF_DIRS=	usr/bin
+USES=		linux:c6
 USE_LDCONFIG=	yes
-DESCR=		${.CURDIR}/../gdk-pixbuf2/pkg-descr
+USE_LINUX=	jasper jpeg png tiff xorglibs
+USE_LINUX_RPM=	yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/graphics/linux-c6-gdk-pixbuf2/pkg-plist.i386 b/graphics/linux-c6-gdk-pixbuf2/pkg-plist.i386
index e2ec81b..3dfcef6 100644
--- a/graphics/linux-c6-gdk-pixbuf2/pkg-plist.i386
+++ b/graphics/linux-c6-gdk-pixbuf2/pkg-plist.i386
@@ -21,9 +21,9 @@ usr/lib/libgdk_pixbuf-2.0.so.0
 usr/lib/libgdk_pixbuf-2.0.so.0.2400.1
 usr/lib/libgdk_pixbuf_xlib-2.0.so.0
 usr/lib/libgdk_pixbuf_xlib-2.0.so.0.2400.1
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.1/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.1/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.1/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
 usr/share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
 usr/share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
 usr/share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo
diff --git a/graphics/linux-c6-gdk-pixbuf2/pkg-plist.x86_64 b/graphics/linux-c6-gdk-pixbuf2/pkg-plist.x86_64
index b860a1a..67f57cd 100644
--- a/graphics/linux-c6-gdk-pixbuf2/pkg-plist.x86_64
+++ b/graphics/linux-c6-gdk-pixbuf2/pkg-plist.x86_64
@@ -43,9 +43,9 @@ usr/lib64/libgdk_pixbuf-2.0.so.0
 usr/lib64/libgdk_pixbuf-2.0.so.0.2400.1
 usr/lib64/libgdk_pixbuf_xlib-2.0.so.0
 usr/lib64/libgdk_pixbuf_xlib-2.0.so.0.2400.1
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.1/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.1/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.1/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
 usr/share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
 usr/share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
 usr/share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo
diff --git a/graphics/linux-c6-glx-utils/Makefile b/graphics/linux-c6-glx-utils/Makefile
index 1de992f..d7b9a11 100644
--- a/graphics/linux-c6-glx-utils/Makefile
+++ b/graphics/linux-c6-glx-utils/Makefile
@@ -8,19 +8,15 @@ CATEGORIES=	graphics linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of the GLX utils (Linux CentOS ${LINUX_DIST_VER})
 
-DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/centos/${LINUX_DIST_VER}
-
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	nolib
 RPMVERSION=	4.el6
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver \
 			linux-c6-libGLU>0:graphics/linux-c6-libGLU
-NVIDIA_GL_USE_OFF=	linux_apps=dri
+NVIDIA_GL_USE_OFF=	LINUX=dri
 
 .if defined(PACKAGE_BUILDING)
 SRC_DISTFILES=	mesa-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
diff --git a/graphics/linux-c6-jasper/Makefile b/graphics/linux-c6-jasper/Makefile
index d581c5d..f01425d 100644
--- a/graphics/linux-c6-jasper/Makefile
+++ b/graphics/linux-c6-jasper/Makefile
@@ -4,18 +4,17 @@ PORTNAME=	jasper
 PORTVERSION=	1.900.1
 PORTREVISION=	1
 CATEGORIES=	graphics linux
-DISTNAME=	${PORTNAME}-libs-${PORTVERSION}-${RPMVERSION}
-SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+LIB_DISTFILES=	${PORTNAME}-libs-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
+SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	JPEG-2000 reference implementation (Linux CentOS ${LINUX_DIST_VER})
 
-ONLY_FOR_ARCHS=	i386 amd64
 RPMVERSION=	16.el6_6.3
-USE_LINUX=	c6
-USE_LINUX_APPS=	jpeg
-USE_LINUX_RPM=	yes
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	jpeg
+USE_LINUX_RPM=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/graphics/linux-c6-jpeg/Makefile b/graphics/linux-c6-jpeg/Makefile
index 0a19f67..7bd0266 100644
--- a/graphics/linux-c6-jpeg/Makefile
+++ b/graphics/linux-c6-jpeg/Makefile
@@ -5,21 +5,20 @@ PORTNAME=	jpeg
 PORTVERSION=	1.2.1
 PORTREVISION=	1
 CATEGORIES=	graphics linux
-DISTNAME=	lib${PORTNAME}-turbo-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of the JPEG lib (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-jpeg-[0-9]* linux-f10-jpeg-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
+LINUX_NAME=	libjpeg-turbo
 RPMVERSION=	3.el6_5
-LINUX_NAME=	lib${PORTNAME}
-BRANDELF_DIRS=	usr/bin
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX_RPM=	yes
 
 DESCR=		${.CURDIR}/../jpeg/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/graphics/linux-c6-jpeg/pkg-plist.i386 b/graphics/linux-c6-jpeg/pkg-plist.i386
index 5c1b8c1..ed151ae 100644
--- a/graphics/linux-c6-jpeg/pkg-plist.i386
+++ b/graphics/linux-c6-jpeg/pkg-plist.i386
@@ -5,12 +5,12 @@ usr/bin/rdjpgcom
 usr/bin/wrjpgcom
 usr/lib/libjpeg.so.62
 usr/lib/libjpeg.so.62.0.0
-usr/share/doc/libjpeg-turbo-1.2.1/ChangeLog.txt
-usr/share/doc/libjpeg-turbo-1.2.1/README
-usr/share/doc/libjpeg-turbo-1.2.1/README-turbo.txt
-usr/share/doc/libjpeg-turbo-1.2.1/change.log
-usr/share/doc/libjpeg-turbo-1.2.1/usage.txt
-usr/share/doc/libjpeg-turbo-1.2.1/wizard.txt
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-turbo.txt
+%%PORTDOCS%%%%DOCSDIR%%/change.log
+%%PORTDOCS%%%%DOCSDIR%%/usage.txt
+%%PORTDOCS%%%%DOCSDIR%%/wizard.txt
 usr/share/man/man1/cjpeg.1.gz
 usr/share/man/man1/djpeg.1.gz
 usr/share/man/man1/jpegtran.1.gz
diff --git a/graphics/linux-c6-jpeg/pkg-plist.x86_64 b/graphics/linux-c6-jpeg/pkg-plist.x86_64
index f86b7c4..d41e594 100644
--- a/graphics/linux-c6-jpeg/pkg-plist.x86_64
+++ b/graphics/linux-c6-jpeg/pkg-plist.x86_64
@@ -7,12 +7,12 @@ usr/lib/libjpeg.so.62
 usr/lib/libjpeg.so.62.0.0
 usr/lib64/libjpeg.so.62
 usr/lib64/libjpeg.so.62.0.0
-usr/share/doc/libjpeg-turbo-1.2.1/ChangeLog.txt
-usr/share/doc/libjpeg-turbo-1.2.1/README
-usr/share/doc/libjpeg-turbo-1.2.1/README-turbo.txt
-usr/share/doc/libjpeg-turbo-1.2.1/change.log
-usr/share/doc/libjpeg-turbo-1.2.1/usage.txt
-usr/share/doc/libjpeg-turbo-1.2.1/wizard.txt
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-turbo.txt
+%%PORTDOCS%%%%DOCSDIR%%/change.log
+%%PORTDOCS%%%%DOCSDIR%%/usage.txt
+%%PORTDOCS%%%%DOCSDIR%%/wizard.txt
 usr/share/man/man1/cjpeg.1.gz
 usr/share/man/man1/djpeg.1.gz
 usr/share/man/man1/jpegtran.1.gz
diff --git a/graphics/linux-c6-libGLU/Makefile b/graphics/linux-c6-libGLU/Makefile
index 4b5d7c4..cbd0a87 100644
--- a/graphics/linux-c6-libGLU/Makefile
+++ b/graphics/linux-c6-libGLU/Makefile
@@ -13,14 +13,13 @@ ALWAYS_KEEP_DISTFILES=	YES
 
 CONFLICTS=	linux-f10-dri-[0-9]* linux-f10-libGLU-[0-9]* linux-c6-dri-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
 .if defined(PACKAGE_BUILDING)
 SRC_DISTFILES=	mesa-${PORTVERSION}-${RPMVERSION}.src.rpm:SOURCE
 .endif
 
 RPMVERSION=	4.el6
 
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/graphics/linux-c6-png/Makefile b/graphics/linux-c6-png/Makefile
index eb8d77f..c0ec35c 100644
--- a/graphics/linux-c6-png/Makefile
+++ b/graphics/linux-c6-png/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	png
 PORTVERSION=	1.2.49
 PORTREVISION=	3
 CATEGORIES=	graphics linux
-DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of the PNG lib (Linux CentOS ${LINUX_DIST_VER})
@@ -13,13 +13,12 @@ COMMENT=	RPM of the PNG lib (Linux CentOS ${LINUX_DIST_VER})
 CONFLICTS=	linux-png-[0-9]* linux-f8-png-[0-9]* linux-f10-png-[0-9]*
 
 LINUX_NAME=	libpng
-ONLY_FOR_ARCHS=	i386 amd64
 RPMVERSION=	2.el6_7
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX_RPM=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/libpng-${PORTVERSION}
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
 PORTDOCS=	CHANGES LICENSE README TODO example.c libpng-1.2.49.txt CMakeLists.txt
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/graphics/linux-c6-sdl_image/Makefile b/graphics/linux-c6-sdl_image/Makefile
index 29c231b..956af4e 100644
--- a/graphics/linux-c6-sdl_image/Makefile
+++ b/graphics/linux-c6-sdl_image/Makefile
@@ -6,22 +6,19 @@ PORTVERSION=	1.2.12
 PORTREVISION=	2
 CATEGORIES=	graphics linux
 MASTER_SITES=	EPEL
-DISTNAME=	SDL_image-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Simple library to load images as SDL interfaces (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-sdl_image-[0-9]* linux-f8-sdl_image-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	jpeg png sdl12 tiff
 LINUX_NAME=	SDL_image
-
 RPMVERSION=	9.el6
-BRANDELF_FILES=	usr/bin/showimage
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	jpeg png sdl12 tiff
+USE_LINUX_RPM=	yes
 
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
 PORTDOCS=	CHANGES COPYING README
diff --git a/graphics/linux-c6-sdl_ttf/Makefile b/graphics/linux-c6-sdl_ttf/Makefile
index 634b9e3..74a9a26 100644
--- a/graphics/linux-c6-sdl_ttf/Makefile
+++ b/graphics/linux-c6-sdl_ttf/Makefile
@@ -6,21 +6,19 @@ PORTVERSION=	2.0.11
 PORTREVISION=	1
 CATEGORIES=	graphics linux
 MASTER_SITES=	EPEL
-DISTNAME=	SDL_ttf-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Simple library to load True Type Fonts as SDL interfaces (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-sdl_ttf-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	jpeg png sdl12 tiff
 LINUX_NAME=	SDL_ttf
-
 RPMVERSION=	6.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	jpeg png sdl12 tiff
+USE_LINUX_RPM=	yes
 
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
 PORTDOCS=	CHANGES COPYING README
diff --git a/graphics/linux-c6-tiff/Makefile b/graphics/linux-c6-tiff/Makefile
index 97e68db..0133b25 100644
--- a/graphics/linux-c6-tiff/Makefile
+++ b/graphics/linux-c6-tiff/Makefile
@@ -5,22 +5,21 @@ PORTNAME=	tiff
 PORTVERSION=	3.9.4
 PORTREVISION=	1
 CATEGORIES=	graphics linux
-DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	TIFF library (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-tiff-[0-9]* linux-f10-tiff-[0-9]*
 
-ONLY_FOR_ARCHS=	amd64 i386
-USE_LINUX=	c6
-USE_LINUX_APPS=	jpeg
-USE_LINUX_RPM=	yes
-RPMVERSION=	10.el6_5
 LINUX_NAME=	lib${PORTNAME}
-BRANDELF_DIRS=	usr/bin
+RPMVERSION=	10.el6_5
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	jpeg
+USE_LINUX_RPM=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/graphics/linux-c6-tiff/pkg-plist.i386 b/graphics/linux-c6-tiff/pkg-plist.i386
index 133d35d..12c52e1 100644
--- a/graphics/linux-c6-tiff/pkg-plist.i386
+++ b/graphics/linux-c6-tiff/pkg-plist.i386
@@ -1,4 +1,3 @@
-@comment file listing
 usr/bin/bmp2tiff
 usr/bin/fax2ps
 usr/bin/fax2tiff
@@ -26,10 +25,10 @@ usr/lib/libtiff.so.3
 usr/lib/libtiff.so.3.9.4
 usr/lib/libtiffxx.so.3
 usr/lib/libtiffxx.so.3.9.4
-usr/share/doc/libtiff-3.9.4/COPYRIGHT
-usr/share/doc/libtiff-3.9.4/README
-usr/share/doc/libtiff-3.9.4/RELEASE-DATE
-usr/share/doc/libtiff-3.9.4/VERSION
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE-DATE
+%%PORTDOCS%%%%DOCSDIR%%/VERSION
 usr/share/man/man1/bmp2tiff.1.gz
 usr/share/man/man1/fax2ps.1.gz
 usr/share/man/man1/fax2tiff.1.gz
@@ -53,4 +52,3 @@ usr/share/man/man1/tiffinfo.1.gz
 usr/share/man/man1/tiffmedian.1.gz
 usr/share/man/man1/tiffset.1.gz
 usr/share/man/man1/tiffsplit.1.gz
-@comment non-empty directory listing in revers order
diff --git a/graphics/linux-c6-tiff/pkg-plist.x86_64 b/graphics/linux-c6-tiff/pkg-plist.x86_64
index dcc3d19..9e49ed3 100644
--- a/graphics/linux-c6-tiff/pkg-plist.x86_64
+++ b/graphics/linux-c6-tiff/pkg-plist.x86_64
@@ -1,4 +1,3 @@
-@comment file listing
 usr/bin/bmp2tiff
 usr/bin/fax2ps
 usr/bin/fax2tiff
@@ -30,10 +29,10 @@ usr/lib64/libtiff.so.3
 usr/lib64/libtiff.so.3.9.4
 usr/lib64/libtiffxx.so.3
 usr/lib64/libtiffxx.so.3.9.4
-usr/share/doc/libtiff-3.9.4/COPYRIGHT
-usr/share/doc/libtiff-3.9.4/README
-usr/share/doc/libtiff-3.9.4/RELEASE-DATE
-usr/share/doc/libtiff-3.9.4/VERSION
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE-DATE
+%%PORTDOCS%%%%DOCSDIR%%/VERSION
 usr/share/man/man1/bmp2tiff.1.gz
 usr/share/man/man1/fax2ps.1.gz
 usr/share/man/man1/fax2tiff.1.gz
@@ -57,4 +56,3 @@ usr/share/man/man1/tiffinfo.1.gz
 usr/share/man/man1/tiffmedian.1.gz
 usr/share/man/man1/tiffset.1.gz
 usr/share/man/man1/tiffsplit.1.gz
-@comment non-empty directory listing in revers order
diff --git a/graphics/linux-f10-cairo/Makefile b/graphics/linux-f10-cairo/Makefile
index 30d61c9..1b9eac6 100644
--- a/graphics/linux-f10-cairo/Makefile
+++ b/graphics/linux-f10-cairo/Makefile
@@ -5,24 +5,21 @@ PORTNAME=	cairo
 PORTVERSION=	1.8.0
 PORTREVISION=	3
 CATEGORIES=	graphics linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Vector graphics library Cairo (Linux Fedora 10)
 
 CONFLICTS=	linux-cairo-[0-9]* linux-f8-cairo-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	fontconfig png xorglibs
+USE_LINUX=	fontconfig png xorglibs
 
 RPMVERSION=	1.fc10
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/lib/libcairo.so.2 \
 		usr/lib/libcairo.so.2.10800.0
-DOCSDIR=	${PREFIX}/usr/share/doc/cairo-${PORTVERSION}
 PORTDOCS=	AUTHORS BIBLIOGRAPHY BUGS COPYING COPYING-LGPL-2.1 \
 		COPYING-MPL-1.1 ChangeLog NEWS PORTING_GUIDE README
 
diff --git a/graphics/linux-f10-dri/Makefile b/graphics/linux-f10-dri/Makefile
index 361bd00..ba412c4 100644
--- a/graphics/linux-f10-dri/Makefile
+++ b/graphics/linux-f10-dri/Makefile
@@ -5,33 +5,25 @@ PORTNAME=	dri
 PORTVERSION=	7.2
 PORTREVISION=	1
 CATEGORIES=	graphics linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-DISTFILES=	Glide3-20050815-7.fc9.${LINUX_RPM_ARCH}.rpm \
-		freeglut-2.4.0-14.fc9.${LINUX_RPM_ARCH}.rpm \
-		libdrm-2.4.0-0.21.fc10.${LINUX_RPM_ARCH}.rpm \
-		mesa-dri-drivers-7.2-0.15.fc10.${LINUX_RPM_ARCH}.rpm \
-		mesa-libGL-7.2-0.15.fc10.${LINUX_RPM_ARCH}.rpm \
-		mesa-libGLU-7.2-0.15.fc10.${LINUX_RPM_ARCH}.rpm
+BIN_DISTFILES=	Glide3-20050815-7.fc9${EXTRACT_SUFX} \
+		freeglut-2.4.0-14.fc9${EXTRACT_SUFX} \
+		libdrm-2.4.0-0.21.fc10${EXTRACT_SUFX} \
+		mesa-dri-drivers-7.2-0.15.fc10${EXTRACT_SUFX} \
+		mesa-libGL-7.2-0.15.fc10${EXTRACT_SUFX} \
+		mesa-libGLU-7.2-0.15.fc10${EXTRACT_SUFX}
+SRC_DISTFILES=	Glide3-20050815-7.fc9.src.rpm:SOURCE \
+		freeglut-2.4.0-14.fc9.src.rpm:SOURCE \
+		libdrm-2.4.0-0.21.fc10.src.rpm:SOURCE \
+		mesa-7.2-0.15.fc10.src.rpm:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Mesa libGL runtime libraries and DRI drivers (Linux Fedora 10)
 
 CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-[0-9]* linux-f8-dri-[0-9]* linux-dri-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	xorglibs
-
+USES=		linux:f10
+USE_LINUX=	xorglibs
+USE_LINUX_RPM=	nolib
 USE_LDCONFIG=	yes
 
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	Glide3-20050815-7.fc9.src.rpm \
-		freeglut-2.4.0-14.fc9.src.rpm \
-		libdrm-2.4.0-0.21.fc10.src.rpm \
-		mesa-7.2-0.15.fc10.src.rpm
-
-ALWAYS_KEEP_DISTFILES=	YES
-.endif
-
 .include <bsd.port.mk>
diff --git a/graphics/linux-f10-gdk-pixbuf/Makefile b/graphics/linux-f10-gdk-pixbuf/Makefile
index da6ace8..26c7dc7 100644
--- a/graphics/linux-f10-gdk-pixbuf/Makefile
+++ b/graphics/linux-f10-gdk-pixbuf/Makefile
@@ -5,15 +5,13 @@ PORTNAME=	gdk-pixbuf
 PORTVERSION=	0.22.0
 PORTREVISION=	1
 CATEGORIES=	graphics linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Image loading library for GTK+ (Linux Fedora 10)
 
 CONFLICTS=	linux-gdk-pixbuf-[0-9]* linux-f8-gdk-pixbuf-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	36.fc9
diff --git a/graphics/linux-f10-glew/Makefile b/graphics/linux-f10-glew/Makefile
index 612584e..9dc4845 100644
--- a/graphics/linux-f10-glew/Makefile
+++ b/graphics/linux-f10-glew/Makefile
@@ -8,18 +8,14 @@ CATEGORIES=	graphics linux
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL Extension Wrangler Library (Linux Fedora 10)
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-LINUX_NAME=	glew
 
 RPMVERSION=	1.fc10
 USE_LDCONFIG=	yes
-BRANDELF_DIRS=	usr/bin
 
 PLIST_FILES=	usr/bin/glewinfo usr/bin/visualinfo \
 		usr/lib/libGLEW.so.1.5 usr/lib/libGLEW.so.1.5.1
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	LICENSE.txt
 
 .include <bsd.port.mk>
diff --git a/graphics/linux-f10-imlib/Makefile b/graphics/linux-f10-imlib/Makefile
index c91f964..b3477098 100644
--- a/graphics/linux-f10-imlib/Makefile
+++ b/graphics/linux-f10-imlib/Makefile
@@ -5,18 +5,16 @@ PORTNAME=	imlib
 PORTVERSION=	1.9.15
 PORTREVISION=	1
 CATEGORIES=	graphics linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of imlib (Linux Fedora 10)
 
 CONFLICTS=	linux-imlib-[0-9]* linux-f8-imlib-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	9.fc10
-BRANDELF_FILES=	usr/bin/imlib_config
 USE_LDCONFIG=	yes
 PLIST=		${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
 
diff --git a/graphics/linux-f10-jpeg/Makefile b/graphics/linux-f10-jpeg/Makefile
index 8c16540..a2efe08 100644
--- a/graphics/linux-f10-jpeg/Makefile
+++ b/graphics/linux-f10-jpeg/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	jpeg
 PORTVERSION=	6b
 CATEGORIES=	graphics linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -12,13 +11,10 @@ COMMENT=	RPM of the JPEG lib (Linux Fedora 10)
 
 CONFLICTS=	linux-jpeg-[0-9]* linux-f8-jpeg-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-LINUX_NAME=	lib${PORTNAME}
 
 RPMVERSION=	43.fc10
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/graphics/linux-f10-libGLU/Makefile b/graphics/linux-f10-libGLU/Makefile
index 1fc54ae..e9d2e79 100644
--- a/graphics/linux-f10-libGLU/Makefile
+++ b/graphics/linux-f10-libGLU/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	libGLU
 PORTVERSION=	7.2
 CATEGORIES=	graphics linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	mesa-${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -13,10 +12,8 @@ COMMENT=	Mesa libGLU runtime library (Linux Fedora 10)
 CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-* linux-libGLU-[0-9]* \
 		linux-f8-libGLU-[0-9]* linux-dri-[0-9]* linux-dri74-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-LINUX_NAME=	mesa-libGLU
 
 RPMVERSION=	0.15.fc10
 USE_LDCONFIG=	yes
@@ -25,6 +22,4 @@ SRC_DISTFILES=	mesa-${PORTVERSION}-${RPMVERSION}.src.rpm
 PLIST_FILES=	usr/lib/libGLU.so.1 usr/lib/libGLU.so.1.3.070300
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
-SRC_DISTFILE=	mesa-${PORTVERSION}-${RPMVERSION}.src.rpm
-
 .include <bsd.port.mk>
diff --git a/graphics/linux-f10-libmng/Makefile b/graphics/linux-f10-libmng/Makefile
index 5e1ec03..81ef74f 100644
--- a/graphics/linux-f10-libmng/Makefile
+++ b/graphics/linux-f10-libmng/Makefile
@@ -5,17 +5,15 @@ PORTNAME=		libmng
 PORTVERSION=		1.0.9
 PORTREVISION=	1
 CATEGORIES=		graphics linux
-MASTER_SITES=		LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=		emulation@FreeBSD.org
 COMMENT=		RPM of libmng (Linux Fedora 10)
 
 CONFLICTS=		linux-libmng-[0-9]* linux-f8-libmng-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	jpeg
+USE_LINUX=	jpeg
 
 RPMVERSION=	7
 USE_LDCONFIG=	yes
diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile
index a8c7cf9..698d29f 100644
--- a/graphics/linux-f10-png/Makefile
+++ b/graphics/linux-f10-png/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	png
 PORTVERSION=	1.2.37
 PORTREVISION=	2
 CATEGORIES=	graphics linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -13,10 +12,8 @@ COMMENT=	RPM of the PNG lib (Linux Fedora 10)
 
 CONFLICTS=	linux-png-[0-9]* linux-f8-png-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-LINUX_NAME=	libpng
 
 RPMVERSION=	1.fc10
 USE_LDCONFIG=	yes
diff --git a/graphics/linux-f10-sdl_image/Makefile b/graphics/linux-f10-sdl_image/Makefile
index b3a2285..b146a9a 100644
--- a/graphics/linux-f10-sdl_image/Makefile
+++ b/graphics/linux-f10-sdl_image/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	sdl_image
 PORTVERSION=	1.2.6
 PORTREVISION=	3
 CATEGORIES=	graphics linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	SDL_image-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -13,14 +12,12 @@ COMMENT=	Simple library to load images as SDL interfaces (Linux Fedora 10)
 
 CONFLICTS=	linux-sdl_image-[0-9]* linux-f8-sdl_image-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	jpeg png sdl12 tiff
+USE_LINUX=	jpeg png sdl12 tiff
 LINUX_NAME=	SDL_image
 
 RPMVERSION=	6.fc9
-BRANDELF_FILES=	usr/bin/showimage
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/bin/showimage usr/lib/libSDL_image-1.2.so.0 \
diff --git a/graphics/linux-f10-sdl_ttf/Makefile b/graphics/linux-f10-sdl_ttf/Makefile
index c03f451..d2692eb 100644
--- a/graphics/linux-f10-sdl_ttf/Makefile
+++ b/graphics/linux-f10-sdl_ttf/Makefile
@@ -10,11 +10,10 @@ DISTNAME=	SDL_ttf-${PORTVERSION}-1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to use TrueType fonts in SDL applications (Linux version)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	sdl12
+USE_LINUX=	sdl12
 USE_LDCONFIG=	yes
-ONLY_FOR_ARCHS=	i386 amd64
 DIST_SUBDIR=	rpm
 PLIST_SUB+=	SDLTTFVER=${PORTVERSION}
 
diff --git a/graphics/linux-f10-tiff/Makefile b/graphics/linux-f10-tiff/Makefile
index f6adc8e..24597f9 100644
--- a/graphics/linux-f10-tiff/Makefile
+++ b/graphics/linux-f10-tiff/Makefile
@@ -4,20 +4,16 @@
 PORTNAME=	tiff
 PORTVERSION=	3.8.2
 CATEGORIES=	graphics linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	TIFF library, Linux/i386 binary (Linux Fedora 10)
 
-ONLY_FOR_ARCHS=	amd64 i386
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	jpeg
-LINUX_NAME=	lib${PORTNAME}
+USE_LINUX=	jpeg
 
 RPMVERSION=	11.fc10
-BRANDELF_DIRS=	usr/bin
 PLIST=		${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
 USE_LDCONFIG=	yes
 
diff --git a/graphics/linux-f10-ungif/Makefile b/graphics/linux-f10-ungif/Makefile
index 457fb05..0799095 100644
--- a/graphics/linux-f10-ungif/Makefile
+++ b/graphics/linux-f10-ungif/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	ungif
 PORTVERSION=	4.1.3
 CATEGORIES=	graphics linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -12,8 +11,7 @@ COMMENT=	RPM of gif and ungif libs (Linux Fedora 10)
 
 CONFLICTS=	linux-ungif-[0-9]* linux-f8-ungif-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 LINUX_NAME=	giflib
 
diff --git a/japanese/slimeforest/Makefile b/japanese/slimeforest/Makefile
index 78b82bf..84e9aeb 100644
--- a/japanese/slimeforest/Makefile
+++ b/japanese/slimeforest/Makefile
@@ -22,8 +22,8 @@ PLIST_SUB=	BINMODE=${BINMODE}
 
 SUB_FILES=	${PORTNAME}.sh
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdlimage
+USES=		linux
+USE_LINUX=	sdlimage
 
 WRKSRC=		${WRKDIR}/slimeforest
 
diff --git a/java/linux-oracle-jdk18/Makefile b/java/linux-oracle-jdk18/Makefile
index 4cfbd37..2401b35 100644
--- a/java/linux-oracle-jdk18/Makefile
+++ b/java/linux-oracle-jdk18/Makefile
@@ -22,9 +22,8 @@ WRKSRC=		${WRKDIR}/jdk${DL_JDK_VERSION}
 PLIST_SUB=	T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
 
 NO_BUILD=	yes
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
-USES=		shebangfix
+USES=		linux shebangfix
+USE_LINUX=	xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
 
 JDK_VENDOR=		oracle
diff --git a/java/linux-oracle-jre18/Makefile b/java/linux-oracle-jre18/Makefile
index 0910017..7c26267 100644
--- a/java/linux-oracle-jre18/Makefile
+++ b/java/linux-oracle-jre18/Makefile
@@ -20,9 +20,8 @@ WRKSRC=		${WRKDIR}/jre${DL_JRE_VERSION}
 PLIST_SUB=	T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
 
 NO_BUILD=	yes
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
-USES=		shebangfix
+USES=		linux shebangfix
+USE_LINUX=	xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
 
 JRE_VENDOR=		oracle
diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index d1caabf..a157c30 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -21,16 +21,18 @@ EXTRACT_DEPENDS=	rpm2cpio.pl:archivers/rpm2cpio
 
 RESTRICTED=	Intel forbids any redistribution.
 
+USES=		linux
+USE_LINUX=	base
+
 PATCHLEVEL=	${PORTVERSION:C/(.+p)(.+)$/pe\2/}
 .if ${PORTVERSION} != ${PATCHLEVEL}
 DISTFILES+=	${DISTNAME} ${PATCHLEVEL}${EXTRACT_SUFX}
-PATCH_DEPENDS=	${LINUX_BASE_PORT}
+USE_LINUX+=	base:patch
 .endif
 
 ONLY_FOR_ARCHS=	i386
 
 USE_LDCONFIG=	yes
-USE_LINUX=	yes
 
 COMPILERDIR=	intel_cc_80
 PLIST_SUB=	COMPILERDIR=${COMPILERDIR}
@@ -162,7 +164,6 @@ do-build:
 	${CC} ${CFLAGS} -o \
 		${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld \
 		${FILESDIR}/ld.c
-# We can't use STRIP_CMD, since we need the FreeBSD one, not the Linux one.
 	${STRIP_CMD} ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld
 	${CHMOD} 755 ${WRKSRC}/opt/${COMPILERDIR}/bin/ldwrapper/ld
 # Make ICC happy with regards to crtbegin.o, crtend.o and libgcc.a which it
diff --git a/lang/linux-c6-tcl85/Makefile b/lang/linux-c6-tcl85/Makefile
index 59bab80..6eca644 100644
--- a/lang/linux-c6-tcl85/Makefile
+++ b/lang/linux-c6-tcl85/Makefile
@@ -12,16 +12,13 @@ COMMENT=	Tool Command Language (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-f10-tcl85-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_RPM_BAD_PERMS=	yes
 RPMVERSION=	6.el6
-BRANDELF_FILES=	usr/bin/tclsh usr/bin/tclsh8.5
+USES=		linux:c6
 USE_LDCONFIG=	yes
-NO_WRKSUBDIR=	yes
+USE_LINUX_RPM=	yes
+USE_LINUX_RPM_BAD_PERMS=	yes
 
+DATADIR=	${PREFIX}/usr/share/tcl${PORTVERSION:R}
 DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/lang/linux-c6-tcl85/pkg-plist.i386 b/lang/linux-c6-tcl85/pkg-plist.i386
index 722af7a..b8cd787 100644
--- a/lang/linux-c6-tcl85/pkg-plist.i386
+++ b/lang/linux-c6-tcl85/pkg-plist.i386
@@ -698,230 +698,230 @@ usr/share/man/mann/upvar.n.gz
 usr/share/man/mann/variable.n.gz
 usr/share/man/mann/vwait.n.gz
 usr/share/man/mann/while.n.gz
-usr/%%DATADIR%%8.5/auto.tcl
-usr/%%DATADIR%%8.5/clock.tcl
-usr/%%DATADIR%%8.5/encoding/ascii.enc
-usr/%%DATADIR%%8.5/encoding/big5.enc
-usr/%%DATADIR%%8.5/encoding/cp1250.enc
-usr/%%DATADIR%%8.5/encoding/cp1251.enc
-usr/%%DATADIR%%8.5/encoding/cp1252.enc
-usr/%%DATADIR%%8.5/encoding/cp1253.enc
-usr/%%DATADIR%%8.5/encoding/cp1254.enc
-usr/%%DATADIR%%8.5/encoding/cp1255.enc
-usr/%%DATADIR%%8.5/encoding/cp1256.enc
-usr/%%DATADIR%%8.5/encoding/cp1257.enc
-usr/%%DATADIR%%8.5/encoding/cp1258.enc
-usr/%%DATADIR%%8.5/encoding/cp437.enc
-usr/%%DATADIR%%8.5/encoding/cp737.enc
-usr/%%DATADIR%%8.5/encoding/cp775.enc
-usr/%%DATADIR%%8.5/encoding/cp850.enc
-usr/%%DATADIR%%8.5/encoding/cp852.enc
-usr/%%DATADIR%%8.5/encoding/cp855.enc
-usr/%%DATADIR%%8.5/encoding/cp857.enc
-usr/%%DATADIR%%8.5/encoding/cp860.enc
-usr/%%DATADIR%%8.5/encoding/cp861.enc
-usr/%%DATADIR%%8.5/encoding/cp862.enc
-usr/%%DATADIR%%8.5/encoding/cp863.enc
-usr/%%DATADIR%%8.5/encoding/cp864.enc
-usr/%%DATADIR%%8.5/encoding/cp865.enc
-usr/%%DATADIR%%8.5/encoding/cp866.enc
-usr/%%DATADIR%%8.5/encoding/cp869.enc
-usr/%%DATADIR%%8.5/encoding/cp874.enc
-usr/%%DATADIR%%8.5/encoding/cp932.enc
-usr/%%DATADIR%%8.5/encoding/cp936.enc
-usr/%%DATADIR%%8.5/encoding/cp949.enc
-usr/%%DATADIR%%8.5/encoding/cp950.enc
-usr/%%DATADIR%%8.5/encoding/dingbats.enc
-usr/%%DATADIR%%8.5/encoding/ebcdic.enc
-usr/%%DATADIR%%8.5/encoding/euc-cn.enc
-usr/%%DATADIR%%8.5/encoding/euc-jp.enc
-usr/%%DATADIR%%8.5/encoding/euc-kr.enc
-usr/%%DATADIR%%8.5/encoding/gb12345.enc
-usr/%%DATADIR%%8.5/encoding/gb1988.enc
-usr/%%DATADIR%%8.5/encoding/gb2312-raw.enc
-usr/%%DATADIR%%8.5/encoding/gb2312.enc
-usr/%%DATADIR%%8.5/encoding/iso2022-jp.enc
-usr/%%DATADIR%%8.5/encoding/iso2022-kr.enc
-usr/%%DATADIR%%8.5/encoding/iso2022.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-1.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-10.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-13.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-14.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-15.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-16.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-2.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-3.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-4.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-5.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-6.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-7.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-8.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-9.enc
-usr/%%DATADIR%%8.5/encoding/jis0201.enc
-usr/%%DATADIR%%8.5/encoding/jis0208.enc
-usr/%%DATADIR%%8.5/encoding/jis0212.enc
-usr/%%DATADIR%%8.5/encoding/koi8-r.enc
-usr/%%DATADIR%%8.5/encoding/koi8-u.enc
-usr/%%DATADIR%%8.5/encoding/ksc5601.enc
-usr/%%DATADIR%%8.5/encoding/macCentEuro.enc
-usr/%%DATADIR%%8.5/encoding/macCroatian.enc
-usr/%%DATADIR%%8.5/encoding/macCyrillic.enc
-usr/%%DATADIR%%8.5/encoding/macDingbats.enc
-usr/%%DATADIR%%8.5/encoding/macGreek.enc
-usr/%%DATADIR%%8.5/encoding/macIceland.enc
-usr/%%DATADIR%%8.5/encoding/macJapan.enc
-usr/%%DATADIR%%8.5/encoding/macRoman.enc
-usr/%%DATADIR%%8.5/encoding/macRomania.enc
-usr/%%DATADIR%%8.5/encoding/macThai.enc
-usr/%%DATADIR%%8.5/encoding/macTurkish.enc
-usr/%%DATADIR%%8.5/encoding/macUkraine.enc
-usr/%%DATADIR%%8.5/encoding/shiftjis.enc
-usr/%%DATADIR%%8.5/encoding/symbol.enc
-usr/%%DATADIR%%8.5/encoding/tis-620.enc
-usr/%%DATADIR%%8.5/history.tcl
-usr/%%DATADIR%%8.5/http1.0/http.tcl
-usr/%%DATADIR%%8.5/http1.0/pkgIndex.tcl
-usr/%%DATADIR%%8.5/init.tcl
-usr/%%DATADIR%%8.5/msgs/af.msg
-usr/%%DATADIR%%8.5/msgs/af_za.msg
-usr/%%DATADIR%%8.5/msgs/ar.msg
-usr/%%DATADIR%%8.5/msgs/ar_in.msg
-usr/%%DATADIR%%8.5/msgs/ar_jo.msg
-usr/%%DATADIR%%8.5/msgs/ar_lb.msg
-usr/%%DATADIR%%8.5/msgs/ar_sy.msg
-usr/%%DATADIR%%8.5/msgs/be.msg
-usr/%%DATADIR%%8.5/msgs/bg.msg
-usr/%%DATADIR%%8.5/msgs/bn.msg
-usr/%%DATADIR%%8.5/msgs/bn_in.msg
-usr/%%DATADIR%%8.5/msgs/ca.msg
-usr/%%DATADIR%%8.5/msgs/cs.msg
-usr/%%DATADIR%%8.5/msgs/da.msg
-usr/%%DATADIR%%8.5/msgs/de.msg
-usr/%%DATADIR%%8.5/msgs/de_at.msg
-usr/%%DATADIR%%8.5/msgs/de_be.msg
-usr/%%DATADIR%%8.5/msgs/el.msg
-usr/%%DATADIR%%8.5/msgs/en_au.msg
-usr/%%DATADIR%%8.5/msgs/en_be.msg
-usr/%%DATADIR%%8.5/msgs/en_bw.msg
-usr/%%DATADIR%%8.5/msgs/en_ca.msg
-usr/%%DATADIR%%8.5/msgs/en_gb.msg
-usr/%%DATADIR%%8.5/msgs/en_hk.msg
-usr/%%DATADIR%%8.5/msgs/en_ie.msg
-usr/%%DATADIR%%8.5/msgs/en_in.msg
-usr/%%DATADIR%%8.5/msgs/en_nz.msg
-usr/%%DATADIR%%8.5/msgs/en_ph.msg
-usr/%%DATADIR%%8.5/msgs/en_sg.msg
-usr/%%DATADIR%%8.5/msgs/en_za.msg
-usr/%%DATADIR%%8.5/msgs/en_zw.msg
-usr/%%DATADIR%%8.5/msgs/eo.msg
-usr/%%DATADIR%%8.5/msgs/es.msg
-usr/%%DATADIR%%8.5/msgs/es_ar.msg
-usr/%%DATADIR%%8.5/msgs/es_bo.msg
-usr/%%DATADIR%%8.5/msgs/es_cl.msg
-usr/%%DATADIR%%8.5/msgs/es_co.msg
-usr/%%DATADIR%%8.5/msgs/es_cr.msg
-usr/%%DATADIR%%8.5/msgs/es_do.msg
-usr/%%DATADIR%%8.5/msgs/es_ec.msg
-usr/%%DATADIR%%8.5/msgs/es_gt.msg
-usr/%%DATADIR%%8.5/msgs/es_hn.msg
-usr/%%DATADIR%%8.5/msgs/es_mx.msg
-usr/%%DATADIR%%8.5/msgs/es_ni.msg
-usr/%%DATADIR%%8.5/msgs/es_pa.msg
-usr/%%DATADIR%%8.5/msgs/es_pe.msg
-usr/%%DATADIR%%8.5/msgs/es_pr.msg
-usr/%%DATADIR%%8.5/msgs/es_py.msg
-usr/%%DATADIR%%8.5/msgs/es_sv.msg
-usr/%%DATADIR%%8.5/msgs/es_uy.msg
-usr/%%DATADIR%%8.5/msgs/es_ve.msg
-usr/%%DATADIR%%8.5/msgs/et.msg
-usr/%%DATADIR%%8.5/msgs/eu.msg
-usr/%%DATADIR%%8.5/msgs/eu_es.msg
-usr/%%DATADIR%%8.5/msgs/fa.msg
-usr/%%DATADIR%%8.5/msgs/fa_in.msg
-usr/%%DATADIR%%8.5/msgs/fa_ir.msg
-usr/%%DATADIR%%8.5/msgs/fi.msg
-usr/%%DATADIR%%8.5/msgs/fo.msg
-usr/%%DATADIR%%8.5/msgs/fo_fo.msg
-usr/%%DATADIR%%8.5/msgs/fr.msg
-usr/%%DATADIR%%8.5/msgs/fr_be.msg
-usr/%%DATADIR%%8.5/msgs/fr_ca.msg
-usr/%%DATADIR%%8.5/msgs/fr_ch.msg
-usr/%%DATADIR%%8.5/msgs/ga.msg
-usr/%%DATADIR%%8.5/msgs/ga_ie.msg
-usr/%%DATADIR%%8.5/msgs/gl.msg
-usr/%%DATADIR%%8.5/msgs/gl_es.msg
-usr/%%DATADIR%%8.5/msgs/gv.msg
-usr/%%DATADIR%%8.5/msgs/gv_gb.msg
-usr/%%DATADIR%%8.5/msgs/he.msg
-usr/%%DATADIR%%8.5/msgs/hi.msg
-usr/%%DATADIR%%8.5/msgs/hi_in.msg
-usr/%%DATADIR%%8.5/msgs/hr.msg
-usr/%%DATADIR%%8.5/msgs/hu.msg
-usr/%%DATADIR%%8.5/msgs/id.msg
-usr/%%DATADIR%%8.5/msgs/id_id.msg
-usr/%%DATADIR%%8.5/msgs/is.msg
-usr/%%DATADIR%%8.5/msgs/it.msg
-usr/%%DATADIR%%8.5/msgs/it_ch.msg
-usr/%%DATADIR%%8.5/msgs/ja.msg
-usr/%%DATADIR%%8.5/msgs/kl.msg
-usr/%%DATADIR%%8.5/msgs/kl_gl.msg
-usr/%%DATADIR%%8.5/msgs/ko.msg
-usr/%%DATADIR%%8.5/msgs/ko_kr.msg
-usr/%%DATADIR%%8.5/msgs/kok.msg
-usr/%%DATADIR%%8.5/msgs/kok_in.msg
-usr/%%DATADIR%%8.5/msgs/kw.msg
-usr/%%DATADIR%%8.5/msgs/kw_gb.msg
-usr/%%DATADIR%%8.5/msgs/lt.msg
-usr/%%DATADIR%%8.5/msgs/lv.msg
-usr/%%DATADIR%%8.5/msgs/mk.msg
-usr/%%DATADIR%%8.5/msgs/mr.msg
-usr/%%DATADIR%%8.5/msgs/mr_in.msg
-usr/%%DATADIR%%8.5/msgs/ms.msg
-usr/%%DATADIR%%8.5/msgs/ms_my.msg
-usr/%%DATADIR%%8.5/msgs/mt.msg
-usr/%%DATADIR%%8.5/msgs/nb.msg
-usr/%%DATADIR%%8.5/msgs/nl.msg
-usr/%%DATADIR%%8.5/msgs/nl_be.msg
-usr/%%DATADIR%%8.5/msgs/nn.msg
-usr/%%DATADIR%%8.5/msgs/pl.msg
-usr/%%DATADIR%%8.5/msgs/pt.msg
-usr/%%DATADIR%%8.5/msgs/pt_br.msg
-usr/%%DATADIR%%8.5/msgs/ro.msg
-usr/%%DATADIR%%8.5/msgs/ru.msg
-usr/%%DATADIR%%8.5/msgs/ru_ua.msg
-usr/%%DATADIR%%8.5/msgs/sh.msg
-usr/%%DATADIR%%8.5/msgs/sk.msg
-usr/%%DATADIR%%8.5/msgs/sl.msg
-usr/%%DATADIR%%8.5/msgs/sq.msg
-usr/%%DATADIR%%8.5/msgs/sr.msg
-usr/%%DATADIR%%8.5/msgs/sv.msg
-usr/%%DATADIR%%8.5/msgs/sw.msg
-usr/%%DATADIR%%8.5/msgs/ta.msg
-usr/%%DATADIR%%8.5/msgs/ta_in.msg
-usr/%%DATADIR%%8.5/msgs/te.msg
-usr/%%DATADIR%%8.5/msgs/te_in.msg
-usr/%%DATADIR%%8.5/msgs/th.msg
-usr/%%DATADIR%%8.5/msgs/tr.msg
-usr/%%DATADIR%%8.5/msgs/uk.msg
-usr/%%DATADIR%%8.5/msgs/vi.msg
-usr/%%DATADIR%%8.5/msgs/zh.msg
-usr/%%DATADIR%%8.5/msgs/zh_cn.msg
-usr/%%DATADIR%%8.5/msgs/zh_hk.msg
-usr/%%DATADIR%%8.5/msgs/zh_sg.msg
-usr/%%DATADIR%%8.5/msgs/zh_tw.msg
-usr/%%DATADIR%%8.5/opt0.4/optparse.tcl
-usr/%%DATADIR%%8.5/opt0.4/pkgIndex.tcl
-usr/%%DATADIR%%8.5/package.tcl
-usr/%%DATADIR%%8.5/parray.tcl
-usr/%%DATADIR%%8.5/safe.tcl
-usr/%%DATADIR%%8.5/tclDTrace.d
-usr/%%DATADIR%%8.5/tclIndex
-usr/%%DATADIR%%8.5/tm.tcl
-usr/%%DATADIR%%8.5/word.tcl
-usr/%%DATADIR%%8/8.4/http-2.7.3.tm
-usr/%%DATADIR%%8/8.4/platform-1.0.4.tm
-usr/%%DATADIR%%8/8.4/platform/shell-1.1.4.tm
-usr/%%DATADIR%%8/8.5/msgcat-1.4.2.tm
-usr/%%DATADIR%%8/8.5/tcltest-2.3.1.tm
+%%DATADIR%%/auto.tcl
+%%DATADIR%%/clock.tcl
+%%DATADIR%%/encoding/ascii.enc
+%%DATADIR%%/encoding/big5.enc
+%%DATADIR%%/encoding/cp1250.enc
+%%DATADIR%%/encoding/cp1251.enc
+%%DATADIR%%/encoding/cp1252.enc
+%%DATADIR%%/encoding/cp1253.enc
+%%DATADIR%%/encoding/cp1254.enc
+%%DATADIR%%/encoding/cp1255.enc
+%%DATADIR%%/encoding/cp1256.enc
+%%DATADIR%%/encoding/cp1257.enc
+%%DATADIR%%/encoding/cp1258.enc
+%%DATADIR%%/encoding/cp437.enc
+%%DATADIR%%/encoding/cp737.enc
+%%DATADIR%%/encoding/cp775.enc
+%%DATADIR%%/encoding/cp850.enc
+%%DATADIR%%/encoding/cp852.enc
+%%DATADIR%%/encoding/cp855.enc
+%%DATADIR%%/encoding/cp857.enc
+%%DATADIR%%/encoding/cp860.enc
+%%DATADIR%%/encoding/cp861.enc
+%%DATADIR%%/encoding/cp862.enc
+%%DATADIR%%/encoding/cp863.enc
+%%DATADIR%%/encoding/cp864.enc
+%%DATADIR%%/encoding/cp865.enc
+%%DATADIR%%/encoding/cp866.enc
+%%DATADIR%%/encoding/cp869.enc
+%%DATADIR%%/encoding/cp874.enc
+%%DATADIR%%/encoding/cp932.enc
+%%DATADIR%%/encoding/cp936.enc
+%%DATADIR%%/encoding/cp949.enc
+%%DATADIR%%/encoding/cp950.enc
+%%DATADIR%%/encoding/dingbats.enc
+%%DATADIR%%/encoding/ebcdic.enc
+%%DATADIR%%/encoding/euc-cn.enc
+%%DATADIR%%/encoding/euc-jp.enc
+%%DATADIR%%/encoding/euc-kr.enc
+%%DATADIR%%/encoding/gb12345.enc
+%%DATADIR%%/encoding/gb1988.enc
+%%DATADIR%%/encoding/gb2312-raw.enc
+%%DATADIR%%/encoding/gb2312.enc
+%%DATADIR%%/encoding/iso2022-jp.enc
+%%DATADIR%%/encoding/iso2022-kr.enc
+%%DATADIR%%/encoding/iso2022.enc
+%%DATADIR%%/encoding/iso8859-1.enc
+%%DATADIR%%/encoding/iso8859-10.enc
+%%DATADIR%%/encoding/iso8859-13.enc
+%%DATADIR%%/encoding/iso8859-14.enc
+%%DATADIR%%/encoding/iso8859-15.enc
+%%DATADIR%%/encoding/iso8859-16.enc
+%%DATADIR%%/encoding/iso8859-2.enc
+%%DATADIR%%/encoding/iso8859-3.enc
+%%DATADIR%%/encoding/iso8859-4.enc
+%%DATADIR%%/encoding/iso8859-5.enc
+%%DATADIR%%/encoding/iso8859-6.enc
+%%DATADIR%%/encoding/iso8859-7.enc
+%%DATADIR%%/encoding/iso8859-8.enc
+%%DATADIR%%/encoding/iso8859-9.enc
+%%DATADIR%%/encoding/jis0201.enc
+%%DATADIR%%/encoding/jis0208.enc
+%%DATADIR%%/encoding/jis0212.enc
+%%DATADIR%%/encoding/koi8-r.enc
+%%DATADIR%%/encoding/koi8-u.enc
+%%DATADIR%%/encoding/ksc5601.enc
+%%DATADIR%%/encoding/macCentEuro.enc
+%%DATADIR%%/encoding/macCroatian.enc
+%%DATADIR%%/encoding/macCyrillic.enc
+%%DATADIR%%/encoding/macDingbats.enc
+%%DATADIR%%/encoding/macGreek.enc
+%%DATADIR%%/encoding/macIceland.enc
+%%DATADIR%%/encoding/macJapan.enc
+%%DATADIR%%/encoding/macRoman.enc
+%%DATADIR%%/encoding/macRomania.enc
+%%DATADIR%%/encoding/macThai.enc
+%%DATADIR%%/encoding/macTurkish.enc
+%%DATADIR%%/encoding/macUkraine.enc
+%%DATADIR%%/encoding/shiftjis.enc
+%%DATADIR%%/encoding/symbol.enc
+%%DATADIR%%/encoding/tis-620.enc
+%%DATADIR%%/history.tcl
+%%DATADIR%%/http1.0/http.tcl
+%%DATADIR%%/http1.0/pkgIndex.tcl
+%%DATADIR%%/init.tcl
+%%DATADIR%%/msgs/af.msg
+%%DATADIR%%/msgs/af_za.msg
+%%DATADIR%%/msgs/ar.msg
+%%DATADIR%%/msgs/ar_in.msg
+%%DATADIR%%/msgs/ar_jo.msg
+%%DATADIR%%/msgs/ar_lb.msg
+%%DATADIR%%/msgs/ar_sy.msg
+%%DATADIR%%/msgs/be.msg
+%%DATADIR%%/msgs/bg.msg
+%%DATADIR%%/msgs/bn.msg
+%%DATADIR%%/msgs/bn_in.msg
+%%DATADIR%%/msgs/ca.msg
+%%DATADIR%%/msgs/cs.msg
+%%DATADIR%%/msgs/da.msg
+%%DATADIR%%/msgs/de.msg
+%%DATADIR%%/msgs/de_at.msg
+%%DATADIR%%/msgs/de_be.msg
+%%DATADIR%%/msgs/el.msg
+%%DATADIR%%/msgs/en_au.msg
+%%DATADIR%%/msgs/en_be.msg
+%%DATADIR%%/msgs/en_bw.msg
+%%DATADIR%%/msgs/en_ca.msg
+%%DATADIR%%/msgs/en_gb.msg
+%%DATADIR%%/msgs/en_hk.msg
+%%DATADIR%%/msgs/en_ie.msg
+%%DATADIR%%/msgs/en_in.msg
+%%DATADIR%%/msgs/en_nz.msg
+%%DATADIR%%/msgs/en_ph.msg
+%%DATADIR%%/msgs/en_sg.msg
+%%DATADIR%%/msgs/en_za.msg
+%%DATADIR%%/msgs/en_zw.msg
+%%DATADIR%%/msgs/eo.msg
+%%DATADIR%%/msgs/es.msg
+%%DATADIR%%/msgs/es_ar.msg
+%%DATADIR%%/msgs/es_bo.msg
+%%DATADIR%%/msgs/es_cl.msg
+%%DATADIR%%/msgs/es_co.msg
+%%DATADIR%%/msgs/es_cr.msg
+%%DATADIR%%/msgs/es_do.msg
+%%DATADIR%%/msgs/es_ec.msg
+%%DATADIR%%/msgs/es_gt.msg
+%%DATADIR%%/msgs/es_hn.msg
+%%DATADIR%%/msgs/es_mx.msg
+%%DATADIR%%/msgs/es_ni.msg
+%%DATADIR%%/msgs/es_pa.msg
+%%DATADIR%%/msgs/es_pe.msg
+%%DATADIR%%/msgs/es_pr.msg
+%%DATADIR%%/msgs/es_py.msg
+%%DATADIR%%/msgs/es_sv.msg
+%%DATADIR%%/msgs/es_uy.msg
+%%DATADIR%%/msgs/es_ve.msg
+%%DATADIR%%/msgs/et.msg
+%%DATADIR%%/msgs/eu.msg
+%%DATADIR%%/msgs/eu_es.msg
+%%DATADIR%%/msgs/fa.msg
+%%DATADIR%%/msgs/fa_in.msg
+%%DATADIR%%/msgs/fa_ir.msg
+%%DATADIR%%/msgs/fi.msg
+%%DATADIR%%/msgs/fo.msg
+%%DATADIR%%/msgs/fo_fo.msg
+%%DATADIR%%/msgs/fr.msg
+%%DATADIR%%/msgs/fr_be.msg
+%%DATADIR%%/msgs/fr_ca.msg
+%%DATADIR%%/msgs/fr_ch.msg
+%%DATADIR%%/msgs/ga.msg
+%%DATADIR%%/msgs/ga_ie.msg
+%%DATADIR%%/msgs/gl.msg
+%%DATADIR%%/msgs/gl_es.msg
+%%DATADIR%%/msgs/gv.msg
+%%DATADIR%%/msgs/gv_gb.msg
+%%DATADIR%%/msgs/he.msg
+%%DATADIR%%/msgs/hi.msg
+%%DATADIR%%/msgs/hi_in.msg
+%%DATADIR%%/msgs/hr.msg
+%%DATADIR%%/msgs/hu.msg
+%%DATADIR%%/msgs/id.msg
+%%DATADIR%%/msgs/id_id.msg
+%%DATADIR%%/msgs/is.msg
+%%DATADIR%%/msgs/it.msg
+%%DATADIR%%/msgs/it_ch.msg
+%%DATADIR%%/msgs/ja.msg
+%%DATADIR%%/msgs/kl.msg
+%%DATADIR%%/msgs/kl_gl.msg
+%%DATADIR%%/msgs/ko.msg
+%%DATADIR%%/msgs/ko_kr.msg
+%%DATADIR%%/msgs/kok.msg
+%%DATADIR%%/msgs/kok_in.msg
+%%DATADIR%%/msgs/kw.msg
+%%DATADIR%%/msgs/kw_gb.msg
+%%DATADIR%%/msgs/lt.msg
+%%DATADIR%%/msgs/lv.msg
+%%DATADIR%%/msgs/mk.msg
+%%DATADIR%%/msgs/mr.msg
+%%DATADIR%%/msgs/mr_in.msg
+%%DATADIR%%/msgs/ms.msg
+%%DATADIR%%/msgs/ms_my.msg
+%%DATADIR%%/msgs/mt.msg
+%%DATADIR%%/msgs/nb.msg
+%%DATADIR%%/msgs/nl.msg
+%%DATADIR%%/msgs/nl_be.msg
+%%DATADIR%%/msgs/nn.msg
+%%DATADIR%%/msgs/pl.msg
+%%DATADIR%%/msgs/pt.msg
+%%DATADIR%%/msgs/pt_br.msg
+%%DATADIR%%/msgs/ro.msg
+%%DATADIR%%/msgs/ru.msg
+%%DATADIR%%/msgs/ru_ua.msg
+%%DATADIR%%/msgs/sh.msg
+%%DATADIR%%/msgs/sk.msg
+%%DATADIR%%/msgs/sl.msg
+%%DATADIR%%/msgs/sq.msg
+%%DATADIR%%/msgs/sr.msg
+%%DATADIR%%/msgs/sv.msg
+%%DATADIR%%/msgs/sw.msg
+%%DATADIR%%/msgs/ta.msg
+%%DATADIR%%/msgs/ta_in.msg
+%%DATADIR%%/msgs/te.msg
+%%DATADIR%%/msgs/te_in.msg
+%%DATADIR%%/msgs/th.msg
+%%DATADIR%%/msgs/tr.msg
+%%DATADIR%%/msgs/uk.msg
+%%DATADIR%%/msgs/vi.msg
+%%DATADIR%%/msgs/zh.msg
+%%DATADIR%%/msgs/zh_cn.msg
+%%DATADIR%%/msgs/zh_hk.msg
+%%DATADIR%%/msgs/zh_sg.msg
+%%DATADIR%%/msgs/zh_tw.msg
+%%DATADIR%%/opt0.4/optparse.tcl
+%%DATADIR%%/opt0.4/pkgIndex.tcl
+%%DATADIR%%/package.tcl
+%%DATADIR%%/parray.tcl
+%%DATADIR%%/safe.tcl
+%%DATADIR%%/tclDTrace.d
+%%DATADIR%%/tclIndex
+%%DATADIR%%/tm.tcl
+%%DATADIR%%/word.tcl
+usr/share/tcl8/8.4/http-2.7.3.tm
+usr/share/tcl8/8.4/platform-1.0.4.tm
+usr/share/tcl8/8.4/platform/shell-1.1.4.tm
+usr/share/tcl8/8.5/msgcat-1.4.2.tm
+usr/share/tcl8/8.5/tcltest-2.3.1.tm
 @dir usr/lib/tcl8.5
-@dir usr/%%DATADIR%%8/8.3
+@dir usr/share/tcl8/8.3
diff --git a/lang/linux-c6-tcl85/pkg-plist.x86_64 b/lang/linux-c6-tcl85/pkg-plist.x86_64
index fedd139..2fa8336 100644
--- a/lang/linux-c6-tcl85/pkg-plist.x86_64
+++ b/lang/linux-c6-tcl85/pkg-plist.x86_64
@@ -699,231 +699,231 @@ usr/share/man/mann/upvar.n.gz
 usr/share/man/mann/variable.n.gz
 usr/share/man/mann/vwait.n.gz
 usr/share/man/mann/while.n.gz
-usr/%%DATADIR%%8.5/auto.tcl
-usr/%%DATADIR%%8.5/clock.tcl
-usr/%%DATADIR%%8.5/encoding/ascii.enc
-usr/%%DATADIR%%8.5/encoding/big5.enc
-usr/%%DATADIR%%8.5/encoding/cp1250.enc
-usr/%%DATADIR%%8.5/encoding/cp1251.enc
-usr/%%DATADIR%%8.5/encoding/cp1252.enc
-usr/%%DATADIR%%8.5/encoding/cp1253.enc
-usr/%%DATADIR%%8.5/encoding/cp1254.enc
-usr/%%DATADIR%%8.5/encoding/cp1255.enc
-usr/%%DATADIR%%8.5/encoding/cp1256.enc
-usr/%%DATADIR%%8.5/encoding/cp1257.enc
-usr/%%DATADIR%%8.5/encoding/cp1258.enc
-usr/%%DATADIR%%8.5/encoding/cp437.enc
-usr/%%DATADIR%%8.5/encoding/cp737.enc
-usr/%%DATADIR%%8.5/encoding/cp775.enc
-usr/%%DATADIR%%8.5/encoding/cp850.enc
-usr/%%DATADIR%%8.5/encoding/cp852.enc
-usr/%%DATADIR%%8.5/encoding/cp855.enc
-usr/%%DATADIR%%8.5/encoding/cp857.enc
-usr/%%DATADIR%%8.5/encoding/cp860.enc
-usr/%%DATADIR%%8.5/encoding/cp861.enc
-usr/%%DATADIR%%8.5/encoding/cp862.enc
-usr/%%DATADIR%%8.5/encoding/cp863.enc
-usr/%%DATADIR%%8.5/encoding/cp864.enc
-usr/%%DATADIR%%8.5/encoding/cp865.enc
-usr/%%DATADIR%%8.5/encoding/cp866.enc
-usr/%%DATADIR%%8.5/encoding/cp869.enc
-usr/%%DATADIR%%8.5/encoding/cp874.enc
-usr/%%DATADIR%%8.5/encoding/cp932.enc
-usr/%%DATADIR%%8.5/encoding/cp936.enc
-usr/%%DATADIR%%8.5/encoding/cp949.enc
-usr/%%DATADIR%%8.5/encoding/cp950.enc
-usr/%%DATADIR%%8.5/encoding/dingbats.enc
-usr/%%DATADIR%%8.5/encoding/ebcdic.enc
-usr/%%DATADIR%%8.5/encoding/euc-cn.enc
-usr/%%DATADIR%%8.5/encoding/euc-jp.enc
-usr/%%DATADIR%%8.5/encoding/euc-kr.enc
-usr/%%DATADIR%%8.5/encoding/gb12345.enc
-usr/%%DATADIR%%8.5/encoding/gb1988.enc
-usr/%%DATADIR%%8.5/encoding/gb2312-raw.enc
-usr/%%DATADIR%%8.5/encoding/gb2312.enc
-usr/%%DATADIR%%8.5/encoding/iso2022-jp.enc
-usr/%%DATADIR%%8.5/encoding/iso2022-kr.enc
-usr/%%DATADIR%%8.5/encoding/iso2022.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-1.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-10.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-13.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-14.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-15.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-16.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-2.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-3.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-4.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-5.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-6.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-7.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-8.enc
-usr/%%DATADIR%%8.5/encoding/iso8859-9.enc
-usr/%%DATADIR%%8.5/encoding/jis0201.enc
-usr/%%DATADIR%%8.5/encoding/jis0208.enc
-usr/%%DATADIR%%8.5/encoding/jis0212.enc
-usr/%%DATADIR%%8.5/encoding/koi8-r.enc
-usr/%%DATADIR%%8.5/encoding/koi8-u.enc
-usr/%%DATADIR%%8.5/encoding/ksc5601.enc
-usr/%%DATADIR%%8.5/encoding/macCentEuro.enc
-usr/%%DATADIR%%8.5/encoding/macCroatian.enc
-usr/%%DATADIR%%8.5/encoding/macCyrillic.enc
-usr/%%DATADIR%%8.5/encoding/macDingbats.enc
-usr/%%DATADIR%%8.5/encoding/macGreek.enc
-usr/%%DATADIR%%8.5/encoding/macIceland.enc
-usr/%%DATADIR%%8.5/encoding/macJapan.enc
-usr/%%DATADIR%%8.5/encoding/macRoman.enc
-usr/%%DATADIR%%8.5/encoding/macRomania.enc
-usr/%%DATADIR%%8.5/encoding/macThai.enc
-usr/%%DATADIR%%8.5/encoding/macTurkish.enc
-usr/%%DATADIR%%8.5/encoding/macUkraine.enc
-usr/%%DATADIR%%8.5/encoding/shiftjis.enc
-usr/%%DATADIR%%8.5/encoding/symbol.enc
-usr/%%DATADIR%%8.5/encoding/tis-620.enc
-usr/%%DATADIR%%8.5/history.tcl
-usr/%%DATADIR%%8.5/http1.0/http.tcl
-usr/%%DATADIR%%8.5/http1.0/pkgIndex.tcl
-usr/%%DATADIR%%8.5/init.tcl
-usr/%%DATADIR%%8.5/msgs/af.msg
-usr/%%DATADIR%%8.5/msgs/af_za.msg
-usr/%%DATADIR%%8.5/msgs/ar.msg
-usr/%%DATADIR%%8.5/msgs/ar_in.msg
-usr/%%DATADIR%%8.5/msgs/ar_jo.msg
-usr/%%DATADIR%%8.5/msgs/ar_lb.msg
-usr/%%DATADIR%%8.5/msgs/ar_sy.msg
-usr/%%DATADIR%%8.5/msgs/be.msg
-usr/%%DATADIR%%8.5/msgs/bg.msg
-usr/%%DATADIR%%8.5/msgs/bn.msg
-usr/%%DATADIR%%8.5/msgs/bn_in.msg
-usr/%%DATADIR%%8.5/msgs/ca.msg
-usr/%%DATADIR%%8.5/msgs/cs.msg
-usr/%%DATADIR%%8.5/msgs/da.msg
-usr/%%DATADIR%%8.5/msgs/de.msg
-usr/%%DATADIR%%8.5/msgs/de_at.msg
-usr/%%DATADIR%%8.5/msgs/de_be.msg
-usr/%%DATADIR%%8.5/msgs/el.msg
-usr/%%DATADIR%%8.5/msgs/en_au.msg
-usr/%%DATADIR%%8.5/msgs/en_be.msg
-usr/%%DATADIR%%8.5/msgs/en_bw.msg
-usr/%%DATADIR%%8.5/msgs/en_ca.msg
-usr/%%DATADIR%%8.5/msgs/en_gb.msg
-usr/%%DATADIR%%8.5/msgs/en_hk.msg
-usr/%%DATADIR%%8.5/msgs/en_ie.msg
-usr/%%DATADIR%%8.5/msgs/en_in.msg
-usr/%%DATADIR%%8.5/msgs/en_nz.msg
-usr/%%DATADIR%%8.5/msgs/en_ph.msg
-usr/%%DATADIR%%8.5/msgs/en_sg.msg
-usr/%%DATADIR%%8.5/msgs/en_za.msg
-usr/%%DATADIR%%8.5/msgs/en_zw.msg
-usr/%%DATADIR%%8.5/msgs/eo.msg
-usr/%%DATADIR%%8.5/msgs/es.msg
-usr/%%DATADIR%%8.5/msgs/es_ar.msg
-usr/%%DATADIR%%8.5/msgs/es_bo.msg
-usr/%%DATADIR%%8.5/msgs/es_cl.msg
-usr/%%DATADIR%%8.5/msgs/es_co.msg
-usr/%%DATADIR%%8.5/msgs/es_cr.msg
-usr/%%DATADIR%%8.5/msgs/es_do.msg
-usr/%%DATADIR%%8.5/msgs/es_ec.msg
-usr/%%DATADIR%%8.5/msgs/es_gt.msg
-usr/%%DATADIR%%8.5/msgs/es_hn.msg
-usr/%%DATADIR%%8.5/msgs/es_mx.msg
-usr/%%DATADIR%%8.5/msgs/es_ni.msg
-usr/%%DATADIR%%8.5/msgs/es_pa.msg
-usr/%%DATADIR%%8.5/msgs/es_pe.msg
-usr/%%DATADIR%%8.5/msgs/es_pr.msg
-usr/%%DATADIR%%8.5/msgs/es_py.msg
-usr/%%DATADIR%%8.5/msgs/es_sv.msg
-usr/%%DATADIR%%8.5/msgs/es_uy.msg
-usr/%%DATADIR%%8.5/msgs/es_ve.msg
-usr/%%DATADIR%%8.5/msgs/et.msg
-usr/%%DATADIR%%8.5/msgs/eu.msg
-usr/%%DATADIR%%8.5/msgs/eu_es.msg
-usr/%%DATADIR%%8.5/msgs/fa.msg
-usr/%%DATADIR%%8.5/msgs/fa_in.msg
-usr/%%DATADIR%%8.5/msgs/fa_ir.msg
-usr/%%DATADIR%%8.5/msgs/fi.msg
-usr/%%DATADIR%%8.5/msgs/fo.msg
-usr/%%DATADIR%%8.5/msgs/fo_fo.msg
-usr/%%DATADIR%%8.5/msgs/fr.msg
-usr/%%DATADIR%%8.5/msgs/fr_be.msg
-usr/%%DATADIR%%8.5/msgs/fr_ca.msg
-usr/%%DATADIR%%8.5/msgs/fr_ch.msg
-usr/%%DATADIR%%8.5/msgs/ga.msg
-usr/%%DATADIR%%8.5/msgs/ga_ie.msg
-usr/%%DATADIR%%8.5/msgs/gl.msg
-usr/%%DATADIR%%8.5/msgs/gl_es.msg
-usr/%%DATADIR%%8.5/msgs/gv.msg
-usr/%%DATADIR%%8.5/msgs/gv_gb.msg
-usr/%%DATADIR%%8.5/msgs/he.msg
-usr/%%DATADIR%%8.5/msgs/hi.msg
-usr/%%DATADIR%%8.5/msgs/hi_in.msg
-usr/%%DATADIR%%8.5/msgs/hr.msg
-usr/%%DATADIR%%8.5/msgs/hu.msg
-usr/%%DATADIR%%8.5/msgs/id.msg
-usr/%%DATADIR%%8.5/msgs/id_id.msg
-usr/%%DATADIR%%8.5/msgs/is.msg
-usr/%%DATADIR%%8.5/msgs/it.msg
-usr/%%DATADIR%%8.5/msgs/it_ch.msg
-usr/%%DATADIR%%8.5/msgs/ja.msg
-usr/%%DATADIR%%8.5/msgs/kl.msg
-usr/%%DATADIR%%8.5/msgs/kl_gl.msg
-usr/%%DATADIR%%8.5/msgs/ko.msg
-usr/%%DATADIR%%8.5/msgs/ko_kr.msg
-usr/%%DATADIR%%8.5/msgs/kok.msg
-usr/%%DATADIR%%8.5/msgs/kok_in.msg
-usr/%%DATADIR%%8.5/msgs/kw.msg
-usr/%%DATADIR%%8.5/msgs/kw_gb.msg
-usr/%%DATADIR%%8.5/msgs/lt.msg
-usr/%%DATADIR%%8.5/msgs/lv.msg
-usr/%%DATADIR%%8.5/msgs/mk.msg
-usr/%%DATADIR%%8.5/msgs/mr.msg
-usr/%%DATADIR%%8.5/msgs/mr_in.msg
-usr/%%DATADIR%%8.5/msgs/ms.msg
-usr/%%DATADIR%%8.5/msgs/ms_my.msg
-usr/%%DATADIR%%8.5/msgs/mt.msg
-usr/%%DATADIR%%8.5/msgs/nb.msg
-usr/%%DATADIR%%8.5/msgs/nl.msg
-usr/%%DATADIR%%8.5/msgs/nl_be.msg
-usr/%%DATADIR%%8.5/msgs/nn.msg
-usr/%%DATADIR%%8.5/msgs/pl.msg
-usr/%%DATADIR%%8.5/msgs/pt.msg
-usr/%%DATADIR%%8.5/msgs/pt_br.msg
-usr/%%DATADIR%%8.5/msgs/ro.msg
-usr/%%DATADIR%%8.5/msgs/ru.msg
-usr/%%DATADIR%%8.5/msgs/ru_ua.msg
-usr/%%DATADIR%%8.5/msgs/sh.msg
-usr/%%DATADIR%%8.5/msgs/sk.msg
-usr/%%DATADIR%%8.5/msgs/sl.msg
-usr/%%DATADIR%%8.5/msgs/sq.msg
-usr/%%DATADIR%%8.5/msgs/sr.msg
-usr/%%DATADIR%%8.5/msgs/sv.msg
-usr/%%DATADIR%%8.5/msgs/sw.msg
-usr/%%DATADIR%%8.5/msgs/ta.msg
-usr/%%DATADIR%%8.5/msgs/ta_in.msg
-usr/%%DATADIR%%8.5/msgs/te.msg
-usr/%%DATADIR%%8.5/msgs/te_in.msg
-usr/%%DATADIR%%8.5/msgs/th.msg
-usr/%%DATADIR%%8.5/msgs/tr.msg
-usr/%%DATADIR%%8.5/msgs/uk.msg
-usr/%%DATADIR%%8.5/msgs/vi.msg
-usr/%%DATADIR%%8.5/msgs/zh.msg
-usr/%%DATADIR%%8.5/msgs/zh_cn.msg
-usr/%%DATADIR%%8.5/msgs/zh_hk.msg
-usr/%%DATADIR%%8.5/msgs/zh_sg.msg
-usr/%%DATADIR%%8.5/msgs/zh_tw.msg
-usr/%%DATADIR%%8.5/opt0.4/optparse.tcl
-usr/%%DATADIR%%8.5/opt0.4/pkgIndex.tcl
-usr/%%DATADIR%%8.5/package.tcl
-usr/%%DATADIR%%8.5/parray.tcl
-usr/%%DATADIR%%8.5/safe.tcl
-usr/%%DATADIR%%8.5/tclDTrace.d
-usr/%%DATADIR%%8.5/tclIndex
-usr/%%DATADIR%%8.5/tm.tcl
-usr/%%DATADIR%%8.5/word.tcl
-usr/%%DATADIR%%8/8.4/http-2.7.3.tm
-usr/%%DATADIR%%8/8.4/platform-1.0.4.tm
-usr/%%DATADIR%%8/8.4/platform/shell-1.1.4.tm
-usr/%%DATADIR%%8/8.5/msgcat-1.4.2.tm
-usr/%%DATADIR%%8/8.5/tcltest-2.3.1.tm
+%%DATADIR%%/auto.tcl
+%%DATADIR%%/clock.tcl
+%%DATADIR%%/encoding/ascii.enc
+%%DATADIR%%/encoding/big5.enc
+%%DATADIR%%/encoding/cp1250.enc
+%%DATADIR%%/encoding/cp1251.enc
+%%DATADIR%%/encoding/cp1252.enc
+%%DATADIR%%/encoding/cp1253.enc
+%%DATADIR%%/encoding/cp1254.enc
+%%DATADIR%%/encoding/cp1255.enc
+%%DATADIR%%/encoding/cp1256.enc
+%%DATADIR%%/encoding/cp1257.enc
+%%DATADIR%%/encoding/cp1258.enc
+%%DATADIR%%/encoding/cp437.enc
+%%DATADIR%%/encoding/cp737.enc
+%%DATADIR%%/encoding/cp775.enc
+%%DATADIR%%/encoding/cp850.enc
+%%DATADIR%%/encoding/cp852.enc
+%%DATADIR%%/encoding/cp855.enc
+%%DATADIR%%/encoding/cp857.enc
+%%DATADIR%%/encoding/cp860.enc
+%%DATADIR%%/encoding/cp861.enc
+%%DATADIR%%/encoding/cp862.enc
+%%DATADIR%%/encoding/cp863.enc
+%%DATADIR%%/encoding/cp864.enc
+%%DATADIR%%/encoding/cp865.enc
+%%DATADIR%%/encoding/cp866.enc
+%%DATADIR%%/encoding/cp869.enc
+%%DATADIR%%/encoding/cp874.enc
+%%DATADIR%%/encoding/cp932.enc
+%%DATADIR%%/encoding/cp936.enc
+%%DATADIR%%/encoding/cp949.enc
+%%DATADIR%%/encoding/cp950.enc
+%%DATADIR%%/encoding/dingbats.enc
+%%DATADIR%%/encoding/ebcdic.enc
+%%DATADIR%%/encoding/euc-cn.enc
+%%DATADIR%%/encoding/euc-jp.enc
+%%DATADIR%%/encoding/euc-kr.enc
+%%DATADIR%%/encoding/gb12345.enc
+%%DATADIR%%/encoding/gb1988.enc
+%%DATADIR%%/encoding/gb2312-raw.enc
+%%DATADIR%%/encoding/gb2312.enc
+%%DATADIR%%/encoding/iso2022-jp.enc
+%%DATADIR%%/encoding/iso2022-kr.enc
+%%DATADIR%%/encoding/iso2022.enc
+%%DATADIR%%/encoding/iso8859-1.enc
+%%DATADIR%%/encoding/iso8859-10.enc
+%%DATADIR%%/encoding/iso8859-13.enc
+%%DATADIR%%/encoding/iso8859-14.enc
+%%DATADIR%%/encoding/iso8859-15.enc
+%%DATADIR%%/encoding/iso8859-16.enc
+%%DATADIR%%/encoding/iso8859-2.enc
+%%DATADIR%%/encoding/iso8859-3.enc
+%%DATADIR%%/encoding/iso8859-4.enc
+%%DATADIR%%/encoding/iso8859-5.enc
+%%DATADIR%%/encoding/iso8859-6.enc
+%%DATADIR%%/encoding/iso8859-7.enc
+%%DATADIR%%/encoding/iso8859-8.enc
+%%DATADIR%%/encoding/iso8859-9.enc
+%%DATADIR%%/encoding/jis0201.enc
+%%DATADIR%%/encoding/jis0208.enc
+%%DATADIR%%/encoding/jis0212.enc
+%%DATADIR%%/encoding/koi8-r.enc
+%%DATADIR%%/encoding/koi8-u.enc
+%%DATADIR%%/encoding/ksc5601.enc
+%%DATADIR%%/encoding/macCentEuro.enc
+%%DATADIR%%/encoding/macCroatian.enc
+%%DATADIR%%/encoding/macCyrillic.enc
+%%DATADIR%%/encoding/macDingbats.enc
+%%DATADIR%%/encoding/macGreek.enc
+%%DATADIR%%/encoding/macIceland.enc
+%%DATADIR%%/encoding/macJapan.enc
+%%DATADIR%%/encoding/macRoman.enc
+%%DATADIR%%/encoding/macRomania.enc
+%%DATADIR%%/encoding/macThai.enc
+%%DATADIR%%/encoding/macTurkish.enc
+%%DATADIR%%/encoding/macUkraine.enc
+%%DATADIR%%/encoding/shiftjis.enc
+%%DATADIR%%/encoding/symbol.enc
+%%DATADIR%%/encoding/tis-620.enc
+%%DATADIR%%/history.tcl
+%%DATADIR%%/http1.0/http.tcl
+%%DATADIR%%/http1.0/pkgIndex.tcl
+%%DATADIR%%/init.tcl
+%%DATADIR%%/msgs/af.msg
+%%DATADIR%%/msgs/af_za.msg
+%%DATADIR%%/msgs/ar.msg
+%%DATADIR%%/msgs/ar_in.msg
+%%DATADIR%%/msgs/ar_jo.msg
+%%DATADIR%%/msgs/ar_lb.msg
+%%DATADIR%%/msgs/ar_sy.msg
+%%DATADIR%%/msgs/be.msg
+%%DATADIR%%/msgs/bg.msg
+%%DATADIR%%/msgs/bn.msg
+%%DATADIR%%/msgs/bn_in.msg
+%%DATADIR%%/msgs/ca.msg
+%%DATADIR%%/msgs/cs.msg
+%%DATADIR%%/msgs/da.msg
+%%DATADIR%%/msgs/de.msg
+%%DATADIR%%/msgs/de_at.msg
+%%DATADIR%%/msgs/de_be.msg
+%%DATADIR%%/msgs/el.msg
+%%DATADIR%%/msgs/en_au.msg
+%%DATADIR%%/msgs/en_be.msg
+%%DATADIR%%/msgs/en_bw.msg
+%%DATADIR%%/msgs/en_ca.msg
+%%DATADIR%%/msgs/en_gb.msg
+%%DATADIR%%/msgs/en_hk.msg
+%%DATADIR%%/msgs/en_ie.msg
+%%DATADIR%%/msgs/en_in.msg
+%%DATADIR%%/msgs/en_nz.msg
+%%DATADIR%%/msgs/en_ph.msg
+%%DATADIR%%/msgs/en_sg.msg
+%%DATADIR%%/msgs/en_za.msg
+%%DATADIR%%/msgs/en_zw.msg
+%%DATADIR%%/msgs/eo.msg
+%%DATADIR%%/msgs/es.msg
+%%DATADIR%%/msgs/es_ar.msg
+%%DATADIR%%/msgs/es_bo.msg
+%%DATADIR%%/msgs/es_cl.msg
+%%DATADIR%%/msgs/es_co.msg
+%%DATADIR%%/msgs/es_cr.msg
+%%DATADIR%%/msgs/es_do.msg
+%%DATADIR%%/msgs/es_ec.msg
+%%DATADIR%%/msgs/es_gt.msg
+%%DATADIR%%/msgs/es_hn.msg
+%%DATADIR%%/msgs/es_mx.msg
+%%DATADIR%%/msgs/es_ni.msg
+%%DATADIR%%/msgs/es_pa.msg
+%%DATADIR%%/msgs/es_pe.msg
+%%DATADIR%%/msgs/es_pr.msg
+%%DATADIR%%/msgs/es_py.msg
+%%DATADIR%%/msgs/es_sv.msg
+%%DATADIR%%/msgs/es_uy.msg
+%%DATADIR%%/msgs/es_ve.msg
+%%DATADIR%%/msgs/et.msg
+%%DATADIR%%/msgs/eu.msg
+%%DATADIR%%/msgs/eu_es.msg
+%%DATADIR%%/msgs/fa.msg
+%%DATADIR%%/msgs/fa_in.msg
+%%DATADIR%%/msgs/fa_ir.msg
+%%DATADIR%%/msgs/fi.msg
+%%DATADIR%%/msgs/fo.msg
+%%DATADIR%%/msgs/fo_fo.msg
+%%DATADIR%%/msgs/fr.msg
+%%DATADIR%%/msgs/fr_be.msg
+%%DATADIR%%/msgs/fr_ca.msg
+%%DATADIR%%/msgs/fr_ch.msg
+%%DATADIR%%/msgs/ga.msg
+%%DATADIR%%/msgs/ga_ie.msg
+%%DATADIR%%/msgs/gl.msg
+%%DATADIR%%/msgs/gl_es.msg
+%%DATADIR%%/msgs/gv.msg
+%%DATADIR%%/msgs/gv_gb.msg
+%%DATADIR%%/msgs/he.msg
+%%DATADIR%%/msgs/hi.msg
+%%DATADIR%%/msgs/hi_in.msg
+%%DATADIR%%/msgs/hr.msg
+%%DATADIR%%/msgs/hu.msg
+%%DATADIR%%/msgs/id.msg
+%%DATADIR%%/msgs/id_id.msg
+%%DATADIR%%/msgs/is.msg
+%%DATADIR%%/msgs/it.msg
+%%DATADIR%%/msgs/it_ch.msg
+%%DATADIR%%/msgs/ja.msg
+%%DATADIR%%/msgs/kl.msg
+%%DATADIR%%/msgs/kl_gl.msg
+%%DATADIR%%/msgs/ko.msg
+%%DATADIR%%/msgs/ko_kr.msg
+%%DATADIR%%/msgs/kok.msg
+%%DATADIR%%/msgs/kok_in.msg
+%%DATADIR%%/msgs/kw.msg
+%%DATADIR%%/msgs/kw_gb.msg
+%%DATADIR%%/msgs/lt.msg
+%%DATADIR%%/msgs/lv.msg
+%%DATADIR%%/msgs/mk.msg
+%%DATADIR%%/msgs/mr.msg
+%%DATADIR%%/msgs/mr_in.msg
+%%DATADIR%%/msgs/ms.msg
+%%DATADIR%%/msgs/ms_my.msg
+%%DATADIR%%/msgs/mt.msg
+%%DATADIR%%/msgs/nb.msg
+%%DATADIR%%/msgs/nl.msg
+%%DATADIR%%/msgs/nl_be.msg
+%%DATADIR%%/msgs/nn.msg
+%%DATADIR%%/msgs/pl.msg
+%%DATADIR%%/msgs/pt.msg
+%%DATADIR%%/msgs/pt_br.msg
+%%DATADIR%%/msgs/ro.msg
+%%DATADIR%%/msgs/ru.msg
+%%DATADIR%%/msgs/ru_ua.msg
+%%DATADIR%%/msgs/sh.msg
+%%DATADIR%%/msgs/sk.msg
+%%DATADIR%%/msgs/sl.msg
+%%DATADIR%%/msgs/sq.msg
+%%DATADIR%%/msgs/sr.msg
+%%DATADIR%%/msgs/sv.msg
+%%DATADIR%%/msgs/sw.msg
+%%DATADIR%%/msgs/ta.msg
+%%DATADIR%%/msgs/ta_in.msg
+%%DATADIR%%/msgs/te.msg
+%%DATADIR%%/msgs/te_in.msg
+%%DATADIR%%/msgs/th.msg
+%%DATADIR%%/msgs/tr.msg
+%%DATADIR%%/msgs/uk.msg
+%%DATADIR%%/msgs/vi.msg
+%%DATADIR%%/msgs/zh.msg
+%%DATADIR%%/msgs/zh_cn.msg
+%%DATADIR%%/msgs/zh_hk.msg
+%%DATADIR%%/msgs/zh_sg.msg
+%%DATADIR%%/msgs/zh_tw.msg
+%%DATADIR%%/opt0.4/optparse.tcl
+%%DATADIR%%/opt0.4/pkgIndex.tcl
+%%DATADIR%%/package.tcl
+%%DATADIR%%/parray.tcl
+%%DATADIR%%/safe.tcl
+%%DATADIR%%/tclDTrace.d
+%%DATADIR%%/tclIndex
+%%DATADIR%%/tm.tcl
+%%DATADIR%%/word.tcl
+usr/share/tcl8/8.4/http-2.7.3.tm
+usr/share/tcl8/8.4/platform-1.0.4.tm
+usr/share/tcl8/8.4/platform/shell-1.1.4.tm
+usr/share/tcl8/8.5/msgcat-1.4.2.tm
+usr/share/tcl8/8.5/tcltest-2.3.1.tm
 @dir usr/lib/tcl8.5
 @dir usr/lib64/tcl8.5
-@dir usr/%%DATADIR%%8/8.3
+@dir usr/share/tcl8/8.3
diff --git a/lang/linux-f10-libg2c/Makefile b/lang/linux-f10-libg2c/Makefile
index 111189b..9f15cc3 100644
--- a/lang/linux-f10-libg2c/Makefile
+++ b/lang/linux-f10-libg2c/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	libg2c
 PORTVERSION=	3.4.6
 CATEGORIES=	lang linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
@@ -13,13 +12,12 @@ COMMENT=	Fortran 77 shared library (Linux Fedora 10)
 
 CONFLICTS=	linux-libg2c-[0-9]* linux-f8-libg2c-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 LINUX_NAME=	compat-libf2c-34
 RPMVERSION=	9
 USE_LDCONFIG=	yes
-SRC_DISTFILES=	compat-gcc-34-${PORTVERSION}-${RPMVERSION}.src.rpm
+SRC_DISTFILES=	compat-gcc-34-${PORTVERSION}-${RPMVERSION}.src.rpm:SOURCE
 
 PLIST_FILES=	usr/lib/libg2c.so.0 usr/lib/libg2c.so.0.0.0
 
diff --git a/lang/linux-f10-tcl85/Makefile b/lang/linux-f10-tcl85/Makefile
index 92d5712..6101850 100644
--- a/lang/linux-f10-tcl85/Makefile
+++ b/lang/linux-f10-tcl85/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	tcl
 PORTVERSION=	8.5.3
 PORTREVISION=	2
 CATEGORIES=	lang linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 PKGNAMESUFFIX=	85
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -13,11 +12,10 @@ COMMENT=	Tool Command Language (Linux Fedora 10)
 
 CONFLICTS=	linux-f8-tcl84-[0-9]* linux-c6-tcl85-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 USE_LINUX_RPM_BAD_PERMS=	yes
 RPMVERSION=	1.fc10
-BRANDELF_FILES=	usr/bin/tclsh8.5
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile
index e1b6233..7af5b64 100644
--- a/lang/linux-j/Makefile
+++ b/lang/linux-j/Makefile
@@ -18,7 +18,7 @@ LICENSE_NAME=	JSoftware End User License Agreement
 LICENSE_FILE=	${FILESDIR}/license.txt
 LICENSE_PERMS=	auto-accept dist-mirror pkg-mirror
 
-USE_LINUX=	yes
+USES=		linux
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
diff --git a/lang/visualworks/Makefile b/lang/visualworks/Makefile
index 9a5e6ed..228b5f7 100644
--- a/lang/visualworks/Makefile
+++ b/lang/visualworks/Makefile
@@ -16,8 +16,8 @@ COMMENT=		High performance Smalltalk environment
 DIST_SUBDIR=		${SUBDIR}
 SUBDIR=			vwnc${PORTVERSION}
 
-USE_LINUX=		yes
-USE_LINUX_APPS=		xorglibs
+USES=			linux
+USE_LINUX=	xorglibs
 ONLY_FOR_ARCHS=		i386 amd64
 NO_BUILD=		yes
 MY_STARTUP_SCRIPT=	visual.sh
diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile
index 7417899..cf4ceb0 100644
--- a/mail/linux-thunderbird/Makefile
+++ b/mail/linux-thunderbird/Makefile
@@ -12,7 +12,5 @@ COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
 USES=		tar:bzip2
 
-WANT_GTK218=	yes
-
 .include "${.CURDIR}/../../www/linux-seamonkey/Makefile.common"
 .include <bsd.port.mk>
diff --git a/mail/linux-thunderbird/pkg-plist b/mail/linux-thunderbird/pkg-plist
index 5d4a506..c6f6269 100644
--- a/mail/linux-thunderbird/pkg-plist
+++ b/mail/linux-thunderbird/pkg-plist
@@ -120,10 +120,6 @@ lib/%%APP_NAME%%/isp/movemail.rdf
 lib/%%APP_NAME%%/isp/rss.rdf
 lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.so
-%%GTK218%%lib/%%APP_NAME%%/libgdk-x11-2.0.so.0
-%%GTK218%%lib/%%APP_NAME%%/libgio-2.0.so.0
-%%GTK218%%lib/%%APP_NAME%%/libglib-2.0.so.0
-%%GTK218%%lib/%%APP_NAME%%/libgtk-x11-2.0.so.0
 lib/%%APP_NAME%%/libldap60.so
 lib/%%APP_NAME%%/libldif60.so
 lib/%%APP_NAME%%/liblgpllibs.so
diff --git a/mail/mulberry/Makefile b/mail/mulberry/Makefile
index a4dbb70..1a576cb 100644
--- a/mail/mulberry/Makefile
+++ b/mail/mulberry/Makefile
@@ -12,10 +12,9 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scalable high-performance GUI Internet Mail User Agent
 
-USES=		tar:tgz
+USES=		linux tar:tgz
 NO_WRKSUBDIR=	yes
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USE_LINUX=	xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
 
 OPTIONS_DEFINE=	DOCS
diff --git a/math/matlab-installer/Makefile b/math/matlab-installer/Makefile
index b2e5672..f604eb8 100644
--- a/math/matlab-installer/Makefile
+++ b/math/matlab-installer/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	mount_cd9660_image:sysutils/diskimage-tools \
 		auto-ask:sysutils/auto-admin \
 		webbrowser:www/webbrowser \
 
-USES=		tar:xz
-USE_LINUX=	yes
-USE_LINUX_APPS=	ncurses-base dri devtools
+USES=		linux tar:xz
+USE_LINUX=	ncurses-base dri devtools
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 JAVA_OS=	linux
diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile
index c1a9c0a..64c3a00 100644
--- a/math/wingz3/Makefile
+++ b/math/wingz3/Makefile
@@ -19,8 +19,8 @@ COMMENT=	Commercial Spreadsheet
 NO_PACKAGE=	Commercial software with nothing to build - install from port
 
 IA32_BINARY_PORT=yes
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 SUB_FILES=	Wingz3
 PLIST_SUB+=	LINUXBASE=${LINUXBASE}
 OLDLIBS=	libm.so.5 libg++.so.27 libstdc++.so.27 libc.so.5 \
diff --git a/misc/opencyc/Makefile b/misc/opencyc/Makefile
index 80591bc..230eb97 100644
--- a/misc/opencyc/Makefile
+++ b/misc/opencyc/Makefile
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General knowledge base and commonsense reasoning engine
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_BUILD=	yes
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
diff --git a/multimedia/linux-c6-libtheora/Makefile b/multimedia/linux-c6-libtheora/Makefile
index abc5d16..70b7467 100644
--- a/multimedia/linux-c6-libtheora/Makefile
+++ b/multimedia/linux-c6-libtheora/Makefile
@@ -11,14 +11,12 @@ COMMENT=	Theora Video Compression Codec (Linux  CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-libtheora-[0-9]* linux-f10-libtheora[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	2.el6
 USE_LDCONFIG=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	COPYING README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/multimedia/linux-c6-libv4l/Makefile b/multimedia/linux-c6-libv4l/Makefile
index eaa9f1a..dbc4920 100644
--- a/multimedia/linux-c6-libv4l/Makefile
+++ b/multimedia/linux-c6-libv4l/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Collection of video4linux support libraries (CentOS 6)
 
 CONFLICTS=	linux-f10-libv4l-[0-9]*
 
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 RPMVERSION=	2.el6
 USE_LDCONFIG=	yes
diff --git a/multimedia/linux-f10-libtheora/Makefile b/multimedia/linux-f10-libtheora/Makefile
index d718a3e..357b86b 100644
--- a/multimedia/linux-f10-libtheora/Makefile
+++ b/multimedia/linux-f10-libtheora/Makefile
@@ -5,15 +5,13 @@ PORTNAME=	libtheora
 PORTVERSION=	1.0rc1
 PORTREVISION=	1
 CATEGORIES=	multimedia linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Theora Video Compression Codec (Linux Fedora 10)
 
 CONFLICTS=	linux-libtheora-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	2.fc10
@@ -22,7 +20,6 @@ USE_LDCONFIG=	yes
 PLIST_FILES=	usr/lib/libtheora.so.0 usr/lib/libtheora.so.0.3.3 \
 		usr/lib/libtheoradec.so.1 usr/lib/libtheoradec.so.1.0.0 \
 		usr/lib/libtheoraenc.so.1 usr/lib/libtheoraenc.so.1.0.0
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	COPYING README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/multimedia/linux-f10-libv4l/Makefile b/multimedia/linux-f10-libv4l/Makefile
index 3081391..9a373186 100644
--- a/multimedia/linux-f10-libv4l/Makefile
+++ b/multimedia/linux-f10-libv4l/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	multimedia linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Collection of video4linux support libraries (Fedora 10)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	1.fc10
diff --git a/multimedia/linux-tsmuxer/Makefile b/multimedia/linux-tsmuxer/Makefile
index 1411a41..6735e5c 100644
--- a/multimedia/linux-tsmuxer/Makefile
+++ b/multimedia/linux-tsmuxer/Makefile
@@ -11,10 +11,11 @@ DISTNAME=	tsMuxeR_${PORTVERSION}
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Utility to create TS and M2TS files for IP broadcasting
 
-USE_LINUX=	yes
+USES=		linux
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/tsMuxeR bin/tsMuxerGUI
+STRIP=
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tsMuxeR ${WRKSRC}/tsMuxerGUI \
diff --git a/multimedia/w_scan/Makefile b/multimedia/w_scan/Makefile
index 58fdffc..9624e60 100644
--- a/multimedia/w_scan/Makefile
+++ b/multimedia/w_scan/Makefile
@@ -27,7 +27,7 @@ PLIST_FILES=	bin/${PORTNAME} \
 OPTIONS_DEFINE=	LINUX DOCS
 
 LINUX_DESC=		Install Linux binary too (linux-w_scan)
-LINUX_USE=		LINUX=yes
+LINUX_USES=		linux
 LINUX_RUN_DEPENDS=	linux_dvbwrapper-kmod>=1.0:multimedia/linux_dvbwrapper-kmod
 LINUX_PLIST_FILES=	bin/linux-${PORTNAME}
 
diff --git a/net-im/linux-instantbird/Makefile b/net-im/linux-instantbird/Makefile
index efafd5a..c7e947a 100644
--- a/net-im/linux-instantbird/Makefile
+++ b/net-im/linux-instantbird/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Instant Messaging client based on XULRunner and libpurple
 
 USES=		tar:bzip2
-USE_LINUX_APPS=	libxml2 #avahiglib avahilibs
+USE_LINUX=	libxml2 #avahiglib avahilibs
 
 ALL_LOCALES=	cs de en-US es-ES et fr nl pl pt-BR ru sk sv-SE uk
 LOCALE=		${${PORT_OPTIONS:MLANG_*}}
diff --git a/net-im/qq/Makefile b/net-im/qq/Makefile
index 8876a13..a673127 100644
--- a/net-im/qq/Makefile
+++ b/net-im/qq/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	kaiw27@gmail.com
 COMMENT=	Tencent QQ for Linux
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	gtk2 xorglibs
+USES=		linux
+USE_LINUX=	gtk2 xorglibs
 NO_BUILD=	yes
 
 QQDIR=		libexec/qq
diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index c49c0e1..7ca2210 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -23,9 +23,8 @@ CONFLICTS=	skype-1* skype-2.0* skype-2.1*
 
 NO_BUILD=	yes
 
-USES=		cpe tar:bzip2
-USE_LINUX=	yes
-USE_LINUX_APPS+=alsalib alsa-plugins-oss expat fontconfig libasyncns \
+USES=		cpe linux tar:bzip2
+USE_LINUX=	alsalib alsa-plugins-oss expat fontconfig libasyncns \
 		libsigcpp20
 RESTRICTED=	Redistribution prohibited.
 
@@ -36,18 +35,18 @@ PLIST_SUB+=	SKYPEDIR=${SKYPEDIR}
 SUB_FILES=	skype.sh
 SUB_LIST+=	SKYPEDIR=${SKYPEDIR}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNVIDIA_GL}
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=xorglibs
+USE_LINUX+=	xorglibs
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 .if ${PORT_OPTIONS:MVIDEO}
 RUN_DEPENDS+=	webcamd:multimedia/webcamd
-USE_LINUX_APPS+=libv4l
+USE_LINUX+=	libv4l
 SUB_LIST+=	VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so "
 .else
 SUB_LIST+=	VIDEO=""
@@ -71,4 +70,4 @@ do-install:
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index a1d6741..62e63c9 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -19,9 +19,8 @@ OPTIONS_DEFAULT=	VIDEO
 
 NO_BUILD=	yes
 
-USES=		cpe tar:bzip2
-USE_LINUX=	yes
-USE_LINUX_APPS+=alsalib alsa-plugins-oss expat fontconfig libasyncns \
+USES=		cpe linux tar:bzip2
+USE_LINUX=	alsalib alsa-plugins-oss expat fontconfig libasyncns \
 		libsigcpp20
 RESTRICTED=	Redistribution prohibited.
 
@@ -32,18 +31,18 @@ PLIST_SUB+=	SKYPEDIR=${SKYPEDIR}
 SUB_FILES=	skype.sh
 SUB_LIST+=	SKYPEDIR=${SKYPEDIR}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNVIDIA_GL}
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=xorglibs
+USE_LINUX+=	xorglibs
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 .if ${PORT_OPTIONS:MVIDEO}
 RUN_DEPENDS+=	webcamd:multimedia/webcamd
-USE_LINUX_APPS+=libv4l
+USE_LINUX+=	libv4l
 SUB_LIST+=	VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so "
 .else
 SUB_LIST+=	VIDEO=""
@@ -66,4 +65,4 @@ do-install:
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/skype4/Makefile b/net-im/skype4/Makefile
index dc13d04..2134608 100644
--- a/net-im/skype4/Makefile
+++ b/net-im/skype4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	4.3.0.37
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://download.skype.com/linux/
@@ -21,9 +21,8 @@ OPTIONS_DEFAULT=	VIDEO
 
 NO_BUILD=	yes
 
-USES=		cpe desktop-file-utils tar:bzip2
-USE_LINUX=	yes
-USE_LINUX_APPS+=	fontconfig xorglibs qt47 qt47-x11 qt47-webkit openssl openssl-compat pulseaudio-libs
+USES=		cpe desktop-file-utils linux tar:bzip2
+USE_LINUX=	fontconfig xorglibs qt47 qt47-x11 qt47-webkit openssl pulseaudio-libs
 
 RESTRICTED=	Redistribution prohibited.
 
@@ -33,20 +32,19 @@ PLIST_SUB+=	SKYPEDIR=${SKYPEDIR}
 SUB_FILES=	skype.sh
 SUB_LIST+=	SKYPEDIR=${SKYPEDIR}
 
-.include <bsd.port.pre.mk>
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
+NVIDIA_GL_USE=		LINUX=xorglibs
+NVIDIA_GL_USE_OFF=	LINUX=dri
+
+.include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100075 || ${OSVERSION} >= 1000000 && ${OSVERSION} < 1002507)
 BROKEN=		Skype 4.3 requires Linux 2.6.32 emulation.
 .endif
 
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE=		LINUX_APPS=xorglibs
-NVIDIA_GL_USE_OFF=	LINUX_APPS=dri
-
-.include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MVIDEO}
 RUN_DEPENDS+=	webcamd:multimedia/webcamd
-USE_LINUX_APPS+=	libv4l
+USE_LINUX+=	libv4l
 SUB_LIST+=	VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so "
 .else
 SUB_LIST+=	VIDEO=""
@@ -72,4 +70,4 @@ do-install:
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/yoono/Makefile b/net-im/yoono/Makefile
index 0f0cea8..b6e9b06 100644
--- a/net-im/yoono/Makefile
+++ b/net-im/yoono/Makefile
@@ -30,10 +30,9 @@ ONLY_FOR_ARCHS_REASON=	binary distribution
 SUB_FILES=	${PORTNAME} pkg-message
 SUB_LIST=	LINUXBASE=${LINUXBASE}
 
+USES=		linux tar:bzip2
 USE_LDCONFIG=	yes
-USE_LINUX=	yes
-USE_LINUX_APPS=	alsalib dbuslibs gtk2 xorglibs
-USES=	tar:bzip2
+USE_LINUX=	alsalib dbuslibs gtk2 xorglibs
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-desktop
 
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index e418cc8..1334f51 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -64,7 +64,7 @@ CLIENT_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_ns
 CLIENT_USE=		RC_SUBR=boinc-client
 
 LINUX_CONFIGURE_ON=	--with-boinc-alt-platform=i686-pc-linux-gnu
-LINUX_USE=		LINUX=yes
+LINUX_USES=		linux
 
 X11_USES=		jpeg
 X11_USE=		GL=glut XORG=xmu,xi
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index ae2a071..07d627e 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -12,11 +12,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Citrix(R) Presentation Server(TM) client
 
 ONLY_FOR_ARCHS=	i386 amd64
-USES=		webplugin:linux
+USES=		linux webplugin:linux
+USE_LINUX=	alsalib gtk2 openmotif
 WEBPLUGIN_DIR=	${PREFIX}/ICAClient
 WEBPLUGIN_FILES=	npica.so
-USE_LINUX=	yes
-USE_LINUX_APPS=	alsalib gtk2 openmotif
 RESTRICTED=	License prohibits redistribution
 
 NO_WRKSUBDIR=	yes
diff --git a/net/linux-c6-avahi-libs/Makefile b/net/linux-c6-avahi-libs/Makefile
index bdb687c..ae5402e 100644
--- a/net/linux-c6-avahi-libs/Makefile
+++ b/net/linux-c6-avahi-libs/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	net linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries for Avahi (Linux CentOS ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	15.el6
diff --git a/net/linux-c6-openldap/Makefile b/net/linux-c6-openldap/Makefile
index 99d31d8..5861def 100644
--- a/net/linux-c6-openldap/Makefile
+++ b/net/linux-c6-openldap/Makefile
@@ -11,15 +11,13 @@ COMMENT=	Lightweight Directory Access Protocol libraries (Linux CentOS ${LINUX_D
 
 CONFLICTS=	linux-f10-openldap-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-#USE_LINUX_APPS=	openssl
+USES=		linux:c6
+#USE_LINUX=	openssl
 RPMVERSION=	12.el6
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 DESCR=	${.CURDIR}/../openldap24-server/pkg-descr
 
-DOCSDIR=	usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
 
 # do not install any openldap configuration directories/files
diff --git a/net/linux-c6-tcp_wrappers-libs/Makefile b/net/linux-c6-tcp_wrappers-libs/Makefile
index bcd913a..7efecb1 100644
--- a/net/linux-c6-tcp_wrappers-libs/Makefile
+++ b/net/linux-c6-tcp_wrappers-libs/Makefile
@@ -9,12 +9,11 @@ CATEGORIES=	net linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries tcp wrappers (Linux CentOS ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	xorglibs
-
 RPMVERSION=	58.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	xorglibs
+USE_LINUX_RPM=	yes
 
 DOCSDIR=	${PREFIX}/usr/share/doc/tcp_wrappers-${PORTVERSION}
 
diff --git a/net/linux-f10-nss_ldap/Makefile b/net/linux-f10-nss_ldap/Makefile
index 1472e32..0b2e1ea 100644
--- a/net/linux-f10-nss_ldap/Makefile
+++ b/net/linux-f10-nss_ldap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nss_ldap
-PORTVERSION=	${NSS_LDAP_VERSION}
+PORTVERSION=	264
 PORTREVISION=	1
 CATEGORIES=	net linux
 MASTER_SITES=	ftp://ftp.pbone.net/mirror/archive.fedoraproject.org/fedora/linux/updates/testing/10/i386/ \
@@ -15,21 +15,12 @@ COMMENT=	RFC 2307 NSS Module (Linux Fedora 10)
 #LICENSE=	GPLv2
 #NO_LICENSES_INSTALL=yes	# license framework does not rm the "share" directory
 
-OPTIONS_DEFINE=	DOCS PAM
-
-NSS_LDAP_VERSION=264
-
-USE_LINUX=	f10
-USE_LINUX_RPM=	yes
-USE_LINUX_PREFIX=yes
-
 RPMVERSION=	6.fc10
+USES=		linux:f10
 USE_LDCONFIG=	yes
+USE_LINUX_RPM=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}
-
-MANPREFIX=	${PREFIX}/usr/share
-
+OPTIONS_DEFINE=	DOCS PAM
 OPTIONS_SUB=	yes
 
 PORTDOCS=	ANNOUNCE.nss_ldap AUTHORS.nss_ldap COPYING.nss_ldap \
@@ -51,12 +42,7 @@ PORTDOCS+=	AUTHORS.pam_ldap COPYING.LIB.pam_ldap COPYING.pam_ldap \
 		pam.d/xscreensaver pam.d/xserver
 .endif
 
-pre-fetch:
-.if !${PORT_OPTIONS:MPAM}
-	@${ECHO_MSG} "Select PAM if you require more advanced ldap support in the linuxulator"
-.endif
-
-post-extract:
+post-patch:
 	@if [ -f ${WRKSRC}/etc/ldap.conf ]; then \
 		${MV} ${WRKSRC}/etc/ldap.conf ${WRKSRC}/etc/ldap.conf.dist; \
 	fi
@@ -64,17 +50,17 @@ post-extract:
 	@if [ -f ${WRKSRC}/lib/security/pam_ldap.so ]; then \
 		${RM} -rf ${WRKSRC}/lib/; \
 	fi
-	@if [ -f ${WRKSRC}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/COPYING.pam_ldap ]; then \
-		${RM} ${WRKSRC}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/*.pam*; \
-		${RM} -rf ${WRKSRC}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d; \
+	@if [ -f ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/COPYING.pam_ldap ]; then \
+		${RM} ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/*.pam*; \
+		${RM} -rf ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d; \
 	fi
 	@if [ -f ${WRKSRC}/usr/share/man/man5/pam_ldap.5.gz ]; then \
 		${RM} ${WRKSRC}/usr/share/man/man5/pam_ldap.5.gz; \
 	fi
 .else
 .if !${PORT_OPTIONS:MDOCS}
-	@if [ -d ${WRKSRC}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d ]; then \
-		${RM} -rf ${WRKSRC}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d/; \
+	@if [ -d ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d ]; then \
+		${RM} -rf ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d/; \
 	fi
 .endif
 .endif
diff --git a/net/linux-f10-openldap/Makefile b/net/linux-f10-openldap/Makefile
index 50ffd30..9ca4264 100644
--- a/net/linux-f10-openldap/Makefile
+++ b/net/linux-f10-openldap/Makefile
@@ -5,12 +5,11 @@ PORTNAME=	openldap
 PORTVERSION=	2.4.12
 PORTREVISION=	2
 CATEGORIES=	net linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Lightweight Directory Access Protocol libraries (Linux Fedora 10)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	1.fc10
@@ -18,7 +17,6 @@ USE_LDCONFIG=	yes
 DESCR=	${.CURDIR}/../openldap24-server/pkg-descr
 
 PLIST_FILES=	usr/lib/liblber-2.4.so.2 usr/lib/liblber-2.4.so.2.2.0 usr/lib/libldap-2.4.so.2 usr/lib/libldap-2.4.so.2.2.0 usr/lib/libldap_r-2.4.so.2 usr/lib/libldap_r-2.4.so.2.2.0 etc/openldap usr/share/man/man5/ldap.conf.5.gz usr/share/man/man5/ldif.5.gz
-DOCSDIR=	usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
 
 # do not install any openldap configuration directories/files
diff --git a/net/spideroak/Makefile b/net/spideroak/Makefile
index 15e2474..f20fff0 100644
--- a/net/spideroak/Makefile
+++ b/net/spideroak/Makefile
@@ -32,9 +32,8 @@ PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,} \
 SUB_LIST=	LINUXBASE=${LINUXBASE}
 SUB_FILES=	pkg-message
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
-USES=		desktop-file-utils python:2 tar:tgz
+USES=		desktop-file-utils linux python:2 tar:tgz
+USE_LINUX=	xorglibs
 
 .include <bsd.port.options.mk>
 
diff --git a/print/foxitreader/Makefile b/print/foxitreader/Makefile
index 62e19e8..676e5d1 100644
--- a/print/foxitreader/Makefile
+++ b/print/foxitreader/Makefile
@@ -23,9 +23,8 @@ NO_BUILD=	yes
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
-USES=	gettext tar:bzip2
-USE_LINUX=	yes
-USE_LINUX_APPS=	avahi-libs cups-libs dbuslibs gtk2 nss
+USES=		gettext linux tar:bzip2
+USE_LINUX=	avahi-libs cups-libs dbuslibs gtk2 nss
 
 WRKSRC=	${WRKDIR}/${PORTVERSION:R}-release
 
diff --git a/print/linux-c6-cups-libs/Makefile b/print/linux-c6-cups-libs/Makefile
index 16d71f1..82907f3 100644
--- a/print/linux-c6-cups-libs/Makefile
+++ b/print/linux-c6-cups-libs/Makefile
@@ -5,17 +5,16 @@ PORTNAME=	cups-libs
 PORTVERSION=	1.4.2
 PORTREVISION=	5
 CATEGORIES=	print linux
-MASTER_SITES=	CENTOS_LINUX
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Common UNIX Printing System libraries
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	gnutls
-SRC_DISTFILES=	cups-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 RPMVERSION=	74.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	gnutls
+USE_LINUX_RPM=	yes
+SRC_DISTFILES=	cups-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
 DESCR=		${.CURDIR}/../cups/pkg-descr
 
diff --git a/print/linux-f10-cups-libs/Makefile b/print/linux-f10-cups-libs/Makefile
index e129584..1f3be56 100644
--- a/print/linux-f10-cups-libs/Makefile
+++ b/print/linux-f10-cups-libs/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	print linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Common UNIX Printing System libraries
 
-USE_LINUX=	f10
+USES=		linux:f10
+USE_LINUX=	gnutls
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	gnutls
-SRC_DISTFILES=	cups-${PORTVERSION}-${RPMVERSION}.src.rpm
+SRC_DISTFILES=	cups-${PORTVERSION}-${RPMVERSION}.src.rpm:SOURCE
 RPMVERSION=	4.fc10
 USE_LDCONFIG=	yes
 
diff --git a/security/hamachi/Makefile b/security/hamachi/Makefile
index fcc7f1c..87ed335 100644
--- a/security/hamachi/Makefile
+++ b/security/hamachi/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Fast, secure, simple VPN software with NAT-traversal
 PATCH_DEPENDS=	upx:archivers/upx
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
+USES=		linux
 
 USE_RC_SUBR=	hamachi
 PLIST_FILES=	bin/hamachi bin/hamachi-init sbin/hamachi-tuncfg
diff --git a/security/linux-c6-cyrus-sasl2/Makefile b/security/linux-c6-cyrus-sasl2/Makefile
index b39f52a..a11ffdf 100644
--- a/security/linux-c6-cyrus-sasl2/Makefile
+++ b/security/linux-c6-cyrus-sasl2/Makefile
@@ -6,21 +6,17 @@ PORTVERSION=	2.1.23
 PORTREVISION=	3
 CATEGORIES=	security linux
 DISTNAME=	cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
+SRC_DISTFILES=	cyrus-sasl-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS ${LINUX_DIST_VER})
 
-ONLY_FOR_ARCHS=	i386 amd64
-
-SRC_DISTFILES= cyrus-sasl-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
 RPMVERSION=	15.el6_6.2
+USES=		linux:c6
 USE_LDCONFIG=	yes
-BRANDELF_FILES=	usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
-DESCR=	${.CURDIR}/../cyrus-sasl2/pkg-descr
+USE_LINUX_RPM=	yes
 
-DOCSDIR=	usr/share/doc/cyrus-sasl-lib-${PORTVERSION}
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/cyrus-sasl-lib-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/security/linux-c6-gnutls/Makefile b/security/linux-c6-gnutls/Makefile
index 28f4db9..dda3e25 100644
--- a/security/linux-c6-gnutls/Makefile
+++ b/security/linux-c6-gnutls/Makefile
@@ -9,9 +9,9 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library
 
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	libtasn1 libgcrypt libgpg-error
+USE_LINUX=	libtasn1 libgcrypt libgpg-error
 
 RPMVERSION=	19.el6_7
 USE_LDCONFIG=	yes
diff --git a/security/linux-c6-libgcrypt/Makefile b/security/linux-c6-libgcrypt/Makefile
index 41ec6ce..fb51377 100644
--- a/security/linux-c6-libgcrypt/Makefile
+++ b/security/linux-c6-libgcrypt/Makefile
@@ -9,12 +9,11 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	General purpose crypto library based on code used in GnuPG (Linux CentOS ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 RPMVERSION=	11.el6_4
 USE_LDCONFIG=	yes
 
-DOCSDIR=	usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING.LIB NEWS THANKS
 DESCR=		${.CURDIR}/../libgcrypt/pkg-descr
 
diff --git a/security/linux-c6-libgpg-error/Makefile b/security/linux-c6-libgpg-error/Makefile
index ecdc3be..f535af0 100644
--- a/security/linux-c6-libgpg-error/Makefile
+++ b/security/linux-c6-libgpg-error/Makefile
@@ -9,11 +9,10 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Common error values for all GnuPG components
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
 RPMVERSION=	4.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
-BRANDELF_FILES=	usr/bin/gpg-error
+USE_LINUX_RPM=	yes
 
 DESCR=		${.CURDIR}/../libgpg-error/pkg-descr
 
diff --git a/security/linux-c6-libssh2/Makefile b/security/linux-c6-libssh2/Makefile
index 55d918c..a28ca33 100644
--- a/security/linux-c6-libssh2/Makefile
+++ b/security/linux-c6-libssh2/Makefile
@@ -11,15 +11,13 @@ COMMENT=	Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-f10-libssh2-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
 RPMVERSION=	2.el6_7.1
-USE_LINUX=	c6
-USE_LINUX_APPS=	openssl
+USES=		linux:c6
+USE_LINUX=	openssl
 
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/security/linux-c6-libtasn1/Makefile b/security/linux-c6-libtasn1/Makefile
index 624ca1f..1edceca 100644
--- a/security/linux-c6-libtasn1/Makefile
+++ b/security/linux-c6-libtasn1/Makefile
@@ -9,16 +9,13 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	ASN.1 structure parser library
 
-USES+=	cpe
+USES=		cpe linux:c6
 CPE_VENDOR=	gnu
-
-USE_LINUX=	c6
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	6.el6_5
 USE_LDCONFIG=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS TODO libtasn1.pdf
 DESCR=		${.CURDIR}/../libtasn1/pkg-descr
 
diff --git a/security/linux-c6-nss/Makefile b/security/linux-c6-nss/Makefile
index fc55d22..e70fce7 100644
--- a/security/linux-c6-nss/Makefile
+++ b/security/linux-c6-nss/Makefile
@@ -5,26 +5,23 @@ PORTNAME=	nss
 PORTVERSION=	3.21.0
 PORTREVISION=	1
 CATEGORIES=	security linux
-DISTFILES=	#
-LIB_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
-		nss-util-${PORTVERSION}-2.el6.${LINUX_RPM_ARCH}.rpm \
-		nss-softokn-3.14.3-23.el6_7.${LINUX_RPM_ARCH}.rpm \
-		nss-softokn-freebl-3.14.3-23.el6_7.${LINUX_RPM_ARCH}.rpm
+LIB_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		nss-util-${PORTVERSION}-2.el6${EXTRACT_SUFX} \
+		nss-softokn-3.14.3-23.el6_7${EXTRACT_SUFX} \
+		nss-softokn-freebl-3.14.3-23.el6_7${EXTRACT_SUFX}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Network Security Services (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-f10-nss-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
 RPMVERSION=	8.el6
-USE_LINUX=	c6
-USE_LINUX_APPS=	nspr sqlite3
-
+USES=		linux:c6
+USE_LINUX=	nspr sqlite3
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 
-SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE \
+SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE \
 		nss-util-${PORTVERSION}-2.el6.src.rpm:SOURCE \
 		nss-softokn-3.14.3-23.el6_7.src.rpm:SOURCE
 
diff --git a/security/linux-c6-openssl-compat/Makefile b/security/linux-c6-openssl-compat/Makefile
index e8a1c73..e312130 100644
--- a/security/linux-c6-openssl-compat/Makefile
+++ b/security/linux-c6-openssl-compat/Makefile
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/usr/share/doc/openssl098e-${PORTVERSION}/LICENSE
 
 CONFLICTS=	linux-f10-openssl-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 RPMVERSION=	20.el6.centos.1
 USE_LDCONFIG=	yes
diff --git a/security/linux-c6-openssl/Makefile b/security/linux-c6-openssl/Makefile
index e60fe68..d5c8363 100644
--- a/security/linux-c6-openssl/Makefile
+++ b/security/linux-c6-openssl/Makefile
@@ -5,18 +5,15 @@ PORTNAME=	openssl
 PORTVERSION=	1.0.1e
 PORTREVISION=	10
 CATEGORIES=	security linux
-MASTER_SITES=	CENTOS_LINUX CENTOS_LINUX_UPDATES
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-openssl-[0-9]* linux-f8-openssl-[0-9]* linux-f10-openssl-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 RPMVERSION=	48.el6_8.1
-BRANDELF_FILES=	usr/bin/openssl
 USE_LDCONFIG=	yes
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
diff --git a/security/linux-c6-openssl/pkg-plist.i386 b/security/linux-c6-openssl/pkg-plist.i386
index dd9a2b7..8af38af 100644
--- a/security/linux-c6-openssl/pkg-plist.i386
+++ b/security/linux-c6-openssl/pkg-plist.i386
@@ -1,4 +1,3 @@
-@comment file listing
 etc/pki/tls/certs/Makefile
 etc/pki/tls/certs/make-dummy-cert
 etc/pki/tls/certs/renew-dummy-cert
@@ -28,18 +27,18 @@ usr/lib/openssl/engines/libnuron.so
 usr/lib/openssl/engines/libpadlock.so
 usr/lib/openssl/engines/libsureware.so
 usr/lib/openssl/engines/libubsec.so
-usr/share/doc/openssl-%%PORTVERSION%%/CHANGES
-usr/share/doc/openssl-%%PORTVERSION%%/FAQ
-usr/share/doc/openssl-%%PORTVERSION%%/INSTALL
-usr/share/doc/openssl-%%PORTVERSION%%/LICENSE
-usr/share/doc/openssl-%%PORTVERSION%%/NEWS
-usr/share/doc/openssl-%%PORTVERSION%%/README
-usr/share/doc/openssl-%%PORTVERSION%%/README.FIPS
-usr/share/doc/openssl-%%PORTVERSION%%/c-indentation.el
-usr/share/doc/openssl-%%PORTVERSION%%/openssl.txt
-usr/share/doc/openssl-%%PORTVERSION%%/openssl_button.gif
-usr/share/doc/openssl-%%PORTVERSION%%/openssl_button.html
-usr/share/doc/openssl-%%PORTVERSION%%/ssleay.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.FIPS
+%%PORTDOCS%%%%DOCSDIR%%/c-indentation.el
+%%PORTDOCS%%%%DOCSDIR%%/openssl.txt
+%%PORTDOCS%%%%DOCSDIR%%/openssl_button.gif
+%%PORTDOCS%%%%DOCSDIR%%/openssl_button.html
+%%PORTDOCS%%%%DOCSDIR%%/ssleay.txt
 usr/share/man/man1/asn1parse.1ssl.gz
 usr/share/man/man1/ca.1ssl.gz
 usr/share/man/man1/ciphers.1ssl.gz
diff --git a/security/linux-c6-openssl/pkg-plist.x86_64 b/security/linux-c6-openssl/pkg-plist.x86_64
index 6d479cf..f9bbd54 100644
--- a/security/linux-c6-openssl/pkg-plist.x86_64
+++ b/security/linux-c6-openssl/pkg-plist.x86_64
@@ -46,18 +46,18 @@ usr/lib64/openssl/engines/libnuron.so
 usr/lib64/openssl/engines/libpadlock.so
 usr/lib64/openssl/engines/libsureware.so
 usr/lib64/openssl/engines/libubsec.so
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/CHANGES
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/FAQ
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/INSTALL
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/LICENSE
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/README
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/README.FIPS
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/c-indentation.el
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/openssl.txt
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/openssl_button.gif
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/openssl_button.html
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/ssleay.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.FIPS
+%%PORTDOCS%%%%DOCSDIR%%/c-indentation.el
+%%PORTDOCS%%%%DOCSDIR%%/openssl.txt
+%%PORTDOCS%%%%DOCSDIR%%/openssl_button.gif
+%%PORTDOCS%%%%DOCSDIR%%/openssl_button.html
+%%PORTDOCS%%%%DOCSDIR%%/ssleay.txt
 usr/share/man/man1/asn1parse.1ssl.gz
 usr/share/man/man1/ca.1ssl.gz
 usr/share/man/man1/ciphers.1ssl.gz
diff --git a/security/linux-f10-cyrus-sasl2/Makefile b/security/linux-f10-cyrus-sasl2/Makefile
index 38e4c17..e2507e9 100644
--- a/security/linux-f10-cyrus-sasl2/Makefile
+++ b/security/linux-f10-cyrus-sasl2/Makefile
@@ -5,25 +5,23 @@ PORTNAME=	cyrus-sasl2
 PORTVERSION=	2.1.22
 PORTREVISION=	3
 CATEGORIES=	security linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 DISTNAME=	cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
 
-SRC_DISTFILES=	cyrus-sasl-${PORTVERSION}-${RPMVERSION}.src.rpm
+SRC_DISTFILES=	cyrus-sasl-${PORTVERSION}-${RPMVERSION}.src.rpm:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer) (Linux Fedora 10)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	19.fc10
 USE_LDCONFIG=	yes
-BRANDELF_FILES=	usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
 DESCR=	${.CURDIR}/../${PORTNAME}/pkg-descr
 
 PLIST_DIRS=	etc/sasl2
 PLIST_FILES=	usr/lib/libsasl2.so.2 usr/lib/libsasl2.so.2.0.22 usr/lib/sasl2/libanonymous.so usr/lib/sasl2/libanonymous.so.2 usr/lib/sasl2/libanonymous.so.2.0.22 usr/lib/sasl2/libsasldb.so usr/lib/sasl2/libsasldb.so.2 usr/lib/sasl2/libsasldb.so.2.0.22 usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
-DOCSDIR=	usr/share/doc/cyrus-sasl-lib-${PORTVERSION}
+DOCSDIR=	${PREFIX}/usr/share/doc/cyrus-sasl-lib-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING NEWS README advanced.html appconvert.html components.html gssapi.html index.html install.html macosx.html mechanisms.html options.html plugprog.html programming.html readme.html sysadmin.html upgrading.html windows.html
 
 .include <bsd.port.mk>
diff --git a/security/linux-f10-gnutls/Makefile b/security/linux-f10-gnutls/Makefile
index b810e94..b1603c2 100644
--- a/security/linux-f10-gnutls/Makefile
+++ b/security/linux-f10-gnutls/Makefile
@@ -9,9 +9,9 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	libtasn1 libgcrypt libgpg-error
+USE_LINUX=	libtasn1 libgcrypt libgpg-error
 
 RPMVERSION=	5.fc10
 USE_LDCONFIG=	yes
diff --git a/security/linux-f10-libgcrypt/Makefile b/security/linux-f10-libgcrypt/Makefile
index 9e5ebd0..c917e97 100644
--- a/security/linux-f10-libgcrypt/Makefile
+++ b/security/linux-f10-libgcrypt/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	General purpose crypto library based on code used in GnuPG
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	1.fc10
diff --git a/security/linux-f10-libgpg-error/Makefile b/security/linux-f10-libgpg-error/Makefile
index 4fdcdff..4925a6d 100644
--- a/security/linux-f10-libgpg-error/Makefile
+++ b/security/linux-f10-libgpg-error/Makefile
@@ -9,14 +9,11 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Common error values for all GnuPG components
 
-USE_LINUX=	f10
-USE_LINUX_RPM=	yes
-
 RPMVERSION=	2
+USES=		linux:f10
 USE_LDCONFIG=	yes
-BRANDELF_FILES=	usr/bin/gpg-error
+USE_LINUX_RPM=	yes
 
-PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 DESCR=		${.CURDIR}/../libgpg-error/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/security/linux-f10-libgpg-error/pkg-plist b/security/linux-f10-libgpg-error/pkg-plist
index e20122b..acaf768 100644
--- a/security/linux-f10-libgpg-error/pkg-plist
+++ b/security/linux-f10-libgpg-error/pkg-plist
@@ -7,9 +7,9 @@ usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
 usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
 usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
 usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/COPYING.LIB
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/ChangeLog
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-%%PORTVERSION%%/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/security/linux-f10-libssh2/Makefile b/security/linux-f10-libssh2/Makefile
index 9d324c8..c7d6d6b 100644
--- a/security/linux-f10-libssh2/Makefile
+++ b/security/linux-f10-libssh2/Makefile
@@ -5,22 +5,20 @@ PORTNAME=	libssh2
 PORTVERSION=	0.18
 PORTREVISION=	1
 CATEGORIES=	security linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Library implementing the SSH2 protocol (Linux Fedora 10)
 
 CONFLICTS=	linux-f8-libssh2-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	openssl
+USE_LINUX=	openssl
 
 RPMVERSION=	7.fc9
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/lib/libssh2.so.1 usr/lib/libssh2.so.1.0.0
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/security/linux-f10-libtasn1/Makefile b/security/linux-f10-libtasn1/Makefile
index e967b6d..d90b73c 100644
--- a/security/linux-f10-libtasn1/Makefile
+++ b/security/linux-f10-libtasn1/Makefile
@@ -9,17 +9,14 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	ASN.1 structure parser library
 
-USES+=	cpe
+USES=		cpe linux:f10
 CPE_VENDOR=	gnu
-
-USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	1.fc10
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/lib/libtasn1.so.3 usr/lib/libtasn1.so.3.0.16
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS TODO libtasn1.pdf
 DESCR=		${.CURDIR}/../libtasn1/pkg-descr
 
diff --git a/security/linux-f10-nss/Makefile b/security/linux-f10-nss/Makefile
index f6b4a51..eac1637 100644
--- a/security/linux-f10-nss/Makefile
+++ b/security/linux-f10-nss/Makefile
@@ -5,15 +5,13 @@ PORTNAME=	nss
 PORTVERSION=	3.12.3.99.3
 PORTREVISION=	2
 CATEGORIES=	security linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Network Security Services (Linux Fedora 10)
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	nspr sqlite3
+USE_LINUX=	nspr sqlite3
 
 RPMVERSION=	2.10.6.fc10
 USE_LDCONFIG=	yes
diff --git a/security/linux-f10-openssl/Makefile b/security/linux-f10-openssl/Makefile
index 27108dc..6223a2a 100644
--- a/security/linux-f10-openssl/Makefile
+++ b/security/linux-f10-openssl/Makefile
@@ -5,18 +5,16 @@ PORTNAME=	openssl
 PORTVERSION=	0.9.8g
 PORTREVISION=	1
 CATEGORIES=	security linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	OpenSSL toolkit (Linux Fedora 10)
 
 CONFLICTS=	linux-openssl-[0-9]* linux-c6-openssl-compat-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	14.fc10
-BRANDELF_FILES=	usr/bin/openssl
 USE_LDCONFIG=	yes
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
diff --git a/security/pkcs11-gateway/Makefile b/security/pkcs11-gateway/Makefile
index 44b420c..5f2452b 100644
--- a/security/pkcs11-gateway/Makefile
+++ b/security/pkcs11-gateway/Makefile
@@ -13,7 +13,7 @@ LICENSE=	LGPL20
 
 MAKEFILE=	Makefile.FreeBSD
 USE_LDCONFIG=	yes
-USE_LINUX=	yes
+USES=		linux
 
 PLIST_FILES=	bin/pkcs11-gateway lib/libpkcs11-gateway.so \
 		lib/libpkcs11-gateway.so.1
diff --git a/sysutils/linux-crashplan/Makefile b/sysutils/linux-crashplan/Makefile
index 0bbfcef..5d0755c 100644
--- a/sysutils/linux-crashplan/Makefile
+++ b/sysutils/linux-crashplan/Makefile
@@ -20,10 +20,9 @@ JAVA_VERSION=	1.7+
 
 WRKSRC=		${WRKDIR}/crashplan-install
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	expat fontconfig xorglibs
+USES=		linux shebangfix tar:tgz
+USE_LINUX=	expat fontconfig xorglibs
 USE_RC_SUBR=	crashplan
-USES=		shebangfix tar:tgz
 
 SHEBANG_FILES=	scripts/CrashPlanEngine scripts/CrashPlanDesktop
 
diff --git a/sysutils/linux-f10-procps/Makefile b/sysutils/linux-f10-procps/Makefile
index c7f8498..2b1108e 100644
--- a/sysutils/linux-f10-procps/Makefile
+++ b/sysutils/linux-f10-procps/Makefile
@@ -11,12 +11,10 @@ COMMENT=	Linux psproc binaries (Linux Fedora 10)
 
 CONFLICTS=	linux-procps-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-ONLY_FOR_ARCHS=	i386 amd64
 RPMVERSION=	21.fc10
 USE_LDCONFIG=	yes
-BRANDELF_DIRS=	bin sbin usr/bin
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 PROCFS=	/compat/linux/proc
diff --git a/sysutils/linux-nero/Makefile b/sysutils/linux-nero/Makefile
index 814e314..8432061 100644
--- a/sysutils/linux-nero/Makefile
+++ b/sysutils/linux-nero/Makefile
@@ -15,13 +15,12 @@ COMMENT=	CD/DVD disk burner
 
 RESTRICTED=	Must be downloaded from their website and a serial number must be bought
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	gtk2
+USES=		linux
 USE_LDCONFIG=	yes
-BRANDELF_DIRS=	usr/bin
+USE_LINUX=	gtk2
+USE_LINUX_RPM=	nolib
 SRC_DISTFILES=
-PLIST=		${MASTERDIR}/pkg-plist
+PLIST=		${PKGDIR}/pkg-plist
 
 # normalize permissions of symbolic links to prevent a package with
 # missing files
diff --git a/sysutils/seatools/Makefile b/sysutils/seatools/Makefile
index ee22022..b06b20a 100644
--- a/sysutils/seatools/Makefile
+++ b/sysutils/seatools/Makefile
@@ -16,7 +16,7 @@ DOWNLOAD_URL=		http://www.seagate.com/files/www-content/support-content/download
 NO_WRKSUBDIR=		yes
 RESTRICTED=		Redistribution is not permitted
 ONLY_FOR_ARCHS=		i386 amd64
-USE_LINUX=		yes
+USES=			linux
 
 PLIST_FILES=		sbin/st
 PORTDOCS=		sthelp.txt
diff --git a/textproc/linux-c6-aspell/Makefile b/textproc/linux-c6-aspell/Makefile
index f490fee..81c2779 100644
--- a/textproc/linux-c6-aspell/Makefile
+++ b/textproc/linux-c6-aspell/Makefile
@@ -11,12 +11,10 @@ COMMENT=	Spelling checker with better logic than ispell (Linux CentOS ${LINUX_DI
 
 CONFLICTS=	linux-aspell-[0-9]* linux-f10-aspell-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	12.el6
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/textproc/linux-c6-expat/Makefile b/textproc/linux-c6-expat/Makefile
index 4401389..f46f686 100644
--- a/textproc/linux-c6-expat/Makefile
+++ b/textproc/linux-c6-expat/Makefile
@@ -11,14 +11,11 @@ COMMENT=	Linux/i386 binary port of Expat XML-parsing library (Linux CentOS ${LIN
 
 CONFLICTS=	linux-expat-[0-9]* linux-f8-expat-[0-9]* linux-f10-expat-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 RPMVERSION=	11.el6_2
-BRANDELF_FILES=	usr/bin/xmlwf
 USE_LDCONFIG=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	COPYING README
 DESCR=		${.CURDIR}/../${PORTNAME}2/pkg-descr
 
diff --git a/textproc/linux-c6-libxml2/Makefile b/textproc/linux-c6-libxml2/Makefile
index bcb6399..7356e09 100644
--- a/textproc/linux-c6-libxml2/Makefile
+++ b/textproc/linux-c6-libxml2/Makefile
@@ -11,14 +11,12 @@ COMMENT=	Library providing XML and HTML support (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-f10-libxml2-[0-9]*
 
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	21.el6_8.1
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS ChangeLog.gz Copyright NEWS README TODO
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/textproc/linux-f10-aspell/Makefile b/textproc/linux-f10-aspell/Makefile
index 2e37c26..ddc3263 100644
--- a/textproc/linux-f10-aspell/Makefile
+++ b/textproc/linux-f10-aspell/Makefile
@@ -5,19 +5,16 @@ PORTNAME=	aspell
 PORTVERSION=	0.60.6
 PORTREVISION=	1
 CATEGORIES=	textproc linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Spelling checker with better logic than ispell (Linux Fedora 10)
 
 CONFLICTS=	linux-aspell-[0-9]* linux-f8-aspell-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	3.fc10
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/textproc/linux-f10-expat/Makefile b/textproc/linux-f10-expat/Makefile
index ced3491..8fa4cfc 100644
--- a/textproc/linux-f10-expat/Makefile
+++ b/textproc/linux-f10-expat/Makefile
@@ -5,24 +5,20 @@ PORTNAME=	expat
 PORTVERSION=	2.0.1
 PORTREVISION=	1
 CATEGORIES=	textproc linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library (Linux Fedora 10)
 
 CONFLICTS=	linux-expat-[0-9]* linux-f8-expat-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	5
-BRANDELF_FILES=	usr/bin/xmlwf
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	lib/libexpat.so.1 lib/libexpat.so.1.5.2 \
 		usr/bin/xmlwf usr/share/man/man1/xmlwf.1.gz
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	COPYING README
 DESCR=		${.CURDIR}/../${PORTNAME}2/pkg-descr
 
diff --git a/textproc/linux-f10-libxml2/Makefile b/textproc/linux-f10-libxml2/Makefile
index a6ad4ae..5d6a0f6 100644
--- a/textproc/linux-f10-libxml2/Makefile
+++ b/textproc/linux-f10-libxml2/Makefile
@@ -5,25 +5,22 @@ PORTNAME=	libxml2
 PORTVERSION=	2.7.3
 PORTREVISION=	2
 CATEGORIES=	textproc linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Library providing XML and HTML support (Linux Fedora 10)
 
 CONFLICTS=	linux-libxml2-[0-9]* linux-f8-libxml2-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 
 RPMVERSION=	1.fc10
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/bin/xmlcatalog usr/bin/xmllint \
 		usr/lib/libxml2.so.2 usr/lib/libxml2.so.${PORTVERSION} \
 		usr/share/man/man1/xmlcatalog.1.gz \
 		usr/share/man/man1/xmllint.1.gz usr/share/man/man3/libxml.3.gz
-DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS ChangeLog.gz Copyright NEWS README TODO
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/textproc/linux-f10-scim-gtk/Makefile b/textproc/linux-f10-scim-gtk/Makefile
index 3f8b41e..9d24e24 100644
--- a/textproc/linux-f10-scim-gtk/Makefile
+++ b/textproc/linux-f10-scim-gtk/Makefile
@@ -5,20 +5,18 @@ PORTNAME=	scim-gtk
 PORTVERSION=	1.4.7
 PORTREVISION=	2
 CATEGORIES=	textproc linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Smart Common Input Method platform, gtk module, (Linux Fedora 10)
 
 CONFLICTS=	linux-scim-gtk-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	gtk2 scimlibs
+USE_LINUX=	gtk2 scimlibs
 
 RPMVERSION=	35.fc10
 USE_LDCONFIG=	yes
-SRC_DISTFILES=	scim-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
+SRC_DISTFILES=	scim-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
 .include <bsd.port.mk>
diff --git a/textproc/linux-f10-scim-libs/Makefile b/textproc/linux-f10-scim-libs/Makefile
index f9543d1..d4a3c43 100644
--- a/textproc/linux-f10-scim-libs/Makefile
+++ b/textproc/linux-f10-scim-libs/Makefile
@@ -5,21 +5,19 @@ PORTNAME=	scim-libs
 PORTVERSION=	1.4.7
 PORTREVISION=	3
 CATEGORIES=	textproc linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Smart Common Input Method libraries (Linux Fedora 10)
 
 CONFLICTS=	linux-scim-libs-[0-9]* linux-f8-scim-libs-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	gtk2
+USE_LINUX=	gtk2
 
 RPMVERSION=	35.fc10
 USE_LDCONFIG=	yes
-SRC_DISTFILES=	scim-${PORTVERSION}-${RPMVERSION}.src.rpm
+SRC_DISTFILES=	scim-${PORTVERSION}-${RPMVERSION}.src.rpm:SOURCE
 
 DESCR=		${.CURDIR}/../scim/pkg-descr
 
diff --git a/textproc/pocketreader/Makefile b/textproc/pocketreader/Makefile
index 80154d4..c8f7f01 100644
--- a/textproc/pocketreader/Makefile
+++ b/textproc/pocketreader/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	pocketreader
 MAINTAINER=	simond@irrelevant.org
 COMMENT=	Siemens PocketReader
 
-USE_LINUX=	yes
+USES=		linux
 NO_BUILD=	yes
 PLIST_FILES=	bin/pocketreader
 
diff --git a/www/linux-c6-flashplugin11/Makefile b/www/linux-c6-flashplugin11/Makefile
index 33951af..ef59120 100644
--- a/www/linux-c6-flashplugin11/Makefile
+++ b/www/linux-c6-flashplugin11/Makefile
@@ -15,8 +15,8 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Adobe Flash Player NPAPI Plugin
 
 ONLY_FOR_ARCHS=	amd64 i386
-USE_LINUX?=	c6
-USE_LINUX_APPS=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss
+USES?=		linux:c6
+USE_LINUX=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss
 
 RESTRICTED=	Redistribution not allowed
 RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
@@ -24,15 +24,15 @@ RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-USES=		webplugin:linux desktop-file-utils cpe
+USES+=		webplugin:linux desktop-file-utils cpe
 WEBPLUGIN_FILES=	libflashplayer.so
 
 OPTIONS_DEFINE=	ALSA
 OPTIONS_SUB=	yes
 
 ALSA_DESC=	ALSA audio output (broken, needs lemul)
-ALSA_USE=	LINUX_APPS=alsalib,alsa-plugins-oss
-ALSA_USE_OFF?=	LINUX_APPS=openssl-compat
+ALSA_USE=	LINUX=alsalib,alsa-plugins-oss
+ALSA_USE_OFF?=	LINUX=openssl-compat
 ALSA_DISTFILES_OFF=	linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
 ALSA_PLIST_SUB_OFF=	LINUXBASE="${LINUXBASE}"
 
diff --git a/www/linux-c6-qt47-webkit/Makefile b/www/linux-c6-qt47-webkit/Makefile
index acb17a2..a0b42f6 100644
--- a/www/linux-c6-qt47-webkit/Makefile
+++ b/www/linux-c6-qt47-webkit/Makefile
@@ -13,14 +13,13 @@ DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/atrpms/6
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of QT4 (Linux CentOS 6)
 
-ONLY_FOR_ARCHS=	i386 amd64
 RPMVERSION=	1_18.el6
-USE_LINUX=	c6
-USE_LINUX_APPS=	fontconfig png xorglibs sqlite3 qt47 qt47-x11
-USE_LINUX_RPM=	yes
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	fontconfig png xorglibs sqlite3 qt47 qt47-x11
+USE_LINUX_RPM=	yes
 DESCR=  ${.CURDIR}/../../www/webkit-gtk3/pkg-descr # contains no GTK references, reuse
 
-SRC_DISTFILES:=		# unretrievable
+SRC_DISTFILES=	# unretrievable
 
 .include <bsd.port.mk>
diff --git a/www/linux-f10-flashplugin11/Makefile b/www/linux-f10-flashplugin11/Makefile
index c5d8cdd..5b5aa79 100644
--- a/www/linux-f10-flashplugin11/Makefile
+++ b/www/linux-f10-flashplugin11/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=	linux-f10-
-USE_LINUX=	f10
+USES=		linux:f10
 MASTERDIR=	${.CURDIR}/../linux-c6-flashplugin11
-ALSA_USE_OFF=	LINUX_APPS=openssl
+ALSA_USE_OFF=	LINUX=openssl
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 176ecfd..161f8fc 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -14,8 +14,6 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 
 USES=		tar:bzip2
 
-WANT_GTK218=	yes
-
 PREFS_FILE=	${WRKSRC}/${APP_SUBDIR}defaults/preferences/browser-prefs.js
 APP_SUBDIR=	browser/ # plugins, extensions
 
diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index 11dd868..a1b1f4e 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -29,10 +29,6 @@ lib/%%APP_NAME%%/gmp-clearkey/0.1/libclearkey.so
 lib/%%APP_NAME%%/icons/updater.png
 lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.so
-%%GTK218%%lib/%%APP_NAME%%/libgdk-x11-2.0.so.0
-%%GTK218%%lib/%%APP_NAME%%/libgio-2.0.so.0
-%%GTK218%%lib/%%APP_NAME%%/libglib-2.0.so.0
-%%GTK218%%lib/%%APP_NAME%%/libgtk-x11-2.0.so.0
 lib/%%APP_NAME%%/liblgpllibs.so
 lib/%%APP_NAME%%/libmozsqlite3.so
 lib/%%APP_NAME%%/libnspr4.so
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index b4c7a65..521cd22 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -20,10 +20,9 @@ COMMENT=	Blazingly fast, full-featured, standards-compliant browser
 
 RUN_DEPENDS=	update-mime-database:misc/shared-mime-info
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	gtk2 naslibs png sqlite3 xorglibs
+USES=		desktop-file-utils linux shared-mime-info tar:xz
+USE_LINUX=	gtk2 naslibs png sqlite3 xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
-USES=		desktop-file-utils shared-mime-info tar:xz
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile
index 3ee9456..a30acab 100644
--- a/www/linux-seamonkey/Makefile
+++ b/www/linux-seamonkey/Makefile
@@ -12,7 +12,5 @@ COMMENT=	The open source, standards compliant web browser
 
 USES=		tar:bzip2
 
-WANT_GTK218=	yes
-
 .include "${.CURDIR}/Makefile.common"
 .include <bsd.port.mk>
diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common
index 286ed96..6bb0576 100644
--- a/www/linux-seamonkey/Makefile.common
+++ b/www/linux-seamonkey/Makefile.common
@@ -1,35 +1,19 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-.if !defined(OVERRIDE_LINUX_NONBASE_PORTS) || \
-    ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"
-.undef WANT_GTK218
-.endif
 
 CATEGORIES+=	linux
 MASTER_SITES?=	MOZILLA/${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US
 PKGNAMEPREFIX?=		linux-
 
-.if defined(WANT_GTK218)
-MASTER_SITES+=	https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/12/Everything/i386/os/Packages/:f12
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		glib2-2.22.2-2.fc12.i686.rpm:f12 \
-		gtk2-2.18.3-19.fc12.i686.rpm:f12
-GTK218_FILES=	lib/libgio-2.0.so.0 \
-		lib/libglib-2.0.so.0 \
-		usr/lib/libgdk-x11-2.0.so.0 \
-		usr/lib/libgtk-x11-2.0.so.0
-.endif
-
-USES+=		cpe
+USES+=		cpe linux
 CPE_VENDOR?=	mozilla
 CPE_TARGET_SW?=	linux
+USE_LINUX+=	alsalib alsa-plugins-oss atk dbusglib dbuslibs \
+		fontconfig gtk2 hicontheme pango
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 APP_NAME=	${PKGBASE}
 BIN_NAME?=	${PORTNAME}
-USE_LINUX=	yes
-USE_LINUX_APPS+=alsalib alsa-plugins-oss atk dbusglib dbuslibs \
-		fontconfig gtk2 hicontheme pango
 
 WRKSRC?=	${WRKDIR}/${BIN_NAME}
 FDIR=		${STAGEDIR}${PREFIX}/lib/${APP_NAME}
@@ -46,12 +30,6 @@ DESKTOP_SUFFIX?=	(Linux, devel)
 .endif
 DESKTOP_SUFFIX?=	(Linux)
 
-.if defined(WANT_GTK218)
-PLIST_SUB+=	GTK218=""
-.else
-PLIST_SUB+=	GTK218="@comment "
-.endif
-
 _A=	>> ${TMPPLIST}
 _Q=	2>/dev/null || true
 
@@ -60,14 +38,6 @@ post-extract:
 	@${RM} -rf ${WRKSRC}/updates
 	@${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME} \
 		${WRKSRC}/${APP_SUBDIR}plugins
-. if defined(WANT_GTK218)
-.  for f in ${GTK218_FILES}
-	@${CP} -p ${WRKDIR}/${f} ${WRKSRC}
-	@${ECHO_CMD} ${f:T} >>${WRKSRC}/dependentlibs.list
-.  endfor
-	@${REINPLACE_CMD} -i '' '/libxul/ { h; d; }; $$G' \
-		${WRKSRC}/dependentlibs.list
-. endif
 .endif
 
 
@@ -121,11 +91,6 @@ create-plist: build
 		%D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ ${_Q}' >> ${PLIST}
 	${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ \
 		-depth 1 -type l -delete ${_Q}' >> ${PLIST}
-.if defined(WANT_GTK218)
-. for f in ${GTK218_FILES}
-	${REINPLACE_CMD} -i '' '/${f:T}/s/^/%%GTK218%%/' ${PLIST}
-. endfor
-.endif
 
 snatch-desktop:
 	${SED} -E -e 's/${PORTNAME}/${APP_NAME}/' \
diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist
index 27d9c87..c79bfe7 100644
--- a/www/linux-seamonkey/pkg-plist
+++ b/www/linux-seamonkey/pkg-plist
@@ -81,10 +81,6 @@ lib/%%APP_NAME%%/isp/movemail.rdf
 lib/%%APP_NAME%%/isp/rss.rdf
 lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.so
-%%GTK218%%lib/%%APP_NAME%%/libgdk-x11-2.0.so.0
-%%GTK218%%lib/%%APP_NAME%%/libgio-2.0.so.0
-%%GTK218%%lib/%%APP_NAME%%/libglib-2.0.so.0
-%%GTK218%%lib/%%APP_NAME%%/libgtk-x11-2.0.so.0
 lib/%%APP_NAME%%/libldap60.so
 lib/%%APP_NAME%%/libldif60.so
 lib/%%APP_NAME%%/liblgpllibs.so
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index 4989bb9..8c22275 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -26,12 +26,11 @@ BINFILE=	${PORTNAME}-i386-${PORTVERSION}-${BINBUILD}${EXTRACT_SUFX}
 ONLY_FOR_ARCHS=	i386 amd64
 
 HAS_CONFIGURE=	yes
+USES=		gmake gnome linux pkgconfig
 USE_GNOME=	glib20 gtk20
 USE_LDCONFIG=	yes
-USE_LINUX=	yes
-USE_LINUX_APPS=	gtk2
+USE_LINUX=	gtk2
 USE_XORG=	x11 xext xt
-USES=		gmake pkgconfig
 
 CFLAGS+=	-std=c99
 
diff --git a/www/opera-linuxplugins/Makefile b/www/opera-linuxplugins/Makefile
index 476d4d2..ae26671 100644
--- a/www/opera-linuxplugins/Makefile
+++ b/www/opera-linuxplugins/Makefile
@@ -23,9 +23,8 @@ OPERA_VER?=	12.16
 OPERA_BUILD?=	1860
 MASTER_SITES_VER_PATH=	linux/${OPERA_VER:S/.//}/
 
-USES=		tar:xz
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux tar:xz
+USE_LINUX=	xorglibs
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/x11-fonts/linux-c6-fontconfig/Makefile b/x11-fonts/linux-c6-fontconfig/Makefile
index 38cd97e..8026305 100644
--- a/x11-fonts/linux-c6-fontconfig/Makefile
+++ b/x11-fonts/linux-c6-fontconfig/Makefile
@@ -11,18 +11,16 @@ COMMENT=	XML-based font configuration API for X Windows (Linux CentOS ${LINUX_DI
 
 CONFLICTS=	linux-fontconfig-[0-9]* linux-f8-fontconfig-[0-9]* linux-f10-fontconfig-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	5.el6
-USE_LINUX=	c6
-USE_LINUX_APPS=	expat
-
-USE_LINUX_RPM=	yes
-BRANDELF_DIRS=	usr/bin
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	expat
+USE_LINUX_RPM=	yes
 
 # We will use some other configuration file, so delete a linux one
 # Don't let the linux fc-cache mess up the native cache file
-post-extract:
+post-patch:
 		@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/fonts ${WRKSRC}/var \
 			${WRKSRC}/usr/bin/fc-cache \
 			${WRKSRC}/usr/share/man/man1/fc-cache.1.gz
@@ -31,6 +29,4 @@ post-install:
 		${MKDIR} ${STAGEDIR}${PREFIX}/etc
 		@${LN} -s ${LOCALBASE}/etc/fonts ${STAGEDIR}${PREFIX}/etc/
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-
 .include <bsd.port.mk>
diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile
index 2c6ab66..f22dc3e 100644
--- a/x11-fonts/linux-f10-fontconfig/Makefile
+++ b/x11-fonts/linux-f10-fontconfig/Makefile
@@ -5,20 +5,17 @@ PORTNAME=	fontconfig
 PORTVERSION=	2.6.0
 PORTREVISION=	1
 CATEGORIES=	x11-fonts linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	XML-based font configuration API for X Windows (Linux Fedora 10)
 
 CONFLICTS=	linux-fontconfig-[0-9]* linux-f8-fontconfig-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	expat
+USE_LINUX=	expat
 
 RPMVERSION=	3.fc10
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 # We will use some other configuration file, so delete a linux one
diff --git a/x11-themes/linux-c6-hicolor-icon-theme/Makefile b/x11-themes/linux-c6-hicolor-icon-theme/Makefile
index 4eccde7..7b4bec7 100644
--- a/x11-themes/linux-c6-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-c6-hicolor-icon-theme/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	4
 CATEGORIES=	x11-themes linux
 MASTER_SITES=	# empty
 DISTFILES=	# empty
-PKGNAMEPREFIX=	linux-${USE_LINUX}-
+PKGNAMEPREFIX=	linux-c6-
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	High-color icon theme shell from the FreeDesktop project
@@ -17,7 +17,7 @@ CONFLICTS=	linux-f10-hicolor-icon-theme-[0-9]*
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 NO_BUILD=	yes
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_PREFIX=	yes
 PLIST_FILES=	usr/share/icons/hicolor
 
diff --git a/x11-themes/linux-f10-hicolor-icon-theme/Makefile b/x11-themes/linux-f10-hicolor-icon-theme/Makefile
index 74101a9..3da1c0f 100644
--- a/x11-themes/linux-f10-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-f10-hicolor-icon-theme/Makefile
@@ -16,7 +16,7 @@ CONFLICTS=	linux-hicolor-icon-theme-[0-9]* linux-f8-hicolor-icon-theme-[0-9]*
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 NO_BUILD=	yes
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_PREFIX=	yes
 PLIST_FILES=	usr/share/icons/hicolor
 
diff --git a/x11-themes/linux-f10-qtcurve-gtk2/Makefile b/x11-themes/linux-f10-qtcurve-gtk2/Makefile
index eaac073..6ea5917 100644
--- a/x11-themes/linux-f10-qtcurve-gtk2/Makefile
+++ b/x11-themes/linux-f10-qtcurve-gtk2/Makefile
@@ -9,11 +9,9 @@ PKGNAMEPREFIX=	linux-f10-
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	QtCurve GTK2 Theme Engine (Linux Fedora 10)
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	gtk2
-LINUX_DIST_VER=	10
+USE_LINUX=	gtk2
 RPMVERSION=	1.fc10
 
 .include <bsd.port.mk>
diff --git a/x11-themes/linux-hicolor-icon-theme/Makefile b/x11-themes/linux-hicolor-icon-theme/Makefile
index 101628d..a6b61f6 100644
--- a/x11-themes/linux-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-hicolor-icon-theme/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-them
 CONFLICTS=	linux-f8-hicolor-icon-theme-[0-9]* linux-f10-hicolor-icon-theme-[0-9]*
 
 NO_BUILD=	yes
-USE_LINUX=	yes
+USES=		linux
 USE_LINUX_PREFIX=	yes
 PLIST_FILES=	usr/share/icons/hicolor
 
diff --git a/x11-toolkits/linux-c6-gtk2/Makefile b/x11-toolkits/linux-c6-gtk2/Makefile
index 3c657f8..7bb8cc0 100644
--- a/x11-toolkits/linux-c6-gtk2/Makefile
+++ b/x11-toolkits/linux-c6-gtk2/Makefile
@@ -5,28 +5,22 @@ PORTNAME=	gtk2
 PORTVERSION=	2.24.23
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits linux
-DISTFILES=	#
-LIB_DISTFILES=	${DISTNAME}.${LINUX_RPM_ARCH}.rpm \
-		${PORTNAME}-immodules-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
-		${PORTNAME}-engines-2.18.4-5.el6.${LINUX_DIST}.${LINUX_RPM_ARCH}.rpm
+LIB_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-engines-2.18.4-5.el6.centos${EXTRACT_SUFX} \
+		${PORTNAME}-immodules-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
+SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	GTK+ library, version 2.X  (Linux CentOS ${LINUX_DIST_VER})
+COMMENT=	GTK+ library, version 2.X (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-gtk2-[0-9]* linux-f8-gtk2-[0-9]* linux-f10-gtk2-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_APPS=	atk gdkpixbuf2 pango xorglibs
-USE_LINUX_RPM=	yes
 RPMVERSION=	8.el6
-BRANDELF_DIRS=	usr/bin
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	atk gdkpixbuf2 pango xorglibs
+USE_LINUX_RPM=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}0/pkg-descr
 
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	gtk2-${PORTVERSION}-${RPMVERSION}.src.rpm:SOURCE
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c6-gtk2/pkg-plist.i386 b/x11-toolkits/linux-c6-gtk2/pkg-plist.i386
index e401635..db75dc3 100644
--- a/x11-toolkits/linux-c6-gtk2/pkg-plist.i386
+++ b/x11-toolkits/linux-c6-gtk2/pkg-plist.i386
@@ -34,14 +34,14 @@ usr/lib/libgdk-x11-2.0.so.0
 usr/lib/libgdk-x11-2.0.so.0.2400.23
 usr/lib/libgtk-x11-2.0.so.0
 usr/lib/libgtk-x11-2.0.so.0.2400.23
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/README
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/AUTHORS
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/COPYING
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/NEWS
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/README
 usr/share/gtk-engines/clearlooks.xml
 usr/share/gtk-engines/crux-engine.xml
 usr/share/gtk-engines/glide.xml
diff --git a/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64 b/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64
index d8fb63c..43cb5fc 100644
--- a/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64
@@ -66,14 +66,14 @@ usr/lib64/libgdk-x11-2.0.so.0
 usr/lib64/libgdk-x11-2.0.so.0.2400.23
 usr/lib64/libgtk-x11-2.0.so.0
 usr/lib64/libgtk-x11-2.0.so.0.2400.23
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/README
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/AUTHORS
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/COPYING
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/NEWS
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/README
 usr/share/gtk-engines/clearlooks.xml
 usr/share/gtk-engines/crux-engine.xml
 usr/share/gtk-engines/glide.xml
diff --git a/x11-toolkits/linux-c6-openmotif/Makefile b/x11-toolkits/linux-c6-openmotif/Makefile
index bbb4be5..da78198 100644
--- a/x11-toolkits/linux-c6-openmotif/Makefile
+++ b/x11-toolkits/linux-c6-openmotif/Makefile
@@ -11,11 +11,10 @@ COMMENT=	Motif toolkit libraries (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-openmotif-[0-9]* linux-f8-openmotif-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 RPMVERSION=	8.el6
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	xorglibs
+USE_LINUX=	xorglibs
 USE_LDCONFIG=	yes
 DESCR=	${.CURDIR}/../open-motif/pkg-descr
 
diff --git a/x11-toolkits/linux-c6-pango/Makefile b/x11-toolkits/linux-c6-pango/Makefile
index 75e99a0..8cbc773 100644
--- a/x11-toolkits/linux-c6-pango/Makefile
+++ b/x11-toolkits/linux-c6-pango/Makefile
@@ -8,22 +8,15 @@ CATEGORIES=	x11-toolkits linux
 
 MAINTAINER=	emulation@FreeBSD.org
 
-COMMENT=	Pango library (Linux  CentOS ${LINUX_DIST_VER})
+COMMENT=	Pango library (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-pango-[0-9]* linux-f10-pango-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_APPS=	cairo expat fontconfig libthai xorglibs
-USE_LINUX_RPM=	yes
 RPMVERSION=	11.el6
-
-BRANDELF_FILES=	usr/bin/pango-querymodules-32
-.if defined(OVERRIDE_LINUX_NONBASE_PORTS) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64"
-BRANDELF_FILES+=	usr/bin/pango-querymodules-64
-.endif
-
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	cairo expat fontconfig libthai xorglibs
+USE_LINUX_RPM=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/x11-toolkits/linux-c6-pango/pkg-plist.i386 b/x11-toolkits/linux-c6-pango/pkg-plist.i386
index fcb01ff..2ddca1b 100644
--- a/x11-toolkits/linux-c6-pango/pkg-plist.i386
+++ b/x11-toolkits/linux-c6-pango/pkg-plist.i386
@@ -1,5 +1,5 @@
 @postexec %D/usr/bin/pango-querymodules-32 > %D/etc/pango/i386-redhat-linux-gnu/pango.modules
-@preunexec rm -f %D/etc/pango/i386-redhat-linux-gnu/pango.modules
+@rmtry etc/pango/i386-redhat-linux-gnu/pango.modules
 etc/pango/pangox.aliases
 usr/bin/pango-querymodules-32
 usr/bin/pango-view
diff --git a/x11-toolkits/linux-c6-pango/pkg-plist.x86_64 b/x11-toolkits/linux-c6-pango/pkg-plist.x86_64
index 87bfe3b..72e5ad2 100644
--- a/x11-toolkits/linux-c6-pango/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c6-pango/pkg-plist.x86_64
@@ -1,8 +1,8 @@
 @postexec %D/usr/bin/pango-querymodules-32 > %D/etc/pango/i386-redhat-linux-gnu/pango.modules
-@preunexec rm -f %D/etc/pango/i386-redhat-linux-gnu/pango.modules
+@rmtry etc/pango/i386-redhat-linux-gnu/pango.modules
 etc/pango/pangox.aliases
 @postexec %D/usr/bin/pango-querymodules-64 > %D/etc/pango/x86_64-redhat-linux-gnu/pango.modules
-@preunexec rm -f %D/etc/pango/x86_64-redhat-linux-gnu/pango.modules
+@rmtry etc/pango/x86_64-redhat-linux-gnu/pango.modules
 usr/bin/pango-querymodules-32
 usr/bin/pango-querymodules-64
 usr/bin/pango-view
diff --git a/x11-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile
index 39409423..53018b5 100644
--- a/x11-toolkits/linux-c6-qt47-x11/Makefile
+++ b/x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -13,21 +13,19 @@ DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/atrpms/6
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of QT4 (Linux CentOS 6)
 
-ONLY_FOR_ARCHS=	i386 amd64
-SRC_DISTFILES:=		# unretrievable.
+SRC_DISTFILES=	# unretrievable.
 
-USE_LINUX=	c6
+RPMVERSION=	1_18.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	fontconfig png xorglibs png alsalib jpeg tiff qt47 openssl
+USE_LINUX_RPM=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
 
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver \
 			linux-c6-libGLU>0:graphics/linux-c6-libGLU
-NVIDIA_GL_USE_OFF=	linux_apps=dri
-
-USE_LINUX_APPS=	fontconfig png xorglibs png alsalib jpeg tiff qt47 openssl
-USE_LINUX_RPM=	yes
-RPMVERSION=	1_18.el6
+NVIDIA_GL_USE_OFF=	LINUX=dri
 
 DESCR=	${.CURDIR}/../../devel/qt4/pkg-descr
 
diff --git a/x11-toolkits/linux-c6-tk85/Makefile b/x11-toolkits/linux-c6-tk85/Makefile
index 8a2cbf4..d3b8ae0 100644
--- a/x11-toolkits/linux-c6-tk85/Makefile
+++ b/x11-toolkits/linux-c6-tk85/Makefile
@@ -12,15 +12,14 @@ COMMENT=	Graphical toolkit for TCL (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-f10-tk85-[0-9]*
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_RPM_BAD_PERMS=	yes
-USE_LINUX_APPS=	xorglibs
-
 RPMVERSION=	5.el6
-BRANDELF_FILES=	#usr/bin/wish8.5
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	xorglibs
+USE_LINUX_RPM=	yes
+USE_LINUX_RPM_BAD_PERMS=	yes
 
+DATADIR=	${PREFIX}/usr/share/tk${PORTVERSION:R}
 DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c6-tk85/pkg-plist.i386 b/x11-toolkits/linux-c6-tk85/pkg-plist.i386
index 281547f..fff9d7f 100644
--- a/x11-toolkits/linux-c6-tk85/pkg-plist.i386
+++ b/x11-toolkits/linux-c6-tk85/pkg-plist.i386
@@ -97,164 +97,164 @@ usr/share/man/mann/ttk_treeview.n.gz
 usr/share/man/mann/ttk_widget.n.gz
 usr/share/man/mann/winfo.n.gz
 usr/share/man/mann/wm.n.gz
-usr/%%DATADIR%%8.5/bgerror.tcl
-usr/%%DATADIR%%8.5/button.tcl
-usr/%%DATADIR%%8.5/choosedir.tcl
-usr/%%DATADIR%%8.5/clrpick.tcl
-usr/%%DATADIR%%8.5/comdlg.tcl
-usr/%%DATADIR%%8.5/console.tcl
-usr/%%DATADIR%%8.5/demos/README
-usr/%%DATADIR%%8.5/demos/anilabel.tcl
-usr/%%DATADIR%%8.5/demos/aniwave.tcl
-usr/%%DATADIR%%8.5/demos/arrow.tcl
-usr/%%DATADIR%%8.5/demos/bind.tcl
-usr/%%DATADIR%%8.5/demos/bitmap.tcl
-usr/%%DATADIR%%8.5/demos/browse
-usr/%%DATADIR%%8.5/demos/button.tcl
-usr/%%DATADIR%%8.5/demos/check.tcl
-usr/%%DATADIR%%8.5/demos/clrpick.tcl
-usr/%%DATADIR%%8.5/demos/colors.tcl
-usr/%%DATADIR%%8.5/demos/combo.tcl
-usr/%%DATADIR%%8.5/demos/cscroll.tcl
-usr/%%DATADIR%%8.5/demos/ctext.tcl
-usr/%%DATADIR%%8.5/demos/dialog1.tcl
-usr/%%DATADIR%%8.5/demos/dialog2.tcl
-usr/%%DATADIR%%8.5/demos/en.msg
-usr/%%DATADIR%%8.5/demos/entry1.tcl
-usr/%%DATADIR%%8.5/demos/entry2.tcl
-usr/%%DATADIR%%8.5/demos/entry3.tcl
-usr/%%DATADIR%%8.5/demos/filebox.tcl
-usr/%%DATADIR%%8.5/demos/floor.tcl
-usr/%%DATADIR%%8.5/demos/form.tcl
-usr/%%DATADIR%%8.5/demos/goldberg.tcl
-usr/%%DATADIR%%8.5/demos/hello
-usr/%%DATADIR%%8.5/demos/hscale.tcl
-usr/%%DATADIR%%8.5/demos/icon.tcl
-usr/%%DATADIR%%8.5/demos/image1.tcl
-usr/%%DATADIR%%8.5/demos/image2.tcl
-usr/%%DATADIR%%8.5/demos/images/earth.gif
-usr/%%DATADIR%%8.5/demos/images/earthris.gif
-usr/%%DATADIR%%8.5/demos/images/face.xbm
-usr/%%DATADIR%%8.5/demos/images/flagdown.xbm
-usr/%%DATADIR%%8.5/demos/images/flagup.xbm
-usr/%%DATADIR%%8.5/demos/images/gray25.xbm
-usr/%%DATADIR%%8.5/demos/images/letters.xbm
-usr/%%DATADIR%%8.5/demos/images/noletter.xbm
-usr/%%DATADIR%%8.5/demos/images/pattern.xbm
-usr/%%DATADIR%%8.5/demos/images/tcllogo.gif
-usr/%%DATADIR%%8.5/demos/images/teapot.ppm
-usr/%%DATADIR%%8.5/demos/items.tcl
-usr/%%DATADIR%%8.5/demos/ixset
-usr/%%DATADIR%%8.5/demos/knightstour.tcl
-usr/%%DATADIR%%8.5/demos/label.tcl
-usr/%%DATADIR%%8.5/demos/labelframe.tcl
-usr/%%DATADIR%%8.5/demos/license.terms
-usr/%%DATADIR%%8.5/demos/mclist.tcl
-usr/%%DATADIR%%8.5/demos/menu.tcl
-usr/%%DATADIR%%8.5/demos/menubu.tcl
-usr/%%DATADIR%%8.5/demos/msgbox.tcl
-usr/%%DATADIR%%8.5/demos/nl.msg
-usr/%%DATADIR%%8.5/demos/paned1.tcl
-usr/%%DATADIR%%8.5/demos/paned2.tcl
-usr/%%DATADIR%%8.5/demos/pendulum.tcl
-usr/%%DATADIR%%8.5/demos/plot.tcl
-usr/%%DATADIR%%8.5/demos/puzzle.tcl
-usr/%%DATADIR%%8.5/demos/radio.tcl
-usr/%%DATADIR%%8.5/demos/rmt
-usr/%%DATADIR%%8.5/demos/rolodex
-usr/%%DATADIR%%8.5/demos/ruler.tcl
-usr/%%DATADIR%%8.5/demos/sayings.tcl
-usr/%%DATADIR%%8.5/demos/search.tcl
-usr/%%DATADIR%%8.5/demos/spin.tcl
-usr/%%DATADIR%%8.5/demos/square
-usr/%%DATADIR%%8.5/demos/states.tcl
-usr/%%DATADIR%%8.5/demos/style.tcl
-usr/%%DATADIR%%8.5/demos/tclIndex
-usr/%%DATADIR%%8.5/demos/tcolor
-usr/%%DATADIR%%8.5/demos/text.tcl
-usr/%%DATADIR%%8.5/demos/textpeer.tcl
-usr/%%DATADIR%%8.5/demos/timer
-usr/%%DATADIR%%8.5/demos/toolbar.tcl
-usr/%%DATADIR%%8.5/demos/tree.tcl
-usr/%%DATADIR%%8.5/demos/ttkbut.tcl
-usr/%%DATADIR%%8.5/demos/ttkmenu.tcl
-usr/%%DATADIR%%8.5/demos/ttknote.tcl
-usr/%%DATADIR%%8.5/demos/ttkpane.tcl
-usr/%%DATADIR%%8.5/demos/ttkprogress.tcl
-usr/%%DATADIR%%8.5/demos/twind.tcl
-usr/%%DATADIR%%8.5/demos/unicodeout.tcl
-usr/%%DATADIR%%8.5/demos/vscale.tcl
-usr/%%DATADIR%%8.5/demos/widget
-usr/%%DATADIR%%8.5/dialog.tcl
-usr/%%DATADIR%%8.5/entry.tcl
-usr/%%DATADIR%%8.5/focus.tcl
-usr/%%DATADIR%%8.5/images/README
-usr/%%DATADIR%%8.5/images/logo.eps
-usr/%%DATADIR%%8.5/images/logo100.gif
-usr/%%DATADIR%%8.5/images/logo64.gif
-usr/%%DATADIR%%8.5/images/logoLarge.gif
-usr/%%DATADIR%%8.5/images/logoMed.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo.eps
-usr/%%DATADIR%%8.5/images/pwrdLogo100.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo150.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo175.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo200.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo75.gif
-usr/%%DATADIR%%8.5/images/tai-ku.gif
-usr/%%DATADIR%%8.5/listbox.tcl
-usr/%%DATADIR%%8.5/menu.tcl
-usr/%%DATADIR%%8.5/mkpsenc.tcl
-usr/%%DATADIR%%8.5/msgbox.tcl
-usr/%%DATADIR%%8.5/msgs/cs.msg
-usr/%%DATADIR%%8.5/msgs/da.msg
-usr/%%DATADIR%%8.5/msgs/de.msg
-usr/%%DATADIR%%8.5/msgs/el.msg
-usr/%%DATADIR%%8.5/msgs/en.msg
-usr/%%DATADIR%%8.5/msgs/en_gb.msg
-usr/%%DATADIR%%8.5/msgs/eo.msg
-usr/%%DATADIR%%8.5/msgs/es.msg
-usr/%%DATADIR%%8.5/msgs/fr.msg
-usr/%%DATADIR%%8.5/msgs/hu.msg
-usr/%%DATADIR%%8.5/msgs/it.msg
-usr/%%DATADIR%%8.5/msgs/nl.msg
-usr/%%DATADIR%%8.5/msgs/pl.msg
-usr/%%DATADIR%%8.5/msgs/pt.msg
-usr/%%DATADIR%%8.5/msgs/ru.msg
-usr/%%DATADIR%%8.5/msgs/sv.msg
-usr/%%DATADIR%%8.5/obsolete.tcl
-usr/%%DATADIR%%8.5/optMenu.tcl
-usr/%%DATADIR%%8.5/palette.tcl
-usr/%%DATADIR%%8.5/panedwindow.tcl
-usr/%%DATADIR%%8.5/safetk.tcl
-usr/%%DATADIR%%8.5/scale.tcl
-usr/%%DATADIR%%8.5/scrlbar.tcl
-usr/%%DATADIR%%8.5/spinbox.tcl
-usr/%%DATADIR%%8.5/tclIndex
-usr/%%DATADIR%%8.5/tearoff.tcl
-usr/%%DATADIR%%8.5/text.tcl
-usr/%%DATADIR%%8.5/tk.tcl
-usr/%%DATADIR%%8.5/tkfbox.tcl
-usr/%%DATADIR%%8.5/ttk/altTheme.tcl
-usr/%%DATADIR%%8.5/ttk/aquaTheme.tcl
-usr/%%DATADIR%%8.5/ttk/button.tcl
-usr/%%DATADIR%%8.5/ttk/clamTheme.tcl
-usr/%%DATADIR%%8.5/ttk/classicTheme.tcl
-usr/%%DATADIR%%8.5/ttk/combobox.tcl
-usr/%%DATADIR%%8.5/ttk/cursors.tcl
-usr/%%DATADIR%%8.5/ttk/defaults.tcl
-usr/%%DATADIR%%8.5/ttk/entry.tcl
-usr/%%DATADIR%%8.5/ttk/fonts.tcl
-usr/%%DATADIR%%8.5/ttk/menubutton.tcl
-usr/%%DATADIR%%8.5/ttk/notebook.tcl
-usr/%%DATADIR%%8.5/ttk/panedwindow.tcl
-usr/%%DATADIR%%8.5/ttk/progress.tcl
-usr/%%DATADIR%%8.5/ttk/scale.tcl
-usr/%%DATADIR%%8.5/ttk/scrollbar.tcl
-usr/%%DATADIR%%8.5/ttk/sizegrip.tcl
-usr/%%DATADIR%%8.5/ttk/treeview.tcl
-usr/%%DATADIR%%8.5/ttk/ttk.tcl
-usr/%%DATADIR%%8.5/ttk/utils.tcl
-usr/%%DATADIR%%8.5/ttk/winTheme.tcl
-usr/%%DATADIR%%8.5/ttk/xpTheme.tcl
-usr/%%DATADIR%%8.5/unsupported.tcl
-usr/%%DATADIR%%8.5/xmfbox.tcl
+%%DATADIR%%/bgerror.tcl
+%%DATADIR%%/button.tcl
+%%DATADIR%%/choosedir.tcl
+%%DATADIR%%/clrpick.tcl
+%%DATADIR%%/comdlg.tcl
+%%DATADIR%%/console.tcl
+%%DATADIR%%/demos/README
+%%DATADIR%%/demos/anilabel.tcl
+%%DATADIR%%/demos/aniwave.tcl
+%%DATADIR%%/demos/arrow.tcl
+%%DATADIR%%/demos/bind.tcl
+%%DATADIR%%/demos/bitmap.tcl
+%%DATADIR%%/demos/browse
+%%DATADIR%%/demos/button.tcl
+%%DATADIR%%/demos/check.tcl
+%%DATADIR%%/demos/clrpick.tcl
+%%DATADIR%%/demos/colors.tcl
+%%DATADIR%%/demos/combo.tcl
+%%DATADIR%%/demos/cscroll.tcl
+%%DATADIR%%/demos/ctext.tcl
+%%DATADIR%%/demos/dialog1.tcl
+%%DATADIR%%/demos/dialog2.tcl
+%%DATADIR%%/demos/en.msg
+%%DATADIR%%/demos/entry1.tcl
+%%DATADIR%%/demos/entry2.tcl
+%%DATADIR%%/demos/entry3.tcl
+%%DATADIR%%/demos/filebox.tcl
+%%DATADIR%%/demos/floor.tcl
+%%DATADIR%%/demos/form.tcl
+%%DATADIR%%/demos/goldberg.tcl
+%%DATADIR%%/demos/hello
+%%DATADIR%%/demos/hscale.tcl
+%%DATADIR%%/demos/icon.tcl
+%%DATADIR%%/demos/image1.tcl
+%%DATADIR%%/demos/image2.tcl
+%%DATADIR%%/demos/images/earth.gif
+%%DATADIR%%/demos/images/earthris.gif
+%%DATADIR%%/demos/images/face.xbm
+%%DATADIR%%/demos/images/flagdown.xbm
+%%DATADIR%%/demos/images/flagup.xbm
+%%DATADIR%%/demos/images/gray25.xbm
+%%DATADIR%%/demos/images/letters.xbm
+%%DATADIR%%/demos/images/noletter.xbm
+%%DATADIR%%/demos/images/pattern.xbm
+%%DATADIR%%/demos/images/tcllogo.gif
+%%DATADIR%%/demos/images/teapot.ppm
+%%DATADIR%%/demos/items.tcl
+%%DATADIR%%/demos/ixset
+%%DATADIR%%/demos/knightstour.tcl
+%%DATADIR%%/demos/label.tcl
+%%DATADIR%%/demos/labelframe.tcl
+%%DATADIR%%/demos/license.terms
+%%DATADIR%%/demos/mclist.tcl
+%%DATADIR%%/demos/menu.tcl
+%%DATADIR%%/demos/menubu.tcl
+%%DATADIR%%/demos/msgbox.tcl
+%%DATADIR%%/demos/nl.msg
+%%DATADIR%%/demos/paned1.tcl
+%%DATADIR%%/demos/paned2.tcl
+%%DATADIR%%/demos/pendulum.tcl
+%%DATADIR%%/demos/plot.tcl
+%%DATADIR%%/demos/puzzle.tcl
+%%DATADIR%%/demos/radio.tcl
+%%DATADIR%%/demos/rmt
+%%DATADIR%%/demos/rolodex
+%%DATADIR%%/demos/ruler.tcl
+%%DATADIR%%/demos/sayings.tcl
+%%DATADIR%%/demos/search.tcl
+%%DATADIR%%/demos/spin.tcl
+%%DATADIR%%/demos/square
+%%DATADIR%%/demos/states.tcl
+%%DATADIR%%/demos/style.tcl
+%%DATADIR%%/demos/tclIndex
+%%DATADIR%%/demos/tcolor
+%%DATADIR%%/demos/text.tcl
+%%DATADIR%%/demos/textpeer.tcl
+%%DATADIR%%/demos/timer
+%%DATADIR%%/demos/toolbar.tcl
+%%DATADIR%%/demos/tree.tcl
+%%DATADIR%%/demos/ttkbut.tcl
+%%DATADIR%%/demos/ttkmenu.tcl
+%%DATADIR%%/demos/ttknote.tcl
+%%DATADIR%%/demos/ttkpane.tcl
+%%DATADIR%%/demos/ttkprogress.tcl
+%%DATADIR%%/demos/twind.tcl
+%%DATADIR%%/demos/unicodeout.tcl
+%%DATADIR%%/demos/vscale.tcl
+%%DATADIR%%/demos/widget
+%%DATADIR%%/dialog.tcl
+%%DATADIR%%/entry.tcl
+%%DATADIR%%/focus.tcl
+%%DATADIR%%/images/README
+%%DATADIR%%/images/logo.eps
+%%DATADIR%%/images/logo100.gif
+%%DATADIR%%/images/logo64.gif
+%%DATADIR%%/images/logoLarge.gif
+%%DATADIR%%/images/logoMed.gif
+%%DATADIR%%/images/pwrdLogo.eps
+%%DATADIR%%/images/pwrdLogo100.gif
+%%DATADIR%%/images/pwrdLogo150.gif
+%%DATADIR%%/images/pwrdLogo175.gif
+%%DATADIR%%/images/pwrdLogo200.gif
+%%DATADIR%%/images/pwrdLogo75.gif
+%%DATADIR%%/images/tai-ku.gif
+%%DATADIR%%/listbox.tcl
+%%DATADIR%%/menu.tcl
+%%DATADIR%%/mkpsenc.tcl
+%%DATADIR%%/msgbox.tcl
+%%DATADIR%%/msgs/cs.msg
+%%DATADIR%%/msgs/da.msg
+%%DATADIR%%/msgs/de.msg
+%%DATADIR%%/msgs/el.msg
+%%DATADIR%%/msgs/en.msg
+%%DATADIR%%/msgs/en_gb.msg
+%%DATADIR%%/msgs/eo.msg
+%%DATADIR%%/msgs/es.msg
+%%DATADIR%%/msgs/fr.msg
+%%DATADIR%%/msgs/hu.msg
+%%DATADIR%%/msgs/it.msg
+%%DATADIR%%/msgs/nl.msg
+%%DATADIR%%/msgs/pl.msg
+%%DATADIR%%/msgs/pt.msg
+%%DATADIR%%/msgs/ru.msg
+%%DATADIR%%/msgs/sv.msg
+%%DATADIR%%/obsolete.tcl
+%%DATADIR%%/optMenu.tcl
+%%DATADIR%%/palette.tcl
+%%DATADIR%%/panedwindow.tcl
+%%DATADIR%%/safetk.tcl
+%%DATADIR%%/scale.tcl
+%%DATADIR%%/scrlbar.tcl
+%%DATADIR%%/spinbox.tcl
+%%DATADIR%%/tclIndex
+%%DATADIR%%/tearoff.tcl
+%%DATADIR%%/text.tcl
+%%DATADIR%%/tk.tcl
+%%DATADIR%%/tkfbox.tcl
+%%DATADIR%%/ttk/altTheme.tcl
+%%DATADIR%%/ttk/aquaTheme.tcl
+%%DATADIR%%/ttk/button.tcl
+%%DATADIR%%/ttk/clamTheme.tcl
+%%DATADIR%%/ttk/classicTheme.tcl
+%%DATADIR%%/ttk/combobox.tcl
+%%DATADIR%%/ttk/cursors.tcl
+%%DATADIR%%/ttk/defaults.tcl
+%%DATADIR%%/ttk/entry.tcl
+%%DATADIR%%/ttk/fonts.tcl
+%%DATADIR%%/ttk/menubutton.tcl
+%%DATADIR%%/ttk/notebook.tcl
+%%DATADIR%%/ttk/panedwindow.tcl
+%%DATADIR%%/ttk/progress.tcl
+%%DATADIR%%/ttk/scale.tcl
+%%DATADIR%%/ttk/scrollbar.tcl
+%%DATADIR%%/ttk/sizegrip.tcl
+%%DATADIR%%/ttk/treeview.tcl
+%%DATADIR%%/ttk/ttk.tcl
+%%DATADIR%%/ttk/utils.tcl
+%%DATADIR%%/ttk/winTheme.tcl
+%%DATADIR%%/ttk/xpTheme.tcl
+%%DATADIR%%/unsupported.tcl
+%%DATADIR%%/xmfbox.tcl
diff --git a/x11-toolkits/linux-c6-tk85/pkg-plist.x86_64 b/x11-toolkits/linux-c6-tk85/pkg-plist.x86_64
index acb77ea..7f6fbfa 100644
--- a/x11-toolkits/linux-c6-tk85/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c6-tk85/pkg-plist.x86_64
@@ -99,164 +99,164 @@ usr/share/man/mann/ttk_treeview.n.gz
 usr/share/man/mann/ttk_widget.n.gz
 usr/share/man/mann/winfo.n.gz
 usr/share/man/mann/wm.n.gz
-usr/%%DATADIR%%8.5/bgerror.tcl
-usr/%%DATADIR%%8.5/button.tcl
-usr/%%DATADIR%%8.5/choosedir.tcl
-usr/%%DATADIR%%8.5/clrpick.tcl
-usr/%%DATADIR%%8.5/comdlg.tcl
-usr/%%DATADIR%%8.5/console.tcl
-usr/%%DATADIR%%8.5/demos/README
-usr/%%DATADIR%%8.5/demos/anilabel.tcl
-usr/%%DATADIR%%8.5/demos/aniwave.tcl
-usr/%%DATADIR%%8.5/demos/arrow.tcl
-usr/%%DATADIR%%8.5/demos/bind.tcl
-usr/%%DATADIR%%8.5/demos/bitmap.tcl
-usr/%%DATADIR%%8.5/demos/browse
-usr/%%DATADIR%%8.5/demos/button.tcl
-usr/%%DATADIR%%8.5/demos/check.tcl
-usr/%%DATADIR%%8.5/demos/clrpick.tcl
-usr/%%DATADIR%%8.5/demos/colors.tcl
-usr/%%DATADIR%%8.5/demos/combo.tcl
-usr/%%DATADIR%%8.5/demos/cscroll.tcl
-usr/%%DATADIR%%8.5/demos/ctext.tcl
-usr/%%DATADIR%%8.5/demos/dialog1.tcl
-usr/%%DATADIR%%8.5/demos/dialog2.tcl
-usr/%%DATADIR%%8.5/demos/en.msg
-usr/%%DATADIR%%8.5/demos/entry1.tcl
-usr/%%DATADIR%%8.5/demos/entry2.tcl
-usr/%%DATADIR%%8.5/demos/entry3.tcl
-usr/%%DATADIR%%8.5/demos/filebox.tcl
-usr/%%DATADIR%%8.5/demos/floor.tcl
-usr/%%DATADIR%%8.5/demos/form.tcl
-usr/%%DATADIR%%8.5/demos/goldberg.tcl
-usr/%%DATADIR%%8.5/demos/hello
-usr/%%DATADIR%%8.5/demos/hscale.tcl
-usr/%%DATADIR%%8.5/demos/icon.tcl
-usr/%%DATADIR%%8.5/demos/image1.tcl
-usr/%%DATADIR%%8.5/demos/image2.tcl
-usr/%%DATADIR%%8.5/demos/images/earth.gif
-usr/%%DATADIR%%8.5/demos/images/earthris.gif
-usr/%%DATADIR%%8.5/demos/images/face.xbm
-usr/%%DATADIR%%8.5/demos/images/flagdown.xbm
-usr/%%DATADIR%%8.5/demos/images/flagup.xbm
-usr/%%DATADIR%%8.5/demos/images/gray25.xbm
-usr/%%DATADIR%%8.5/demos/images/letters.xbm
-usr/%%DATADIR%%8.5/demos/images/noletter.xbm
-usr/%%DATADIR%%8.5/demos/images/pattern.xbm
-usr/%%DATADIR%%8.5/demos/images/tcllogo.gif
-usr/%%DATADIR%%8.5/demos/images/teapot.ppm
-usr/%%DATADIR%%8.5/demos/items.tcl
-usr/%%DATADIR%%8.5/demos/ixset
-usr/%%DATADIR%%8.5/demos/knightstour.tcl
-usr/%%DATADIR%%8.5/demos/label.tcl
-usr/%%DATADIR%%8.5/demos/labelframe.tcl
-usr/%%DATADIR%%8.5/demos/license.terms
-usr/%%DATADIR%%8.5/demos/mclist.tcl
-usr/%%DATADIR%%8.5/demos/menu.tcl
-usr/%%DATADIR%%8.5/demos/menubu.tcl
-usr/%%DATADIR%%8.5/demos/msgbox.tcl
-usr/%%DATADIR%%8.5/demos/nl.msg
-usr/%%DATADIR%%8.5/demos/paned1.tcl
-usr/%%DATADIR%%8.5/demos/paned2.tcl
-usr/%%DATADIR%%8.5/demos/pendulum.tcl
-usr/%%DATADIR%%8.5/demos/plot.tcl
-usr/%%DATADIR%%8.5/demos/puzzle.tcl
-usr/%%DATADIR%%8.5/demos/radio.tcl
-usr/%%DATADIR%%8.5/demos/rmt
-usr/%%DATADIR%%8.5/demos/rolodex
-usr/%%DATADIR%%8.5/demos/ruler.tcl
-usr/%%DATADIR%%8.5/demos/sayings.tcl
-usr/%%DATADIR%%8.5/demos/search.tcl
-usr/%%DATADIR%%8.5/demos/spin.tcl
-usr/%%DATADIR%%8.5/demos/square
-usr/%%DATADIR%%8.5/demos/states.tcl
-usr/%%DATADIR%%8.5/demos/style.tcl
-usr/%%DATADIR%%8.5/demos/tclIndex
-usr/%%DATADIR%%8.5/demos/tcolor
-usr/%%DATADIR%%8.5/demos/text.tcl
-usr/%%DATADIR%%8.5/demos/textpeer.tcl
-usr/%%DATADIR%%8.5/demos/timer
-usr/%%DATADIR%%8.5/demos/toolbar.tcl
-usr/%%DATADIR%%8.5/demos/tree.tcl
-usr/%%DATADIR%%8.5/demos/ttkbut.tcl
-usr/%%DATADIR%%8.5/demos/ttkmenu.tcl
-usr/%%DATADIR%%8.5/demos/ttknote.tcl
-usr/%%DATADIR%%8.5/demos/ttkpane.tcl
-usr/%%DATADIR%%8.5/demos/ttkprogress.tcl
-usr/%%DATADIR%%8.5/demos/twind.tcl
-usr/%%DATADIR%%8.5/demos/unicodeout.tcl
-usr/%%DATADIR%%8.5/demos/vscale.tcl
-usr/%%DATADIR%%8.5/demos/widget
-usr/%%DATADIR%%8.5/dialog.tcl
-usr/%%DATADIR%%8.5/entry.tcl
-usr/%%DATADIR%%8.5/focus.tcl
-usr/%%DATADIR%%8.5/images/README
-usr/%%DATADIR%%8.5/images/logo.eps
-usr/%%DATADIR%%8.5/images/logo100.gif
-usr/%%DATADIR%%8.5/images/logo64.gif
-usr/%%DATADIR%%8.5/images/logoLarge.gif
-usr/%%DATADIR%%8.5/images/logoMed.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo.eps
-usr/%%DATADIR%%8.5/images/pwrdLogo100.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo150.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo175.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo200.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo75.gif
-usr/%%DATADIR%%8.5/images/tai-ku.gif
-usr/%%DATADIR%%8.5/listbox.tcl
-usr/%%DATADIR%%8.5/menu.tcl
-usr/%%DATADIR%%8.5/mkpsenc.tcl
-usr/%%DATADIR%%8.5/msgbox.tcl
-usr/%%DATADIR%%8.5/msgs/cs.msg
-usr/%%DATADIR%%8.5/msgs/da.msg
-usr/%%DATADIR%%8.5/msgs/de.msg
-usr/%%DATADIR%%8.5/msgs/el.msg
-usr/%%DATADIR%%8.5/msgs/en.msg
-usr/%%DATADIR%%8.5/msgs/en_gb.msg
-usr/%%DATADIR%%8.5/msgs/eo.msg
-usr/%%DATADIR%%8.5/msgs/es.msg
-usr/%%DATADIR%%8.5/msgs/fr.msg
-usr/%%DATADIR%%8.5/msgs/hu.msg
-usr/%%DATADIR%%8.5/msgs/it.msg
-usr/%%DATADIR%%8.5/msgs/nl.msg
-usr/%%DATADIR%%8.5/msgs/pl.msg
-usr/%%DATADIR%%8.5/msgs/pt.msg
-usr/%%DATADIR%%8.5/msgs/ru.msg
-usr/%%DATADIR%%8.5/msgs/sv.msg
-usr/%%DATADIR%%8.5/obsolete.tcl
-usr/%%DATADIR%%8.5/optMenu.tcl
-usr/%%DATADIR%%8.5/palette.tcl
-usr/%%DATADIR%%8.5/panedwindow.tcl
-usr/%%DATADIR%%8.5/safetk.tcl
-usr/%%DATADIR%%8.5/scale.tcl
-usr/%%DATADIR%%8.5/scrlbar.tcl
-usr/%%DATADIR%%8.5/spinbox.tcl
-usr/%%DATADIR%%8.5/tclIndex
-usr/%%DATADIR%%8.5/tearoff.tcl
-usr/%%DATADIR%%8.5/text.tcl
-usr/%%DATADIR%%8.5/tk.tcl
-usr/%%DATADIR%%8.5/tkfbox.tcl
-usr/%%DATADIR%%8.5/ttk/altTheme.tcl
-usr/%%DATADIR%%8.5/ttk/aquaTheme.tcl
-usr/%%DATADIR%%8.5/ttk/button.tcl
-usr/%%DATADIR%%8.5/ttk/clamTheme.tcl
-usr/%%DATADIR%%8.5/ttk/classicTheme.tcl
-usr/%%DATADIR%%8.5/ttk/combobox.tcl
-usr/%%DATADIR%%8.5/ttk/cursors.tcl
-usr/%%DATADIR%%8.5/ttk/defaults.tcl
-usr/%%DATADIR%%8.5/ttk/entry.tcl
-usr/%%DATADIR%%8.5/ttk/fonts.tcl
-usr/%%DATADIR%%8.5/ttk/menubutton.tcl
-usr/%%DATADIR%%8.5/ttk/notebook.tcl
-usr/%%DATADIR%%8.5/ttk/panedwindow.tcl
-usr/%%DATADIR%%8.5/ttk/progress.tcl
-usr/%%DATADIR%%8.5/ttk/scale.tcl
-usr/%%DATADIR%%8.5/ttk/scrollbar.tcl
-usr/%%DATADIR%%8.5/ttk/sizegrip.tcl
-usr/%%DATADIR%%8.5/ttk/treeview.tcl
-usr/%%DATADIR%%8.5/ttk/ttk.tcl
-usr/%%DATADIR%%8.5/ttk/utils.tcl
-usr/%%DATADIR%%8.5/ttk/winTheme.tcl
-usr/%%DATADIR%%8.5/ttk/xpTheme.tcl
-usr/%%DATADIR%%8.5/unsupported.tcl
-usr/%%DATADIR%%8.5/xmfbox.tcl
+%%DATADIR%%/bgerror.tcl
+%%DATADIR%%/button.tcl
+%%DATADIR%%/choosedir.tcl
+%%DATADIR%%/clrpick.tcl
+%%DATADIR%%/comdlg.tcl
+%%DATADIR%%/console.tcl
+%%DATADIR%%/demos/README
+%%DATADIR%%/demos/anilabel.tcl
+%%DATADIR%%/demos/aniwave.tcl
+%%DATADIR%%/demos/arrow.tcl
+%%DATADIR%%/demos/bind.tcl
+%%DATADIR%%/demos/bitmap.tcl
+%%DATADIR%%/demos/browse
+%%DATADIR%%/demos/button.tcl
+%%DATADIR%%/demos/check.tcl
+%%DATADIR%%/demos/clrpick.tcl
+%%DATADIR%%/demos/colors.tcl
+%%DATADIR%%/demos/combo.tcl
+%%DATADIR%%/demos/cscroll.tcl
+%%DATADIR%%/demos/ctext.tcl
+%%DATADIR%%/demos/dialog1.tcl
+%%DATADIR%%/demos/dialog2.tcl
+%%DATADIR%%/demos/en.msg
+%%DATADIR%%/demos/entry1.tcl
+%%DATADIR%%/demos/entry2.tcl
+%%DATADIR%%/demos/entry3.tcl
+%%DATADIR%%/demos/filebox.tcl
+%%DATADIR%%/demos/floor.tcl
+%%DATADIR%%/demos/form.tcl
+%%DATADIR%%/demos/goldberg.tcl
+%%DATADIR%%/demos/hello
+%%DATADIR%%/demos/hscale.tcl
+%%DATADIR%%/demos/icon.tcl
+%%DATADIR%%/demos/image1.tcl
+%%DATADIR%%/demos/image2.tcl
+%%DATADIR%%/demos/images/earth.gif
+%%DATADIR%%/demos/images/earthris.gif
+%%DATADIR%%/demos/images/face.xbm
+%%DATADIR%%/demos/images/flagdown.xbm
+%%DATADIR%%/demos/images/flagup.xbm
+%%DATADIR%%/demos/images/gray25.xbm
+%%DATADIR%%/demos/images/letters.xbm
+%%DATADIR%%/demos/images/noletter.xbm
+%%DATADIR%%/demos/images/pattern.xbm
+%%DATADIR%%/demos/images/tcllogo.gif
+%%DATADIR%%/demos/images/teapot.ppm
+%%DATADIR%%/demos/items.tcl
+%%DATADIR%%/demos/ixset
+%%DATADIR%%/demos/knightstour.tcl
+%%DATADIR%%/demos/label.tcl
+%%DATADIR%%/demos/labelframe.tcl
+%%DATADIR%%/demos/license.terms
+%%DATADIR%%/demos/mclist.tcl
+%%DATADIR%%/demos/menu.tcl
+%%DATADIR%%/demos/menubu.tcl
+%%DATADIR%%/demos/msgbox.tcl
+%%DATADIR%%/demos/nl.msg
+%%DATADIR%%/demos/paned1.tcl
+%%DATADIR%%/demos/paned2.tcl
+%%DATADIR%%/demos/pendulum.tcl
+%%DATADIR%%/demos/plot.tcl
+%%DATADIR%%/demos/puzzle.tcl
+%%DATADIR%%/demos/radio.tcl
+%%DATADIR%%/demos/rmt
+%%DATADIR%%/demos/rolodex
+%%DATADIR%%/demos/ruler.tcl
+%%DATADIR%%/demos/sayings.tcl
+%%DATADIR%%/demos/search.tcl
+%%DATADIR%%/demos/spin.tcl
+%%DATADIR%%/demos/square
+%%DATADIR%%/demos/states.tcl
+%%DATADIR%%/demos/style.tcl
+%%DATADIR%%/demos/tclIndex
+%%DATADIR%%/demos/tcolor
+%%DATADIR%%/demos/text.tcl
+%%DATADIR%%/demos/textpeer.tcl
+%%DATADIR%%/demos/timer
+%%DATADIR%%/demos/toolbar.tcl
+%%DATADIR%%/demos/tree.tcl
+%%DATADIR%%/demos/ttkbut.tcl
+%%DATADIR%%/demos/ttkmenu.tcl
+%%DATADIR%%/demos/ttknote.tcl
+%%DATADIR%%/demos/ttkpane.tcl
+%%DATADIR%%/demos/ttkprogress.tcl
+%%DATADIR%%/demos/twind.tcl
+%%DATADIR%%/demos/unicodeout.tcl
+%%DATADIR%%/demos/vscale.tcl
+%%DATADIR%%/demos/widget
+%%DATADIR%%/dialog.tcl
+%%DATADIR%%/entry.tcl
+%%DATADIR%%/focus.tcl
+%%DATADIR%%/images/README
+%%DATADIR%%/images/logo.eps
+%%DATADIR%%/images/logo100.gif
+%%DATADIR%%/images/logo64.gif
+%%DATADIR%%/images/logoLarge.gif
+%%DATADIR%%/images/logoMed.gif
+%%DATADIR%%/images/pwrdLogo.eps
+%%DATADIR%%/images/pwrdLogo100.gif
+%%DATADIR%%/images/pwrdLogo150.gif
+%%DATADIR%%/images/pwrdLogo175.gif
+%%DATADIR%%/images/pwrdLogo200.gif
+%%DATADIR%%/images/pwrdLogo75.gif
+%%DATADIR%%/images/tai-ku.gif
+%%DATADIR%%/listbox.tcl
+%%DATADIR%%/menu.tcl
+%%DATADIR%%/mkpsenc.tcl
+%%DATADIR%%/msgbox.tcl
+%%DATADIR%%/msgs/cs.msg
+%%DATADIR%%/msgs/da.msg
+%%DATADIR%%/msgs/de.msg
+%%DATADIR%%/msgs/el.msg
+%%DATADIR%%/msgs/en.msg
+%%DATADIR%%/msgs/en_gb.msg
+%%DATADIR%%/msgs/eo.msg
+%%DATADIR%%/msgs/es.msg
+%%DATADIR%%/msgs/fr.msg
+%%DATADIR%%/msgs/hu.msg
+%%DATADIR%%/msgs/it.msg
+%%DATADIR%%/msgs/nl.msg
+%%DATADIR%%/msgs/pl.msg
+%%DATADIR%%/msgs/pt.msg
+%%DATADIR%%/msgs/ru.msg
+%%DATADIR%%/msgs/sv.msg
+%%DATADIR%%/obsolete.tcl
+%%DATADIR%%/optMenu.tcl
+%%DATADIR%%/palette.tcl
+%%DATADIR%%/panedwindow.tcl
+%%DATADIR%%/safetk.tcl
+%%DATADIR%%/scale.tcl
+%%DATADIR%%/scrlbar.tcl
+%%DATADIR%%/spinbox.tcl
+%%DATADIR%%/tclIndex
+%%DATADIR%%/tearoff.tcl
+%%DATADIR%%/text.tcl
+%%DATADIR%%/tk.tcl
+%%DATADIR%%/tkfbox.tcl
+%%DATADIR%%/ttk/altTheme.tcl
+%%DATADIR%%/ttk/aquaTheme.tcl
+%%DATADIR%%/ttk/button.tcl
+%%DATADIR%%/ttk/clamTheme.tcl
+%%DATADIR%%/ttk/classicTheme.tcl
+%%DATADIR%%/ttk/combobox.tcl
+%%DATADIR%%/ttk/cursors.tcl
+%%DATADIR%%/ttk/defaults.tcl
+%%DATADIR%%/ttk/entry.tcl
+%%DATADIR%%/ttk/fonts.tcl
+%%DATADIR%%/ttk/menubutton.tcl
+%%DATADIR%%/ttk/notebook.tcl
+%%DATADIR%%/ttk/panedwindow.tcl
+%%DATADIR%%/ttk/progress.tcl
+%%DATADIR%%/ttk/scale.tcl
+%%DATADIR%%/ttk/scrollbar.tcl
+%%DATADIR%%/ttk/sizegrip.tcl
+%%DATADIR%%/ttk/treeview.tcl
+%%DATADIR%%/ttk/ttk.tcl
+%%DATADIR%%/ttk/utils.tcl
+%%DATADIR%%/ttk/winTheme.tcl
+%%DATADIR%%/ttk/xpTheme.tcl
+%%DATADIR%%/unsupported.tcl
+%%DATADIR%%/xmfbox.tcl
diff --git a/x11-toolkits/linux-f10-blt/Makefile b/x11-toolkits/linux-f10-blt/Makefile
index 4fe004f..6271346 100644
--- a/x11-toolkits/linux-f10-blt/Makefile
+++ b/x11-toolkits/linux-f10-blt/Makefile
@@ -9,9 +9,9 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	devel@stasyan.com
 COMMENT=	BLT widget extension to Tcl/Tk scripting language development (Linux Fedora 10)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	tcl85 tk85 xorglibs
+USE_LINUX=	tcl85 tk85 xorglibs
 
 RPMVERSION=	28.z.fc10
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 4e30748..72282a8 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -5,48 +5,43 @@ PORTNAME=	gtk2
 PORTVERSION=	2.14.7
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-
-DISTFILES=	${DISTNAME}.${LINUX_RPM_ARCH}.rpm \
-		${PORTNAME}-engines-2.16.1-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		gtk-murrine-engine-0.53.1-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		gtk-nodoka-engine-0.7.2-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		gtk-qt-engine-1.1-2.fc10.${LINUX_RPM_ARCH}.rpm \
-		gtk-rezlooks-engine-0.6-6.fc9.${LINUX_RPM_ARCH}.rpm \
-		gtk-xfce-engine-2.4.3-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		pixman-0.12.0-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		jasper-libs-1.900.1-8.fc9.${LINUX_RPM_ARCH}.rpm
+BIN_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-engines-2.16.1-1.fc10${EXTRACT_SUFX} \
+		gtk-murrine-engine-0.53.1-3.fc10${EXTRACT_SUFX} \
+		gtk-nodoka-engine-0.7.2-1.fc10${EXTRACT_SUFX} \
+		gtk-qt-engine-1.1-2.fc10${EXTRACT_SUFX} \
+		gtk-rezlooks-engine-0.6-6.fc9${EXTRACT_SUFX} \
+		gtk-xfce-engine-2.4.3-1.fc10${EXTRACT_SUFX} \
+		pixman-0.12.0-3.fc10${EXTRACT_SUFX} \
+		jasper-libs-1.900.1-8.fc9${EXTRACT_SUFX}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X (Linux Fedora 10)
 
 CONFLICTS=	linux-gtk2-[0-9]* linux-f8-gtk2-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
-USE_LINUX_RPM=	yes
+USES=		linux:f10
 # these libraries are required by gtk-query-immodules-2.0 or
 # gdk-pixbuf-query-loaders
-USE_LINUX_APPS=	atk jpeg pango png tiff xorglibs
+USE_LINUX=	atk jpeg pango png tiff xorglibs
+USE_LINUX_RPM=	nolib
 
 RPMVERSION=	9.fc10
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}0/pkg-descr
-SRC_DISTFILES=	${DISTNAME}.src.rpm \
-		${PORTNAME}-engines-2.16.1-1.fc10.src.rpm \
-		gtk-murrine-engine-0.53.1-3.fc10.src.rpm \
-		gtk-nodoka-engine-0.7.2-1.fc10.src.rpm \
-		gtk-qt-engine-1.1-2.fc10.src.rpm \
-		gtk-rezlooks-engine-0.6-6.fc9.src.rpm \
-		gtk-xfce-engine-2.4.3-1.fc10.src.rpm \
-		pixman-0.12.0-3.fc10.src.rpm \
-		jasper-1.900.1-8.fc9.src.rpm
+SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE \
+		${PORTNAME}-engines-2.16.1-1.fc10.src.rpm:SOURCE \
+		gtk-murrine-engine-0.53.1-3.fc10.src.rpm:SOURCE \
+		gtk-nodoka-engine-0.7.2-1.fc10.src.rpm:SOURCE \
+		gtk-qt-engine-1.1-2.fc10.src.rpm:SOURCE \
+		gtk-rezlooks-engine-0.6-6.fc9.src.rpm:SOURCE \
+		gtk-xfce-engine-2.4.3-1.fc10.src.rpm:SOURCE \
+		pixman-0.12.0-3.fc10.src.rpm:SOURCE \
+		jasper-1.900.1-8.fc9.src.rpm:SOURCE
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/usr/lib/gtk-2.0/modules/libferret.la
 	${RM} ${STAGEDIR}${PREFIX}/usr/lib/gtk-2.0/modules/libgail.la
 
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-openmotif/Makefile b/x11-toolkits/linux-f10-openmotif/Makefile
index f0e2c83..b0d9d4a 100644
--- a/x11-toolkits/linux-f10-openmotif/Makefile
+++ b/x11-toolkits/linux-f10-openmotif/Makefile
@@ -12,11 +12,10 @@ COMMENT=	Motif toolkit Linux libraries
 
 CONFLICTS=	linux-openmotif-[0-9]* linux-f8-openmotif-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 RPMVERSION=	1.fc10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	xorglibs
+USE_LINUX=	xorglibs
 USE_LDCONFIG=	yes
 SRC_DISTFILES=
 DISTINFO_FILE=	${MASTERDIR}/distinfo.i386
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index 30f2c13..1df9b0a 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -5,20 +5,18 @@ PORTNAME=	pango
 PORTVERSION=	1.28.3
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	LOCAL/netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
+MASTER_SITES=	LOCAL/netchild/rpms/fedora10
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Pango library (Linux Fedora 10)
 
 CONFLICTS=	linux-pango-[0-9]* linux-f8-pango-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 # these libraries are required by pango-querymodules
-USE_LINUX_APPS=	cairo expat fontconfig xorglibs
+USE_LINUX=	cairo expat fontconfig xorglibs
 RPMVERSION=	1.fc10
-BRANDELF_FILES=	usr/bin/pango-querymodules-32
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/x11-toolkits/linux-f10-qt45/Makefile b/x11-toolkits/linux-f10-qt45/Makefile
index 18a9ace..31062a74 100644
--- a/x11-toolkits/linux-f10-qt45/Makefile
+++ b/x11-toolkits/linux-f10-qt45/Makefile
@@ -1,20 +1,18 @@
 # $FreeBSD$
 
-PORTNAME=	${LINUX_NAME}45
+PORTNAME=	qt45
 PORTVERSION=	4.5.3
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/10/i386/ \
 		http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/10/SRPMS/
 DISTNAME=	qt-${PORTVERSION}-${RPMVERSION}
 
-
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of QT4 (Linux Fedora 10)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	fontconfig libmng png
-LINUX_NAME=	qt
+USE_LINUX=	fontconfig libmng png
 
 RPMVERSION=	9.fc10
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/linux-f10-tk85/Makefile b/x11-toolkits/linux-f10-tk85/Makefile
index a6c6ae6..345df45 100644
--- a/x11-toolkits/linux-f10-tk85/Makefile
+++ b/x11-toolkits/linux-f10-tk85/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	tk
 PORTVERSION=	8.5.3
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 PKGNAMESUFFIX=	85
 
@@ -14,13 +13,12 @@ COMMENT=	Graphical toolkit for TCL (Linux Fedora 10)
 
 CONFLICTS=	linux-f8-tk84-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 USE_LINUX_RPM_BAD_PERMS=	yes
-USE_LINUX_APPS=	xorglibs
+USE_LINUX=	xorglibs
 
 RPMVERSION=	5.fc10
-BRANELF_FILES=	usr/bin/wish8.5
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
diff --git a/x11/linux-c6-pixman/Makefile b/x11/linux-c6-pixman/Makefile
index f9f2947..9fcdec9 100644
--- a/x11/linux-c6-pixman/Makefile
+++ b/x11/linux-c6-pixman/Makefile
@@ -7,10 +7,9 @@ CATEGORIES=	x11 linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Low-level pixel manipulation library (Linux CentOS ${LINUX_DIST_VER})
 
-ONLY_FOR_ARCHS=	amd64 i386
 RPMVERSION=	1.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
-USE_LINUX=	c6
 USE_LINUX_RPM=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/x11/linux-c6-xorg-libs/Makefile b/x11/linux-c6-xorg-libs/Makefile
index f966feb..a369d01 100644
--- a/x11/linux-c6-xorg-libs/Makefile
+++ b/x11/linux-c6-xorg-libs/Makefile
@@ -5,44 +5,40 @@ PORTNAME=	xorg-libs
 PORTVERSION=	7.4
 PORTREVISION=	5
 CATEGORIES=	x11 linux
-MASTER_SITES=	CENTOS_LINUX CENTOS_LINUX_UPDATES
-DISTFILES:=	#hack
-LIB_DISTFILES=	libICE-1.0.6-1.el6.${LINUX_RPM_ARCH}.rpm \
-		libSM-1.2.1-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libX11-1.6.3-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXScrnSaver-1.2.2-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXau-1.0.6-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libXaw-1.0.11-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXcomposite-0.4.3-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libXcursor-1.1.14-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXdamage-1.1.3-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libXdmcp-1.1.1-3.el6.${LINUX_RPM_ARCH}.rpm \
-		libXevie-1.0.3-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libXext-1.3.3-1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXfixes-5.0.1-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXfont-1.5.1-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXft-2.3.2-1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXi-1.7.4-1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXinerama-1.1.3-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXmu-1.1.1-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXp-1.0.2-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXpm-3.5.10-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libXrandr-1.4.2-1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXrender-0.9.8-2.1.el6_8.1.${LINUX_RPM_ARCH}.rpm \
-		libXres-1.0.7-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXt-1.1.4-6.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXtst-1.2.2-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXv-1.0.9-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXvMC-1.0.8-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXxf86dga-1.1.4-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libXxf86misc-1.0.3-4.el6.${LINUX_RPM_ARCH}.rpm \
-		libXxf86vm-1.1.3-2.1.el6.${LINUX_RPM_ARCH}.rpm \
-		libfontenc-1.1.2-3.el6.${LINUX_RPM_ARCH}.rpm \
-		libxcb-1.11-2.el6.${LINUX_RPM_ARCH}.rpm \
-		libxkbfile-1.0.6-1.1.el6.${LINUX_RPM_ARCH}.rpm \
-		mesa-libGLw-6.5.1-10.el6.${LINUX_RPM_ARCH}.rpm
-
-.if defined(PACKAGE_BUILDING)
+LIB_DISTFILES=	libICE-1.0.6-1.el6${EXTRACT_SUFX} \
+		libSM-1.2.1-2.el6${EXTRACT_SUFX} \
+		libX11-1.6.3-2.el6${EXTRACT_SUFX} \
+		libXScrnSaver-1.2.2-2.el6${EXTRACT_SUFX} \
+		libXau-1.0.6-4.el6${EXTRACT_SUFX} \
+		libXaw-1.0.11-2.el6${EXTRACT_SUFX} \
+		libXcomposite-0.4.3-4.el6${EXTRACT_SUFX} \
+		libXcursor-1.1.14-2.1.el6${EXTRACT_SUFX} \
+		libXdamage-1.1.3-4.el6${EXTRACT_SUFX} \
+		libXdmcp-1.1.1-3.el6${EXTRACT_SUFX} \
+		libXevie-1.0.3-4.el6${EXTRACT_SUFX} \
+		libXext-1.3.3-1.el6${EXTRACT_SUFX} \
+		libXfixes-5.0.1-2.1.el6${EXTRACT_SUFX} \
+		libXfont-1.5.1-2.el6${EXTRACT_SUFX} \
+		libXft-2.3.2-1.el6${EXTRACT_SUFX} \
+		libXi-1.7.4-1.el6${EXTRACT_SUFX} \
+		libXinerama-1.1.3-2.1.el6${EXTRACT_SUFX} \
+		libXmu-1.1.1-2.el6${EXTRACT_SUFX} \
+		libXp-1.0.2-2.1.el6${EXTRACT_SUFX} \
+		libXpm-3.5.10-2.el6${EXTRACT_SUFX} \
+		libXrandr-1.4.2-1.el6${EXTRACT_SUFX} \
+		libXrender-0.9.8-2.1.el6_8.1${EXTRACT_SUFX} \
+		libXres-1.0.7-2.1.el6${EXTRACT_SUFX} \
+		libXt-1.1.4-6.1.el6${EXTRACT_SUFX} \
+		libXtst-1.2.2-2.1.el6${EXTRACT_SUFX} \
+		libXv-1.0.9-2.1.el6${EXTRACT_SUFX} \
+		libXvMC-1.0.8-2.1.el6${EXTRACT_SUFX} \
+		libXxf86dga-1.1.4-2.1.el6${EXTRACT_SUFX} \
+		libXxf86misc-1.0.3-4.el6${EXTRACT_SUFX} \
+		libXxf86vm-1.1.3-2.1.el6${EXTRACT_SUFX} \
+		libfontenc-1.1.2-3.el6${EXTRACT_SUFX} \
+		libxcb-1.11-2.el6${EXTRACT_SUFX} \
+		libxkbfile-1.0.6-1.1.el6${EXTRACT_SUFX} \
+		mesa-libGLw-6.5.1-10.el6${EXTRACT_SUFX}
 SRC_DISTFILES=	libICE-1.0.6-1.el6.src.rpm:SOURCE \
 		libSM-1.2.1-2.el6.src.rpm:SOURCE \
 		libX11-1.6.3-2.el6.src.rpm:SOURCE \
@@ -77,20 +73,15 @@ SRC_DISTFILES=	libICE-1.0.6-1.el6.src.rpm:SOURCE \
 		libxcb-1.11-2.el6.src.rpm:SOURCE \
 		libxkbfile-1.0.6-1.1.el6.src.rpm:SOURCE \
 		mesa-libGLw-6.5.1-10.el6.src.rpm:SOURCE
-.endif
-
-MAINTAINER=		emulation@FreeBSD.org
-COMMENT=		Xorg libraries (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=		linux-xorg-libs-[0-9]* linux-f8-xorg-libs-[0-9]* linux-f10-xorg-libs-[0-9]*
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Xorg libraries (Linux CentOS ${LINUX_DIST_VER})
 
-USE_LINUX=	c6
-USE_LINUX_APPS=		fontconfig
-USE_LINUX_RPM=		yes
-USE_LDCONFIG=		yes
+CONFLICTS=	linux-xorg-libs-[0-9]* linux-f8-xorg-libs-[0-9]* linux-f10-xorg-libs-[0-9]*
 
-#post-install:
-#	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ld.so.conf.d
-#	@${INSTALL_DATA} ${FILESDIR}/xorg-x11-i386.conf ${STAGEDIR}${PREFIX}/etc/ld.so.conf.d
+USES=		linux:c6
+USE_LDCONFIG=	yes
+USE_LINUX=	fontconfig
+USE_LINUX_RPM=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/linux-f10-xorg-libs/Makefile b/x11/linux-f10-xorg-libs/Makefile
index f2a782e..9552214 100644
--- a/x11/linux-f10-xorg-libs/Makefile
+++ b/x11/linux-f10-xorg-libs/Makefile
@@ -3,101 +3,89 @@
 
 PORTNAME=	xorg-libs
 PORTVERSION=	7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
+BIN_DISTFILES=	libICE-1.0.4-4.fc10${EXTRACT_SUFX} \
+		libFS-1.0.1-2.fc10${EXTRACT_SUFX} \
+		libSM-1.1.0-2.fc10${EXTRACT_SUFX} \
+		libX11-1.1.5-4.fc10${EXTRACT_SUFX} \
+		libXScrnSaver-1.1.3-1.fc10${EXTRACT_SUFX} \
+		libXTrap-1.0.0-6.fc10${EXTRACT_SUFX} \
+		libXau-1.0.4-1.fc10${EXTRACT_SUFX} \
+		libXaw-1.0.4-3.fc10${EXTRACT_SUFX} \
+		libXcomposite-0.4.0-5.fc10${EXTRACT_SUFX} \
+		libXcursor-1.1.9-3.fc10${EXTRACT_SUFX} \
+		libXdamage-1.1.1-4.fc9${EXTRACT_SUFX} \
+		libXdmcp-1.0.2-6.fc10${EXTRACT_SUFX} \
+		libXevie-1.0.2-4.fc10${EXTRACT_SUFX} \
+		libXext-1.0.4-1.fc9${EXTRACT_SUFX} \
+		libXfixes-4.0.3-4.fc10${EXTRACT_SUFX} \
+		libXfont-1.3.3-1.fc10${EXTRACT_SUFX} \
+		libXft-2.1.13-1.fc10${EXTRACT_SUFX} \
+		libXi-1.1.3-4.fc9${EXTRACT_SUFX} \
+		libXinerama-1.0.3-2.fc10${EXTRACT_SUFX} \
+		libXmu-1.0.4-1.fc9${EXTRACT_SUFX} \
+		libXp-1.0.0-11.fc9${EXTRACT_SUFX} \
+		libXpm-3.5.7-4.fc9${EXTRACT_SUFX} \
+		libXrandr-1.2.3-1.fc10${EXTRACT_SUFX} \
+		libXrender-0.9.4-3.fc9${EXTRACT_SUFX} \
+		libXres-1.0.3-5.fc10${EXTRACT_SUFX} \
+		libXt-1.0.5-1.fc10${EXTRACT_SUFX} \
+		libXtst-1.0.3-3.fc9${EXTRACT_SUFX} \
+		libXv-1.0.4-1.fc10${EXTRACT_SUFX} \
+		libXvMC-1.0.4-5.fc10${EXTRACT_SUFX} \
+		libXxf86dga-1.0.2-3.fc10${EXTRACT_SUFX} \
+		libXxf86misc-1.0.1-6.fc10${EXTRACT_SUFX} \
+		libXxf86vm-1.0.2-1.fc10${EXTRACT_SUFX} \
+		libfontenc-1.0.4-6.fc10${EXTRACT_SUFX} \
+		libxcb-1.1.91-5.fc10${EXTRACT_SUFX} \
+		libxkbfile-1.0.4-5.fc9${EXTRACT_SUFX} \
+		mesa-libGLw-6.5.1-5.fc9${EXTRACT_SUFX}
+SRC_DISTFILES=	libICE-1.0.4-4.fc10.src.rpm:SOURCE \
+		libFS-1.0.1-2.fc10.src.rpm:SOURCE \
+		libSM-1.1.0-2.fc10.src.rpm:SOURCE \
+		libX11-1.1.5-4.fc10.src.rpm:SOURCE \
+		libXScrnSaver-1.1.3-1.fc10.src.rpm:SOURCE \
+		libXTrap-1.0.0-6.fc10.src.rpm:SOURCE \
+		libXau-1.0.4-1.fc10.src.rpm:SOURCE \
+		libXaw-1.0.4-3.fc10.src.rpm:SOURCE \
+		libXcomposite-0.4.0-5.fc10.src.rpm:SOURCE \
+		libXcursor-1.1.9-3.fc10.src.rpm:SOURCE \
+		libXdamage-1.1.1-4.fc9.src.rpm:SOURCE \
+		libXdmcp-1.0.2-6.fc10.src.rpm:SOURCE \
+		libXevie-1.0.2-4.fc10.src.rpm:SOURCE \
+		libXext-1.0.4-1.fc9.src.rpm:SOURCE \
+		libXfixes-4.0.3-4.fc10.src.rpm:SOURCE \
+		libXfont-1.3.3-1.fc10.src.rpm:SOURCE \
+		libXft-2.1.13-1.fc10.src.rpm:SOURCE \
+		libXi-1.1.3-4.fc9.src.rpm:SOURCE \
+		libXinerama-1.0.3-2.fc10.src.rpm:SOURCE \
+		libXmu-1.0.4-1.fc9.src.rpm:SOURCE \
+		libXp-1.0.0-11.fc9.src.rpm:SOURCE \
+		libXpm-3.5.7-4.fc9.src.rpm:SOURCE \
+		libXrandr-1.2.3-1.fc10.src.rpm:SOURCE \
+		libXrender-0.9.4-3.fc9.src.rpm:SOURCE \
+		libXres-1.0.3-5.fc10.src.rpm:SOURCE \
+		libXt-1.0.5-1.fc10.src.rpm:SOURCE \
+		libXtst-1.0.3-3.fc9.src.rpm:SOURCE \
+		libXv-1.0.4-1.fc10.src.rpm:SOURCE \
+		libXvMC-1.0.4-5.fc10.src.rpm:SOURCE \
+		libXxf86dga-1.0.2-3.fc10.src.rpm:SOURCE \
+		libXxf86misc-1.0.1-6.fc10.src.rpm:SOURCE \
+		libXxf86vm-1.0.2-1.fc10.src.rpm:SOURCE \
+		libfontenc-1.0.4-6.fc10.src.rpm:SOURCE \
+		libxcb-1.1.91-5.fc10.src.rpm:SOURCE \
+		libxkbfile-1.0.4-5.fc9.src.rpm:SOURCE \
+		mesa-libGLw-6.5.1-5.fc9.src.rpm:SOURCE
 
-DISTFILES=	libICE-1.0.4-4.fc10.${LINUX_RPM_ARCH}.rpm \
-		libFS-1.0.1-2.fc10.${LINUX_RPM_ARCH}.rpm \
-		libSM-1.1.0-2.fc10.${LINUX_RPM_ARCH}.rpm \
-		libX11-1.1.5-4.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXScrnSaver-1.1.3-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXTrap-1.0.0-6.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXau-1.0.4-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXaw-1.0.4-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXcomposite-0.4.0-5.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXcursor-1.1.9-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXdamage-1.1.1-4.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXdmcp-1.0.2-6.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXevie-1.0.2-4.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXext-1.0.4-1.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXfixes-4.0.3-4.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXfont-1.3.3-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXft-2.1.13-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXi-1.1.3-4.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXinerama-1.0.3-2.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXmu-1.0.4-1.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXp-1.0.0-11.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXpm-3.5.7-4.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXrandr-1.2.3-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXrender-0.9.4-3.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXres-1.0.3-5.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXt-1.0.5-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXtst-1.0.3-3.fc9.${LINUX_RPM_ARCH}.rpm \
-		libXv-1.0.4-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXvMC-1.0.4-5.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXxf86dga-1.0.2-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXxf86misc-1.0.1-6.fc10.${LINUX_RPM_ARCH}.rpm \
-		libXxf86vm-1.0.2-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		libfontenc-1.0.4-6.fc10.${LINUX_RPM_ARCH}.rpm \
-		libxcb-1.1.91-5.fc10.${LINUX_RPM_ARCH}.rpm \
-		libxkbfile-1.0.4-5.fc9.${LINUX_RPM_ARCH}.rpm \
-		mesa-libGLw-6.5.1-5.fc9.${LINUX_RPM_ARCH}.rpm
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Xorg libraries (Linux Fedora 10)
 
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	libICE-1.0.4-4.fc10.src.rpm \
-		libFS-1.0.1-2.fc10.src.rpm \
-		libSM-1.1.0-2.fc10.src.rpm \
-		libX11-1.1.5-4.fc10.src.rpm \
-		libXScrnSaver-1.1.3-1.fc10.src.rpm \
-		libXTrap-1.0.0-6.fc10.src.rpm \
-		libXau-1.0.4-1.fc10.src.rpm \
-		libXaw-1.0.4-3.fc10.src.rpm \
-		libXcomposite-0.4.0-5.fc10.src.rpm \
-		libXcursor-1.1.9-3.fc10.src.rpm \
-		libXdamage-1.1.1-4.fc9.src.rpm \
-		libXdmcp-1.0.2-6.fc10.src.rpm \
-		libXevie-1.0.2-4.fc10.src.rpm \
-		libXext-1.0.4-1.fc9.src.rpm \
-		libXfixes-4.0.3-4.fc10.src.rpm \
-		libXfont-1.3.3-1.fc10.src.rpm \
-		libXft-2.1.13-1.fc10.src.rpm \
-		libXi-1.1.3-4.fc9.src.rpm \
-		libXinerama-1.0.3-2.fc10.src.rpm \
-		libXmu-1.0.4-1.fc9.src.rpm \
-		libXp-1.0.0-11.fc9.src.rpm \
-		libXpm-3.5.7-4.fc9.src.rpm \
-		libXrandr-1.2.3-1.fc10.src.rpm \
-		libXrender-0.9.4-3.fc9.src.rpm \
-		libXres-1.0.3-5.fc10.src.rpm \
-		libXt-1.0.5-1.fc10.src.rpm \
-		libXtst-1.0.3-3.fc9.src.rpm \
-		libXv-1.0.4-1.fc10.src.rpm \
-		libXvMC-1.0.4-5.fc10.src.rpm \
-		libXxf86dga-1.0.2-3.fc10.src.rpm \
-		libXxf86misc-1.0.1-6.fc10.src.rpm \
-		libXxf86vm-1.0.2-1.fc10.src.rpm \
-		libfontenc-1.0.4-6.fc10.src.rpm \
-		libxcb-1.1.91-5.fc10.src.rpm \
-		libxkbfile-1.0.4-5.fc9.src.rpm \
-		mesa-libGLw-6.5.1-5.fc9.src.rpm
+CONFLICTS=	linux-xorg-libs-[0-9]* linux-f8-xorg-libs-[0-9]*
 
-ALWAYS_KEEP_DISTFILES=	YES
-.endif
-
-CONFLICTS=		linux-xorg-libs-[0-9]* linux-f8-xorg-libs-[0-9]*
-
-MAINTAINER=		emulation@FreeBSD.org
-COMMENT=		Xorg libraries (Linux Fedora 10)
-
-USE_LINUX=	f10
-USE_LINUX_RPM=		yes
-USE_LINUX_APPS=		fontconfig
-
-USE_LDCONFIG=		yes
-
-post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ld.so.conf.d
-	@${INSTALL_DATA} ${FILESDIR}/xorg-x11-i386.conf ${STAGEDIR}${PREFIX}/etc/ld.so.conf.d
+USES=		linux:f10
+USE_LDCONFIG=	yes
+USE_LINUX=	fontconfig
+USE_LINUX_RPM=	nolib
 
 .include <bsd.port.mk>
diff --git a/x11/linux-f10-xorg-libs/pkg-plist b/x11/linux-f10-xorg-libs/pkg-plist
index 0a25a44..4bdb706 100644
--- a/x11/linux-f10-xorg-libs/pkg-plist
+++ b/x11/linux-f10-xorg-libs/pkg-plist
@@ -1,5 +1,3 @@
-@comment file listing
-etc/ld.so.conf.d/xorg-x11-i386.conf
 usr/lib/libFS.so.6
 usr/lib/libFS.so.6.0.0
 usr/lib/libGLw.so.1
@@ -419,5 +417,4 @@ usr/share/doc/libxkbfile-1.0.4/COPYING
 usr/share/doc/libxkbfile-1.0.4/ChangeLog
 usr/share/doc/mesa-libGLw-6.5.1/README
 usr/share/icons/default/index.theme
-@comment deal with empty directories installed by the port
 @dir usr/share/X11/app-defaults
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index b57a658..39542b7 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -96,7 +96,7 @@ PLIST_SUB+=	LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
 
 .if ${PORT_OPTIONS:MLINUX}
 CONFLICTS_INSTALL=	linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
-USE_LINUX=	yes
+USES+=		linux
 PLIST_SUB+=	LINUX=""
 .else
 PLIST_SUB+=	LINUX="@comment "