- Use new knobs from bsd.sdl.mk

Approved by:	portmgr

9 files changed, 20 insertions, 37 deletions

diff --git a/devel/adasdl/Makefile b/devel/adasdl/Makefile
index 78c6a783116..076cddf3e66 100644
--- a/devel/adasdl/Makefile
+++ b/devel/adasdl/Makefile
@@ -15,12 +15,10 @@ DISTNAME=      AdaSDL_${PORTVERSION}
 MAINTAINER=	david@realityrift.com
 COMMENT=	An Ada thin binding to SDL
 
-LIB_DEPENDS=	SDL-1.1:${PORTSDIR}/devel/sdl12 \
-		SDL_image:${PORTSDIR}/graphics/sdl_image \
-		SDL_mixer:${PORTSDIR}/audio/sdl_mixer \
-		${GL_DEPENDS}
+LIB_DEPENDS=	${GL_DEPENDS}
 BUILD_DEPENDS=	gnatmake:${PORTSDIR}/lang/gnat
 
+USE_SDL=	mixer image sdl
 USE_GMAKE=     yes
 USE_REINPLACE= yes
 
diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile
index d4c4626ff1e..c290e62ade3 100644
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@@ -13,16 +13,13 @@ MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
 MAINTAINER=	markp@FreeBSD.org
 COMMENT=	An SDL game engine library
 
-LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image
-
+USE_SDL=	image sdl
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 CONFIGURE_ARGS+=	--program-prefix=""
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" \
-		SDL_CONFIG="${SDL_CONFIG}"
+		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
 
 post-patch:
 	${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG}|g; \
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index c06284a2d6c..bc94405320c 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -16,15 +16,14 @@ DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Kyra is a simple Sprite engine written in C++
 
-LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_LIBTOOL=	yes
-USE_SDL=	yes
+USE_SDL=	image sdl
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/devel/libuta/Makefile b/devel/libuta/Makefile
index be97404ea6c..15dace3f5a9 100644
--- a/devel/libuta/Makefile
+++ b/devel/libuta/Makefile
@@ -38,7 +38,7 @@ WITH_SDL_MIXER=	yes
 .endif
 
 .if defined(WITH_SDL_MIXER)
-LIB_DEPENDS+=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
+USE_SDL=	mixer sdl
 .endif
 
 pre-everything::
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index 97f02f2fb4f..acf0d581cad 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -13,30 +13,31 @@ DISTNAME=	SDL_perl-${PORTVERSION}
 MAINTAINER=	philip@paeps.cx
 COMMENT=	Perl Bindings for SDL
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
+USE_SDL=	yes
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_SDL_TTF)
-LIB_DEPENDS+=	SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf
+USE_SDL=	ttf sdl
 .endif
 
 .if !defined(WITHOUT_SDL_NET)
-LIB_DEPENDS+=	SDL_net.0:${PORTSDIR}/net/sdl_net
+USE_SDL=	net sdl
 .endif
 
 .if !defined(WITHOUT_SDL_GFX)
-LIB_DEPENDS+=	SDL_gfx.10:${PORTSDIR}/graphics/sdl_gfx
+USE_SDL=	gfx sdl
 .endif
 
 .if !defined(WITHOUT_SDL_IMAGE)
-LIB_DEPENDS+=	SDL_image.10:${PORTSDIR}/graphics/sdl_image
+USE_SDL=	image sdl
 .endif
 
 .if !defined(WITHOUT_SDL_MIXER)
-LIB_DEPENDS+=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
+USE_SDL=	mixer sdl
 .endif
 
 .if ${PERL_LEVEL} < 500600
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 886ca96ba88..c537ddbc18e 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -15,17 +15,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A module designed to write games in Python
 
 BUILD_DEPENDS=	${PYNUMERIC}
-LIB_DEPENDS=	SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		smpeg.1:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg
 RUN_DEPENDS=	${PYNUMERIC}
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	ttf image mixer sdl
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} config.py
diff --git a/devel/ruby-rudl/Makefile b/devel/ruby-rudl/Makefile
index 3e4fe8f3cdd..4bca24be102 100644
--- a/devel/ruby-rudl/Makefile
+++ b/devel/ruby-rudl/Makefile
@@ -16,11 +16,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A high level library to use SDL from Ruby
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf
-
+USE_SDL=	image mixer ttf sdl
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
index 6c6c51de5c0..558c92b33d9 100644
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@@ -17,14 +17,11 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Ruby extension library to use SDL library
 
 BUILD_DEPENDS=	${NONEXISTENT}:${RUBY_OPENGL_PORTDIR}:patch
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf \
-		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
 
 RUBY_OPENGL_PORTDIR=	${.CURDIR}/../../graphics/ruby-opengl
 RUBY_OPENGL_WRKSRC_CMD=	cd ${RUBY_OPENGL_PORTDIR}; ${MAKE} -V WRKSRC
 
+USE_SDL=	mixer image ttf sdl
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 RUBY_WITH_PTHREAD=	yes
diff --git a/devel/wftk/Makefile b/devel/wftk/Makefile
index be97404ea6c..15dace3f5a9 100644
--- a/devel/wftk/Makefile
+++ b/devel/wftk/Makefile
@@ -38,7 +38,7 @@ WITH_SDL_MIXER=	yes
 .endif
 
 .if defined(WITH_SDL_MIXER)
-LIB_DEPENDS+=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
+USE_SDL=	mixer sdl
 .endif
 
 pre-everything::