Make ports/multimedia use the USE_SDL macro

PR:		ports/61805
Submitted by:	Edwin Groothuis <edwin@mavetju.org>
Approved by:	maintainer timeout

7 files changed, 12 insertions, 29 deletions

diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile
index b578053..5ea4d63 100644
--- a/multimedia/dumpmpeg/Makefile
+++ b/multimedia/dumpmpeg/Makefile
@@ -16,12 +16,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ijliao@FreeBSD.org
 COMMENT=	Dump frames from mpeg movies
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		smpeg:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	smpeg:${PORTSDIR}/multimedia/smpeg
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG=${SDL_CONFIG}
+USE_SDL=	sdl
 
 MAN1=		dumpmpeg.1
 PLIST_FILES=	bin/dumpmpeg
diff --git a/multimedia/enjoympeg/Makefile b/multimedia/enjoympeg/Makefile
index 9e1a49b..fa87cff 100644
--- a/multimedia/enjoympeg/Makefile
+++ b/multimedia/enjoympeg/Makefile
@@ -15,11 +15,9 @@ MASTER_SITES=	http://people.freenet.de/for_Ki/
 MAINTAINER=	ijliao@FreeBSD.org
 COMMENT=	An MPEG-1 video player
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		smpeg:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	smpeg:${PORTSDIR}/multimedia/smpeg
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG=${SDL_CONFIG}
+USE_SDL=	sdl
 
 .include <bsd.port.mk>
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index d8d1039..9fff010 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -37,12 +37,8 @@ DOC_FILES=      AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \
 .include <bsd.port.pre.mk>
 
 .ifndef(WITHOUT_SDL)
-LIB_DEPENDS+=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
+USE_SDL=	sdl
 CONFIGURE_ARGS+= --enable-sdl
-CONFIGURE_ENV+=	SDL_CONFIG="${SDL_CONFIG}"
 .endif
 
 pre-everything::
diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile
index f5974eb..1e7e164 100644
--- a/multimedia/libmovtar/Makefile
+++ b/multimedia/libmovtar/Makefile
@@ -15,22 +15,19 @@ MASTER_SITE_SUBDIR=	mjpeg
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Supports reading/writing of MJPEG video in YUV 4:2:2 JPEG
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
+USE_SDL=	sdl
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_SIZE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-m4data-prefix=${PREFIX}/share
-CONFIGURE_ENV=  SDL_CONFIG="${SDL_CONFIG}" \
-		LOCALBASE="${LOCALBASE}"
+CONFIGURE_ENV=  LOCALBASE="${LOCALBASE}"
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS=${PTHREAD_LIBS}
 
-SDL_CONFIG?=    ${LOCALBASE}/bin/sdl11-config
-
 .include <bsd.port.pre.mk>
 
 post-patch:
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 072cf1b..3789d43 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -37,8 +37,6 @@ MAN1=	divxdec.1 jpeg2yuv.1 lav2divx.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 \
 	yuvplay.1 yuvscaler.1 yuvycsnoise.1
 MAN5=	yuv4mpeg.5
 
-SDL_CONFIG?=		${LOCALBASE}/bin/sdl11-config
-
 DOC_FILES=	AUTHORS BUGS CHANGES COPYING ChangeLog HINTS NEWS \
 		PLANS README README.DV README.avilib README.glav \
 		README.lavpipe README.transist TODO
@@ -107,10 +105,8 @@ CONFIGURE_ARGS+=	--with-movtar-prefix=${LOCALBASE}
 .endif
 #
 .ifdef(WITH_SDL)
-LIB_DEPENDS+=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
+USE_SDL=	yes
 CONFIGURE_ARGS+=	--with-sdl
-CONFIGURE_ENV+=		SDL_CONFIG="${SDL_CONFIG}"
 .endif
 #
 .ifdef(WITH_QUICKTIME)
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index bf71f62..471c1e1 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm \
 
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
-USE_SDL=	yes
+USE_SDL=	sdl
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 USE_SIZE=	yes
diff --git a/multimedia/oqtplayer/Makefile b/multimedia/oqtplayer/Makefile
index 7a7c91f..7a70857 100644
--- a/multimedia/oqtplayer/Makefile
+++ b/multimedia/oqtplayer/Makefile
@@ -17,15 +17,13 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A very very small, not functionnal, video OpenQuicktime (TM) player
 
-LIB_DEPENDS=    SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		openquicktime.0:${PORTSDIR}/multimedia/openquicktime
+LIB_DEPENDS=    openquicktime.0:${PORTSDIR}/multimedia/openquicktime
 
 USE_SIZE=	yes
+USE_SDL=	yes
 MAKE_ENV=	SDL_CONFIG=${SDL_CONFIG}
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
 CFLAGS+=	-I${LOCALBASE}/include
 
 do-install: