17 files changed, 17 insertions, 49 deletions

diff --git a/audio/baudline/Makefile b/audio/baudline/Makefile
index f9eec4b6f768..02605a954b41 100644
--- a/audio/baudline/Makefile
+++ b/audio/baudline/Makefile
@@ -19,8 +19,8 @@ COMMENT=	Real-time signal analysis and time-frequency browser
 
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
-USE_XLIB=	yes
 USE_LINUX=	yes
+USE_LINUX_APPS=	xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
 
 RESTRICTED=	author requests no distribution except from their site
diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile
index 0eb54ae43538..9e9ab0cb8c8f 100644
--- a/audio/linux-esound/Makefile
+++ b/audio/linux-esound/Makefile
@@ -13,9 +13,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-0.fc4.1
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of esound
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
-
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	libaudiofile
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 BRANDELF_DIRS=	usr/bin
diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile
index 0eb54ae43538..9e9ab0cb8c8f 100644
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -13,9 +13,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-0.fc4.1
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of esound
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
-
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	libaudiofile
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 BRANDELF_DIRS=	usr/bin
diff --git a/audio/linux-f10-freealut/Makefile b/audio/linux-f10-freealut/Makefile
index 25b7563fa6d0..93d47290414b 100644
--- a/audio/linux-f10-freealut/Makefile
+++ b/audio/linux-f10-freealut/Makefile
@@ -14,9 +14,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.fc${LINUX_DIST_VER}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free implementation of OpenAL's ALUT standard (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal
-
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	openal
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/audio/linux-f10-libvorbis/Makefile b/audio/linux-f10-libvorbis/Makefile
index 6e081b01de79..e21ca9b52cf8 100644
--- a/audio/linux-f10-libvorbis/Makefile
+++ b/audio/linux-f10-libvorbis/Makefile
@@ -12,10 +12,9 @@ CATEGORIES=	audio linux
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
-
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	libogg
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 AUTOMATIC_PLIST=yes
diff --git a/audio/linux-f10-openal/Makefile b/audio/linux-f10-openal/Makefile
index 17f13446e84c..850736b2b4da 100644
--- a/audio/linux-f10-openal/Makefile
+++ b/audio/linux-f10-openal/Makefile
@@ -14,15 +14,9 @@ MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A 3D positional spatialized sound library (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
-		${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts \
-		${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound \
-		${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile \
-		${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	alsalib arts esound libaudiofile libvorbis sdl12
 LINUX_DIST_VER=	4
 MASTER_SITE_SRC_SUBDIR=	../extras/${LINUX_DIST_VER}/SRPMS
 USE_LDCONFIG=	yes
diff --git a/audio/linux-f10-sdl_mixer/Makefile b/audio/linux-f10-sdl_mixer/Makefile
index 139e6300ae42..8a21370a5e18 100644
--- a/audio/linux-f10-sdl_mixer/Makefile
+++ b/audio/linux-f10-sdl_mixer/Makefile
@@ -14,10 +14,9 @@ DISTNAME=	SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	sdl12
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 AUTOMATIC_PLIST=yes
diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile
index 0eb54ae43538..9e9ab0cb8c8f 100644
--- a/audio/linux-f8-esound/Makefile
+++ b/audio/linux-f8-esound/Makefile
@@ -13,9 +13,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-0.fc4.1
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of esound
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
-
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	libaudiofile
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 BRANDELF_DIRS=	usr/bin
diff --git a/audio/linux-f8-freealut/Makefile b/audio/linux-f8-freealut/Makefile
index 25b7563fa6d0..93d47290414b 100644
--- a/audio/linux-f8-freealut/Makefile
+++ b/audio/linux-f8-freealut/Makefile
@@ -14,9 +14,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.fc${LINUX_DIST_VER}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free implementation of OpenAL's ALUT standard (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal
-
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	openal
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/audio/linux-f8-libvorbis/Makefile b/audio/linux-f8-libvorbis/Makefile
index 6e081b01de79..e21ca9b52cf8 100644
--- a/audio/linux-f8-libvorbis/Makefile
+++ b/audio/linux-f8-libvorbis/Makefile
@@ -12,10 +12,9 @@ CATEGORIES=	audio linux
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
-
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	libogg
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 AUTOMATIC_PLIST=yes
diff --git a/audio/linux-f8-openal/Makefile b/audio/linux-f8-openal/Makefile
index 17f13446e84c..850736b2b4da 100644
--- a/audio/linux-f8-openal/Makefile
+++ b/audio/linux-f8-openal/Makefile
@@ -14,15 +14,9 @@ MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A 3D positional spatialized sound library (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
-		${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts \
-		${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound \
-		${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile \
-		${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	alsalib arts esound libaudiofile libvorbis sdl12
 LINUX_DIST_VER=	4
 MASTER_SITE_SRC_SUBDIR=	../extras/${LINUX_DIST_VER}/SRPMS
 USE_LDCONFIG=	yes
diff --git a/audio/linux-f8-sdl_mixer/Makefile b/audio/linux-f8-sdl_mixer/Makefile
index 139e6300ae42..8a21370a5e18 100644
--- a/audio/linux-f8-sdl_mixer/Makefile
+++ b/audio/linux-f8-sdl_mixer/Makefile
@@ -14,10 +14,9 @@ DISTNAME=	SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	sdl12
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 AUTOMATIC_PLIST=yes
diff --git a/audio/linux-freealut/Makefile b/audio/linux-freealut/Makefile
index 25b7563fa6d0..93d47290414b 100644
--- a/audio/linux-freealut/Makefile
+++ b/audio/linux-freealut/Makefile
@@ -14,9 +14,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.fc${LINUX_DIST_VER}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free implementation of OpenAL's ALUT standard (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal
-
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	openal
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/audio/linux-libvorbis/Makefile b/audio/linux-libvorbis/Makefile
index 6e081b01de79..e21ca9b52cf8 100644
--- a/audio/linux-libvorbis/Makefile
+++ b/audio/linux-libvorbis/Makefile
@@ -12,10 +12,9 @@ CATEGORIES=	audio linux
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg
-
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	libogg
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 AUTOMATIC_PLIST=yes
diff --git a/audio/linux-openal/Makefile b/audio/linux-openal/Makefile
index 17f13446e84c..850736b2b4da 100644
--- a/audio/linux-openal/Makefile
+++ b/audio/linux-openal/Makefile
@@ -14,15 +14,9 @@ MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A 3D positional spatialized sound library (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
-		${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts \
-		${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound \
-		${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile \
-		${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	alsalib arts esound libaudiofile libvorbis sdl12
 LINUX_DIST_VER=	4
 MASTER_SITE_SRC_SUBDIR=	../extras/${LINUX_DIST_VER}/SRPMS
 USE_LDCONFIG=	yes
diff --git a/audio/linux-sdl_mixer/Makefile b/audio/linux-sdl_mixer/Makefile
index 139e6300ae42..8a21370a5e18 100644
--- a/audio/linux-sdl_mixer/Makefile
+++ b/audio/linux-sdl_mixer/Makefile
@@ -14,10 +14,9 @@ DISTNAME=	SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	sdl12
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
 AUTOMATIC_PLIST=yes
diff --git a/audio/teamspeak_client/Makefile b/audio/teamspeak_client/Makefile
index dc2c5b6c944b..84ffc1386f02 100644
--- a/audio/teamspeak_client/Makefile
+++ b/audio/teamspeak_client/Makefile
@@ -18,12 +18,10 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Client side of a group voice chat system
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
-
 ONLY_FOR_ARCHS=	i386 amd64
 USE_BZIP2=	yes
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	jpeg xorglibs
 NO_BUILD=	yes
 
 TSIMG=		${WRKSRC}/setup.data/image