- Use new knobs from bsd.sdl.mk

15 files changed, 18 insertions, 59 deletions

diff --git a/games/csmash/Makefile b/games/csmash/Makefile
index bef9622d73d..bb44ad311be 100644
--- a/games/csmash/Makefile
+++ b/games/csmash/Makefile
@@ -15,10 +15,7 @@ MASTER_SITE_SUBDIR=	cannonsmash
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A 3D tabletennis game
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image
-
-USE_SDL=	yes
+USE_SDL=	image mixer sdl
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk20
 USE_REINPLACE=	yes
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index 17490735979..d9fd1e18c99 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -13,10 +13,7 @@ MASTER_SITES=	http://www.nbswebfx.com/downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An interesting one-player puzzle game for X
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	mixer
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 MAKE_ENV=	JOY=NO \
diff --git a/games/glmaze/Makefile b/games/glmaze/Makefile
index 5c19edb6103..b8f4bd6eb4f 100644
--- a/games/glmaze/Makefile
+++ b/games/glmaze/Makefile
@@ -13,8 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiplayer OpenGL Maze Game
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
+USE_SDL=	mixer sdl
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index ef1c7dad9b8..4af3e6d852a 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -21,8 +21,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A game of yore similar to the "Tron" and "Nibbles"
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 DATAVERSION=	1.5
 SOUNDVERSION=	1.0
@@ -35,7 +34,7 @@ SOUNDSRC=	${WRKDIR}/${SOUNDISTNAME}
 MUSICSRC=	${WRKDIR}/${MUSICDISTNAME}
 
 USE_X_PREFIX=	yes
-USE_SDL=	yes
+USE_SDL=	mixer sdl
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index d48a1ebb291..c09b69b2300 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -15,13 +15,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A game similar to Jezzball or Barrack
 
-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}" \
-		prefix="${PREFIX}" \
+MAKE_ENV=	prefix="${PREFIX}" \
 		highscoredir="${PREFIX}/share/icebreaker/scores" \
 		mandir="${PREFIX}/man" \
 		CHMOD="${CHMOD}" \
diff --git a/games/ltris/Makefile b/games/ltris/Makefile
index 2f8d6805d20..9d74c24a0ba 100644
--- a/games/ltris/Makefile
+++ b/games/ltris/Makefile
@@ -15,9 +15,7 @@ MASTER_SITE_SUBDIR=	lgames
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An another tetris clone but a good one with bunch of cool features
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
-USE_SDL=	yes
+USE_SDL=	mixer sdl
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/games/madbomber/Makefile b/games/madbomber/Makefile
index a04a618c72a..f8a3599b1da 100644
--- a/games/madbomber/Makefile
+++ b/games/madbomber/Makefile
@@ -13,10 +13,7 @@ MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/madbomber/src/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A clone of Activision's classic Atari 2600 console game "Kaboom!"
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image
-
-USE_SDL=	yes
+USE_SDL=	mixer image sdl
 
 CPPFLAGS=	`${SDL_CONFIG} --cflags` -DDATA_PREFIX=\"${DATADIR}/\"
 LDFLAGS=	`${SDL_CONFIG} --libs`
diff --git a/games/moonlander/Makefile b/games/moonlander/Makefile
index c37114d6ee4..4568dc34a86 100644
--- a/games/moonlander/Makefile
+++ b/games/moonlander/Makefile
@@ -14,9 +14,7 @@ DISTNAME=	moon-lander-1.0
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	"land a spacecraft on the moon"
 
-LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
+USE_SDL=	mixer image sdl
 USE_X_PREFIX=	YES
 USE_REINPLACE=	YES
 
diff --git a/games/nil/Makefile b/games/nil/Makefile
index c424d727a1f..407027c2702 100644
--- a/games/nil/Makefile
+++ b/games/nil/Makefile
@@ -14,14 +14,12 @@ MASTER_SITE_SUBDIR=	sobomax
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A multiplayer game that can be described as Quake in 2D or Worms done right
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
 WRKSRC=		${WRKDIR}/${PORTNAME}/${PORTNAME}
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-USE_SDL=	yes
+USE_SDL=	mixer sdl
 
 pre-patch:
 	@${FIND} ${WRKSRC} \( -name "*.[ch]" -or -name "*.cpp" \) | \
diff --git a/games/powerpak/Makefile b/games/powerpak/Makefile
index d39e8d342e5..5502e863221 100644
--- a/games/powerpak/Makefile
+++ b/games/powerpak/Makefile
@@ -14,19 +14,15 @@ DISTNAME=	PowerPak
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SDL-based Game Software Development Kit
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		glut.3:${PORTSDIR}/graphics/libglut \
+LIB_DEPENDS=	glut.3:${PORTSDIR}/graphics/libglut \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		smpeg.1:${PORTSDIR}/multimedia/smpeg \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 
+USE_SDL=	mixer sdl
 USE_FREETYPE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 MAKEFILE=	Makefile.UNIX
 
 post-extract:
diff --git a/games/race/Makefile b/games/race/Makefile
index 6e44b81f4af..52f7b112bdc 100644
--- a/games/race/Makefile
+++ b/games/race/Makefile
@@ -14,13 +14,10 @@ MASTER_SITES=	ftp://users.freebsd.org.uk/pub/foobar2k/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL Racing Game
 
-LIB_DEPENDS=	SDL_mixer:${PORTSDIR}/audio/sdl_mixer \
-		SDL_image:${PORTSDIR}/graphics/sdl_image
-
+USE_SDL=	mixer image sdl
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_MESA=	yes
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 CFLAGS+=	"-I${X11BASE}/include"
 MAKE_ENV=	CC="${CC} ${CFLAGS}" LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
 
diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile
index 4f874ef6e1d..82256c29022 100644
--- a/games/rockdodger/Makefile
+++ b/games/rockdodger/Makefile
@@ -14,10 +14,7 @@ MASTER_SITE_SUBDIR=	spacerocks
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Addictive rock-dodging greeblie-killing platform game
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image
-
+USE_SDL=	mixer image sdl
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
diff --git a/games/sdlroids/Makefile b/games/sdlroids/Makefile
index e78f94bfbf1..3e80869b2ed 100644
--- a/games/sdlroids/Makefile
+++ b/games/sdlroids/Makefile
@@ -14,14 +14,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An enhanced shoot-the-asteroids game
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	mixer sdl
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
 MAN6=		sdlroids.6
 
diff --git a/games/uhexen/Makefile b/games/uhexen/Makefile
index a8e2607116d..5a1e70a9964 100644
--- a/games/uhexen/Makefile
+++ b/games/uhexen/Makefile
@@ -18,19 +18,15 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another port of Hexen, popular game from Raven Softrware
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
 .if !defined(WITHOUT_WAD)
 EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
 .endif
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	mixer sdl
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
 .if defined(WITHOUT_WAD)
 PLIST_SUB=	WAD:="@comment "
diff --git a/games/vectoroids/Makefile b/games/vectoroids/Makefile
index 3b246f9e0d9..6638bbe5fc6 100644
--- a/games/vectoroids/Makefile
+++ b/games/vectoroids/Makefile
@@ -14,11 +14,8 @@ MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/vectoroids/src/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A vector-based, pretty, Asteroids clone
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image
-
 USE_X_PREFIX=	yes
-USE_SDL=	yes
+USE_SDL=	image mixer sdl
 USE_GMAKE=	yes
 
 do-install: