44 files changed, 76 insertions, 186 deletions

diff --git a/games/54321/Makefile b/games/54321/Makefile
index 1595726d2bfd..daf737926430 100644
--- a/games/54321/Makefile
+++ b/games/54321/Makefile
@@ -15,10 +15,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	llwang@infor.org
 COMMENT=	54321 is five games in four-, three-, or two-dimensions for one player
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
+USE_SDL=	image sdl
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	all size
diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index 6d04668a826b..067a3fc99a70 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -18,17 +18,15 @@ MAINTAINER=	flynn@energyhq.es.eu.org
 COMMENT=	A free role playing game
 
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		vorbis.3:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
+USE_SDL=	mixer sdl
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-py-debug
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	SDL_CONFIG=${LOCALBASE}/bin/sdl11-config \
-		LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib
 
 post-install:
 		cd ${WRKDIR}/wastesedge-${PORTVERSION} && \
diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile
index f1c5eb9086a6..6a9d2bddd4ff 100644
--- a/games/afternoonstalker/Makefile
+++ b/games/afternoonstalker/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A clone of the 1981 Night Stalker video game
 
-LIB_DEPENDS=	gengameng.4:${PORTSDIR}/devel/gengameng \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
+LIB_DEPENDS=	gengameng.4:${PORTSDIR}/devel/gengameng
 
