Page MenuHomeFreeBSD
Files F154323489

D4093.diff
No OneTemporary
Actions

D4093.diff
View Options

Index: head/Mk/bsd.port.mk
===================================================================
--- head/Mk/bsd.port.mk
+++ head/Mk/bsd.port.mk
@@ -1445,7 +1445,7 @@
.include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
.endif
-.if defined(USE_SDL) || defined(WANT_SDL)
+.if defined(USE_SDL)
.include "${PORTSDIR}/Mk/bsd.sdl.mk"
.endif
@@ -1916,7 +1916,7 @@
.include "${PORTSDIR}/Mk/bsd.qt.mk"
.endif
-.if defined(USE_SDL) || defined(WANT_SDL)
+.if defined(USE_SDL)
.include "${PORTSDIR}/Mk/bsd.sdl.mk"
.endif
Index: head/Mk/bsd.sanity.mk
===================================================================
--- head/Mk/bsd.sanity.mk
+++ head/Mk/bsd.sanity.mk
@@ -153,6 +153,10 @@
DEV_ERROR+= "INSTALLS_EGGINFO is no longer supported, please add the entry directly to the plist"
.endif
+.if defined(WANT_SDL)
+DEV_ERROR+= "WANT_SDL is no longer supported. If you need SDL, use USE_SDL, if you need optional dependency, use options"
+.endif
+
SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
USE_READLINE USE_ICONV PERL_CONFIGURE PERL_MODBUILD \
USE_PERL5_BUILD USE_PERL5_RUN USE_DISPLAY USE_FUSE \
Index: head/Mk/bsd.sdl.mk
===================================================================
--- head/Mk/bsd.sdl.mk
+++ head/Mk/bsd.sdl.mk
@@ -16,17 +16,6 @@
# the standard SDL and SDL_sound, use "USE_SDL=sdl sound" and the
# required libraries are included in your LIB_DEPENDS.
#
-# If you want to check for the availability for certain SDL ports, you
-# can set WANT_SDL and run it through bsd.port.pre.mk:
-# WANT_SDL= yes
-# USE_SDL= sdl
-# .include <bsd.port.pre.mk>
-# .if ${HAVE_SDL:Mgraphics}
-# USE_SDL+= graphics
-# .endif
-# .include <bsd.port.post.mk>
-# Run "make -V USE_SDL" to see which libs are asked for at the end.
-#
#
# $FreeBSD$
@@ -132,26 +121,6 @@
_REQUIRES_ttf2= sdl2
#
-# If WANT_SDL is defined, check for the available libraries
-#
-.if !defined(AFTERPORTMK)
-.if !defined(SDL_Include_pre)
-
-SDL_Include_pre= bsd.sdl.mk
-
-HAVE_SDL?=
-.if defined(WANT_SDL)
-.for component in ${_USE_SDL_ALL}
-.if exists(${LOCALBASE}/lib/lib${_LIB_${component}}.so)
-HAVE_SDL+= ${component}
-.endif
-.endfor
-.endif
-
-.endif
-.endif
-
-#
# If USE_SDL is defined, make dependencies for the libraries
#
.if !defined(BEFOREPORTMK)
Index: head/audio/adplay/Makefile
===================================================================
--- head/audio/adplay/Makefile
+++ head/audio/adplay/Makefile
@@ -20,7 +20,6 @@
GNU_CONFIGURE= yes
USES= libtool
-WANT_SDL= yes
DBFILE= adplug.db
DBVERSION= 2006-07-07
Index: head/devel/pwlib/Makefile
===================================================================
--- head/devel/pwlib/Makefile
+++ head/devel/pwlib/Makefile
@@ -23,7 +23,6 @@
USE_GCC= any
USE_AUTOTOOLS= autoconf
WANT_GNOME= yes
-WANT_SDL= yes
USE_OPENSSL= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
Index: head/games/noegnud-littlehack/Makefile
===================================================================
--- head/games/noegnud-littlehack/Makefile
+++ head/games/noegnud-littlehack/Makefile
@@ -22,7 +22,6 @@
NOEGNUDVERSION= ${PORTNAME}-0.8.0
USES= bison tar:bzip2
USE_GL= yes
-WANT_SDL= yes
USE_SDL= sdl image mixer
WRKSRC= ${WRKDIR}/${DISTNAME}/variants
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
@@ -30,14 +29,10 @@
INSTALL_TARGET= install_lh001
MAKE_JOBS_UNSAFE= yes
-.include <bsd.port.pre.mk>
-
pre-everything::
-.if ${HAVE_SDL}
@${ECHO_MSG} "This port depends on SDL with OpenGL support."
@${ECHO_MSG} "If your SDL does not support OpenGL, hit ^C now and reinstall SDL"
@${ECHO_MSG} "with OpenGL support turned on."
-.endif
post-extract:
@${CP} ${DISTDIR}/nethack-342.tgz ${WRKSRC}/tarballs
@@ -54,4 +49,4 @@
do-configure:
(cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-littlehack-0.0.1/Makefile)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/games/noegnud-nethack-deet/Makefile
===================================================================
--- head/games/noegnud-nethack-deet/Makefile
+++ head/games/noegnud-nethack-deet/Makefile
@@ -22,7 +22,6 @@
NOEGNUDVERSION= ${PORTNAME}-0.8.0
USES= bison tar:bzip2
USE_GL= yes
-WANT_SDL= yes
USE_SDL= sdl image mixer
WRKSRC= ${WRKDIR}/${DISTNAME}/variants
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
@@ -30,14 +29,10 @@
INSTALL_TARGET= install_nh342-dt
MAKE_JOBS_UNSAFE= yes
-.include <bsd.port.pre.mk>
-
pre-everything::
-.if ${HAVE_SDL}
@${ECHO_MSG} "This port depends on SDL with OpenGL support."
@${ECHO_MSG} "If your SDL does not support OpenGL, hit ^C now and reinstall SDL"
@${ECHO_MSG} "with OpenGL support turned on."
-.endif
post-extract:
@${CP} ${DISTDIR}/nethack-342.tgz ${WRKSRC}/tarballs
@@ -55,4 +50,4 @@
do-configure:
(cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.2-deet/Makefile)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/games/noegnud-nethack/Makefile
===================================================================
--- head/games/noegnud-nethack/Makefile
+++ head/games/noegnud-nethack/Makefile
@@ -22,7 +22,6 @@
NOEGNUDVERSION= ${PORTNAME}-0.8.0
USES= bison gmake tar:bzip2
USE_GL= yes
-WANT_SDL= yes
USE_SDL= sdl image mixer
WRKSRC= ${WRKDIR}/${DISTNAME}/variants
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
@@ -30,14 +29,10 @@
INSTALL_TARGET= install_nh343
MAKE_JOBS_UNSAFE= yes
-.include <bsd.port.pre.mk>
-
pre-everything::
-.if ${HAVE_SDL}
@${ECHO_MSG} "This port depends on SDL with OpenGL support."
@${ECHO_MSG} "If your SDL does not support OpenGL, hit ^C now and reinstall SDL"
@${ECHO_MSG} "with OpenGL support turned on."
-.endif
post-extract:
@${CP} ${DISTDIR}/nethack-343-src.tgz ${WRKSRC}/tarballs
@@ -56,4 +51,4 @@
do-configure:
(cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.3/Makefile)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/games/noegnud-slashem/Makefile
===================================================================
--- head/games/noegnud-slashem/Makefile
+++ head/games/noegnud-slashem/Makefile
@@ -22,7 +22,6 @@
NOEGNUDVERSION= ${PORTNAME}-0.8.0
USES= bison gmake tar:bzip2
USE_GL= yes
-WANT_SDL= yes
USE_SDL= sdl image mixer
WRKSRC= ${WRKDIR}/${DISTNAME}/variants
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
@@ -30,14 +29,10 @@
INSTALL_TARGET= install_se006e4f8
MAKE_JOBS_UNSAFE= yes
-.include <bsd.port.pre.mk>
-
pre-everything::
-.if ${HAVE_SDL}
@${ECHO_MSG} "This port depends on SDL with OpenGL support."
@${ECHO_MSG} "If your SDL does not support OpenGL, hit ^C now and reinstall SDL"
@${ECHO_MSG} "with OpenGL support turned on."
-.endif
post-extract:
@${CP} ${DISTDIR}/se006e4f8.tar.gz ${WRKSRC}/tarballs
@@ -57,4 +52,4 @@
do-configure:
(cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-slashem-0.0.6E4F8/Makefile)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/games/quake2lnx/Makefile
===================================================================
--- head/games/quake2lnx/Makefile
+++ head/games/quake2lnx/Makefile
@@ -17,7 +17,6 @@
LICENSE= GPLv2
USES= gmake
-WANT_SDL= yes
ALL_TARGET= build_release
LIBDIR= ${PREFIX}/lib/${PORTNAME}
Index: head/games/quakeforge/Makefile
===================================================================
--- head/games/quakeforge/Makefile
+++ head/games/quakeforge/Makefile
@@ -22,7 +22,6 @@
INSTALL_TARGET= install-strip
USES= bison compiler:nestedfct gmake libtool tar:bzip2
USE_LDCONFIG= yes
-WANT_SDL= yes
CONFIGURE_ARGS+=--with-global-cfg=${PREFIX}/etc/quakeforge.conf \
--with-sharepath=${DATADIR} \
Index: head/graphics/gnash/Makefile
===================================================================
--- head/graphics/gnash/Makefile
+++ head/graphics/gnash/Makefile
@@ -21,7 +21,6 @@
USES= cpe gmake jpeg libtool pkgconfig tar:bzip2
GNU_CONFIGURE= yes
-WANT_SDL= yes
USE_GCC= any
WANT_GSTREAMER= yes
USE_GNOME= libxml2
Index: head/multimedia/audacious-plugins/Makefile
===================================================================
--- head/multimedia/audacious-plugins/Makefile
+++ head/multimedia/audacious-plugins/Makefile
@@ -20,7 +20,6 @@
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
USE_GNOME= glib20
-WANT_SDL= yes
OPTIONS_DEFINE= DBUS OSS4 SDLOUT ALSA CUE MP3 STATUSICON AOSD AOSDXCOMP \
ADPLUG VORBIS FLAC WAVPACK AAC SNDFILE MODPLUG JACK \
Index: head/multimedia/avidemux/Makefile.common
===================================================================
--- head/multimedia/avidemux/Makefile.common
+++ head/multimedia/avidemux/Makefile.common
@@ -19,7 +19,6 @@
OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options
USE_SQLITE= yes
-WANT_SDL= yes
USES= cmake:outsource pkgconfig iconv gmake compiler:features
USES+= dos2unix
DOS2UNIX_FILES= cmake/admCheckMiscLibs.cmake po/CMakeLists.txt
Index: head/multimedia/ffmpeg0/Makefile
===================================================================
--- head/multimedia/ffmpeg0/Makefile
+++ head/multimedia/ffmpeg0/Makefile
@@ -25,7 +25,6 @@
USES= cpe gmake perl5 pkgconfig tar:bzip2
USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
USE_PERL5= build
-WANT_SDL= yes
FFMPEG_SUFFIX= 0
HAS_CONFIGURE= yes
Index: head/multimedia/mplayer/Makefile.common
===================================================================
--- head/multimedia/mplayer/Makefile.common
+++ head/multimedia/mplayer/Makefile.common
@@ -51,4 +51,3 @@
--enable-ass-internal
WANT_GNOME= yes
-WANT_SDL= yes
Index: head/multimedia/transcode/Makefile
===================================================================
--- head/multimedia/transcode/Makefile
+++ head/multimedia/transcode/Makefile
@@ -17,7 +17,6 @@
USE_LDCONFIG= yes
USES= gmake libtool pkgconfig tar:bzip2
USE_GCC= any
-WANT_SDL= yes
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-oss

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 8:29 PM (7 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32303955
Default Alt Text
D4093.diff (9 KB)

Event Timeline