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

22 files changed, 68 insertions, 101 deletions

diff --git a/security/hamachi/Makefile b/security/hamachi/Makefile
index fcc7f1c25fad..87ed335d1384 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 b39f52a38750..a11ffdfbbe43 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 28f4db9441f0..dda3e25ecdfb 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 41ec6ce2809c..fb513775c145 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 ecdc3be64231..f535af084380 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 55d918c1f2dd..a28ca33393d3 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 624ca1f3043a..1edceca1202b 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 fc55d2225c6e..e70fce7aff55 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 e8a1c73e390e..e31213052ec0 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 e60fe6857719..d5c8363fa866 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 dd9a2b7ae41c..8af38af21c68 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 6d479cfa8983..f9bbd54019d2 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 38e4c17e3600..e2507e9dd501 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 b810e94e467b..b1603c2523a4 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 9e5ebd06661b..c917e97bd9a9 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 4fdcdff76af3..4925a6dd44eb 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 e20122bb9c38..acaf768b7ad0 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 9d324c89da38..c7d6d6ba3c6a 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 e967b6dfa1b6..d90b73c2c00d 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 f6b4a51dc7b5..eac163751abc 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 27108dc33dcd..6223a2a7dafb 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 44b420c79369..5f2452b3bf0f 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