svn commit: r401100 - in head: Mk audio/adplay devel/pwlib games/noegnud-littlehack games/noegnud-nethack games/noegnud-nethack-deet games/noegnud-slashem games/quake2lnx games/quakeforge graphics/...
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon Nov 9 14:30:05 UTC 2015
Author: amdmi3
Date: Mon Nov 9 14:30:02 2015
New Revision: 401100
URL: https://svnweb.freebsd.org/changeset/ports/401100
Log:
Remove support for WANT_SDL/HAVE_SDL knobs
WANT_SDL/HAVE_SDL macros allowed a port to check which SDL components
are installed. This goes against the policy of avoiding automatic
dependencies, and there are actually no cases in the portstree where
these knobs are used properly, so axe them out.
Approved by: portmgr (mat)
Differential Revision: D4093
Modified:
head/Mk/bsd.port.mk
head/Mk/bsd.sanity.mk
head/Mk/bsd.sdl.mk
head/audio/adplay/Makefile
head/devel/pwlib/Makefile
head/games/noegnud-littlehack/Makefile
head/games/noegnud-nethack-deet/Makefile
head/games/noegnud-nethack/Makefile
head/games/noegnud-slashem/Makefile
head/games/quake2lnx/Makefile
head/games/quakeforge/Makefile
head/graphics/gnash/Makefile
head/multimedia/audacious-plugins/Makefile
head/multimedia/avidemux/Makefile.common
head/multimedia/ffmpeg0/Makefile
head/multimedia/mplayer/Makefile.common
head/multimedia/transcode/Makefile
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Mon Nov 9 14:27:31 2015 (r401099)
+++ head/Mk/bsd.port.mk Mon Nov 9 14:30:02 2015 (r401100)
@@ -1445,7 +1445,7 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/
.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 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfo
.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
Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk Mon Nov 9 14:27:31 2015 (r401099)
+++ head/Mk/bsd.sanity.mk Mon Nov 9 14:30:02 2015 (r401100)
@@ -153,6 +153,10 @@ DEV_WARNING+= "PYDISTUTILS_INSTALLNOSING
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 \
Modified: head/Mk/bsd.sdl.mk
==============================================================================
--- head/Mk/bsd.sdl.mk Mon Nov 9 14:27:31 2015 (r401099)
+++ head/Mk/bsd.sdl.mk Mon Nov 9 14:30:02 2015 (r401100)
@@ -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 @@ _LIB_ttf2= libSDL2_ttf.so
_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)
Modified: head/audio/adplay/Makefile
==============================================================================
--- head/audio/adplay/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/audio/adplay/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -20,7 +20,6 @@ LIB_DEPENDS= libadplug.so:${PORTSDIR}/au
GNU_CONFIGURE= yes
USES= libtool
-WANT_SDL= yes
DBFILE= adplug.db
DBVERSION= 2006-07-07
Modified: head/devel/pwlib/Makefile
==============================================================================
--- head/devel/pwlib/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/devel/pwlib/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -23,7 +23,6 @@ USES= bison gmake
USE_GCC= any
USE_AUTOTOOLS= autoconf
WANT_GNOME= yes
-WANT_SDL= yes
USE_OPENSSL= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
Modified: head/games/noegnud-littlehack/Makefile
==============================================================================
--- head/games/noegnud-littlehack/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/games/noegnud-littlehack/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -22,7 +22,6 @@ RUN_DEPENDS= noegnud-data>0:${PORTSDIR}/
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 @@ ALL_TARGET= lh001
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 @@ post-patch:
do-configure:
(cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-littlehack-0.0.1/Makefile)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/games/noegnud-nethack-deet/Makefile
==============================================================================
--- head/games/noegnud-nethack-deet/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/games/noegnud-nethack-deet/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -22,7 +22,6 @@ RUN_DEPENDS= noegnud-data>0:${PORTSDIR}/
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 @@ ALL_TARGET= nh342-dt
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 @@ post-patch:
do-configure:
(cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.2-deet/Makefile)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/games/noegnud-nethack/Makefile
==============================================================================
--- head/games/noegnud-nethack/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/games/noegnud-nethack/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -22,7 +22,6 @@ RUN_DEPENDS= noegnud-data>0:${PORTSDIR}/
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 @@ ALL_TARGET= nh343
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 @@ post-patch:
do-configure:
(cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.3/Makefile)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/games/noegnud-slashem/Makefile
==============================================================================
--- head/games/noegnud-slashem/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/games/noegnud-slashem/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -22,7 +22,6 @@ RUN_DEPENDS= noegnud-data>0:${PORTSDIR}/
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 @@ ALL_TARGET= se006e4f8
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 @@ post-patch:
do-configure:
(cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-slashem-0.0.6E4F8/Makefile)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/games/quake2lnx/Makefile
==============================================================================
--- head/games/quake2lnx/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/games/quake2lnx/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -17,7 +17,6 @@ COMMENT= Icculus.org version of the orig
LICENSE= GPLv2
USES= gmake
-WANT_SDL= yes
ALL_TARGET= build_release
LIBDIR= ${PREFIX}/lib/${PORTNAME}
Modified: head/games/quakeforge/Makefile
==============================================================================
--- head/games/quakeforge/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/games/quakeforge/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -22,7 +22,6 @@ GNU_CONFIGURE= yes
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} \
Modified: head/graphics/gnash/Makefile
==============================================================================
--- head/graphics/gnash/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/graphics/gnash/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -21,7 +21,6 @@ CONFLICTS= gnash-devel-[0-9]*
USES= cpe gmake jpeg libtool pkgconfig tar:bzip2
GNU_CONFIGURE= yes
-WANT_SDL= yes
USE_GCC= any
WANT_GSTREAMER= yes
USE_GNOME= libxml2
Modified: head/multimedia/audacious-plugins/Makefile
==============================================================================
--- head/multimedia/audacious-plugins/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/multimedia/audacious-plugins/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -20,7 +20,6 @@ USE_LDCONFIG= yes
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 \
Modified: head/multimedia/avidemux/Makefile.common
==============================================================================
--- head/multimedia/avidemux/Makefile.common Mon Nov 9 14:27:31 2015 (r401099)
+++ head/multimedia/avidemux/Makefile.common Mon Nov 9 14:30:02 2015 (r401100)
@@ -19,7 +19,6 @@ USE_QT4= # empty
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
Modified: head/multimedia/ffmpeg0/Makefile
==============================================================================
--- head/multimedia/ffmpeg0/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/multimedia/ffmpeg0/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -25,7 +25,6 @@ PORTSCOUT= limit:^0\.7.*
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
Modified: head/multimedia/mplayer/Makefile.common
==============================================================================
--- head/multimedia/mplayer/Makefile.common Mon Nov 9 14:27:31 2015 (r401099)
+++ head/multimedia/mplayer/Makefile.common Mon Nov 9 14:30:02 2015 (r401100)
@@ -51,4 +51,3 @@ CONFIGURE_ARGS= --cc="${CC}" \
--enable-ass-internal
WANT_GNOME= yes
-WANT_SDL= yes
Modified: head/multimedia/transcode/Makefile
==============================================================================
--- head/multimedia/transcode/Makefile Mon Nov 9 14:27:31 2015 (r401099)
+++ head/multimedia/transcode/Makefile Mon Nov 9 14:30:02 2015 (r401100)
@@ -17,7 +17,6 @@ LIB_DEPENDS= libavcodec.so:${PORTSDIR}/m
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
More information about the svn-ports-head
mailing list