+USE_SDL=	mixer sdl
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 100c2188fe92..0bcaacd5eb17 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -16,12 +16,7 @@ DISTNAME=	AlephOne-${PORTVERSION}
 MAINTAINER=	malyn@strangeGizmo.com
 COMMENT=	The open source version of Bungie's Marathon game
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_net.0:${PORTSDIR}/net/sdl_net
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	image net sdl
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/asc/Makefile b/games/asc/Makefile
index d85860923d7e..2293f7493242 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -19,22 +19,16 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	A turn based, multiplayer strategic game with very nice graphics
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDLmm.8:${PORTSDIR}/devel/sdlmm \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		paragui.4:${PORTSDIR}/x11-toolkits/paragui
+LIB_DEPENDS=	paragui.4:${PORTSDIR}/x11-toolkits/paragui
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	image mm mixer sdl
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 USE_GETOPT_LONG=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		CPPFLAGS="`${SDL_CONFIG} --cflags`" \
+CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags`" \
 		CXXFLAGS="-D_UNICODE_BROKEN_" \
 		LIBS="`${SDL_CONFIG} --libs` -lm"
 
diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile
index b4ae388256df..10d838491c18 100644
--- a/games/bomberinstinct/Makefile
+++ b/games/bomberinstinct/Makefile
@@ -15,17 +15,13 @@ DISTNAME=	BomberInstinct-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A nice Bomberman-like multiplayer game
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	mixer sdl
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_PERL5_BUILD=yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl"
 
 pre-patch:
diff --git a/games/columns/Makefile b/games/columns/Makefile
index b5e90a2434ce..e178bfbe2861 100644
--- a/games/columns/Makefile
+++ b/games/columns/Makefile
@@ -15,13 +15,9 @@ DISTNAME=	Columns-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nice little implementation of columns game for X Window System
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/games/crimson/Makefile b/games/crimson/Makefile
index 2eef81f35a79..df165597a8b3 100644
--- a/games/crimson/Makefile
+++ b/games/crimson/Makefile
@@ -14,13 +14,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	Jan.Stocker@t-online.de
 COMMENT=	Tactical war game in the tradition of Battle Isle
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_SDL=	yes
+USE_SDL=	mixer sdl
 
 MAN6=	crimson.6
 
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index b83ea8f75454..c303282e1091 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -16,10 +16,7 @@ DISTNAME=	CriticalMass-${PORTVERSION}
 MAINTAINER=	nbm@FreeBSD.org
 COMMENT=	An SDL/OpenGL space shoot\'em up game
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
+USE_SDL=	image mixer sdl
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/cube/Makefile b/games/cube/Makefile
index 6142ba215350..f89136b416c2 100644
--- a/games/cube/Makefile
+++ b/games/cube/Makefile
@@ -15,9 +15,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/:S/./_/}
 MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	An OpenGL 3D First Person Shooter game
 
-LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
+USE_SDL=	image mixer sdl
 USE_ZIP=	yes
 USE_GMAKE=	yes
 
diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile
index 4217401d14f8..02d7ec793643 100644
--- a/games/defendguin/Makefile
+++ b/games/defendguin/Makefile
@@ -13,13 +13,9 @@ MASTER_SITES=	http://www.nbswebfx.com/downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Another shoot-the-Bill game
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	mixer sdl
 USE_GMAKE=	yes
-MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		MKDIR="${MKDIR}" \
+MAKE_ENV=	MKDIR="${MKDIR}" \
 		TAR="${TAR}"
 
 MAN6=		defendguin.6
diff --git a/games/egoboo/Makefile b/games/egoboo/Makefile
index bb922f2dec4f..da151cfe374f 100644
--- a/games/egoboo/Makefile
+++ b/games/egoboo/Makefile
@@ -15,12 +15,10 @@ DISTNAME=	ego222
 MAINTAINER=	Jan.Stocker@t-online.de
 COMMENT=	A 3d dungeon crawling adventure in the spirit of NetHack
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_SDL=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 USE_REINPLACE=	yes
 
 pre-patch:
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index 188b2b483dee..36da506a70fe 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -17,16 +17,14 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	A 3d penguin racing game using OpenGL
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		tcl83.1:${PORTSDIR}/lang/tcl83
+LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 
+USE_SDL=	mixer sdl
 USE_MESA=	yes
 USE_GMAKE=	yes
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 USE_AUTOMAKE=	yes
 AUTOMAKE_ARGS=	-a
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		THREAD_LIB="${PTHREAD_LIB}"
+CONFIGURE_ENV=	THREAD_LIB="${PTHREAD_LIB}"
 MAKE_ENV=	${CONFIGURE_ENV}
 CONFIGURE_ARGS=	--with-tcl-inc="${LOCALBASE}/include/tcl8.3" \
 		--with-tcl-libs="${LOCALBASE}/lib" \
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index 3ddafc9160cb..a4c6170c3b67 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -16,12 +16,12 @@ DISTNAME=	nethack_source_331_jtp_${PORTVERSION:S/.//g}
 MAINTAINER=	kris@FreeBSD.org
 COMMENT=	NetHack derivative
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
 
 NHDIR=		"${PREFIX}/share/falconseyedir"
 MAKE_ENV=	NHDIR="${NHDIR}" NETHACKCONFIG="${NETHACKCONFIG}"
 NETHACKCONFIG=	${FILESDIR}/x-config
+USE_SDL=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	Yes
 USE_ZIP=	yes
diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile
index 21d1a7c52fd8..d2716f90b756 100644
--- a/games/frozenbubble/Makefile
+++ b/games/frozenbubble/Makefile
@@ -19,17 +19,12 @@ COMMENT=	Throw colourful bubbles to build groups and destroy the groups
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SDL_perl.pm:${PORTSDIR}/devel/p5-SDL
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
+USE_SDL=	mixer image sdl
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
-MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		MKDIR="${MKDIR}" \
+MAKE_ENV=	MKDIR="${MKDIR}" \
 		TAR="${TAR}"
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/c_stuff/
diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index c5acde9967fc..d5cb1022ae48 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -16,10 +16,8 @@ EXTRACT_SUFX=	-src.tar.gz
 MAINTAINER=	erik@smluc.org
 COMMENT=	An OpenGL & SDL action flight simulator
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
 WRKSRC=		${WRKDIR}/${DISTNAME}-src
-USE_SDL=	yes
+USE_SDL=	mixer sdl
 USE_MESA=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--x-include=${X11BASE}/include \
diff --git a/games/jumpnbump/Makefile b/games/jumpnbump/Makefile
index 029e2031143f..b36084abdf85 100644
--- a/games/jumpnbump/Makefile
+++ b/games/jumpnbump/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	http://www.jumpbump.mine.nu/port/ \
 MAINTAINER=	gurkan@linuks.mine.nu
 COMMENT=	A fun multiplayer game with cute fluffy bunnies and bloody explosions
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
+USE_SDL=	mixer sdl
 
 .if !defined (WITHOUT_TCL)
 RUN_DEPENDS+=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
diff --git a/games/kobodeluxe/Makefile b/games/kobodeluxe/Makefile
index 66a1434a18e9..4c9b84ceb54c 100644
--- a/games/kobodeluxe/Makefile
+++ b/games/kobodeluxe/Makefile
@@ -15,13 +15,11 @@ DISTNAME=	KoboDeluxe-${PORTVERSION:S/.p/pre/}
 MAINTAINER=	verm@drunkmonk.net
 COMMENT=	Kobo Deluxe (formerly SKobo) is an SDL port of Akira Higuchi's XKobo
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG=${LOCALBASE}/bin/sdl11-config
 CONFIGURE_ARGS+=	--program-transform-name="s/$$//"
 
+USE_SDL=	image sdl
 USE_AUTOMAKE=	yes
 USE_AUTOCONF=	yes
 USE_AUTOCONF_VER=	253
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 7f4607a76e9e..e706b039cd45 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -14,16 +14,14 @@ MASTER_SITE_SUBDIR=	lgames
 MAINTAINER=	verm@drunkmonk.net
 COMMENT=	The polished successor to LBreakout
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
+USE_SDL=	mixer sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-highscore-path=/var/games \
 		--with-doc-path=${PREFIX}/share/doc
-CONFIGURE_ENV=	SDL_CONFIG=${LOCALBASE}/bin/sdl11-config \
-		LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index b85ca201d370..467a5672d7bc 100644
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@@ -15,13 +15,10 @@ MASTER_SITE_SUBDIR=	lgeneral
 MAINTAINER=	filippo@widestore.net
 COMMENT=	A turn-based strategy engine inspired by Panzer General
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
+USE_SDL=	yes
 
 .ifndef (WITHOUT_SOUND)
-LIB_DEPENDS+=	SDL_mixer:${PORTSDIR}/audio/sdl_mixer
+USE_SDL=	mixer
 .else
 CONFIGURE_ARGS+=--disable-sound
 .endif
diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile
index e92c09af671a..55d4b0f921ab 100644
--- a/games/lmarbles/Makefile
+++ b/games/lmarbles/Makefile
@@ -15,12 +15,10 @@ MASTER_SITE_SUBDIR=	lgames
 MAINTAINER=	verm@drunkmonk.net
 COMMENT=	A challenging puzzle game similar to Atomix
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
+USE_SDL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-profile-path=/var/games
-CONFIGURE_ENV=	SDL_CONFIG=${LOCALBASE}/bin/sdl11-config
 USE_REINPLACE=	yes
 
 MAN6=	marbles.6
diff --git a/games/marbles/Makefile b/games/marbles/Makefile
index e92c09af671a..55d4b0f921ab 100644
--- a/games/marbles/Makefile
+++ b/games/marbles/Makefile
@@ -15,12 +15,10 @@ MASTER_SITE_SUBDIR=	lgames
 MAINTAINER=	verm@drunkmonk.net
 COMMENT=	A challenging puzzle game similar to Atomix
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
+USE_SDL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-profile-path=/var/games
-CONFIGURE_ENV=	SDL_CONFIG=${LOCALBASE}/bin/sdl11-config
 USE_REINPLACE=	yes
 
 MAN6=	marbles.6
diff --git a/games/newvox/Makefile b/games/newvox/Makefile
index 5589d042eb5c..617247bfca17 100644
--- a/games/newvox/Makefile
+++ b/games/newvox/Makefile
@@ -13,11 +13,9 @@ MASTER_SITES=	http://www.libsdl.org/projects/newvox/src/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Voxel-style landscape rendering fly-by
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
+USE_SDL=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/newvox ${PREFIX}/bin
diff --git a/games/njam/Makefile b/games/njam/Makefile
index 3733eea7ab68..6ed4e51ada97 100644
--- a/games/njam/Makefile
+++ b/games/njam/Makefile
@@ -15,12 +15,8 @@ DISTNAME=	 ${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Fast paced multiplayer pac-man clone
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_net.0:${PORTSDIR}/net/sdl_net
-
 USE_GMAKE=	yes
-USE_SDL=	yes
+USE_SDL=	mixer image net sdl
 DOC_FILES=	assassin.gif award-2.gif cookie.gif doc-editor.html \
 		doc.html doc2.html door.gif freezer.gif ghactive.gif \
 		ghinactive.gif hunter.gif invisible.gif juice.gif \
diff --git a/games/oilwar/Makefile b/games/oilwar/Makefile
index 9a9d4bad7f2f..2e1f326d445e 100644
--- a/games/oilwar/Makefile
+++ b/games/oilwar/Makefile
@@ -14,12 +14,7 @@ DISTNAME=	OilWar-${PORTVERSION}
 MAINTAINER=	hendrik@scholz.net
 COMMENT=	Evil army wants to steal your oil
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
+USE_SDL=	image mixer sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/games/penguin-command/Makefile b/games/penguin-command/Makefile
index 60e755dfa887..ca1a28a48f57 100644
--- a/games/penguin-command/Makefile
+++ b/games/penguin-command/Makefile
@@ -14,15 +14,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	markp@FreeBSD.org
 COMMENT=	A clone of the classic game Missile Command
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	mixer sdl
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_TARGET=
 MAN6=		penguin-command.6
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index 5d4c99e15217..5508934556bc 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -16,14 +16,13 @@ COMMENT=	Emilia Pinball is a free pinball game
 
 .if !defined(WITH_ALLEGRO)
 BUILD_DEPENDS=	${SDL_CONFIG}:${PORTSDIR}/devel/sdl12
-LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
 .else
 BROKEN=		"support with Allegro is (temporarily) broken as of version 0.31"
 BUILD_DEPENDS=	${ALLEGRO_CONFIG}:${PORTSDIR}/devel/allegro
 LIB_DEPENDS=	alleg.41:${PORTSDIR}/devel/allegro
 .endif
 
+USE_SDL=	image mixer sdl
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_MESA=	yes
@@ -37,9 +36,7 @@ CONFIGURE_ARGS+=	--with-allegro
 EXTRA_LIBS=	-lGL -lGLU
 .endif
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -DRZR_LIBSTATIC" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${EXTRA_LIBS}" \
-		SDL_CONFIG="${SDL_CONFIG}"
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${EXTRA_LIBS}"
 ALLEGRO_CONFIG=	${LOCALBASE}/bin/allegro-config
 
 DOCS=		README
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index 4f734c0598e6..1440f382c18f 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -14,17 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	fracture@allusion.net
 COMMENT=	A multiplayer-capable and modified version of ID's classic doom game
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		smpeg.1:${PORTSDIR}/multimedia/smpeg \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		SDL_net.0:${PORTSDIR}/net/sdl_net
-
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
+LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg
 
+USE_SDL=	mixer net sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		CFLAGS+="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CFLAGS+="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN5=		boom.cfg.5
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 61d01c9f6ba1..8254664df92a 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -54,9 +54,8 @@ PLIST_SUB+=	GL:="@comment "
 .endif
 
 .if !defined(WITHOUT_SDL) && defined(WITH_SDL)
-LIB_DEPENDS+=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
+USE_SDL=	yes
 CONFIGURE_ARGS+=--with-sdl=${LOCALBASE}
-CONFIGURE_ENV=	"SDL_CONFIG=${LOCALBASE}/bin/sdl11-config"
 .if !defined(WITHOUT_GL)
 PLIST_SUB+=	SDLGL:=""
 .else
diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile
index 2a4a403e2c3f..9a1b473903a7 100644
--- a/games/quake2lnx/Makefile
+++ b/games/quake2lnx/Makefile
@@ -48,7 +48,7 @@ PLIST_SUB+=	SVGA="@comment "
 	|| exists(${LOCALBASE}/lib/libSDL-1.1.so.5)
 . if !(defined(WITHOUT_SDLCLIENT) && defined(WITHOUT_SDL) \
 	&& defined(WITHOUT_SDLGL))
-LIB_DEPENDS+=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
+USE_SDL=	yes
 . endif
 . if !defined(WITHOUT_SDLCLIENT)
 MAKE_ARGS+=	BUILD_SDLQUAKE2=YES
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 790f972bd878..2c26feb2c678 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -126,9 +126,8 @@ PLIST_SUB+=	XMMS:="@comment "
 .endif
 
 .if !defined(WITHOUT_SDL) && defined(WITH_SDL)
-LIB_DEPENDS+=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
+USE_SDL=	yes
 CONFIGURE_ARGS+=--with-sdl=${LOCALBASE}
-CONFIGURE_ENV=	"SDL_CONFIG=${LOCALBASE}/bin/sdl11-config"
 PLIST_SUB+=	SDL:=""
 .else
 CONFIGURE_ARGS+=--disable-sdl --disable-sdltest
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 540cca26d6b8..deb28a2b0f8d 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -15,8 +15,7 @@ MAINTAINER=	mwest@uct.ac.za
 COMMENT=	Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff
 
 .if defined(WITH_SDL)
-LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
+USE_SDL=	image mixer sdl
 MAKE_ARGS+=	sdl
 .endif
 
diff --git a/games/scorched3d-devel/Makefile b/games/scorched3d-devel/Makefile
index fc1c9e134030..d4b16fb860f0 100644
--- a/games/scorched3d-devel/Makefile
+++ b/games/scorched3d-devel/Makefile
@@ -16,14 +16,11 @@ DISTNAME=		Scorched3D-${SCORCH_VERSION}-src
 MAINTAINER=		mdodd@FreeBSD.org
 COMMENT=		Scorched is a game based loosely on the classic DOS game
 
-LIB_DEPENDS=		SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-			SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-			SDL_net.0:${PORTSDIR}/net/sdl_net \
-			wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
+LIB_DEPENDS=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
 
+USE_SDL=		mixer net sdl
 SCORCH_VERSION=		35
 WRKSRC=			${WRKDIR}/scorched
-SDL_CONFIG?=		${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE= 		yes
 USE_GL=			yes
 USE_GMAKE=		yes
@@ -32,9 +29,7 @@ USE_AUTOCONF_VER=	253
 
 AUTOMAKE_ARGS=		--foreign
 CONFIGURE_ARGS=		--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-			SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
-MAKE_ENV=		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
+CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=		ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \
 			AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}"
 
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index fc1c9e134030..d4b16fb860f0 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -16,14 +16,11 @@ DISTNAME=		Scorched3D-${SCORCH_VERSION}-src
 MAINTAINER=		mdodd@FreeBSD.org
 COMMENT=		Scorched is a game based loosely on the classic DOS game
 
-LIB_DEPENDS=		SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-			SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-			SDL_net.0:${PORTSDIR}/net/sdl_net \
-			wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
+LIB_DEPENDS=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
 
+USE_SDL=		mixer net sdl
 SCORCH_VERSION=		35
 WRKSRC=			${WRKDIR}/scorched
-SDL_CONFIG?=		${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE= 		yes
 USE_GL=			yes
 USE_GMAKE=		yes
@@ -32,9 +29,7 @@ USE_AUTOCONF_VER=	253
 
 AUTOMAKE_ARGS=		--foreign
 CONFIGURE_ARGS=		--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-			SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
-MAKE_ENV=		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
+CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=		ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \
 			AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}"
 
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index c070fe29ab9b..6e7e98b1ef85 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -15,14 +15,14 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	alexander@trull.com
 COMMENT=	Free implementation of LucasArts S.C.U.M.M. interpreter
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		mad.2:${PORTSDIR}/audio/mad
+LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/mad
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
+USE_SDL=	yes
 
 MAN6=		scummvm.6
 
diff --git a/games/ssc/Makefile b/games/ssc/Makefile
index 65714a63930e..912fdb42e793 100644
--- a/games/ssc/Makefile
+++ b/games/ssc/Makefile
@@ -14,13 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}x
 MAINTAINER=	tiamat@comset.net
 COMMENT=	An OpenGL arcade space shoot-em-up with interesting physics
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		yes
-USE_SDL=	yes
+USE_SDL=	mixer sdl
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index 9d3a35c38dbd..38653e317134 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -14,8 +14,7 @@ DISTNAME=	tworld-${PORTVERSION}
 MAINTAINER=	sec@42.org
 COMMENT=	An emulation of the game "Chip's Challenge"
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
+USE_SDL=	yes
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_REINPLACE=	YES
diff --git a/games/toppler/Makefile b/games/toppler/Makefile
index 916d125f02ae..c0056afcc72a 100644
--- a/games/toppler/Makefile
+++ b/games/toppler/Makefile
@@ -14,15 +14,10 @@ MASTER_SITE_SUBDIR=	toppler
 MAINTAINER=	dom@happygiraffe.net
 COMMENT=	A game where you have to climb the tower and avoid the monsters
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
-LIB_DEPENDS+=	SDL_mixer:${PORTSDIR}/audio/sdl_mixer
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	mixer sdl
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
 MAN6=		toppler.6
 
diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index 31a4e301699e..49b1ace3008b 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -14,14 +14,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SDL-based Marble Madness clone
 
-LIB_DEPENDS=	SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		guile.15:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
 USE_X_PREFIX=	yes
-USE_SDL=	yes
+USE_SDL=	mixer image ttf sdl
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnometarget
diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile
index fc6c4fa5c368..f3fc64c47ad3 100644
--- a/games/tuxpuck/Makefile
+++ b/games/tuxpuck/Makefile
@@ -15,14 +15,12 @@ MASTER_SITES=	http://www.efd.lth.se/~d00jkr/tuxpuck/
 MAINTAINER=	Jan.Stocker@t-online.de
 COMMENT=	Shufflepuck Cafe Clone
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
+USE_SDL=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 ALL_TARGET=	tuxpuck
 
 MANCOMPRESSED=	yes
diff --git a/games/tuxracer-commercial/Makefile b/games/tuxracer-commercial/Makefile
index 188b2b483dee..36da506a70fe 100644
--- a/games/tuxracer-commercial/Makefile
+++ b/games/tuxracer-commercial/Makefile
@@ -17,16 +17,14 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	A 3d penguin racing game using OpenGL
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		tcl83.1:${PORTSDIR}/lang/tcl83
+LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 
+USE_SDL=	mixer sdl
 USE_MESA=	yes
 USE_GMAKE=	yes
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 USE_AUTOMAKE=	yes
 AUTOMAKE_ARGS=	-a
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		THREAD_LIB="${PTHREAD_LIB}"
+CONFIGURE_ENV=	THREAD_LIB="${PTHREAD_LIB}"
 MAKE_ENV=	${CONFIGURE_ENV}
 CONFIGURE_ARGS=	--with-tcl-inc="${LOCALBASE}/include/tcl8.3" \
 		--with-tcl-libs="${LOCALBASE}/lib" \
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 188b2b483dee..36da506a70fe 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -17,16 +17,14 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	A 3d penguin racing game using OpenGL
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		tcl83.1:${PORTSDIR}/lang/tcl83
+LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 
+USE_SDL=	mixer sdl
 USE_MESA=	yes
 USE_GMAKE=	yes
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 USE_AUTOMAKE=	yes
 AUTOMAKE_ARGS=	-a
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		THREAD_LIB="${PTHREAD_LIB}"
+CONFIGURE_ENV=	THREAD_LIB="${PTHREAD_LIB}"
 MAKE_ENV=	${CONFIGURE_ENV}
 CONFIGURE_ARGS=	--with-tcl-inc="${LOCALBASE}/include/tcl8.3" \
 		--with-tcl-libs="${LOCALBASE}/lib" \
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index 78f5fff04e77..ddd7a7267a59 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -14,16 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pat@FreeBSD.org
 COMMENT=	An educational typing tutor starring Tux the Linux Penguin
 
-LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
+USE_SDL=	image mixer sdl
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_AUTOMAKE_VER=14
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
 pre-patch:
 .for dirs in data images sounds
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 256694464726..a4b33cd1eb72 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -14,12 +14,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	drs@rucus.ru.ac.za
 COMMENT=	A clone of Rick Dangerous
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 RESTRICTED=	Copyright status of the graphics and sounds is uncertain
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_SDL=	yes
 
 MAN6=		xrick.6
 MANCOMPRESSED=	yes