37 files changed, 43 insertions, 129 deletions

diff --git a/games/HeroesOfMightAndMagic/Makefile b/games/HeroesOfMightAndMagic/Makefile
index 9e2cf11caf80..faf43d3e5aca 100644
--- a/games/HeroesOfMightAndMagic/Makefile
+++ b/games/HeroesOfMightAndMagic/Makefile
@@ -15,12 +15,11 @@ DISTFILES=
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	BSD Installation of the Linux game "Heroes of Might and Magic III"
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
-
 PLIST=		${WRKDIR}/PLIST
 IS_INTERACTIVE=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
+USE_LINUX_APPS=	gtk
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 NO_CDROM=	Software is commercial
diff --git a/games/adom/Makefile b/games/adom/Makefile
index 3ffc9f133d60..50bc23fe361b 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -19,7 +19,7 @@ NO_CDROM=	Copy of CD must be sent to author
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	xorglibs
 
 WRKSRC=		${WRKDIR}/adom
 NO_BUILD=	yes
diff --git a/games/dsnake/Makefile b/games/dsnake/Makefile
index a971c01a5fd9..1d16849c3e64 100644
--- a/games/dsnake/Makefile
+++ b/games/dsnake/Makefile
@@ -15,13 +15,11 @@ DISTNAME=	${PORTNAME}-linux-${PORTVERSION}
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Deluxe Snake - snake clone with frogs and mushrooms
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/liballeg.so.4.0:${PORTSDIR}/devel/linux-allegro
-
 RESTRICTED=	Licence forbids any repacking and reselling
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	allegro xorglibs
 WRKSRC=		${WRKDIR}/DeluxeSnake
 
 SUB_FILES=	pkg-install pkg-deinstall
diff --git a/games/gish-demo/Makefile b/games/gish-demo/Makefile
index e18a5118af53..b6a7cdbe5890 100644
--- a/games/gish-demo/Makefile
+++ b/games/gish-demo/Makefile
@@ -14,14 +14,11 @@ DISTNAME=	gishdemo
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A platform game with a gelatinous 12-pound ball of tar named Gish (Demo version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
-		${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal \
-		${LINUXBASE}/usr/lib/libalut.so.0:${PORTSDIR}/audio/linux-freealut
-
 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=	freealut libvorbis openal
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 SUB_FILES=	rungish.sh
diff --git a/games/hohlin/Makefile b/games/hohlin/Makefile
index e7ead06f688c..9452168f65ff 100644
--- a/games/hohlin/Makefile
+++ b/games/hohlin/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/hoh-install-${PORTVERSION}/
 
 USE_BZIP2=	YES
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	xorglibs
 ONLY_FOR_ARCHS=	i386
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/}
 
diff --git a/games/linux-candycruncher-demo/Makefile b/games/linux-candycruncher-demo/Makefile
index ce903084477f..591d42b5c6fd 100644
--- a/games/linux-candycruncher-demo/Makefile
+++ b/games/linux-candycruncher-demo/Makefile
@@ -16,17 +16,9 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Candy Cruncher Demo - a fast puzzle game with lots of candies
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
-		${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
-		${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
-		${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
-		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
-		${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib
-
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	alsalib jpeg libogg libvorbis mikmod sdl12 sdlmixer xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 
diff --git a/games/linux-coldwar-demo/Makefile b/games/linux-coldwar-demo/Makefile
index 30dab75dba0e..822449c4a63f 100644
--- a/games/linux-coldwar-demo/Makefile
+++ b/games/linux-coldwar-demo/Makefile
@@ -16,17 +16,9 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Coldwar Demo - a third-person sneaker like Splinter Cell
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
-		${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
-		${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
-		${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
-		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
-		${LINUXBASE}/usr/lib/libtheora.so.0:${PORTSDIR}/multimedia/linux-libtheora
-
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	sdl12 jpeg sdlmixer mikmod libogg libvorbis libtheora xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 
diff --git a/games/linux-darwinia-demo/Makefile b/games/linux-darwinia-demo/Makefile
index f5f87aba9253..b67689897917 100644
--- a/games/linux-darwinia-demo/Makefile
+++ b/games/linux-darwinia-demo/Makefile
@@ -16,13 +16,9 @@ EXTRACT_SUFX=	.sh
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Real-time action strategy with programs
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
-		${LINUXBASE}/usr/lib/libvorbisfile.so.3:${PORTSDIR}/audio/linux-libvorbis
-
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	sdl12 libogg libvorbis xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/linux-defcon/Makefile b/games/linux-defcon/Makefile
index db007abcb920..4e1ec563318b 100644
--- a/games/linux-defcon/Makefile
+++ b/games/linux-defcon/Makefile
@@ -15,13 +15,9 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Defcon for Linux
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
-		${LINUXBASE}/usr/lib/libvorbisfile.so.3:${PORTSDIR}/audio/linux-libvorbis
-
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	sdl12 libogg libvorbis xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 
diff --git a/games/linux-doom3-demo/Makefile b/games/linux-doom3-demo/Makefile
index 120966299f0d..dd7cf71f34a5 100644
--- a/games/linux-doom3-demo/Makefile
+++ b/games/linux-doom3-demo/Makefile
@@ -21,8 +21,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DOOM III demo for Linux
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_XLIB=	yes
 USE_LINUX=	yes
+USE_LINUX_APPS=	xorglibs
 NO_PACKAGE=	Distfile size is 462MB, set FORCE_PACKAGE if you really want to build this package
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index e586e0bf3e17..8092a981ed64 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Doom III for Linux
 
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/linux-gorky17-demo/Makefile b/games/linux-gorky17-demo/Makefile
index 2169f79198f0..266418c8628c 100644
--- a/games/linux-gorky17-demo/Makefile
+++ b/games/linux-gorky17-demo/Makefile
@@ -16,16 +16,9 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Gorky17 Demo - a tactical shooter similiar to Jagged Alliance
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
-		${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
-		${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
-		${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
-		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	sdl12 jpeg sdlmixer mikmod libogg libvorbis xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 
diff --git a/games/linux-hdb-demo/Makefile b/games/linux-hdb-demo/Makefile
index 49f71fcd9c9a..ed919003db4a 100644
--- a/games/linux-hdb-demo/Makefile
+++ b/games/linux-hdb-demo/Makefile
@@ -16,15 +16,9 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Hyperspace Delivery Boy Demo - deliver mail and packages
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
-		${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
-		${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
-		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	sdl12 sdlmixer mikmod libogg libvorbis xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 
diff --git a/games/linux-majesty-demo/Makefile b/games/linux-majesty-demo/Makefile
index cc7e77551517..d92f6409a326 100644
--- a/games/linux-majesty-demo/Makefile
+++ b/games/linux-majesty-demo/Makefile
@@ -16,16 +16,9 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Majesty Gold Demo
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
-		${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
-		${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
-		${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
-		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
-
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX=	sdl12 jpeg sdlmixer mikmod libogg libvorbis xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 
diff --git a/games/linux-nerogame/Makefile b/games/linux-nerogame/Makefile
index 92a675a04845..aac80146a7ac 100644
--- a/games/linux-nerogame/Makefile
+++ b/games/linux-nerogame/Makefile
@@ -15,11 +15,8 @@ DISTNAME=	nero2_linux_i386
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Neuro envolving robotic operatives the game
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
-		${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libtheora.so.0:${PORTSDIR}/multimedia/linux-libtheora
-
 USE_LINUX=	yes
+USE_LINUX_APPS=	libvorbis sdl12 libtheora
 NO_BUILD=	yes
 RESTRICTED=	Nero is freeware, but i am not sure of its license
 
diff --git a/games/linux-ningpo-demo/Makefile b/games/linux-ningpo-demo/Makefile
index dd1b0abeb721..4748d30bace6 100644
--- a/games/linux-ningpo-demo/Makefile
+++ b/games/linux-ningpo-demo/Makefile
@@ -16,17 +16,9 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	NingPo Mahjong Demo - a feature rich Mahjong game
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
-		${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
-		${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
-		${LINUXBASE}/usr/lib/libogg.so.0:${PORTSDIR}/audio/linux-libogg \
-		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
-		${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib
-
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	sdl12 jpeg sdlmixer mikmod libogg libvorbis alsalib xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 
diff --git a/games/linux-nwnclient/Makefile b/games/linux-nwnclient/Makefile
index 05e961a39df8..bac03bbbce1d 100644
--- a/games/linux-nwnclient/Makefile
+++ b/games/linux-nwnclient/Makefile
@@ -17,8 +17,7 @@ DISTFILES=	nwclient129.tar.gz \
 MAINTAINER=	sean-freebsd@farley.org
 COMMENT=	Neverwinter Nights Linux (x86) Client
 
-RUN_DEPENDS=	${LOCALBASE}/share/nwndata/NWNv129.txt:${PORTSDIR}/games/nwndata \
-		${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
+RUN_DEPENDS=	${LOCALBASE}/share/nwndata/NWNv129.txt:${PORTSDIR}/games/nwndata
 
 .ifdef WITH_NVIDIA_GL
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
@@ -29,8 +28,8 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
 
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386
-USE_XLIB=	yes
 USE_LINUX=	yes
+USE_LINUX_APPS=	sdl12 xorglibs
 NWNDATADIR=	${LOCALBASE}/share/nwndata
 
 PLIST_SUB+=	NWNVERSION="${PORTVERSION:S/.//}"
diff --git a/games/linux-quake4-demo/Makefile b/games/linux-quake4-demo/Makefile
index 20f90a65c349..fbaeba26d672 100644
--- a/games/linux-quake4-demo/Makefile
+++ b/games/linux-quake4-demo/Makefile
@@ -18,9 +18,8 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Quake 4 for Linux Demo
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
 USE_LINUX=	yes
+USE_LINUX_APPS=	sdl12
 NO_WRKSUBDIR=	yes
 NO_CDROM=	Redistribution is limited, see license
 NO_PACKAGE=	Package will be 337MB, set FORCE_PACKAGE if you really want it
diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index a93102f5bd07..858d9f206c33 100644
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@@ -18,9 +18,8 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Quake 4 for Linux
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
 USE_LINUX=	yes
+USE_LINUX_APPS=	sdl12
 NO_WRKSUBDIR=	yes
 NO_CDROM=	Redistribution is limited, see license
 NO_PACKAGE=	Package will be 280MB, set FORCE_PACKAGE if you really want it
diff --git a/games/linux-savage-samuraiwars/Makefile b/games/linux-savage-samuraiwars/Makefile
index b803575c2414..c198db8bc34e 100644
--- a/games/linux-savage-samuraiwars/Makefile
+++ b/games/linux-savage-samuraiwars/Makefile
@@ -19,11 +19,9 @@ DIST_SUBDIR=	savage
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	An official mod for Savage game (linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
-		${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff
-
 USE_BZIP2=	yes
 USE_LINUX=	yes
+USE_LINUX_APPS=	libvorbis tiff
 NO_BUILD=	yes
 RESTRICTED=	SamuraiWars is freeware, but i am not sure of its license
 NO_PACKAGE=	Package will be 350MB, set FORCE_PACKAGE if you really want it
diff --git a/games/linux-savage/Makefile b/games/linux-savage/Makefile
index ae294bd8390d..44e5c04f43d1 100644
--- a/games/linux-savage/Makefile
+++ b/games/linux-savage/Makefile
@@ -21,10 +21,8 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	The Savage game (linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
-		${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff
-
 USE_LINUX=	yes
+USE_LINUX_APPS=	libvorbis tiff
 NO_BUILD=	yes
 RESTRICTED=	Savage is freeware, but i am not sure of its license
 NO_PACKAGE=	Package will be 150MB, set FORCE_PACKAGE if you really want it
diff --git a/games/linux-sof/Makefile b/games/linux-sof/Makefile
index 0e8abe3502e1..89adca403d5b 100644
--- a/games/linux-sof/Makefile
+++ b/games/linux-sof/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Soldier of Fortune for Linux
 PATCH_DEPENDS=	xdelta:${PORTSDIR}/misc/xdelta
 
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	xorglibs
 USE_LDCONFIG=	yes
 NO_BUILD=	yes
 NO_PACKAGE=	Distribution is 448MB; set FORCE_PACKAGE if you really want\
diff --git a/games/linux-spheresofchaos-demo/Makefile b/games/linux-spheresofchaos-demo/Makefile
index 7a7ce470044b..23a7705ccaba 100644
--- a/games/linux-spheresofchaos-demo/Makefile
+++ b/games/linux-spheresofchaos-demo/Makefile
@@ -19,10 +19,9 @@ DISTNAME=	chaosl-${PORTVERSION}
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	An unusual and spectacular shoot-em-up for the PC
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
 USE_ZIP=	yes
 USE_LINUX=	yes
+USE_LINUX_APPS=	sdl12
 
 NO_BUILD=	yes
 
diff --git a/games/linux-ssamtfe/Makefile b/games/linux-ssamtfe/Makefile
index 9ac4c7e3f381..b6d1a648445e 100644
--- a/games/linux-ssamtfe/Makefile
+++ b/games/linux-ssamtfe/Makefile
@@ -15,12 +15,10 @@ DISTFILES=	${PORTNAME:S|ssam|serious.sam.|}_${PORTVERSION:S|b|beta|}-english-2.r
 MAINTAINER=	ports@logvinov.com
 COMMENT=	Serious Sam: The First Encounter
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
 OPTIONS=	VORBIS	"Ogg playing support"	on
 
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	sdl12 xorglibs
 NO_BUILD=	yes
 NO_PACKAGE=	Distribution is 279MB; set FORCE_PACKAGE if you really want\
 		to build this package
@@ -31,7 +29,7 @@ SUB_FILES=	pkg-message
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_VORBIS)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
+USE_LINUX_APPS+=libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 PLIST_SUB+=	VORBIS="@comment "
diff --git a/games/linux-ssamtse/Makefile b/games/linux-ssamtse/Makefile
index edc2a7703e4f..ccb4815ffc10 100644
--- a/games/linux-ssamtse/Makefile
+++ b/games/linux-ssamtse/Makefile
@@ -15,12 +15,10 @@ DISTFILES=	${PORTNAME:S|ssam|serious.sam.|}_${PORTVERSION:S|b|beta|}-english-2.r
 MAINTAINER=	ports@logvinov.com
 COMMENT=	Serious Sam: The Second Encounter for Linux
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
 OPTIONS=	VORBIS	"Ogg playing support"	on
 
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	sdl12 xorglibs
 NO_BUILD=	yes
 NO_PACKAGE=	Distribution is 352MB; set FORCE_PACKAGE if you really want to build this package
 RESTRICTED=	Redistribution is limited, see license
@@ -30,7 +28,7 @@ SUB_FILES=	pkg-message
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_VORBIS)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis
+USE_LINUX_APPS+=libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 PLIST_SUB+=	VORBIS="@comment "
diff --git a/games/linux-steam/Makefile b/games/linux-steam/Makefile
index 225546718c3f..cab2fa2be859 100644
--- a/games/linux-steam/Makefile
+++ b/games/linux-steam/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${LINUX_BASE_PORT}
 
 IS_INTERACTIVE=	yes
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	xorglibs
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 INSTALLDIR?=	steam
diff --git a/games/linux-unrealgold/Makefile b/games/linux-unrealgold/Makefile
index 883d50cf85fb..d43d85130800 100644
--- a/games/linux-unrealgold/Makefile
+++ b/games/linux-unrealgold/Makefile
@@ -18,11 +18,10 @@ MAINTAINER=	ports@logvinov.com
 COMMENT=	Unreal Gold for Linux
 
 BUILD_DEPENDS=	ut:${PORTSDIR}/games/linux-ut
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		ut:${PORTSDIR}/games/linux-ut
+RUN_DEPENDS=	ut:${PORTSDIR}/games/linux-ut
 
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	sdl12 xorglibs
 NO_BUILD=	yes
 NO_PACKAGE=	Distribution is 131MB; set FORCE_PACKAGE if you really want\
 		to build this package
diff --git a/games/linux-uplink-demo/Makefile b/games/linux-uplink-demo/Makefile
index 11dc6230133b..a241bada1798 100644
--- a/games/linux-uplink-demo/Makefile
+++ b/games/linux-uplink-demo/Makefile
@@ -16,15 +16,9 @@ EXTRACT_SUFX=	.sh
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	High tech computer crime and industrial espionage on the Internet
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
-		${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0:${PORTSDIR}/audio/linux-sdl_mixer \
-		${LINUXBASE}/usr/lib/libmikmod.so.2:${PORTSDIR}/audio/linux-mikmod \
-		${LINUXBASE}/usr/lib/libvorbisfile.so.3:${PORTSDIR}/audio/linux-libvorbis
-
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	sdl12 jpeg sdlmixer mikmod libvorbis xorglibs
 USE_LDCONFIG=	yes
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
diff --git a/games/linux-ut/Makefile b/games/linux-ut/Makefile
index 929414d9dab2..c2d6e33a42c5 100644
--- a/games/linux-ut/Makefile
+++ b/games/linux-ut/Makefile
@@ -18,11 +18,9 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	scf@FreeBSD.org
 COMMENT=	Unreal Tournament for Linux
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	sdl12 xorglibs
 NO_BUILD=	yes
 NO_PACKAGE=	Distribution is 340MB; set FORCE_PACKAGE if you really want\
 		to build this package
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index a56f85c91237..0fe569c2262d 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -17,8 +17,8 @@ EXTRACT_SUFX=	.sh.bin
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Unreal Tournament 2003 demo
 
-USE_XLIB=	yes
 USE_LINUX=	yes
+USE_LINUX_APPS=	xorglibs
 NO_PACKAGE=	Distfile is 130MB, set FORCE_PACKAGE if you really want to build this package
 RESTRICTED=	Redistribution is limited, see license
 NO_BUILD=	yes
diff --git a/games/linux-ut2004-demo/Makefile b/games/linux-ut2004-demo/Makefile
index a6dcd4f68d85..9c220192c4d1 100644
--- a/games/linux-ut2004-demo/Makefile
+++ b/games/linux-ut2004-demo/Makefile
@@ -19,8 +19,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unreal Tournament 2004 demo
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_XLIB=	yes
 USE_LINUX=	yes
+USE_LINUX_APPS=	xorglibs
 NO_PACKAGE=	Distfile size is 275MB, set FORCE_PACKAGE if you really want to build this package
 RESTRICTED=	Redistribution is limited, see license
 NO_BUILD=	yes
diff --git a/games/linux-virtual-jay-peak/Makefile b/games/linux-virtual-jay-peak/Makefile
index dce2a140cd12..e3e02d7a91b9 100644
--- a/games/linux-virtual-jay-peak/Makefile
+++ b/games/linux-virtual-jay-peak/Makefile
@@ -17,8 +17,8 @@ COMMENT=	A simulation of snowboarding at the Jay Peak resort in Vermont
 
 WRKSRC=		${WRKDIR}/soulride
 ONLY_FOR_ARCHS=	i386
-USE_XLIB=	yes
 USE_LINUX=	yes
+USE_LINUX_APPS=	xorglibs
 NO_BUILD=	yes
 SUB_FILES=	virtual-jay-peak
 
diff --git a/games/linux-warsow/Makefile b/games/linux-warsow/Makefile
index 457c8902c0dc..79ec4a4ae1a7 100644
--- a/games/linux-warsow/Makefile
+++ b/games/linux-warsow/Makefile
@@ -27,10 +27,10 @@ COMMENT=	Free multiplayer first person shooter with cartoon design
 
 IGNORE=		is outdated, does not match games/warsow-data port
 
-RUN_DEPENDS=	${LINUXBASE}/lib/libssl.so.5:${PORTSDIR}/security/linux-openssl \
-		${DATADIR}/data0.pk3:${PORTSDIR}/games/warsow-data
+RUN_DEPENDS=	${DATADIR}/data0.pk3:${PORTSDIR}/games/warsow-data
 
 USE_LINUX=	yes
+USE_LINUX_APPS=	openssl
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 NO_BUILD=	yes
@@ -79,10 +79,7 @@ PLIST_SUB+=	ENGINESUFFIX=${ENGINESUFFIX} \
 .endif
 
 .if !defined(WITHOUT_CLIENT)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
-		${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
-		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
-		${LINUXBASE}/usr/lib/libcurl.so.3:${PORTSDIR}/ftp/linux-curl
+USE_LINUX_APPS+=sdl12 libvorbis jpeg curl
 PLIST_SUB+=	CLIENT=""
 WARSOW_TARGET+=	warsow
 WARSOW_EXTRACT+=${PORTNAME}/warsow${ENGINESUFFIX} \
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index 3a7161d18e5d..1cce010f3f33 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -19,8 +19,8 @@ COMMENT=	Return to Castle Wolfenstein for Linux
 
 USE_MAKESELF=	yes
 USE_LINUX=	yes
+USE_LINUX_APPS=	xorglibs
 USE_GL=		linux
-USE_XLIB=	yes
 NO_WRKSUBDIR=	yes
 
 SUB_FILES=	pkg-message
diff --git a/games/stvef-paks/Makefile b/games/stvef-paks/Makefile
index 29cbc7c535e5..ba4bb8885290 100644
--- a/games/stvef-paks/Makefile
+++ b/games/stvef-paks/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	xorglibs
 EXTRACT_ONLY=	# Don't extract anything
 
 GAMEDIR=	${PREFIX}/games/stvef/
diff --git a/games/stvef-server/Makefile b/games/stvef-server/Makefile
index 5ec35c1db14f..2eb06b0361b7 100644
--- a/games/stvef-server/Makefile
+++ b/games/stvef-server/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Star Trek Voyager: Elite Forces dedicated server for Linux
 ONLY_FOR_ARCHS=	i386
 USE_ZIP=	yes
 USE_LINUX=	yes
-USE_XLIB=	yes
+USE_LINUX_APPS=	xorglibs
 WRKSRC=		${WRKDIR}/Linux
 
 INSTALL_DIR=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
diff --git a/games/utserver/Makefile b/games/utserver/Makefile
index 5a3ab166d7a0..6530c393ba4e 100644
--- a/games/utserver/Makefile
+++ b/games/utserver/Makefile
@@ -20,11 +20,10 @@ EXTRACT_ONLY=	${MAINFILE}
 MAINTAINER=	ports@logvinov.com
 COMMENT=	Unreal Tournament Dedicated Server for Linux
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
-
 OPTIONS=	BONUSPACKS	"install the official bonus packs collection" on
 
 USE_LINUX=	yes
+USE_LINUX_APPS=	sdl12
 NO_CDROM=	Size; the data set is much too big
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/ut-server