Date: Fri, 31 May 2013 14:40:56 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319495 - in head/games: alephone alienarena armagetron arx-libertatis balazarbrothers blinkensisters bloodfrontier d2x-xl daimonin eduke32 foobillard freedink-engine freedroidrpg galax... Message-ID: <201305311440.r4VEeuX5028032@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Fri May 31 14:40:56 2013 New Revision: 319495 URL: http://svnweb.freebsd.org/changeset/ports/319495 Log: - adopt optionsNG for games - trim historical headers and trim comments - some Makefile cleanup Approved by: portmgr (bapt) Modified: head/games/alephone/Makefile head/games/alienarena/Makefile head/games/armagetron/Makefile head/games/arx-libertatis/Makefile head/games/balazarbrothers/Makefile head/games/blinkensisters/Makefile head/games/bloodfrontier/Makefile head/games/d2x-xl/Makefile head/games/daimonin/Makefile head/games/eduke32/Makefile head/games/foobillard/Makefile head/games/freedink-engine/Makefile head/games/freedroidrpg/Makefile head/games/galaxymage/Makefile head/games/glest/Makefile head/games/heretic/Makefile head/games/linux-nerogame/Makefile head/games/linux-nwnclient/Makefile head/games/linux-quake4/Makefile head/games/linux-quake4/pkg-plist head/games/linux-savage/Makefile head/games/linux-warsow/Makefile head/games/luola/Makefile head/games/mangos/Makefile head/games/marsnomercy/Makefile head/games/mirrormagic/Makefile head/games/mkgichessclub/Makefile head/games/moonlander/Makefile head/games/naev/Makefile head/games/nexuiz/Makefile head/games/noegnud-addons/Makefile head/games/numptyphysics/Makefile head/games/pvpgn/Makefile head/games/py-pychess/Makefile head/games/pysycache-lang/Makefile head/games/pysycache-themes/Makefile head/games/quake2-source/Makefile head/games/quake2-zaero/Makefile head/games/quake3/Makefile head/games/scourge/Makefile head/games/scummvm-tools/Makefile head/games/steelstorm/Makefile head/games/teeworlds/Makefile head/games/tyrquake/Makefile head/games/xqf/Makefile Modified: head/games/alephone/Makefile ============================================================================== --- head/games/alephone/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/alephone/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: alephone -# Date created: 27 February 2001 -# Whom: Michael Alyn Miller <malyn@strangeGizmo.com> -# +# Created by: Michael Alyn Miller <malyn@strangeGizmo.com> # $FreeBSD$ -# PORTNAME= alephone PORTVERSION= 20120514 @@ -30,53 +26,53 @@ DATADIR= ${PREFIX}/share/AlephOne MAN6= alephone.6 -OPTIONS= MAD "use libmad for mp3 playback" on \ - OGG "enable ogg/vorbis music playback" on \ - SPEEX "enable speex net mic playback" on \ - SMPEG "use SMPEG for movie playback" on \ - TTF "enable SDL_ttf font rendering" on \ - ZZIP "enable zziplib support" on +OPTIONS_DEFINE= MAD OGG SPEEX SMPEG TTF ZZIP +SMPEG_DESC= Use SMPEG for movie playback +TTF_DESC= Enable SDL_ttf font rendering +ZZIP_DESC= Enable zziplib support + +OPTIONS_DEFAULT= MAD OGG SPEEX SMPEG TTF ZZIP .include <bsd.port.options.mk> -.if defined(WITHOUT_MAD) -CONFIGURE_ARGS+=--disable-mad -.else +.if ${PORT_OPTIONS:MMAD} LIB_DEPEND+= mad.2:${PORTSDIR}/audio/libmad +.else +CONFIGURE_ARGS+=--disable-mad .endif -.if defined(WITHOUT_OGG) -CONFIGURE_ARGS+=--disable-vorbis -.else +.if ${PORT_OPTIONS:MOGG} LIB_DEPEND+= vorbisfile.6:${PORTSDIR}/audio/libvorbis +.else +CONFIGURE_ARGS+=--disable-vorbis .endif -.if defined(WITHOUT_SPEEX) -CONFIGURE_ARGS+=--disable-speex -.else +.if ${PORT_OPTIONS:MSPEEX} LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex +.else +CONFIGURE_ARGS+=--disable-speex .endif -.if defined(WITHOUT_SMPEG) -CONFIGURE_ARGS+=--disable-smpeg -.else +.if ${PORT_OPTIONS:MSMPEG} LIB_DEPENDS+= smpeg.1:${PORTSDIR}/multimedia/smpeg +.else +CONFIGURE_ARGS+=--disable-smpeg .endif -.if defined(WITHOUT_TTF) -CONFIGURE_ARGS+=--disable-ttf -.else +.if ${PORT_OPTIONS:MTTF} USE_SDL+= ttf +.else +CONFIGURE_ARGS+=--disable-ttf .endif -.if defined(WITHOUT_ZZIP) -CONFIGURE_ARGS+=--disable-zzip -.else +.if ${PORT_OPTIONS:MZZIP} LIB_DEPENDS+= zzip.13:${PORTSDIR}/devel/zziplib +.else +CONFIGURE_ARGS+=--disable-zzip .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} README ${DOCSDIR} cd ${WRKSRC}/docs && ${INSTALL_DATA} *.html ${DOCSDIR} Modified: head/games/alienarena/Makefile ============================================================================== --- head/games/alienarena/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/alienarena/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -36,8 +36,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-7.53/sour SUB_FILES= pkg-message -OPTIONS= CLIENT "Build client" on \ - DEDICATED "Build dedicated server" on +OPTIONS_MULTI= FLAVOR +OPTIONS_MULTI_FLAVOR= CLIENT DEDICATED +CLIENT_DESC= Build client +DEDICATED_DESC= Build dedicated server + +OPTIONS_DEFAULT= CLIENT DEDICATED PLIST_SUB= LIBDIR=${LIBDIR:S/${PREFIX}\///} @@ -45,7 +49,7 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} .include <bsd.port.options.mk> -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} USES+= pkgconfig LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl \ freetype.9:${PORTSDIR}/print/freetype2 \ @@ -57,21 +61,17 @@ USE_OPENAL= soft alut USE_XORG= xxf86dga xxf86vm .endif -.if !defined(WITH_CLIENT) && defined(WITH_DEDICATED) +.if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MDEDICATED} CONFIGURE_ARGS+=--disable-client .endif -.if !defined(WITH_CLIENT) && !defined(WITH_DEDICATED) -IGNORE= needs at least one executable (CLIENT or DEDICATED) -.endif - -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} PLIST_SUB+= CLIENT="" .else PLIST_SUB+= CLIENT="@comment " .endif -.if defined(WITH_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} PLIST_SUB+= DEDICATED="" .else PLIST_SUB+= DEDICATED="@comment " @@ -89,11 +89,11 @@ do-install: ${LN} -s ${DATADIR}/arena/* ${LIBDIR}/arena ${LN} -s ${DATADIR}/botinfo ${LIBDIR} ${LN} -s ${DATADIR}/data1/* ${LIBDIR}/data1 -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} ${INSTALL_PROGRAM} ${WRKSRC}/crx \ ${PREFIX}/bin/${PORTNAME} .endif -.if defined(WITH_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} ${INSTALL_PROGRAM} ${WRKSRC}/crx-ded \ ${PREFIX}/bin/${PORTNAME}-ded .endif Modified: head/games/armagetron/Makefile ============================================================================== --- head/games/armagetron/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/armagetron/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: armagetron -# Date created: 12 November 2005 -# Whom: Maxime Henrion <mux@FreeBSD.org> -# +# Created by: Maxime Henrion <mux@FreeBSD.org> # $FreeBSD$ -# PORTNAME= armagetron PORTVERSION= 0.2.8.2.1 @@ -27,12 +22,15 @@ LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphi png15:${PORTSDIR}/graphics/png \ xml2.5:${PORTSDIR}/textproc/libxml2 -OPTIONS= MUSIC "Compile in support for background music" on \ - ARMA_SERVER_ONLY "Build dedicated server only" off +OPTIONS_DEFINE= MUSIC ARMA_SERVER_ONLY +MUSIC_DESC= Compile in support for background music +ARMA_SERVER_ONLY_DESC= Build dedicated server only -.include <bsd.port.pre.mk> +OPTIONS_DEFAULT= MUSIC -.if defined(WITH_ARMA_SERVER_ONLY) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MARMA_SERVER_ONLY} CONFIGURE_ARGS+= --disable-glout PLIST_SUB+= CLIENT="@comment " SERVER="" SUFFIX="-dedicated" PKGNAMESUFFX= -dedicated @@ -42,7 +40,7 @@ USE_GL= gl USE_SDL= sdl image CXXFLAGS+= `${SDL_CONFIG} --cflags` PLIST_SUB+= CLIENT="" SERVER="@comment " SUFFIX="" -.if !defined(WITHOUT_MUSIC) +.if ${PORT_OPTIONS:MMUSIC} USE_SDL+= mixer CONFIGURE_ARGS+=--enable-music .endif @@ -58,4 +56,4 @@ post-patch: ${WRKSRC}/batch/*.in @${FIND} ${WRKSRC}/batch -name '*.bak' -o -name '*.orig' -delete -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/arx-libertatis/Makefile ============================================================================== --- head/games/arx-libertatis/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/arx-libertatis/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -33,11 +33,12 @@ MAN6= arx.6 PORTDOCS= AUTHORS CHANGELOG README.md -OPTIONS= CRASHREPORTER "Build crash reporter (requires Qt4)" off +OPTIONS_DEFINE= CRASHREPORTER +CRASHREPORTER_DESC= Build crash reporter (requires Qt4) .include <bsd.port.options.mk> -.if defined(WITH_CRASHREPORTER) +.if ${PORT_OPTIONS:MCRASHREPORTER} USE_QT4= corelib gui network rcc_build moc_build uic_build qmake_build CMAKE_ARGS+= -DBUILD_CRASHREPORTER=ON PLIST_SUB+= CRASHREPORTER="" @@ -47,7 +48,7 @@ PLIST_SUB+= CRASHREPORTER="@comment " .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ Modified: head/games/balazarbrothers/Makefile ============================================================================== --- head/games/balazarbrothers/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/balazarbrothers/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: balazarbrothers -# Date created: 2006-05-07 -# Whom: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> -# +# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> # $FreeBSD$ -# PORTNAME= balazarbrothers PORTVERSION= 0.3.1 @@ -34,12 +30,14 @@ PYDISTUTILS_PKGNAME= BalazarBrothers PYDISTUTILS_EGGINFODIR= ${PREFIX}/share DATADIR= share/balazar_brothers -OPTIONS= OPENAL "Use openal sound system" on +OPTIONS_DEFINE= OPENAL +OPTIONS_DEFAULT= OPENAL +.include <bsd.port.options.mk> .include <bsd.port.pre.mk> -.if !defined(WITHOUT_OPENAL) -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_openal.so:${PORTSDIR}/audio/py-openal +.if ${PORT_OPTIONS:MOPENAL} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openal>=0:${PORTSDIR}/audio/py-openal .endif post-patch: Modified: head/games/blinkensisters/Makefile ============================================================================== --- head/games/blinkensisters/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/blinkensisters/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: blinkensisters -# Date created: 26 Mar 2006 -# Whom: Dmitry Marakasov <amdmi3@amdmi3.ru> -# +# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru> # $FreeBSD$ -# PORTNAME= blinkensisters PORTVERSION= 0.5.3 @@ -26,18 +22,20 @@ ADDONS_WRKSRC= ${WRKDIR}/blinkensisters/ PORTDOCS= * -OPTIONS= ADDONS "Install addons (~200 MB download size)" off \ - SDL_MIXER "Build with sound support" on \ - SDL_NET "Build with network support" on \ - THEORA "Build with theora support" off +OPTIONS_DEFINE= ADDONS SDL_MIXER SDL_NET THEORA +ADDONS_DESC= Install addons (~200 MB download size) +SDL_MIXER_DESC= Build with sound support +SDL_NET_DESC= Build with network support -.include <bsd.port.pre.mk> +OPTIONS_DEFAULT= SDL_MIXER SDL_NET + +.include <bsd.port.options.mk> .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif -.if defined(WITH_ADDONS) +.if ${PORT_OPTIONS:MADDONS} DISTNAME= LostPixels-${PORTVERSION}-source-with-addons PKGNAMESUFFIX= -with-addons PLIST_SUB+= ADDONS="" @@ -46,41 +44,41 @@ DISTNAME= LostPixels-${PORTVERSION}-sour PLIST_SUB+= ADDONS="@comment " .endif -.if defined(WITHOUT_SDL_MIXER) -CMAKE_ARGS+= -DUSE_SDL_MIXER:BOOL=OFF -PLIST_SUB+= SDL_MIXER="@comment " -.else +.if ${PORT_OPTIONS:MSDL_MIXER} USE_SDL+= mixer PLIST_SUB+= SDL_MIXER="" +.else +CMAKE_ARGS+= -DUSE_SDL_MIXER:BOOL=OFF +PLIST_SUB+= SDL_MIXER="@comment " .endif -.if defined(WITHOUT_SDL_NET) -CMAKE_ARGS+= -DUSE_SDL_NET:BOOL=OFF -PLIST_SUB+= SDL_NET="@comment " -.else +.if ${PORT_OPTIONS:MSDL_NET} USE_SDL+= net PLIST_SUB+= SDL_NET="" +.else +CMAKE_ARGS+= -DUSE_SDL_NET:BOOL=OFF +PLIST_SUB+= SDL_NET="@comment " .endif -.if defined(WITH_THEORA) +.if ${PORT_OPTIONS:MTHEORA} CMAKE_ARGS+= -DUSE_THEORA:BOOL=ON .else LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora .endif post-patch: -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/^INSTALL.*doc/ d' ${WRKSRC}/CMakeLists.txt .endif @${REINPLACE_CMD} -e 's|share/blinkensisters|${DATADIR:S,${PREFIX}/,,}|; \ s|share/doc/blinkensisters|${DOCSDIR:S,${PREFIX}/,,}|' \ ${WRKSRC}/CMakeLists.txt -.if defined(WITH_ADDONS) +.if ${PORT_OPTIONS:MADDONS} @${FIND} ${ADDONS_WRKSRC} -name "Makefile" | ${XARGS} \ ${REINPLACE_CMD} -e 's|bmfcompress|${WRKSRC}/&|' .endif -.if defined(WITH_ADDONS) +.if ${PORT_OPTIONS:MADDONS} post-build: cd ${ADDONS_WRKSRC} && ${MAKE} @@ -89,4 +87,4 @@ post-install: ${INSTALL_DATA} ${ADDONS_WRKSRC}/for_upload/*.bmf ${DATADIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/bloodfrontier/Makefile ============================================================================== --- head/games/bloodfrontier/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/bloodfrontier/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sauerbraten -# Date created: 2006-02-01 -# Whom: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> -# +# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> # $FreeBSD$ -# PORTNAME= bloodfrontier DISTVERSION= B2 @@ -27,9 +23,14 @@ MAKE_JOBS_SAFE= yes SUB_FILES= bfclient bfserver -OPTIONS= CLIENT "Build client" on \ - DEDICATED "Build dedicated server" on \ - OPTIMIZED_CFLAGS "Enabled additional optimizations" on +OPTIONS_DEFINE= OPTIMIZED_CFLAGS +OPTIONS_MULTI= FLAVOR +OPTIONS_MULTI_FLAVOR= CLIENT DEDICATED +CLIENT_DESC= Build client +DEDICATED_DESC= Build dedicated server +FLAVOR_DESC= Executable Selections + +OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS .include <bsd.port.options.mk> @@ -37,23 +38,19 @@ OPTIONS= CLIENT "Build client" on \ BROKEN= Does not compile on ia64, powerpc, or sparc64 .endif -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) -IGNORE= needs at least one executable (CLIENT or DEDICATED) -.endif - -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} USE_GL= yes USE_SDL= image mixer sdl PLIST_FILES+= bin/bfclient libexec/bfclient BINARIES+= client .endif -.if !defined(WITHOUT_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} PLIST_FILES+= bin/bfserver libexec/bfserver BINARIES+= server .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -fomit-frame-pointer CXXFLAGS+= -O3 -fomit-frame-pointer .endif Modified: head/games/d2x-xl/Makefile ============================================================================== --- head/games/d2x-xl/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/d2x-xl/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: d2x-xl -# Date created: 25 Feb 2009 -# Whom: Aragon Gouveia -# +# Created by: Aragon Gouveia # $FreeBSD$ -# PORTNAME= d2x-xl PORTVERSION= 1.14.121 @@ -38,15 +34,16 @@ USE_DOS2UNIX= missing depcomp SUB_FILES= pkg-message -OPTIONS= OPENGL "Use OpenGL for 3D graphics" on +OPTIONS_DEFINE= OPENGL +OPTIONS_DEFAULT= OPENGL -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif -.if !defined(WITHOUT_OPENGL) +.if ${PORT_OPTIONS:MOPENGL} USE_GL= gl glu CONFIGURE_ARGS+=--with-opengl CPPFLAGS+= -I${LOCALBASE}/include @@ -74,4 +71,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/d2x-xl ${PREFIX}/bin/d2x-xl @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/daimonin/Makefile ============================================================================== --- head/games/daimonin/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/daimonin/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: daimonin-client -# Date created: 15 Feb 2005 -# Whom: Pav Lucistnik <pav@FreeBSD.org> -# +# Created by: Pav Lucistnik <pav@FreeBSD.org> # $FreeBSD$ -# PORTNAME= daimonin PORTVERSION= 0.10.5 @@ -31,29 +27,26 @@ SUB_LIST= PORTVERSION=${PORTVERSION} WRKSRC= ${WRKDIR}/client/make/linux -OPTIONS= KB_DESKTOP "Install key bindings for desktop (num keypad)" on \ - KB_LAPTOP "Install key bindings for laptop (789uojkl)" off \ - KB_ROGUE "Install rogue-like key bindings (hjkl and yubn)" off \ - MUSIC "Download and Install music files (83 Mb)" on \ - DEBUG "Enable debugging messages in log" off +OPTIONS_DEFINE= MUSIC DEBUG +OPTIONS_SINGLE= KB +OPTIONS_SINGLE_KB= KB_DESKTOP KB_LAPTOP KB_ROGUE +KB_DESKTOP_DESC= Key bindings for desktop (num keypad) +KB_LAPTOP_DESC= Key bindings for laptop (789uojkl) +KB_ROGUE_DESC= Rogue-like key bindings (hjkl and yubn) +KB_DESC= KB Selection +MUSIC_DESC= Download and Install music files (83 Mb) -DD?= /bin/dd +OPTIONS_DEFAULT= KB_DESKTOP MUSIC -.include <bsd.port.pre.mk> +DD?= /bin/dd -.if defined(WITH_KB_DESKTOP) && defined(WITH_KB_LAPTOP) || \ - defined(WITH_KB_LAPTOP) && defined(WITH_KB_ROGUE) || \ - defined(WITH_KB_DESKTOP) && defined(WITH_KB_ROGUE) -pre-fetch:: - @${ECHO_MSG} 'error: only one of the KB_* OPTIONS may be used - rerun "make config"' - @${FALSE} -.endif +.include <bsd.port.options.mk> -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-wrapper.c .endif -.if defined(WITH_MUSIC) +.if ${PORT_OPTIONS:MMUSIC} RUN_DEPENDS+= ${DATADIR}/media/AnichGiantTrouble.ogg:${PORTSDIR}/games/daimonin-music .endif @@ -79,10 +72,10 @@ post-install: ${CHMOD} a+x ${PREFIX}/bin/daimonin @${FIND} ${DATADIR} -name '*.orig' -exec rm {} \; ${MV} ${DATADIR}/settings/keys.dat ${DATADIR}/settings/keys-desktop.dat -.if defined(WITH_KB_LAPTOP) +.if ${PORT_OPTIONS:MKB_LAPTOP} @${ECHO} Configuring keyboard bindings for laptop ${LN} -s ${DATADIR}/settings/keys-laptop.dat ${DATADIR}/settings/keys.dat -.elif defined(WITH_KB_ROGUE) +.elif ${PORT_OPTIONS:MKB_ROGUE} @${ECHO} Configuring rogue-like keyboard bindings ${LN} -s ${DATADIR}/settings/keys-rogue.dat ${DATADIR}/settings/keys.dat .else @@ -90,4 +83,4 @@ post-install: ${LN} -s ${DATADIR}/settings/keys-desktop.dat ${DATADIR}/settings/keys.dat .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/eduke32/Makefile ============================================================================== --- head/games/eduke32/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/eduke32/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,7 +1,4 @@ -# New ports collection makefile for: eduke32 -# Date Created: 1 Aug 2006 -# Whom: alepulver -# +# Created by: alepulver # $FreeBSD$ PORTNAME= eduke32 @@ -28,12 +25,15 @@ USE_SDL= mixer sdl WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION} SVNREVISION= 1923 -OPTIONS= MIDI "Enable original MIDI music support" On \ - TIMIDITYPLUS "Use Timidity++ instead of Timidity" Off \ - VORBIS "Enable Ogg Vorbis music files support" On +OPTIONS_DEFINE= MIDI TIMIDITYPLUS VORBIS +MIDI_DESC= Original MIDI music support +TIMIDITYPLUS_DESC= Use Timidity++ instead of Timidity + +OPTIONS_DEFAULT= MIDI VORBIS .include "${.CURDIR}/../duke3d-data/Makefile.include" +.include <bsd.port.options.mk> .include <bsd.port.pre.mk> .if ${ARCH} == "i386" @@ -44,20 +44,20 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/na BROKEN= Does not compile on sparc64 .endif -.if defined(WITH_MIDI) -.if defined(WITH_TIMIDITYPLUS) +.if ${PORT_OPTIONS:MMIDI} +.if ${PORT_OPTIONS:MTIMIDITYPLUS} RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity++ .else RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity .endif .endif -.if defined(WITH_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis .endif post-patch: -.if defined(WITHOUT_VORBIS) +.if ! ${PORT_OPTIONS:MVORBIS} @${REINPLACE_CMD} '/+= -lvorbis/d' ${WRKSRC}/Makefile .endif .if ${ARCH} != "i386" @@ -82,11 +82,11 @@ do-install: .for f in eduke32 mapster32 ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/samples/*.sample ${DOCSDIR} .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR} . for f in cfg map m32 txt ${INSTALL_DATA} ${WRKSRC}/samples/*.${f} ${EXAMPLESDIR} Modified: head/games/foobillard/Makefile ============================================================================== --- head/games/foobillard/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/foobillard/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: foobillard -# Date created: 26 October 2002 -# Whom: Thomas Vogt <thomas.vogt@bsdunix.ch> -# +# Created by: Thomas Vogt <thomas.vogt@bsdunix.ch> # $FreeBSD$ -# PORTNAME= foobillard PORTVERSION= 3.0a @@ -17,10 +13,11 @@ COMMENT= Free OpenGL billiards game LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 -OPTIONS= SDL "Use SDL instead of glut" off \ - NVIDIA_BUMPREF "Enable NVidia extensions" off +OPTIONS_DEFINE= SDL NVIDIA_BUMPREF +SDL_DESC= SDL instead of glut +NVIDIA_BUMPREF_DESC= NVidia extensions -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> FREETYPE_CONFIG?= ${LOCALBASE}/bin/freetype-config @@ -38,7 +35,7 @@ DESKTOP_ENTRIES= "Foobillard" \ "Game;Simulation;" \ false -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL= yes CONFIGURE_ARGS+= --enable-SDL .else @@ -46,7 +43,7 @@ USE_GL= glut CONFIGURE_ARGS+= --enable-glut .endif -.if !defined(WITH_NVIDIA_BUMPREF) +.if ! ${PORT_OPTIONS:MNVIDIA_BUMPREF} CONFIGURE_ARGS+= --disable-nvidia .endif @@ -57,6 +54,6 @@ post-patch: ${WRKSRC}/src/Makefile.in post-install: - @${INSTALL_MAN} ${WRKSRC}/foobillard.6 ${PREFIX}/man/man6/foobillard.6 + @${INSTALL_MAN} ${WRKSRC}/foobillard.6 ${MAN6PREFIX}/man/man6/foobillard.6 -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/freedink-engine/Makefile ============================================================================== --- head/games/freedink-engine/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/freedink-engine/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: syncterm -# Date created: 3 October 2006 -# Whom: shurd -# +# Created by: shurd # $FreeBSD$ -# PORTNAME= freedink PORTVERSION= 1.08.${PORTVER} @@ -26,11 +22,14 @@ CONFIGURE_ARGS= --disable-static --disab MAN6= freedink.6 freedinkedit.6 dink.6 dinkedit.6 -OPTIONS= EMBEDDED "Enable Embedded Resources" on +OPTIONS_DEFINE= EMBEDDED +EMBEDDED_DESC= Embedded Resources -.include <bsd.port.pre.mk> +OPTIONS_DEFAULT= EMBEDDED -.ifdef WITHOUT_EMBEDDED +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MEMBEDDED} CONFIGURE_ARGS+= --enable-embedded-resources BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS+= zip.3:${PORTSDIR}/archivers/libzip @@ -39,4 +38,4 @@ RUN_DEPENDS+= zip:${PORTSDIR}/archivers CONFIGURE_ARGS+= --disable-embedded-resources .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/freedroidrpg/Makefile ============================================================================== --- head/games/freedroidrpg/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/freedroidrpg/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: freedroidrpg -# Date created: 18 Jul 2005 -# Whom: Travis Poppe <tlp@liquidx.org> -# +# Created by: Travis Poppe <tlp@liquidx.org> # $FreeBSD$ -# PORTNAME= freedroidrpg PORTVERSION= 0.15 @@ -23,13 +19,14 @@ CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDI MAN6= freedroidRPG.6 -OPTIONS= BACKTRACE "Use backtrace() to generate nice bug reports" on \ - OPENGL "Enable the OpenGL support (highly recommended!)" on \ - VORBIS "Enable vorbis support (music)" on +OPTIONS_DEFINE= BACKTRACE OPENGL VORBIS +BACKTRACE_DESC= Use backtrace() to generate nice bug reports + +OPTIONS_DEFAULT= BACKTRACE OPENGL VORBIS .include <bsd.port.options.mk> -.if !defined(WITHOUT_BACKTRACE) +.if ${PORT_OPTIONS:MBACKTRACE} LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo CONFIGURE_ARGS+=--enable-backtrace STRIP= # @@ -37,14 +34,14 @@ STRIP= # CONFIGURE_ARGS+=--disable-backtrace .endif -.if !defined(WITHOUT_OPENGL) +.if ${PORT_OPTIONS:MOPENGL} USE_GL= yes CONFIGURE_ARGS+=--enable-opengl .else CONFIGURE_ARGS+=--disable-opengl .endif -.if !defined(WITHOUT_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis \ ogg:${PORTSDIR}/audio/libogg CONFIGURE_ARGS+=--enable-vorbis Modified: head/games/galaxymage/Makefile ============================================================================== --- head/games/galaxymage/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/galaxymage/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: galaxymage -# Date created: 2006-01-30 -# Whom: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> -# +# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> # $FreeBSD$ -# PORTNAME= galaxymage PORTVERSION= 0.3.0 @@ -23,11 +19,12 @@ USE_TWISTED= yes USES= gettext NO_BUILD= yes -OPTIONS= PSYCO "Use just-in-time Python compiler" off +OPTIONS_DEFINE= PSYCO +PSYCO_DESC= Use just-in-time Python compiler -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_PSYCO) +.if ${PORT_OPTIONS:MPSYCO} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco .endif @@ -50,7 +47,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/locale/${FILE}/LC_MESSAGES/* \ ${PREFIX}/share/locale/${FILE}/LC_MESSAGES .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @cd ${WRKSRC}/doc && \ ${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \ @@ -58,4 +55,4 @@ do-install: "${DOCSDIR}/{}" \; @${INSTALL_DATA} ${WRKSRC}/CREDITS.txt ${WRKSRC}/README.txt ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/glest/Makefile ============================================================================== --- head/games/glest/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/glest/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: glest -# Date created: 2005-10-30 -# Whom: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> -# +# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> # $FreeBSD$ -# PORTNAME= glest PORTVERSION= 3.2.2 @@ -36,13 +32,15 @@ SUB_FILES= glest-wrapper pkg-message JAM_CMD= ${LOCALBASE}/bin/jam -qa -OPTIONS= EDITOR "Build map editor" off +OPTIONS_DEFINE= EDITOR +EDITOR_DESC= Build map editor EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} +.include <bsd.port.options.mk> .include <bsd.port.pre.mk> -.if defined(WITH_EDITOR) +.if ${PORT_OPTIONS:MEDITOR} USE_WX= 2.6+ WX_CONF_ARGS= relative WANT_UNICODE= yes @@ -74,7 +72,7 @@ do-build: @cd ${WRKSRC} && ${JAM_CMD} do-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/code_license.txt ${DOCSDIR}/code_license.txt .endif Modified: head/games/heretic/Makefile ============================================================================== --- head/games/heretic/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/heretic/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: glheretic -# Date created: 04 Feb 2000 -# Whom: Will Andrews <andrews@technologist.com> -# +# Created by: Will Andrews <andrews@technologist.com> # $FreeBSD$ -# PORTNAME= heretic PORTVERSION= 1.2 @@ -20,36 +16,35 @@ USE_XORG= x11 xi xpm xau USE_GMAKE= yes MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} -OPTIONS= X11 "Use X11" on \ - FASTX11 "Use FastX11" off \ - SDL "Use SDL" off \ - WAD "With shareware WAD" on +OPTIONS_DEFINE= WAD +OPTIONS_SINGLE= SG1 +OPTIONS_SINGLE_SG1= X11 FASTX11 SDL +FASTX11_DESC= Use FastX11 +WAD_DESC= With shareware WAD +SG1_DESC= Graphics Selections -.include <bsd.port.pre.mk> +OPTIONS_DEFAULT= X11 WAD -.if (defined(WITH_X11) && (defined(WITH_FASTX11) || defined(WITH_SDL))) || \ - (defined(WITH_FASTX11) && (defined(WITH_X11) || defined(WITH_SDL))) -IGNORE= you must only define X11, xor FASTX11, xor SDL -.endif +.include <bsd.port.options.mk> -.if defined(WITH_X11) +.if ${PORT_OPTIONS:MX11} ALL_TARGET= x11 BINARY= xheretic .endif -.if defined(WITH_FASTX11) +.if ${PORT_OPTIONS:MFASTX11} ALL_TARGET= fastx11 BINARY= xaheretic .endif -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL= yes ALL_TARGET= sdl BINARY= sdlheretic CFLAGS+= `${SDL_CONFIG} --cflags` .endif -.if defined(WITH_WAD) +.if ${PORT_OPTIONS:MWAD} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source heretic_share.wad.gz:wad EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PLIST_SUB= WAD:="" @@ -58,7 +53,7 @@ PLIST_SUB= WAD:="@comment " .endif post-extract: -.if !defined(WITHOUT_WAD) +.if ${PORT_OPTIONS:MWAD} @${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/heretic_share.wad.gz \ > ${WRKSRC}/heretic_share.wad .endif @@ -67,15 +62,15 @@ post-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/heretic ${INSTALL_PROGRAM} ${WRKSRC}/sndserver ${PREFIX}/bin/sndserver -.if !defined(WITHOUT_WAD) +.if ${PORT_OPTIONS:MWAD} @${MKDIR} ${PREFIX}/share/heretic ${INSTALL_DATA} ${WRKSRC}/heretic_share.wad ${PREFIX}/share/heretic .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in "End User License Heretic Source Code.txt" Gamekeys.txt README.txt AUTHORS SourceReadme.txt Changelog README.opengl ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/linux-nerogame/Makefile ============================================================================== --- head/games/linux-nerogame/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/linux-nerogame/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: linux-nerogame -# Date created: 2007-10-04 -# Whom: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> -# +# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ -# PORTNAME= nerogame PORTVERSION= 2.0 @@ -24,15 +20,17 @@ SUB_FILES= nerogame pkg-message DATADIR= share/${PKGNAMEPREFIX}${PORTNAME} WRKSRC= ${WRKDIR}/${DISTNAME} -OPTIONS= NVIDIA "Install support for nvidia" off +OPTIONS_DEFINE= NVIDIA +NVIDIA_DESC= Nvidia support +.include <bsd.port.options.mk> .include <bsd.port.pre.mk> .if ${OSVERSION} < 800076 BROKEN= does not build .endif -.if defined(WITH_NVIDIA) +.if ${PORT_OPTIONS:MNVIDIA} . if !exists(${LINUXBASE}/usr/lib/libGL.so.1) RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver . endif Modified: head/games/linux-nwnclient/Makefile ============================================================================== --- head/games/linux-nwnclient/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/linux-nwnclient/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: linux_nwnclient -# Date created: 1 April 2003 -# Whom: Erik Olson <erikolson@olsonexpress.com> -# +# Created by: Erik Olson <erikolson@olsonexpress.com> # $FreeBSD$ -# PORTNAME= nwnclient PORTVERSION= 1.69 @@ -36,8 +32,10 @@ USE_LINUX_APPS+=libglu USE_LINUX_APPS+=dri .endif -OPTIONS= NWMOVIES "Install support for movies using BinkPlayer" off +OPTIONS_DEFINE= NWMOVIES +NWMOVIES_DESC= Support for movies using BinkPlayer +.include <bsd.port.options.mk> .include <bsd.port.pre.mk> # Client detection. Currently, detects only original and Diamond editions. @@ -45,7 +43,7 @@ OPTIONS= NWMOVIES "Install support for m CLIENT_FILES= nwclientgold.tar.gz:GOLD \ nwclienthotu.tar.gz:HOTU \ English_linuxclient169_xp2.tar.gz:CLIENT -.if !defined(WITHOUT_NWMOVIES) +.if ${PORT_OPTIONS:MNWMOVIES} NWMOVIESFILE= nwmovies-v4-public.20090223.080954.tar.gz BINKPLAYERFILE= BinkLinuxPlayer.zip CLIENT_NWMOVIES=${NWMOVIESFILE}:NWMOVIES \ Modified: head/games/linux-quake4/Makefile ============================================================================== --- head/games/linux-quake4/Makefile Fri May 31 14:18:20 2013 (r319494) +++ head/games/linux-quake4/Makefile Fri May 31 14:40:56 2013 (r319495) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Quake 4 -# Date created: 21 Oct 2005 -# Whom: Ed Schouten <ed@fxq.nl> -# +# Created by: Ed Schouten <ed@fxq.nl> # $FreeBSD$ -# PORTNAME= quake4 PORTVERSION= 1.4.2 @@ -28,15 +24,18 @@ PLIST_SUB+= Q4DIR="${Q4DIR}" \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305311440.r4VEeuX5028032>