42 files changed, 112 insertions, 185 deletions

diff --git a/audio/baudline/Makefile b/audio/baudline/Makefile
index c88618c8e3e2..bd30921e55b7 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 27fffa8b6bbf..fec8f7cafa3b 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 563f009a0f7f..3023132d8117 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 572454eb2266..7b8a3c1efcff 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 99656678bacf..85a316c97e02 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 7f6ecee515cd..89957ccc9793 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 c4c1e264db09..61aec8f89470 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 e2b28411897e..982d09022e6d 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 0531217da807..470069616a74 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 e51298af0567..340fdb75d076 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 d710271141ff..0150accc76a8 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 d33e0cff7248..14e2f98dca42 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 54188a8d5cbb..7bad30d4fa35 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 dbecb046ef57..67397582fd1d 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 d96e05f92d61..06597738ffb9 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 ee8cb4bc6c38..374aeb6d4c4b 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 3863c5a6d049..4e57c639b3ba 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 dca321ac3d95..31e942f85251 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 2c850b58aa0e..c99610344810 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 91aece4d2920..2306a9d2434f 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 6435bb307ceb..b62137264ff2 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 5362f05292a9..dba0508d893b 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 2be5e618766c..e3686f989d98 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 db187f5190f2..cb48be9272ad 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 b65e81f64b08..8b7b63ca1451 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 11e47c746c1f..6740b2bcdd6b 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 74740173ef9d..151c1f436a8e 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 6ac6e8d9c552..7c44ebf325fd 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 70c25bccae0e..cf25f3dc51d5 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 f07f541ee236..c6bc7a534043 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 a1d68bd41082..7d6cd494b0eb 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 07c425da5c0b..cfb1a02e5422 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 12b8a6d18f15..96406d48ba21 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 592d1866c17c..abadb529b10a 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 512f1fb4f8ad..8dc31a1e7072 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 82cc8719df3c..0f3b8df7626b 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 643485bc7976..7d0de9d68dea 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 8df20d455fc6..3b75f8e15327 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 305fa67c3c0e..699df83947ba 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 b32cd3d291ad..5afe8b8a4adf 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 2ea133f51b61..74d0bc2741d9 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 696fc7aaa61e..23bea1ca3229 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: