aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/drumpiler/Makefile2
-rw-r--r--audio/ksmp3play/Makefile2
-rw-r--r--audio/sdl_mixer/Makefile2
-rw-r--r--audio/sdl_sound/Makefile2
-rw-r--r--audio/tempest_for_eliza/Makefile2
-rw-r--r--devel/clanlib-devel/Makefile2
-rw-r--r--devel/esdl/Makefile2
-rw-r--r--devel/libuta/Makefile6
-rw-r--r--devel/wftk/Makefile6
-rw-r--r--emulators/dgen-sdl/Makefile2
-rw-r--r--emulators/fceu/Makefile2
-rw-r--r--emulators/fceux/Makefile2
-rw-r--r--emulators/freesci/Makefile5
-rw-r--r--emulators/frodo/Makefile2
-rw-r--r--emulators/generator/Makefile2
-rw-r--r--emulators/scummvm/Makefile2
-rw-r--r--emulators/stella/Makefile2
-rw-r--r--emulators/vba/Makefile2
-rw-r--r--games/abuse_sdl/Makefile2
-rw-r--r--games/adgali/Makefile2
-rw-r--r--games/amphetamine/Makefile2
-rw-r--r--games/columns/Makefile2
-rw-r--r--games/egoboo/Makefile2
-rw-r--r--games/exult/Makefile2
-rw-r--r--games/falconseye/Makefile2
-rw-r--r--games/freesci/Makefile5
-rw-r--r--games/gltron/Makefile7
-rw-r--r--games/lbreakout/Makefile2
-rw-r--r--games/lgeneral/Makefile2
-rw-r--r--games/lmarbles/Makefile2
-rw-r--r--games/maelstrom/Makefile6
-rw-r--r--games/marbles/Makefile2
-rw-r--r--games/newvox/Makefile2
-rw-r--r--games/quake2forge/Makefile3
-rw-r--r--games/quake2lnx/Makefile11
-rw-r--r--games/quakeforge/Makefile5
-rw-r--r--games/scummvm/Makefile2
-rw-r--r--games/tileworld/Makefile2
-rw-r--r--games/tuxpuck/Makefile2
-rw-r--r--games/wolf3d/Makefile2
-rw-r--r--games/xrick/Makefile2
-rw-r--r--graphics/blender-devel/Makefile2
-rw-r--r--graphics/guilib/Makefile2
-rw-r--r--graphics/sdl_gfx/Makefile2
-rw-r--r--graphics/sdl_image/Makefile2
-rw-r--r--graphics/sdl_ttf/Makefile2
-rw-r--r--graphics/swfdec/Makefile2
-rw-r--r--graphics/white_dune/Makefile2
-rw-r--r--misc/kdeaddons3/Makefile2
-rw-r--r--multimedia/ffmpeg-devel/Makefile5
-rw-r--r--multimedia/ffmpeg/Makefile5
-rw-r--r--multimedia/gstreamer-plugins/Makefile8
-rw-r--r--multimedia/gstreamer-plugins80/Makefile8
-rw-r--r--multimedia/mjpegtools/Makefile5
-rw-r--r--multimedia/mplayer/Makefile5
-rw-r--r--multimedia/mplayerxp/Makefile13
-rw-r--r--multimedia/oqtplayer/Makefile2
-rw-r--r--multimedia/transcode/Makefile5
-rw-r--r--net/sdl_net/Makefile2
-rw-r--r--x11-toolkits/gai/Makefile2
-rw-r--r--x11/electricsheep/Makefile2
61 files changed, 99 insertions, 97 deletions
diff --git a/audio/drumpiler/Makefile b/audio/drumpiler/Makefile
index 9bc2e13e3e13..af59333b6ed0 100644
--- a/audio/drumpiler/Makefile
+++ b/audio/drumpiler/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Drum machine compiler
USE_REINPLACE= yes
-USE_SDL= yes
+USE_SDL= sdl
CFLAGS+= `${SDL_CONFIG} --cflags`
LIBS+= `${SDL_CONFIG} --libs`
PLIST_FILES= bin/drumpiler
diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile
index 37e10aa5e6c2..4869d6230754 100644
--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@@ -17,7 +17,7 @@ COMMENT= An curses-based MP3 player
LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg
-USE_SDL= yes
+USE_SDL= sdl
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 0226cad075e4..873dcecab380 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -18,7 +18,7 @@ COMMENT= A sample multi-channel audio mixer library
LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
smpeg.1:${PORTSDIR}/multimedia/smpeg
-USE_SDL= yes
+USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index e332c0128475..8cb035e52d07 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -15,7 +15,7 @@ DISTNAME= SDL_sound-${PORTVERSION}
MAINTAINER= dyeske@yahoo.com
COMMENT= A SDL audio library and player for some popular sound file formats
-USE_SDL= yes
+USE_SDL= sdl
USE_REINPLACE= yes
USE_LIBTOOL= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/audio/tempest_for_eliza/Makefile b/audio/tempest_for_eliza/Makefile
index 9b6136ed6d3a..f47b737708c0 100644
--- a/audio/tempest_for_eliza/Makefile
+++ b/audio/tempest_for_eliza/Makefile
@@ -16,7 +16,7 @@ COMMENT= A program to send AM radio signals using a PC monitor
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_SDL= yes
+USE_SDL= sdl
post-install:
${MKDIR} ${PREFIX}/share/tempest
diff --git a/devel/clanlib-devel/Makefile b/devel/clanlib-devel/Makefile
index 6b73db22b4a6..17ba9c98d0aa 100644
--- a/devel/clanlib-devel/Makefile
+++ b/devel/clanlib-devel/Makefile
@@ -57,7 +57,7 @@ CFLAGS+= -O0
CONFIGURE_ARGS+= --disable-clanSDL
PLIST_SUB+= SDL="@comment "
.else
-USE_SDL= yes
+USE_SDL= sdl
CONFIGURE_ARGS+= --disable-sdltest
PLIST_SUB+= SDL=""
.endif
diff --git a/devel/esdl/Makefile b/devel/esdl/Makefile
index e1089cb562bc..a54a863d0723 100644
--- a/devel/esdl/Makefile
+++ b/devel/esdl/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GL= yes
USE_GMAKE= yes
-USE_SDL= yes
+USE_SDL= sdl
USE_SIZE= yes
ALL_TARGET= target
PLIST_SUB= VERSION="${PORTVERSION}"
diff --git a/devel/libuta/Makefile b/devel/libuta/Makefile
index afe03413983c..696339577ef5 100644
--- a/devel/libuta/Makefile
+++ b/devel/libuta/Makefile
@@ -29,6 +29,8 @@ INSTALLS_SHLIB= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+WANT_SDL= yes
+
SDL11_FILES= configure uta/color.h uta/event.h uta/keysym.h uta/mutex.h \
uta/pixelformat.h uta/rect.h uta/sge_blib.cc uta/sge_blib.h \
uta/sge_draw.cc uta/sge_draw.h uta/sound.h uta/surface_io.cc \
@@ -36,12 +38,12 @@ SDL11_FILES= configure uta/color.h uta/event.h uta/keysym.h uta/mutex.h \
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libSDL_mixer.so.2)
+.if ${HAVE_SDL:Mmixer}!=""
WITH_SDL_MIXER= yes
.endif
.if defined(WITH_SDL_MIXER)
-USE_SDL= mixer sdl
+USE_SDL+= mixer
.endif
post-patch:
diff --git a/devel/wftk/Makefile b/devel/wftk/Makefile
index afe03413983c..696339577ef5 100644
--- a/devel/wftk/Makefile
+++ b/devel/wftk/Makefile
@@ -29,6 +29,8 @@ INSTALLS_SHLIB= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
+WANT_SDL= yes
+
SDL11_FILES= configure uta/color.h uta/event.h uta/keysym.h uta/mutex.h \
uta/pixelformat.h uta/rect.h uta/sge_blib.cc uta/sge_blib.h \
uta/sge_draw.cc uta/sge_draw.h uta/sound.h uta/surface_io.cc \
@@ -36,12 +38,12 @@ SDL11_FILES= configure uta/color.h uta/event.h uta/keysym.h uta/mutex.h \
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libSDL_mixer.so.2)
+.if ${HAVE_SDL:Mmixer}!=""
WITH_SDL_MIXER= yes
.endif
.if defined(WITH_SDL_MIXER)
-USE_SDL= mixer sdl
+USE_SDL+= mixer
.endif
post-patch:
diff --git a/emulators/dgen-sdl/Makefile b/emulators/dgen-sdl/Makefile
index 47ff848bafc5..e618ca071828 100644
--- a/emulators/dgen-sdl/Makefile
+++ b/emulators/dgen-sdl/Makefile
@@ -15,7 +15,7 @@ COMMENT= A wonderful Sega Genesis/MegaDrive emulator
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
-USE_SDL= yes
+USE_SDL= sdl
USE_GL= yes
GNU_CONFIGURE= yes
diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile
index 9bdc5758b35a..5bd0f9d44b40 100644
--- a/emulators/fceu/Makefile
+++ b/emulators/fceu/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= gibbon@cocoa.freemail.ne.jp
COMMENT= A portable NES/Famicom emulator based on Bero's original FCE
-USE_SDL= yes
+USE_SDL= sdl
MAN6= fceu.6
WRKSRC= ${WRKDIR}/fceu
USE_X_PREFIX= yes
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index 9bdc5758b35a..5bd0f9d44b40 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= gibbon@cocoa.freemail.ne.jp
COMMENT= A portable NES/Famicom emulator based on Bero's original FCE
-USE_SDL= yes
+USE_SDL= sdl
MAN6= fceu.6
WRKSRC= ${WRKDIR}/fceu
USE_X_PREFIX= yes
diff --git a/emulators/freesci/Makefile b/emulators/freesci/Makefile
index 9bef9d963364..4c5fd823c636 100644
--- a/emulators/freesci/Makefile
+++ b/emulators/freesci/Makefile
@@ -20,6 +20,7 @@ USE_BZIP2= yes
USE_REINPLACE= yes
USE_XLIB= yes
GNU_CONFIGURE= yes
+WANT_SDL= yes
CONFIGURE_TARGET=
CONFIGURE_ENV= CFLAGS=${PTHREAD_CFLAGS}
@@ -28,7 +29,7 @@ MAN6= freesci-tools.6 freesci.6
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libSDL-1.1.so.5)
+.if ${HAVE_SDL:Msdl}!=""
WITH_SDL= yes
.endif
.if exists(${LOCALBASE}/lib/libdirectfb-0.9.so.16)
@@ -43,7 +44,7 @@ CONFIGURE_ARGS+= --with-console
.endif
.if defined(WITH_SDL) && !defined(WITHOUT_SDL)
-LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
+USE_SDL= yes
CONFIGURE_ARGS= --with-sdl-prefix=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-sdl
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 1e777129b06c..a76a3388e8d2 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
USE_REINPLACE= yes
.if !defined(WITHOUT_SDL)
-USE_SDL= yes
+USE_SDL= sdl
.endif
ROM= 1541 Basic Char Kernal
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index 7f38870882d7..9aa890733ea7 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
PLIST_FILES= bin/generator-gtk
USE_GNOME= gtk12
-USE_SDL= yes
+USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/emulators/scummvm/Makefile b/emulators/scummvm/Makefile
index 37ff0db945d0..da4b3db45391 100644
--- a/emulators/scummvm/Makefile
+++ b/emulators/scummvm/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_PERL5_BUILD=yes
USE_REINPLACE= yes
-USE_SDL= yes
+USE_SDL= sdl
MAN6= scummvm.6
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 2195a9afab3b..7a9b5464b03b 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -30,7 +30,7 @@ PLIST_SUB= STELLA_BIN="${STELLA_BIN}"
ALL_TARGET= freebsd-x
STELLA_BIN= stella.x11
.else
-USE_SDL= yes
+USE_SDL= sdl
ALL_TARGET= freebsd-sdl
STELLA_BIN= stella.sdl
.endif
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index cfdcd0dac764..bd6b1bce006d 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_SDL= yes
+USE_SDL= sdl
WRKSRC= ${WRKDIR}/VisualBoyAdvance-${PORTVERSION}
TARGET_DIR= ${PREFIX}/bin/
diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile
index 6fe9e62da2c4..86f0a6476210 100644
--- a/games/abuse_sdl/Makefile
+++ b/games/abuse_sdl/Makefile
@@ -16,7 +16,7 @@ COMMENT= An SDL port of the Abuse game engine
USE_BZIP2= yes
USE_MESA= yes
-USE_SDL= yes
+USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 2a3bcc1457ae..571f97b6627b 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
freetype.9:${PORTSDIR}/print/freetype2
-USE_SDL= yes
+USE_SDL= sdl
USE_GNOME= gnometarget
USE_REINPLACE= yes
USE_GMAKE= yes
diff --git a/games/amphetamine/Makefile b/games/amphetamine/Makefile
index 76411bf975cd..f21c74c6cbb1 100644
--- a/games/amphetamine/Makefile
+++ b/games/amphetamine/Makefile
@@ -19,7 +19,7 @@ COMMENT= A 2D - Jump'n'run shooter
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
-USE_SDL= yes
+USE_SDL= sdl
USE_GMAKE= yes
DATAVERSION= 0.8.6
diff --git a/games/columns/Makefile b/games/columns/Makefile
index e178bfbe2861..dd0f474f23aa 100644
--- a/games/columns/Makefile
+++ b/games/columns/Makefile
@@ -15,7 +15,7 @@ DISTNAME= Columns-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Nice little implementation of columns game for X Window System
-USE_SDL= yes
+USE_SDL= sdl
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/games/egoboo/Makefile b/games/egoboo/Makefile
index 34642705f36e..b652b20ff22b 100644
--- a/games/egoboo/Makefile
+++ b/games/egoboo/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= Jan.Stocker@t-online.de
COMMENT= A 3d dungeon crawling adventure in the spirit of NetHack
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_SDL= yes
+USE_SDL= sdl
USE_MESA= yes
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/games/exult/Makefile b/games/exult/Makefile
index bb459dd008c7..ccefd109b344 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -18,7 +18,7 @@ COMMENT= Ultima VII engine
RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
USE_XLIB= yes
-USE_SDL= yes
+USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index a4c6170c3b67..a63f5c16633e 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
NHDIR= "${PREFIX}/share/falconseyedir"
MAKE_ENV= NHDIR="${NHDIR}" NETHACKCONFIG="${NETHACKCONFIG}"
NETHACKCONFIG= ${FILESDIR}/x-config
-USE_SDL= yes
+USE_SDL= sdl
USE_PERL5_BUILD=yes
USE_X_PREFIX= Yes
USE_ZIP= yes
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index 9bef9d963364..4c5fd823c636 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -20,6 +20,7 @@ USE_BZIP2= yes
USE_REINPLACE= yes
USE_XLIB= yes
GNU_CONFIGURE= yes
+WANT_SDL= yes
CONFIGURE_TARGET=
CONFIGURE_ENV= CFLAGS=${PTHREAD_CFLAGS}
@@ -28,7 +29,7 @@ MAN6= freesci-tools.6 freesci.6
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libSDL-1.1.so.5)
+.if ${HAVE_SDL:Msdl}!=""
WITH_SDL= yes
.endif
.if exists(${LOCALBASE}/lib/libdirectfb-0.9.so.16)
@@ -43,7 +44,7 @@ CONFIGURE_ARGS+= --with-console
.endif
.if defined(WITH_SDL) && !defined(WITHOUT_SDL)
-LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
+USE_SDL= yes
CONFIGURE_ARGS= --with-sdl-prefix=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-sdl
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index 2feef46aae4d..6a10e3847ab8 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -16,12 +16,11 @@ EXTRACT_SUFX= -source.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= A 3D worm game for two players for X Window System
-LIB_DEPENDS= SDL_sound-1.0.1:${PORTSDIR}/audio/sdl_sound \
- png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_X_PREFIX= yes
USE_GL= yes
-USE_SDL= yes
+USE_SDL= sdl sound
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -33,7 +32,7 @@ CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
.if defined(WITH_SDL_NET)
-LIB_DEPENDS+= SDL_net:${PORTSDIR}/net/sdl_net
+USE_SDL+= net
CONFIGURE_ARGS+= --enable-network
.endif
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index 6826c553ae76..bec91705ebae 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= lgames
MAINTAINER= ports@FreeBSD.org
COMMENT= A nice clone of classical Breakout game
-USE_SDL= yes
+USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index e17a87371616..6cbfcced4086 100644
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= lgeneral
MAINTAINER= filippo@widestore.net
COMMENT= A turn-based strategy engine inspired by Panzer General
-USE_SDL= yes
+USE_SDL= sdl
.ifndef (WITHOUT_SOUND)
USE_SDL= mixer
diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile
index 78587c3b2bd6..614bdb155c3f 100644
--- a/games/lmarbles/Makefile
+++ b/games/lmarbles/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= lgames
MAINTAINER= verm@drunkmonk.net
COMMENT= A challenging puzzle game similar to Atomix
-USE_SDL= yes
+USE_SDL= sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-profile-path=/var/games
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index db9ca8d307f3..4bccaede64da 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -14,14 +14,10 @@ DISTNAME= Maelstrom-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Asteroids-style game for X Window System
-LIB_DEPENDS= SDL_net.0:${PORTSDIR}/net/sdl_net
-
-SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
-
+USE_SDL= sdl net
USE_X_PREFIX= yes
USE_XPM= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}"
CONFIGURE_ARGS+=--program-transform-name=\'\'
.if !defined(NOPORTDOCS)
diff --git a/games/marbles/Makefile b/games/marbles/Makefile
index 78587c3b2bd6..614bdb155c3f 100644
--- a/games/marbles/Makefile
+++ b/games/marbles/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= lgames
MAINTAINER= verm@drunkmonk.net
COMMENT= A challenging puzzle game similar to Atomix
-USE_SDL= yes
+USE_SDL= sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-profile-path=/var/games
diff --git a/games/newvox/Makefile b/games/newvox/Makefile
index 617247bfca17..cf3d71bdad8f 100644
--- a/games/newvox/Makefile
+++ b/games/newvox/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.libsdl.org/projects/newvox/src/
MAINTAINER= ports@FreeBSD.org
COMMENT= Voxel-style landscape rendering fly-by
-USE_SDL= yes
+USE_SDL= sdl
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 715642a8f459..03881b1f801c 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -21,6 +21,7 @@ USE_GMAKE= yes
USE_LIBTOOL= yes
USE_XLIB= yes
INSTALLS_SHLIB= yes
+WANT_SDL= yes
LDCONFIG_DIRS= ${PREFIX}/lib/quake2 ${PREFIX}/lib/quake2/baseq2 ${PREFIX}/lib/quake2/ctf
.include <bsd.port.pre.mk>
@@ -28,7 +29,7 @@ LDCONFIG_DIRS= ${PREFIX}/lib/quake2 ${PREFIX}/lib/quake2/baseq2 ${PREFIX}/lib/qu
CONFIGURE_ARGS= --enable-static=no --program-transform-name='s/^quake2$$/q2f/'
CONFIGURE_TARGET=
-.if exists(${LOCALBASE}/lib/libSDL-1.1.so.5)
+.if ${HAVE_SDL:Msdl}!=""
WITH_SDL= yes
.endif
diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile
index 91044d01b52d..4982b94019a3 100644
--- a/games/quake2lnx/Makefile
+++ b/games/quake2lnx/Makefile
@@ -27,6 +27,7 @@ COMMENT= Cleaned up copy of the original Quake II source code
USE_GMAKE= yes
USE_REINPLACE= yes
+WANT_SDL= yes
.include <bsd.port.pre.mk>
@@ -45,10 +46,10 @@ PLIST_SUB+= SVGA="@comment "
.endif
.if defined(WITH_SDLCLIENT) || defined(WITH_SDL) || defined(WITH_SDLGL) \
- || exists(${LOCALBASE}/lib/libSDL-1.1.so.5)
+ || ${HAVE_SDL:Msdl}!=""
. if !(defined(WITHOUT_SDLCLIENT) && defined(WITHOUT_SDL) \
&& defined(WITHOUT_SDLGL))
-USE_SDL= yes
+USE_SDL= sdl
. endif
. if !defined(WITHOUT_SDLCLIENT)
MAKE_ARGS+= BUILD_SDLQUAKE2=YES
@@ -188,13 +189,13 @@ pre-everything::
.if ${ARCH} == "i386" && !(defined(WITH_SVGA) || exists(${LOCALBASE}/lib/libvga.so.1))
@${ECHO_MSG} "Define WITH_SVGA to build SVGA driver"
.endif
-.if !(defined(WITH_SDL) || exists(${LOCALBASE}/lib/libSDL-1.1.so.5))
+.if !(defined(WITH_SDL) || ${HAVE_SDL:Msdl}!="")
@${ECHO_MSG} "Define WITH_SDL to build SDL software driver"
.endif
-.if !(defined(WITH_SDLGL) || exists(${LOCALBASE}/lib/libSDL-1.1.so.5))
+.if !(defined(WITH_SDLGL) || ${HAVE_SDL:Msdl}!="")
@${ECHO_MSG} "Define WITH_SDLGL to build SDL OpenGL driver"
.endif
-.if !(defined(WITH_SDLCLIENT) || exists(${LOCALBASE}/lib/libSDL-1.1.so.5))
+.if !(defined(WITH_SDLCLIENT) || ${HAVE_SDL:Msdl}!="")
@${ECHO_MSG} "Define WITH_SDLCLIENT to build executable that uses SDL for cdrom and sound"
.endif
.if !(defined(WITH_AA) || exists(${LOCALBASE}/lib/libaa.so.1))
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 3d5f44b6fbfc..dfe1356f48bf 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -36,6 +36,7 @@ USE_GMAKE= yes
USE_XLIB= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
+WANT_SDL= yes
.include <bsd.port.pre.mk>
@@ -56,7 +57,7 @@ CFLAGS+= -ffast-math
.endif
.endif
-.if exists(${LOCALBASE}/lib/libSDL-1.1.so.5)
+.if ${HAVE_SDL:Msdl}!=""
WITH_SDL= yes
.endif
@@ -127,7 +128,7 @@ PLIST_SUB+= XMMS:="@comment "
.endif
.if !defined(WITHOUT_SDL) && defined(WITH_SDL)
-USE_SDL= yes
+USE_SDL= sdl
CONFIGURE_ARGS+=--with-sdl=${LOCALBASE}
PLIST_SUB+= SDL:=""
.else
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 37ff0db945d0..da4b3db45391 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_PERL5_BUILD=yes
USE_REINPLACE= yes
-USE_SDL= yes
+USE_SDL= sdl
MAN6= scummvm.6
diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index 08bbce39ef4e..81f85289cf97 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -15,7 +15,7 @@ DISTNAME= tworld-${PORTVERSION}
MAINTAINER= sec@42.org
COMMENT= An emulation of the game "Chip's Challenge"
-USE_SDL= yes
+USE_SDL= sdl
GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_REINPLACE= YES
diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile
index e6ac96e69b67..3809b506b450 100644
--- a/games/tuxpuck/Makefile
+++ b/games/tuxpuck/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
vorbis.3:${PORTSDIR}/audio/libvorbis
-USE_SDL= yes
+USE_SDL= sdl
USE_GMAKE= yes
ALL_TARGET= tuxpuck
diff --git a/games/wolf3d/Makefile b/games/wolf3d/Makefile
index 51129c4b4548..edb2552e22c4 100644
--- a/games/wolf3d/Makefile
+++ b/games/wolf3d/Makefile
@@ -16,7 +16,7 @@ DISTFILES= wolf3d-20011028.tar.gz:wolf wolfdata.tar.gz:wolfdata
MAINTAINER= tlp@liquidx.org
COMMENT= "Wolfenstein 3D Linux" by Steven Fuller (1992)
-USE_SDL= yes
+USE_SDL= sdl
USE_GZIP= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 14f036fc03c0..eb27c6e2d4d0 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -20,7 +20,7 @@ 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
+USE_SDL= sdl
MAN6= xrick.6
MANCOMPRESSED= yes
diff --git a/graphics/blender-devel/Makefile b/graphics/blender-devel/Makefile
index d7b575838962..f5b393e6064e 100644
--- a/graphics/blender-devel/Makefile
+++ b/graphics/blender-devel/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
USE_PYTHON= yes
-USE_SDL= yes
+USE_SDL= sdl
USE_GL= yes
CONFIGURE_ARGS= --with-sdl=${LOCALBASE} --disable-oggtest --disable-vorbistest --disable-sdltest
diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile
index 3e1cb7449fe5..26b5082703f7 100644
--- a/graphics/guilib/Makefile
+++ b/graphics/guilib/Makefile
@@ -15,7 +15,7 @@ DISTNAME= GUIlib-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A very simple GUI framework for use with SDL
-USE_SDL= yes
+USE_SDL= sdl
USE_GMAKE= yes
USE_LIBTOOL= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index 8acb25de89de..3367f29e18dd 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -17,7 +17,7 @@ DISTNAME= SDL_gfx-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= SDL graphics drawing primitives and other support functions
-USE_SDL= yes
+USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index 032da3e79610..fe477c4349fe 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-USE_SDL= yes
+USE_SDL= sdl
USE_GMAKE= yes
USE_LIBTOOL= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 8cc13958b450..16ab7d6f3ead 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -17,7 +17,7 @@ COMMENT= A library to use TrueType fonts to render text in SDL applications
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
-USE_SDL= yes
+USE_SDL= sdl
USE_GL= yes
USE_REINPLACE= yes
USE_GMAKE= yes
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 0f9690f13876..e0c412307d00 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -19,7 +19,7 @@ COMMENT= Flash Rendering Library
LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad
USE_X_PREFIX= yes
-USE_SDL= yes
+USE_SDL= sdl
USE_GNOME= gnomehack gtk20 libartlgpl2
USE_GETOPT_LONG= yes
USE_REINPLACE= yes
diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile
index 5b52df177947..f1c0903ec779 100644
--- a/graphics/white_dune/Makefile
+++ b/graphics/white_dune/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
USE_MOTIF= yes
USE_GL= yes
-USE_SDL= yes
+USE_SDL= sdl
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 13c513b01f02..12bf7d0f5b5b 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -23,7 +23,7 @@ PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_SDL= yes
+USE_SDL= sdl
USE_REINPLACE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 67b0f555b100..390da734ce52 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -20,6 +20,7 @@ HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_SIZE= yes
+WANT_SDL= yes
CONFIGURE_ARGS= --cc="${CC}" --prefix="${PREFIX}" \
--make="${GMAKE}" --enable-shared \
--extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
@@ -59,7 +60,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-bktr-patch-libavformat::Makefile
##
##
## SDL
-.if exists(${LOCALBASE}/lib/libSDL-1.1.so)
+.if ${HAVE_SDL:Msdl}
WITH_SDL=yes
.endif
## freetype2
@@ -116,7 +117,7 @@ CONFIGURE_ARGS+= --disable-mmx
.endif
## SDL
.ifdef(WITH_SDL)
-USE_SDL= yes
+USE_SDL= sdl
PLIST_SUB+= SDL=""
.else
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 67b0f555b100..390da734ce52 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -20,6 +20,7 @@ HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_SIZE= yes
+WANT_SDL= yes
CONFIGURE_ARGS= --cc="${CC}" --prefix="${PREFIX}" \
--make="${GMAKE}" --enable-shared \
--extra-ldflags="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
@@ -59,7 +60,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-bktr-patch-libavformat::Makefile
##
##
## SDL
-.if exists(${LOCALBASE}/lib/libSDL-1.1.so)
+.if ${HAVE_SDL:Msdl}
WITH_SDL=yes
.endif
## freetype2
@@ -116,7 +117,7 @@ CONFIGURE_ARGS+= --disable-mmx
.endif
## SDL
.ifdef(WITH_SDL)
-USE_SDL= yes
+USE_SDL= sdl
PLIST_SUB+= SDL=""
.else
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 3a41d7ca36db..7153c000d7b4 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -32,6 +32,7 @@ USE_GNOME= gnomehack \
USE_LIBTOOL= yes
USE_REINPLACE= yes
USE_SIZE= yes
+WANT_SDL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-tests \
--disable-alsa \
@@ -56,7 +57,6 @@ WANT_GNOME= yes
MAN1= gst-launch-ext.1 gst-visualise.1
PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
-SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config"
XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config"
# library minor number
@@ -258,7 +258,7 @@ WITH_PNG=yes
.endif
# sdl
-.if exists(${LOCALBASE}/lib/libSDL-1.1.a)
+.if ${HAVE_SDL:Msdl}
WITH_SDL=yes
.endif
@@ -582,11 +582,9 @@ CONFIGURE_ARGS+= --disable-sdl \
--disable-sdltest
PLIST_SUB+= SDL="@comment "
.else
-LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
+USE_SDL= sdl
CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \
--with-sdl-exec-prefix=${LOCALBASE}
-CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG}
PLIST_SUB+= SDL=""
.endif
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 3a41d7ca36db..7153c000d7b4 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -32,6 +32,7 @@ USE_GNOME= gnomehack \
USE_LIBTOOL= yes
USE_REINPLACE= yes
USE_SIZE= yes
+WANT_SDL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-tests \
--disable-alsa \
@@ -56,7 +57,6 @@ WANT_GNOME= yes
MAN1= gst-launch-ext.1 gst-visualise.1
PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
-SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config"
XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config"
# library minor number
@@ -258,7 +258,7 @@ WITH_PNG=yes
.endif
# sdl
-.if exists(${LOCALBASE}/lib/libSDL-1.1.a)
+.if ${HAVE_SDL:Msdl}
WITH_SDL=yes
.endif
@@ -582,11 +582,9 @@ CONFIGURE_ARGS+= --disable-sdl \
--disable-sdltest
PLIST_SUB+= SDL="@comment "
.else
-LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
+USE_SDL= sdl
CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \
--with-sdl-exec-prefix=${LOCALBASE}
-CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG}
PLIST_SUB+= SDL=""
.endif
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 3789d436f5ea..89cd52533913 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -29,6 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS:S/"//g}" \
PTHREAD_LIBS="${PTHREAD_LIBS:S/"//g}"
WANT_GNOME= yes
+WANT_SDL= yes
MAN1= divxdec.1 jpeg2yuv.1 lav2divx.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 \
lavpipe.1 lavplay.1 lavrec.1 lavtrans.1 mjpegtools.1 mp2enc.1 \
@@ -76,7 +77,7 @@ WITH_LIBMOVTAR= yes
WITH_QUICKTIME= yes
.endif
# SDL
-.if exists(${LOCALBASE}/lib/libSDL-1.1.so.5)
+.if ${HAVE_SDL}:Msdl}!=""
WITH_SDL= yes
.endif
@@ -105,7 +106,7 @@ CONFIGURE_ARGS+= --with-movtar-prefix=${LOCALBASE}
.endif
#
.ifdef(WITH_SDL)
-USE_SDL= yes
+USE_SDL= sdl
CONFIGURE_ARGS+= --with-sdl
.endif
#
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 348612b873ac..d5d507816cc0 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -216,6 +216,7 @@ CONFIGURE_ARGS+=--language=${WITH_LANG}
.endif
WANT_GNOME= yes
+WANT_SDL= yes
USE_REINPLACE= yes
MAN1= mplayer.1
MANCOMPRESSED= no
@@ -271,7 +272,7 @@ WITH_SVGALIB= yes
WITH_AALIB= yes
.endif
-.if exists(${LOCALBASE}/lib/libSDL-1.1.so.5)
+.if ${HAVE_SDL:Msdl}!=""
WITH_SDL= yes
WITH_AALIB= yes
.endif
@@ -418,7 +419,7 @@ LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
.endif
.if defined(WITH_SDL)
-USE_SDL= yes
+USE_SDL= sdl
.endif
.if defined(WITH_ESOUND)
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index 84a83d707acb..82ecb31f51b4 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -29,10 +29,10 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_SIZE= yes
HAS_CONFIGURE= yes
+WANT_SDL= yes
MAN1= mplayerxp.1
-SDL_CONFIG?= "${LOCALBASE}/bin/sdl11-config"
WIN32_CODEC_PREFIX= ${LOCALBASE}/lib/win32
# dirs to create before installation
@@ -80,11 +80,11 @@ WITH_CDPARANOIA=yes
WITH_DVD=yes
.endif
# sdl
-.if exists(${LOCALBASE}/lib/libSDL-1.1.a)
+.if ${HAVE_SDL:Msdl}!=""
WITH_SDL=yes
.endif
# sdl_image
-.if exists(${LOCALBASE}/lib/libSDL_image.a)
+.if ${HAVE_SDL:Mimage}!=""
WITH_SDL_IMAGE=yes
.endif
# xvid
@@ -139,17 +139,14 @@ CONFIGURE_ARGS+= --with-libdvdnav=${LOCALBASE}
.endif
# sdl
.ifdef(WITH_SDL)
-LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
+USE_SDL= sdl
CONFIGURE_ARGS+= --enable-sdl
-CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG}
.else
CONFIGURE_ARGS+= --disable-sdl
.endif
# sdl_image
.ifdef(WITH_SDL_IMAGE)
-LIB_DEPENDS+= SDL_image.10:${PORTSDIR}/graphics/sdl_image
-
+USE_SDL+= image
CONFIGURE_ARGS+= --enable-sdl-image
.else
CONFIGURE_ARGS+= --disable-sdl-image
diff --git a/multimedia/oqtplayer/Makefile b/multimedia/oqtplayer/Makefile
index 7a70857bae67..9c79ca05c07a 100644
--- a/multimedia/oqtplayer/Makefile
+++ b/multimedia/oqtplayer/Makefile
@@ -20,7 +20,7 @@ COMMENT= A very very small, not functionnal, video OpenQuicktime (TM) player
LIB_DEPENDS= openquicktime.0:${PORTSDIR}/multimedia/openquicktime
USE_SIZE= yes
-USE_SDL= yes
+USE_SDL= sdl
MAKE_ENV= SDL_CONFIG=${SDL_CONFIG}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 2f1734c27948..0e50f055eb23 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -29,6 +29,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
+WANT_SDL= yes
MAN1= avifix.1 aviindex.1 avimerge.1 avisplit.1 avisync.1 tccat.1 tcdemux.1 \
tcprobe.1 tcscan.1 transcode.1 tcextract.1 tcdecode.1 tcmodinfo.1 \
@@ -48,7 +49,7 @@ WITH_IMAGEMAGICK= yes
WITH_AVIFILE= yes
.endif
-.if exists(${LOCALBASE}/lib/libSDL-1.1.so)
+.if ${HAVE_SDL:Msdl}!=""
WITH_SDL= yes
.endif
@@ -138,7 +139,7 @@ WITHOUT_FFMPEG= YES
.endif
.if defined(WITH_SDL)
-LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12
+USE_SDL= sdl
WITH_LIBDV= yes
PLIST_SUB+= WITH_SDL=""
.else
diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile
index c59c1c3a8f1f..79884cd7b24c 100644
--- a/net/sdl_net/Makefile
+++ b/net/sdl_net/Makefile
@@ -17,7 +17,7 @@ COMMENT= A small sample cross-platform networking library
LIB_DEPENDS= GUI.0:${PORTSDIR}/graphics/guilib
-USE_SDL= yes
+USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index af5cbc739951..f4372b26207e 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext
USE_REINPLACE= yes
USE_BZIP2= yes
USE_GL= yes
-USE_SDL= yes
+USE_SDL= sdl
USE_GNOME= gnomehack gnomeprefix gdkpixbuf gtk20 pango gnomepanel
GNU_CONFIGURE= yes
CONFIGURE_ENV= SDLCONF=${SDL_CONFIG}
diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile
index 5590eb3e550b..effa7e877163 100644
--- a/x11/electricsheep/Makefile
+++ b/x11/electricsheep/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage \
curl:${PORTSDIR}/ftp/curl
USE_X_PREFIX= yes
-USE_SDL= yes
+USE_SDL= sdl
USE_GMAKE= yes
USE_REINPLACE= yes
USE_LIBTOOL= yes