Index: editors/biew/Makefile =================================================================== --- editors/biew/Makefile (revision 311718) +++ editors/biew/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: BIEW (now called BEYE, Binary EYE) -# Date created: 04 February 2000 -# Whom: Michael Vasilenko -# +# Created by: Michael Vasilenko # $FreeBSD$ -# PORTNAME= biew PORTVERSION= 6.1.0 @@ -32,15 +28,18 @@ PORTDOCS= biew_en.txt biew_ru.txt develop.en develop.ru file_ini.en \ file_ini.ru release.txt unix.txt -OPTIONS= SLANG "Use S-Lang based display renderer" on +OPTIONS_DEFINE= SLANG DOCS +OPTIONS_DEFAULT= SLANG DOCS -.include +SLANG_DESC= Use S-Lang based display renderer +.include + .if ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not compile .endif -.if defined(WITH_SLANG) +.if ${PORT_OPTIONS:MSLANG} LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2 CONFIGURE_ARGS+= --enable-slang .else @@ -72,9 +71,9 @@ ${INSTALL_DATA} ${WRKSRC}/bin_rc/syntax/* ${DATADIR}/syntax ${INSTALL_DATA} ${WRKSRC}/bin_rc/xlt/russian/* ${DATADIR}/xlt ${INSTALL_MAN} ${WRKSRC}/doc/biew.1 ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR} .endif -.include +.include Index: games/cleanq3/Makefile =================================================================== --- games/cleanq3/Makefile (revision 311718) +++ games/cleanq3/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: CleanQ3 -# Date created: 17 Mar 2006 -# Whom: Alexey Dokuchaev -# +# Created by: Alexey Dokuchaev # $FreeBSD$ -# PORTNAME= cleanq3 PORTVERSION= 0.5.2 @@ -22,25 +18,25 @@ BUILD_WRKSRC= ${WRKSRC}/code/unix MAKE_JOBS_UNSAFE= yes -OPTIONS= CLIENT "Build client" on \ - DEDICATED "Build dedicated server" on \ - GAMELIBS "Build game libraries (when not mandatory)" off \ - OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ - SMP "Build SMP (threaded) client" on +OPTIONS_MULTI= TYPE +OPTIONS_MULTI_TYPE= CLIENT DEDICATED SMP +OPTIONS_DEFINE= GAMELIBS OPTIMIZED_CFLAGS +OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS SMP + +CLIENT_DESC= Build client +DEDICATED_DESC= Build dedicated server +GAMELIBS_DESC= Build game libraries (when not mandatory) +SMP_DESC= Build SMP (threaded) client + MAKE_ENV= LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" LIBDIR= ${PREFIX}/lib/${PORTNAME} VM_ARCHS= i386 -.include +.include -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && \ - defined(WITHOUT_SMP) -IGNORE= needs at least one of CLIENT, DEDICATED and SMP options -.endif - .if ${ARCH} == "i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm .endif @@ -55,12 +51,12 @@ MAKE_ENV+= DLL_ONLY=true .endif -.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP) +.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP} USE_GL= yes USE_XORG= xxf86dga .endif -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= CLIENT=YES PLIST_SUB+= CLIENT="" Q3BIN+= cleanq3 @@ -68,7 +64,7 @@ PLIST_SUB+= CLIENT="@comment " .endif -.if !defined(WITHOUT_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= DEDICATED=YES PLIST_SUB+= DEDICATED="" Q3BIN+= cleanq3ded @@ -76,18 +72,18 @@ PLIST_SUB+= DEDICATED="@comment " .endif -.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED) +.if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= GAMELIBS=YES PLIST_SUB+= GAMELIBS="" .else PLIST_SUB+= GAMELIBS="@comment " .endif -.if !defined(WITHOUT_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= OPTIMIZED_CFLAGS=YES .endif -.if !defined(WITHOUT_SMP) +.if ${PORT_OPTIONS:MSMP} MAKE_ENV+= SMP=YES \ PTHREAD_LIBS="${PTHREAD_LIBS}" PLIST_SUB+= SMP="" @@ -108,7 +104,7 @@ .for bin in ${Q3BIN} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${PREFIX}/bin .endfor -.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED) +.if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) .for dir in baseq3 missionpack ${MKDIR} ${LIBDIR}/${dir} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir} @@ -116,4 +112,4 @@ .endif .include "${.CURDIR}/../quake3-data/Makefile.include" -.include +.include Index: games/egl/Makefile =================================================================== --- games/egl/Makefile (revision 311718) +++ games/egl/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: EGL -# Date created: 20 May 2006 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= egl PORTVERSION= 0.3.1 @@ -24,11 +20,13 @@ USE_GMAKE= yes NO_WRKSUBDIR= yes -OPTIONS= CLIENT "Build client" on \ - DEDICATED "Build dedicated server" on \ - GAME "Build main game modification" on \ - OPTIMIZED_CFLAGS "Enable compilation optimizations" on +OPTIONS_DEFINE= CLIENT DEDICATED GAME OPTIMIZED_CFLAGS +OPTIONS_DEFAULT= CLIENT DEDICATED GAME OPTIMIZED_CFLAGS +CLIENT_DESC= Build client +DEDICATED_DESC= Build dedicated server +GAME_DESC= Build main game modification + MAKEFILE= makefile MAKE_ENV= LIBDIR="${LIBDIR}" PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -37,9 +35,9 @@ .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +.include -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png USE_GL= yes @@ -53,7 +51,7 @@ PLIST_SUB+= CLIENT="@comment " .endif -.if defined(WITH_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} PLIST_SUB+= DEDICATED="" EGL_BIN+= eglded .else @@ -61,14 +59,14 @@ PLIST_SUB+= DEDICATED="@comment " .endif -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} PLIST_SUB+= GAME="" .else MAKE_ENV+= BUILD_GAME=NO PLIST_SUB+= GAME="@comment " .endif -.if defined(WITHOUT_OPTIMIZED_CFLAGS) +.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS) MAKE_ENV+= WITH_OPT_CFLAGS=NO .endif @@ -80,4 +78,4 @@ ${INSTALL_PROGRAM} ${WRKSRC}/release/baseq2/*.so ${LIBDIR}/baseq2 ${INSTALL_DATA} ${DISTDIR}/egl.pkz ${LIBDIR}/baseq2 -.include +.include Index: games/fuhquake/Makefile =================================================================== --- games/fuhquake/Makefile (revision 311718) +++ games/fuhquake/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: FuhQuake -# Date created: 01 Jun 2003 -# Whom: Alexey Dokuchaev -# +# Created by: Alexey Dokuchaev # $FreeBSD$ -# PORTNAME= fuhquake PORTVERSION= 0.31 @@ -25,25 +21,27 @@ MAKEFILE= ${FILESDIR}/Makefile WRKSRC= ${WRKDIR}/source -OPTIONS= GLX "Build GLX client" on \ - HUD "High quality HUD images" off \ - OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ - X11 "Build X11 client" on \ - X86_ASM "Enable x86 assembly code" on \ - XMMS "Enable MP3 Player feature" off +OPTIONS_MULTI= CLIENT +OPTIONS_MULTI_CLIENT= GLX X11 +OPTIONS_DEFINE_i386= X86_ASM +OPTIONS_DEFINE= HUD OPTIMIZED_CFLAGS XMMS DOCS +OPTIONS_DEFAULT= GLX OPTIMIZED_CFLAGS X11 X86_ASM DOCS + +GLX_DESC= GLX client +X11_DESC= X11 client +HUD_DESC= High quality HUD images +X86_ASM_DESC= x86 assembly code +XMMS_DESC= MP3 Player feature + DATADIR= ${Q1DIR} MAKE_ENV= DATADIR="${DATADIR}" .include "${.CURDIR}/../quake-data/Makefile.include" -.include +.include -.if !defined(WITH_GLX) && !defined(WITH_X11) -IGNORE= needs at least one client (GLX or X11) -.endif - -.if defined(WITH_GLX) +.if ${PORT_OPTIONS:MGLX} USE_GL= yes LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg @@ -54,7 +52,7 @@ PLIST_SUB+= GLX="@comment " .endif -.if defined(WITH_HUD) +.if ${PORT_OPTIONS:MHUD} DISTFILES+= fuh-hud${EXTRACT_SUFX}:misc PLIST_SUB+= HUD="" .else @@ -62,14 +60,14 @@ .endif .for f in OPTIMIZED_CFLAGS X86_ASM -. if defined(WITH_${f}) +. if ${PORT_OPTIONS:M${f}} MAKE_ARGS+= -DWITH_${f} . else MAKE_ARGS+= -DWITHOUT_${f} . endif .endfor -.if defined(WITH_X11) +.if ${PORT_OPTIONS:MX11} USE_XORG= x11 xxf86dga PLIST_SUB+= X11="" CLIENTS+= x11 @@ -77,8 +75,7 @@ PLIST_SUB+= X11="@comment " .endif -.if (defined(WITH_XMMS) || exists(${LOCALBASE}/lib/libxmms.so.4)) && \ - defined(CLIENTS) +.if ${PORT_OPTIONS:MXMMS} || exists(${LOCALBASE}/lib/libxmms.so.4) LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms MAKE_ARGS+= -DWITH_XMMS \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ @@ -102,16 +99,16 @@ ${MKDIR} ${DATADIR}/${PORTNAME} ${INSTALL_DATA} ${WRKDIR}/qw/*.dat ${DATADIR}/${PORTNAME} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/pak0.pak ${DATADIR}/${PORTNAME} -.if defined(WITH_HUD) +.if ${PORT_OPTIONS:MHUD} ${MKDIR} ${DATADIR}/${PORTNAME}/textures/wad ${INSTALL_DATA} ${WRKDIR}/qw/charset.png ${DATADIR}/${PORTNAME} ${INSTALL_DATA} ${WRKDIR}/qw/textures/wad/* \ ${DATADIR}/${PORTNAME}/textures/wad .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/*.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.txt ${DOCSDIR} .endif -.include +.include Index: games/fuhquake/files/Makefile =================================================================== --- games/fuhquake/files/Makefile (revision 311722) +++ games/fuhquake/files/Makefile (working copy) @@ -13,7 +13,7 @@ DO_CFLAGS = ${CFLAGS} -funsigned-char -I${LOCALBASE}/include -I${LOCALBASE}/include -DDATADIR='"${DATADIR}"' -DLOCALBASE='"${LOCALBASE}"' -.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) +.if ${PORT_OPTIONS:MX86_ASM} DO_CFLAGS += -Did386 .endif @@ -21,11 +21,11 @@ DO_CFLAGS += -DWITH_ZLIB -DWITH_PNG -DWITH_JPEG -DGLQUAKE -DWITH_DGA -DWITH_VMODE .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} DO_CFLAGS += -O -pipe -s -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations .endif -.if defined(WITH_XMMS) +.if ${PORT_OPTIONS:MXMMS} XMMS_CFLAGS != glib-config --cflags DO_CFLAGS += -D__XMMS__ ${XMMS_CFLAGS} ${PTHREAD_CFLAGS} XMMS_LIBS = -L${LOCALBASE}/lib -lxmms ${PTHREAD_LIBS} @@ -111,7 +111,7 @@ rulesets.o \ utils.o -.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) +.if ${PORT_OPTIONS:MX86_ASM} CL_COMMON_AS_OBJS = \ cl_math.o \ math.o \ @@ -149,7 +149,7 @@ r_surf.o \ r_vars.o -.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) +.if ${PORT_OPTIONS:MX86_ASM} CL_SOFT_AS_OBJS = \ d_draw.o \ d_draw16.o \ Index: games/mvdsv/Makefile =================================================================== --- games/mvdsv/Makefile (revision 311718) +++ games/mvdsv/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: MVDSV (+ master port for qwdtools) -# Date created: 03 Jun 2003 -# Whom: Alexey Dokuchaev -# +# Created by: Alexey Dokuchaev # $FreeBSD$ -# PORTNAME?= mvdsv PORTVERSION= 0.29 @@ -27,18 +23,25 @@ PLIST_FILES= bin/${PORTNAME} -OPTIONS= X86_ASM "Compile with x86 assembly code" on +OPTIONS_DEFINE_i386= X86_ASM +OPTIONS_DEFINE_amd64= X86_ASM +OPTIONS_DEFAULT= X86_ASM + .if ${PORTNAME} == "mvdsv" -OPTIONS+= KQUEUE "Enable Kqueue support" on +OPTIONS_DEFINE+= KQUEUE +OPTIONS_DEFAULT+= KQUEUE .endif -.include +X86_ASM_DESC= Compile with x86 assembly code +KQUEUE_DESC= Kqueue support -.if defined(WITHOUT_KQUEUE) +.include + +.if empty(PORT_OPTIONS:MKQUEUE) MAKE_ARGS+= -DNOKQUEUE .endif -.if defined(WITHOUT_X86_ASM) +.if empty(PORT_OPTIONS:MX86_ASM) MAKE_ARGS+= -DWITHOUT_X86_ASM .endif @@ -53,4 +56,4 @@ @${ECHO_MSG} .endif -.include +.include Index: games/q2p/Makefile =================================================================== --- games/q2p/Makefile (revision 311718) +++ games/q2p/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: q2p -# Date created: 2007-01-05 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= q2p PORTVERSION= 0.2.20061231 @@ -20,35 +16,39 @@ USE_GMAKE= yes ALL_TARGET= release -OPTIONS= CLIENT "Build client" on \ - CTF "Build CTF (Capture The Flag) modification" off \ - DEDICATED "Build dedicated server" on \ - GAME "Build a main game .so modification" off \ - GLX "Build OpenGL renderer" on \ - OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ - OSS "Enable Open Sound System sound support" on \ - SDL "Enable SDL sound support" on \ - SDLGL "Build SDL OpenGL renderer" on +OPTIONS_DEFINE= CLIENT CTF DEDICATED GAME GLX OPTIMIZED_CFLAGS OSS \ + SDL SDLGL DOCS +OPTIONS_DEFAULT= CLIENT DEDICATED GLX OPTIMIZED_CFLAGS OSS SDL SDLGL \ + DOCS + +CLIENT_DESC= Client +CTF_DESC= CTF (Capture The Flag) modification +DEDICATED_DESC= Dedicated server +GAME_DESC= Main game .so modification +GLX_DESC= OpenGL renderer +SDL_DESC= SDL sound support +SDLGL_DESC= Build SDL OpenGL renderer + MAKE_ENV= DATADIR="${Q2DIR}" LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" LIBDIR= ${PREFIX}/lib/${PORTNAME} .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +.include -.if !defined(WITHOUT_GLX) || !defined(WITHOUT_SDLGL) +.if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDLGL} USE_GL= glu LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png .endif -.if !defined(WITHOUT_SDL) || !defined(WITHOUT_SDLGL) +.if ${PORT_OPTIONS:MSDL} || ${PORT_OPTIONS:MSDLGL} USE_SDL= sdl .endif -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis MAKE_ENV+= BUILD_Q2P=YES PLIST_SUB+= CLIENT="" @@ -57,14 +57,14 @@ PLIST_SUB+= CLIENT="@comment " .endif -.if defined(WITH_CTF) +.if ${PORT_OPTIONS:MCTF} MAKE_ENV+= BUILD_CTF=YES PLIST_SUB+= CTF="" .else PLIST_SUB+= CTF="@comment " .endif -.if !defined(WITHOUT_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= BUILD_DEDICATED=YES PLIST_SUB+= DEDICATED="" Q2BIN+= ${PORTNAME}-ded @@ -72,7 +72,7 @@ PLIST_SUB+= DEDICATED="@comment " .endif -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} MAKE_ENV+= BUILD_GAME=YES PLIST_SUB+= GAME="" .else @@ -80,7 +80,7 @@ .endif .for opt in GLX SDLGL -. if !defined(WITHOUT_${opt}) +. if ${PORT_OPTIONS:M${opt}} MAKE_ENV+= BUILD_${opt}=YES PLIST_SUB+= ${opt}="" Q2REF+= ${opt:L:S/glx/gl/:S/sdlgl/sdl/} @@ -89,11 +89,11 @@ . endif .endfor -.if !defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= OPTIMIZE=YES .endif -.if !defined(WITHOUT_OSS) +.if ${PORT_OPTIONS:MOSS} MAKE_ENV+= BUILD_OSS_SND=YES PLIST_SUB+= OSS="" Q2SND+= oss @@ -101,7 +101,7 @@ PLIST_SUB+= OSS="@comment " .endif -.if !defined(WITHOUT_SDL) +.if ${PORT_OPTIONS:MSDL} MAKE_ENV+= BUILD_SDL_SND=YES PLIST_SUB+= SDL="" Q2SND+= sdl @@ -125,17 +125,17 @@ .for snd in ${Q2SND} ${INSTALL_PROGRAM} ${WRKSRC}/quake2/snd_${snd}.so ${LIBDIR} .endfor -.if defined(WITH_CTF) +.if ${PORT_OPTIONS:MCTF} ${MKDIR} ${LIBDIR}/ctf ${INSTALL_PROGRAM} ${WRKSRC}/quake2/ctf/game.so ${LIBDIR}/ctf .endif -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} ${INSTALL_PROGRAM} ${WRKSRC}/quake2/baseq2/game.so ${LIBDIR}/baseq2 .endif ${INSTALL_DATA} ${WRKSRC}/data/baseq2/* ${LIBDIR}/baseq2 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} Q2P_readme.txt Ogg_readme.txt ${DOCSDIR} .endif -.include +.include Index: games/q2pro/Makefile =================================================================== --- games/q2pro/Makefile (revision 311718) +++ games/q2pro/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: q2pro -# Date created: 2006-12-25 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= q2pro PORTVERSION= ${SVN_REV} @@ -21,14 +17,21 @@ WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= # -OPTIONS= CLIENT "Build client" on \ - DEDICATED "Build dedicated server" on \ - GAME "Build a main game .so file" off \ - GL "Build OpenGL render" on \ - SOFT "Build software render" on \ - UI "Build user interface (for CLIENT menus)" on \ - X86_ASM "Enable use of optimized x86 assembly code" on +OPTIONS_MULTI= TYPE +OPTIONS_MULTI_TYPE= CLIENT DEDICATED +OPTIONS_DEFINE_i386= X86_ASM +OPTIONS_DEFINE= GAME GL SOFT UI +OPTIONS_DEFAULT= CLIENT DEDICATED GL SOFT UI X86_ASM + +CLIENT_DESC= Client +DEDICATED_DESC= Dedicated server +GAME_DESC= Main game .so file +GL_DESC= OpenGL render +SOFT_DESC= Software render +UI_DESC= User interface (for CLIENT menus) +X86_ASM_DESC= Use of optimized x86 assembly code + MAKE_ENV= LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" @@ -37,13 +40,9 @@ .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +.include -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) -IGNORE= needs at least one executable (CLIENT and DEDICATED) -.endif - -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} USE_SDL+= sdl ALL_TARGET+= client PLIST_SUB+= CLIENT="" @@ -51,21 +50,21 @@ PLIST_SUB+= CLIENT="@comment " .endif -.if !defined(WITHOUT_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} ALL_TARGET+= server PLIST_SUB+= DEDICATED="" .else PLIST_SUB+= DEDICATED="@comment " .endif -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} ALL_TARGET+= game PLIST_SUB+= GAME="" .else PLIST_SUB+= GAME="@comment " .endif -.if !defined(WITHOUT_GL) +.if ${PORT_OPTIONS:MGL} USE_GL= yes LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png @@ -75,21 +74,21 @@ PLIST_SUB+= GL="@comment " .endif -.if !defined(WITHOUT_SOFT) +.if ${PORT_OPTIONS:MSOFT} ALL_TARGET+= ref_soft PLIST_SUB+= SOFT="" .else PLIST_SUB+= SOFT="@comment " .endif -.if !defined(WITHOUT_UI) +.if ${PORT_OPTIONS:MUI} ALL_TARGET+= ui PLIST_SUB+= UI="" .else PLIST_SUB+= UI="@comment " .endif -.if !defined(WITHOUT_X86_ASM) && ${ARCH} == "i386" +.if ${PORT_OPTIONS:MX86_ASM} MAKE_ENV+= USE_X86_ASM=yes .endif @@ -100,22 +99,22 @@ do-install: ${MKDIR} ${LIBDIR}/baseq2 -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} ${INSTALL_PROGRAM} ${WRKSRC}/build/release/q2pro ${PREFIX}/bin .endif -.if !defined(WITHOUT_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} ${INSTALL_PROGRAM} ${WRKSRC}/build/release/q2proded ${PREFIX}/bin .endif -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} ${INSTALL_PROGRAM} ${WRKSRC}/build/release/game.so ${LIBDIR}/baseq2 .endif -.if !defined(WITHOUT_GL) +.if ${PORT_OPTIONS:MGL} ${INSTALL_PROGRAM} ${WRKSRC}/build/release/ref_newgl.so ${LIBDIR} .endif -.if !defined(WITHOUT_SOFT) +.if ${PORT_OPTIONS:MSOFT} ${INSTALL_PROGRAM} ${WRKSRC}/build/release/ref_soft.so ${LIBDIR} .endif -.if !defined(WITHOUT_UI) +.if ${PORT_OPTIONS:MUI} ${INSTALL_PROGRAM} ${WRKSRC}/build/release/ui.so ${LIBDIR} .endif @@ -129,4 +128,4 @@ ${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} q2pro ${RM} -rf q2pro -.include +.include Index: games/quake-data/Makefile =================================================================== --- games/quake-data/Makefile (revision 311718) +++ games/quake-data/Makefile (working copy) @@ -20,10 +20,13 @@ NO_BUILD= yes NO_WRKSUBDIR= yes -OPTIONS= FULL "Install full version" off \ - QUAKEWORLD "Install QuakeWorld data" on \ - QUAKEWORLD_SKINS "Install QuakeWorld skins" on +OPTIONS_DEFINE= FULL QUAKEWORLD QUAKEWORLD_SKINS +OPTIONS_DEFAULT= QUAKEWORLD QUAKEWORLD_SKINS +FULL_DESC= Install full version +QUAKEWORLD_DESC= Install QuakeWorld data +QUAKEWORLD_SKINS_DESC= Install QuakeWorld skins + DATADIR= ${Q1DIR} PROGFILE= qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz @@ -31,22 +34,22 @@ .include "Makefile.include" -.include +.include -.if defined(WITH_FULL) +.if ${PORT_OPTIONS:MFULL} DISTFILES+= pak1.pak PLIST_SUB+= FULL="" .else PLIST_SUB+= FULL="@comment " .endif -.if !defined(WITHOUT_QUAKEWORLD) +.if ${PORT_OPTIONS:MQUAKEWORLD} MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/unix/:qw|} DISTFILES+= ${PROGFILE}:qw EXTRACT_ONLY+= ${PROGFILE} PLIST_SUB+= QUAKEWORLD="" -.if !defined(WITHOUT_QUAKEWORLD_SKINS) +.if ${PORT_OPTIONS:MQUAKEWORLD_SKINS} MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/skins/:skins|} DISTFILES+= ${SKINFILES:S/$/:skins/} EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip @@ -57,10 +60,10 @@ .else PLIST_SUB+= QUAKEWORLD="@comment " -.endif # !WITHOUT_QUAKEWORLD +.endif pre-fetch: -.if defined(WITH_FULL) && !exists(${DISTDIR}/${DIST_SUBDIR}/pak1.pak) +.if ${PORT_OPTIONS:MFULL} && !exists(${DISTDIR}/${DIST_SUBDIR}/pak1.pak) @${ECHO_CMD} @${ECHO_CMD} You need to copy the file pak1.pak from the original Quake CDROM to ${DISTDIR}/${DIST_SUBDIR} in order to install this port. | ${FMT} @${ECHO_CMD} @@ -70,20 +73,20 @@ do-install: ${MKDIR} ${DATADIR}/id1 ${INSTALL_DATA} ${WRKSRC}/id1/pak0.pak ${DATADIR}/id1 -.if defined(WITH_FULL) +.if ${PORT_OPTIONS:MFULL} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/pak1.pak ${DATADIR}/id1 .endif -.if !defined(WITHOUT_QUAKEWORLD) +.if ${PORT_OPTIONS:MQUAKEWORLD} @${MKDIR} ${DATADIR}/qw @${INSTALL_DATA} ${WRKSRC}/qw/qwprogs.dat ${DATADIR}/qw @${MKDIR} ${DATADIR}/qw/skins @${INSTALL_SCRIPT} ${WRKSRC}/qw/skins/fixskins.sh ${DATADIR}/qw/skins -. if !defined(WITHOUT_QUAKEWORLD_SKINS) +. if ${PORT_OPTIONS:MQUAKEWORLD_SKINS} . for f in ${SKINFILES} @${UNZIP_CMD} -nq ${DISTDIR}/${DIST_SUBDIR}/${f} -d ${DATADIR}/qw/skins . endfor @(cd ${DATADIR}/qw/skins && LANG=C ./fixskins.sh *) . endif -.endif # !WITHOUT_QUAKEWORLD +.endif -.include +.include Index: games/quake-extras/Makefile =================================================================== --- games/quake-extras/Makefile (revision 311718) +++ games/quake-extras/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake-extras -# Date created: 10 May 2006 -# Whom: alepulver -# +# Created by: alepulver # $FreeBSD$ -# PORTNAME= extras PORTVERSION= 1.1 @@ -22,12 +18,16 @@ NO_BUILD= yes NO_WRKSUBDIR= yes -OPTIONS= LITS "Coloured lighting (FuhQuake/JoeQuake based)" on \ - REMODEL "High quality models" on \ - RETEXTURE_HQ "High quality textures (200MB)" off \ - RETEXTURE_LW "Low (still good) quality textures (15MB)" on \ - SKYBOXES "Skyboxes (sky replacement images)" on +OPTIONS_DEFINE= LITS REMODEL RETEXTURE_HQ RETEXTURE_LW +OPTIONS_DEFINE_i386= SKYBOXES +OPTIONS_DEFAULT= LITS REMODEL RETEXTURE_LW SKYBOXES +LITS_DESC= Coloured lighting (FuhQuake/JoeQuake based) +REMODEL_DESC= High quality models +RETEXTURE_HQ_DESC= High quality textures (200MB) +RETEXTURE_LW_DESC= Low (still good) quality textures (15MB) +SKYBOXES_DESC= Skyboxes (sky replacement images) + DATADIR= ${Q1DIR} LITSFILE= fuhquake-lits.rar @@ -36,57 +36,56 @@ .include "${.CURDIR}/../quake-data/Makefile.include" -.include +.include # FIXME: SKYBOXES option only enabled for i386, as the unpacking program # "nwreckdum" fails when receiving SIGXFSZ on !i386 platforms. -.if !defined(WITHOUT_REMODEL) || \ - (!defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386") +.if ${PORT_OPTIONS:MREMODEL} || ${PORT_OPTIONS:MSKYBOXES} EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip .endif -.if !defined(WITHOUT_LITS) +.if ${PORT_OPTIONS:MLITS} EXTRACT_DEPENDS+= unrar:${PORTSDIR}/archivers/unrar .endif -.if !defined(WITHOUT_LITS) +.if ${PORT_OPTIONS:MLITS} DISTFILES+= ${LITSFILE}:fq PLIST_SUB+= LITS="" .else PLIST_SUB+= LITS="@comment " .endif -.if !defined(WITHOUT_REMODEL) +.if ${PORT_OPTIONS:MREMODEL} DISTFILES+= ${SKINSFILE}:remod PLIST_SUB+= REMOD="" .else PLIST_SUB+= REMOD="@comment " .endif -.if defined(WITH_RETEXTURE_HQ) +.if ${PORT_OPTIONS:MRETEXTURE_HQ} TEXFILE= qrp-maptextures-2007-10-06r2-7files.zip TEX_EXT= tga -.elif !defined(WITHOUT_RETEXTURE_LW) +.elif ${PORT_OPTIONS:MRETEXTURE_LW} TEXFILE= qrp-maptextures-2007-10-20r2-7files-low.zip TEX_EXT= jpg .endif -.if !defined(WITHOUT_RETEXTURE_LW) || defined(WITH_RETEXTURE_HQ) +.if ${PORT_OPTIONS:MRETEXTURE_LW} || ${PORT_OPTIONS:MRETEXTURE_HQ} DISTFILES+= ${TEXFILE}:retex PLIST_SUB+= RETEX="" EXT="${TEX_EXT}" .else PLIST_SUB+= RETEX="@comment " .endif -.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_LW) || \ - defined(WITH_RETEXTURE_HQ) +.if ${PORT_OPTIONS:MREMODEL} || ${PORT_OPTIONS:MRETEXTURE_LW} || \ + ${PORT_OPTIONS:MRETEXTURE_HQ} PLIST_SUB+= TEX_DIR="" .else PLIST_SUB+= TEX_DIR="@comment " .endif -.if !defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386" +.if ${PORT_OPTIONS:MSKYBOXES} DISTFILES+= ${SKYFILE}:fq EXTRACT_DEPENDS+= nwreckdum:${PORTSDIR}/archivers/nwreckdum PLIST_SUB+= SKYBOX="" @@ -95,16 +94,16 @@ .endif do-extract: -.if !defined(WITHOUT_LITS) +.if ${PORT_OPTIONS:MLITS} @${MKDIR} ${WRKDIR}/lits @cd ${WRKDIR}/lits && \ unrar x ${DISTDIR}/${DIST_SUBDIR}/${LITSFILE} >/dev/null .endif -.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_LW) || \ - defined(WITH_RETEXTURE_HQ) +.if ${PORT_OPTIONS:MREMODEL} || ${PORT_OPTIONS:MRETEXTURE_LW} || \ + ${PORT_OPTIONS:MRETEXTURE_HQ} @${MKDIR} ${WRKDIR}/textures .endif -.if !defined(WITHOUT_REMODEL) +.if ${PORT_OPTIONS:MREMODEL} @cd ${WRKDIR}/textures && \ ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${SKINSFILE} @${RM} ${WRKDIR}/textures/readme.txt @@ -114,33 +113,33 @@ ${LN} -s $$f `${ECHO_CMD} $$f | ${SED} -E -e 's/([[:alnum:]]+)_.+/\1/'`.mdl_`${ECHO_CMD} $$f | ${SED} -E -e 's/[[:alnum:]]+_(.+)/\1/'`; \ done .endif -.if !defined(WITHOUT_RETEXTURE_LW) || defined(WITH_RETEXTURE_HQ) +.if ${PORT_OPTIONS:MRETEXTURE_LW} || ${PORT_OPTIONS:MRETEXTURE_HQ} @cd ${WRKDIR} && \ ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${TEXFILE} "*.pk3" && \ ${UNZIP_CMD} -qo *.pk3 && ${RM} *.pk3 @cd ${WRKDIR}/textures && for tex in *.link; do ln -s `${CAT} $$tex` \ `${ECHO_CMD} $$tex | ${SED} -e 's|\.link|.${TEX_EXT}|'`; done .endif -.if !defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386" +.if ${PORT_OPTIONS:MSKYBOXES} @cd ${WRKDIR} && ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${SKYFILE} @nwreckdum -d ${WRKDIR}/skyboxes -p ${WRKDIR}/pakX.pak >/dev/null .endif do-install: -.if !defined(WITHOUT_LITS) +.if ${PORT_OPTIONS:MLITS} ${MKDIR} ${DATADIR}/id1/lits ${INSTALL_DATA} ${WRKSRC}/lits/* ${DATADIR}/id1/lits .endif -.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_LW) || \ - defined(WITH_RETEXTURE_HQ) +.if ${PORT_OPTIONS:MREMODEL} || ${PORT_OPTIONS:MRETEXTURE_LW} || \ + ${PORT_OPTIONS:MRETEXTURE_HQ} ${CP} -R ${WRKSRC}/textures ${DATADIR}/id1 .endif -.if !defined(WITHOUT_REMODEL) +.if ${PORT_OPTIONS:MREMODEL} cd ${DATADIR}/id1/textures && \ ${LN} -s . bmodels && ${LN} -s . progs .endif -.if !defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386" +.if ${PORT_OPTIONS:MSKYBOXES} ${CP} -R ${WRKSRC}/skyboxes/* ${DATADIR}/id1 .endif -.include +.include Index: games/quake-source/Makefile =================================================================== --- games/quake-source/Makefile (revision 311718) +++ games/quake-source/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake-source -# Date created: 15 Sep 2005 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= source PORTVERSION= 1.01 @@ -21,15 +17,18 @@ NO_BUILD= yes NO_WRKSUBDIR= yes -OPTIONS= QUAKEWORLD "Install QuakeWorld source" on +OPTIONS_DEFINE= QUAKEWORLD +OPTIONS_DEFAULT= QUAKEWORLD +QUAKEWORLD_DESC= Install QuakeWorld source + LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} .include "Makefile.include" -.include +.include -.if !defined(WITHOUT_QUAKEWORLD) +.if ${PORT_OPTIONS:MQUAKEWORLD} MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/unix/:qw|} DISTFILES+= qwsv-2.30-glibc-i386-unknown-linux2.0${EXTRACT_SUFX}:qw PLIST_SUB+= QUAKEWORLD="" @@ -48,7 +47,7 @@ do-install: ${MKDIR} ${DATADIR} ${CP} -R ${WRKSRC}/send/v101qc ${DATADIR} -.if !defined(WITHOUT_QUAKEWORLD) +.if ${PORT_OPTIONS:MQUAKEWORLD} ${MKDIR} ${DATADIR}/qw . for f in *.h *.qc *.src @${REINPLACE_CMD} -e "s|`${ECHO_CMD} -e '\r'`$$||" ${WRKSRC}/qw/${f} @@ -56,4 +55,4 @@ . endfor .endif -.include +.include Index: games/quake2-3zb2/Makefile =================================================================== --- games/quake2-3zb2/Makefile (revision 311718) +++ games/quake2-3zb2/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2-3zb2 -# Date created: 2006-12-24 -# Whom: alepulver -# +# Created by: alepulver # $FreeBSD$ -# PORTNAME= 3zb2 PORTVERSION= 0.97 @@ -24,17 +20,20 @@ USE_DOS2UNIX= *.[ch] NO_WRKSUBDIR= yes -OPTIONS= NODES "Install nodes for DM and CTF maps (recommended)" on +OPTIONS_DEFINE= NODES DOCS +OPTIONS_DEFAULT= NODES DOCS +NODES_DESC= Install nodes for DM and CTF maps (recommended) + SUB_FILES= pkg-message DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +.include -.if defined(WITH_NODES) +.if ${PORT_OPTIONS:MNODES} NODES= base_pk citycl_pk cmbbstr_pk cxdmx_pk cxxdmx_pk dm64_pk \ fact_pk hangar_pk ikdmx_pk2 jail_pk retinal_pk spasmox_pk \ trdmx_pk trpower_pk verm0x_pk ware_pk waste_pk xatrixmap_pk1 \ @@ -65,11 +64,11 @@ ${MKDIR} ${Q2DIR}/${PORTNAME}/${f} ${INSTALL_DATA} ${WRKSRC}/3zb2/${f}/* ${Q2DIR}/${PORTNAME}/${f} .endfor -.if defined(WITH_NODES) +.if ${PORT_OPTIONS:MNODES} ${INSTALL_DATA} ${WRKSRC}/*.chn ${Q2DIR}/${PORTNAME}/chdtm ${INSTALL_DATA} ${WRKSRC}/*.chf ${Q2DIR}/${PORTNAME}/chctf .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/3zb2 && ${CP} -R *.txt "User Guide" ${DOCSDIR} @${FIND} ${DOCSDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE} @@ -81,4 +80,4 @@ @${CAT} ${PKGMESSAGE} @${ECHO_CMD} -.include +.include Index: games/quake2-data/Makefile =================================================================== --- games/quake2-data/Makefile (revision 311720) +++ games/quake2-data/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2-data -# Date created: 28 Sep 2005 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= data PORTVERSION= 3.20 @@ -23,10 +19,12 @@ USE_ZIP= yes NO_WRKSUBDIR= yes -OPTIONS= MANUAL "Install game manual" off \ - OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ - SHAREWARE "Install demo version of the game data" off +OPTIONS_DEFINE= MANUAL OPTIMIZED_CFLAGS SHAREWARE +OPTIONS_DEFAULT= OPTIMIZED_CFLAGS +MANUAL_DESC= Install game manual +SHAREWARE_DESC= Install demo version of the game data + LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${Q2DIR} DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} @@ -37,23 +35,23 @@ .include "Makefile.include" -.include +.include -.if defined(WITH_MANUAL) || defined(WITH_SHAREWARE) +.if ${PORT_OPTIONS:MMANUAL} || ${PORT_OPTIONS:MSHAREWARE} DISTFILES+= ${Q2_DEMO}:data .endif -.if defined(WITH_MANUAL) +.if ${PORT_OPTIONS:MMANUAL} PLIST_SUB+= MANUAL="" .else PLIST_SUB+= MANUAL="@comment " .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= WITH_OPTIMIZED_CFLAGS=yes .endif -.if defined(WITH_SHAREWARE) +.if ${PORT_OPTIONS:MSHAREWARE} PLIST_SUB+= FULL="@comment " \ SHAREWARE="" .else @@ -69,11 +67,11 @@ uncompress -c ${DISTDIR}/${Q2_SRC} | ${TAIL} +434 | ${SH} @${UNZIP_CMD} -q -d ${WRKDIR} \ ${DISTDIR}/${Q2_UPDATE} baseq2/* -x *.dll -.if defined(WITH_MANUAL) +.if ${PORT_OPTIONS:MMANUAL} @${UNZIP_CMD} -ajq -d ${WRKDIR}/DOCS \ ${DISTDIR}/${Q2_DEMO} Install/Data/DOCS/* .endif -.if defined(WITH_SHAREWARE) +.if ${PORT_OPTIONS:MSHAREWARE} @${RM} ${WRKDIR}/baseq2/pak[^0].pak @${UNZIP_CMD} -jq -d ${WRKDIR}/baseq2 \ ${DISTDIR}/${Q2_DEMO} Install/Data/baseq2/pak0.pak @@ -89,16 +87,16 @@ ${MKDIR} ${DATADIR}/baseq2 ${INSTALL_PROGRAM} ${WRKSRC}/game.so ${DATADIR}/baseq2 ${CP} -R ${WRKSRC}/baseq2/* ${DATADIR}/baseq2 -.if defined(WITH_MANUAL) +.if ${PORT_OPTIONS:MMANUAL} @${MKDIR} ${DOCSDIR} @${CP} -R ${WRKSRC}/DOCS ${DOCSDIR}/manual .endif post-install: -.if !defined(WITH_SHAREWARE) +.if empty(PORT_OPTIONS:MSHAREWARE) @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} .endif -.include +.include Index: games/quake2-data/files/Makefile =================================================================== --- games/quake2-data/files/Makefile (revision 311721) +++ games/quake2-data/files/Makefile (working copy) @@ -53,7 +53,7 @@ q_shared.c CFLAGS+= -Dstricmp=strcasecmp -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -ffast-math -funroll-loops -fomit-frame-pointer \ -fexpensive-optimizations .endif Index: games/quake2-extras/Makefile =================================================================== --- games/quake2-extras/Makefile (revision 311718) +++ games/quake2-extras/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2-extras -# Date created: 27 Jul 2006 -# Whom: alepulver -# +# Created by: alepulver # $FreeBSD$ -# PORTNAME= extras PORTVERSION= 1.0 @@ -22,10 +18,13 @@ USE_ZIP= yes NO_WRKSUBDIR= yes -OPTIONS= RETEXTURE "Install high quality textures" on \ - RETEXTURE_FULL "Install more textures (120MB)" off \ - SKINS "Install high quality skins" off +OPTIONS_DEFINE= RETEXTURE RETEXTURE_FULL SKINS +OPTIONS_DEFAULT= RETEXTURE +RETEXTURE_DESC= Install high quality textures +RETEXTURE_FULL_DESC= Install more textures (120MB) +SKINS_DESC= Install high quality skins + LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} RETEX_PAKS= 10 11 12 13 14 16 17 19 @@ -34,14 +33,14 @@ .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +.include -.if defined(WITH_RETEXTURE_FULL) || defined(WITH_SKINS) +.if ${PORT_OPTIONS:MRETEXTURE_FULL} || ${PORT_OPTIONS:MSKINS} BUILD_DEPENDS+= nwreckdum:${PORTSDIR}/archivers/nwreckdum PLIST_FILES+= %%Q2DIR%%/baseq2/pak20.pak .endif -.if defined(WITH_RETEXTURE) && !defined(WITH_RETEXTURE_FULL) +.if ${PORT_OPTIONS:MRETEXTURE} && ${PORT_OPTIONS:MRETEXTURE_FULL} .for i in ${RETEX_PAKS} DISTFILES+= pak${i}.pak:retex PLIST_FILES+= %%Q2DIR%%/baseq2/pak${i}.pak @@ -51,47 +50,47 @@ PLIST_SUB+= RETEX="@comment " .endif -.if defined(WITH_RETEXTURE_FULL) +.if ${PORT_OPTIONS:MRETEXTURE_FULL} DISTFILES+= ${RETEX_FULL}:retex2 EXTRACT_ONLY+= ${RETEX_FULL} PLIST_FILES+= %%Q2DIR%%/baseq2/pak10.pak .endif -.if defined(WITH_SKINS) +.if ${PORT_OPTIONS:MSKINS} DISTFILES+= ${SKINS}:retex2 EXTRACT_ONLY+= ${SKINS} PLIST_FILES+= %%Q2DIR%%/baseq2/pak20.pak .endif post-extract: -.if defined(WITH_RETEXTURE_FULL) +.if ${PORT_OPTIONS:MRETEXTURE_FULL} @${MKDIR} ${WRKSRC}/pak10 @${MV} ${WRKSRC}/textures ${WRKSRC}/pak10 .endif -.if defined(WITH_SKINS) +.if ${PORT_OPTIONS:MSKINS} @${MKDIR} ${WRKSRC}/pak20 @${MV} ${WRKSRC}/models ${WRKSRC}/pak20 .endif do-build: -.if defined(WITH_RETEXTURE_FULL) +.if ${PORT_OPTIONS:MRETEXTURE_FULL} @nwreckdum -c -p ${WRKSRC}/pak10.pak -d ${WRKSRC}/pak10 .endif -.if defined(WITH_SKINS) +.if ${PORT_OPTIONS:MSKINS} @nwreckdum -c -p ${WRKSRC}/pak20.pak -d ${WRKSRC}/pak20 .endif do-install: -.if defined(WITH_RETEXTURE) && !defined(WITH_RETEXTURE_FULL) +.if ${PORT_OPTIONS:MRETEXTURE} && empty(PORT_OPTIONS:MRETEXTURE_FULL) .for i in ${RETEX_PAKS} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/pak${i}.pak ${Q2DIR}/baseq2 .endfor .endif -.if defined(WITH_RETEXTURE_FULL) +.if ${PORT_OPTIONS:MRETEXTURE_FULL} ${INSTALL_DATA} ${WRKSRC}/pak10.pak ${Q2DIR}/baseq2 .endif -.if defined(WITH_SKINS) +.if ${PORT_OPTIONS:MSKINS} ${INSTALL_DATA} ${WRKSRC}/pak20.pak ${Q2DIR}/baseq2 .endif -.include +.include Index: games/quake2-source/Makefile =================================================================== --- games/quake2-source/Makefile (revision 311718) +++ games/quake2-source/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2-source -# Date created: 29 Sep 2005 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= source PORTVERSION= 3.21 @@ -22,23 +18,25 @@ NO_BUILD= yes -OPTIONS= CTF "Install Capture The Flag mod source" off \ - ROGUE "Install Ground Zero (Rogue) mission pack source" off \ - XATRIX "Install The Reckoning (Xatrix) mission pack source" off +OPTIONS_DEFINE= CTF ROGUE XATRIX +CTF_DESC= Install Capture The Flag mod source +ROGUE_DESC= Install Ground Zero (Rogue) mission pack source +XATRIX_DESC= Install The Reckoning (Xatrix) mission pack source + LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME} -.include +.include -.if defined(WITH_CTF) +.if ${PORT_OPTIONS:MCTF} PLIST_SUB+= CTF="" .else PLIST_SUB+= CTF="@comment " .endif -.if defined(WITH_ROGUE) +.if ${PORT_OPTIONS:MROGUE} DISTFILES+= roguesrc320.shar.Z:id EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_rogue_g__local.h \ ${FILESDIR}/extra-patch-src_rogue_q__shared.c @@ -48,7 +46,7 @@ PLIST_SUB+= ROGUE="@comment " .endif -.if defined(WITH_XATRIX) +.if ${PORT_OPTIONS:MXATRIX} DISTFILES+= xatrixsrc320.shar.Z:id EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xatrix_q__shared.c XATRIX_OFF= 441 @@ -59,7 +57,7 @@ post-extract: .for f in rogue xatrix -. if defined(WITH_${f:U}) +. if ${PORT_OPTIONS:M${f:U}} @${MKDIR} ${WRKSRC}/src/${f} @(cd ${WRKSRC}/src/${f} && ${GUNZIP_CMD} -c \ ${DISTDIR}/${DIST_SUBDIR}/${f}src320.shar.Z > \ @@ -78,10 +76,10 @@ ${CP} -R ${WRKSRC}/src/game ${DATADIR} ${INSTALL_DATA} ${FILESDIR}/Makefile.game ${DATADIR}/game/Makefile .for f in ctf rogue xatrix -. if defined(WITH_${f:U}) +. if ${PORT_OPTIONS:M${f:U}} ${CP} -R ${WRKSRC}/src/${f} ${DATADIR} ${INSTALL_DATA} ${FILESDIR}/Makefile.${f} ${DATADIR}/${f}/Makefile . endif .endfor -.include +.include Index: games/quake2-zaero/Makefile =================================================================== --- games/quake2-zaero/Makefile (revision 311718) +++ games/quake2-zaero/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2-zaero -# Date created: 2006-12-24 -# Whom: alepulver -# +# Created by: alepulver # $FreeBSD$ -# PORTNAME= zaero PORTVERSION= 1.1 @@ -21,16 +17,19 @@ USE_DOS2UNIX= *.[ch] NO_WRKSUBDIR= yes -OPTIONS= DEMO "Install demo version of the game data" off \ - DM "Install deathmatch maps" off +OPTIONS_DEFINE= DEMO DM DOCS +OPTIONS_DEFAULT= DOCS +DEMO_DESC= Install demo version of the game data +DM_DESC= Install deathmatch maps + DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +.include -.if defined(WITH_DEMO) +.if ${PORT_OPTIONS:MDEMO} DISTFILES+= zaerodemo${EXTRACT_SUFX} PLIST_SUB+= DEMO="" .else @@ -38,7 +37,7 @@ SUB_FILES+= pkg-message .endif -.if defined(WITH_DM) +.if ${PORT_OPTIONS:MDM} DISTFILES+= zaerodm${EXTRACT_SUFX} PLIST_SUB+= DM="" .else @@ -54,25 +53,25 @@ do-install: ${MKDIR} ${Q2DIR}/${PORTNAME} ${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/${PORTNAME} -.if defined(WITH_DEMO) +.if ${PORT_OPTIONS:MDEMO} ${INSTALL_DATA} ${WRKSRC}/zaero/pak0.pak ${Q2DIR}/${PORTNAME} ${MKDIR} ${Q2DIR}/${PORTNAME}/sprites ${INSTALL_DATA} ${WRKSRC}/zaero/sprites/* ${Q2DIR}/${PORTNAME}/sprites .endif ${INSTALL_DATA} ${WRKSRC}/pak1.pak ${Q2DIR}/${PORTNAME} -.if defined(WITH_DM) +.if ${PORT_OPTIONS:MDM} ${INSTALL_DATA} ${WRKSRC}/zaero/pak2.pak ${Q2DIR}/${PORTNAME} .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/changelog.txt ${DOCSDIR} .endif -.if !defined(WITH_DEMO) +.if ${PORT_OPTIONS:MDEMO} post-install: @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} .endif -.include +.include Index: games/quake2lnx/Makefile =================================================================== --- games/quake2lnx/Makefile (revision 311718) +++ games/quake2lnx/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Quake2-LNX -# Date created: 11 Jun 2003 -# Whom: Alexey Dokuchaev -# +# Created by: Alexey Dokuchaev # $FreeBSD$ -# PORTNAME= quake2lnx PORTVERSION= 0.16.2 @@ -21,26 +17,28 @@ USE_GMAKE= yes WANT_SDL= yes -OPTIONS= X11 "Build X11 software driver" on \ - GLX "Build GLX driver" on \ - EYECANDY "Build executable with fancier GL graphics" off \ - SDL "Build SDL software driver" off \ - SDLGL "Build SDL OpenGL driver" off \ - SDLCLIENT "Build executable that uses SDL" off \ - SVGA "Build SVGA driver (i386 only)" off \ - AA "Build ASCII software renderer" off \ - CLIENT "Build client executable" on \ - SERVER "Build dedicated server executable" on \ - GAME "Build a main game .so file" off \ - CTF "Build Capture The Flag mod" off \ - RETEXTURE "Enable support of retextured graphics" off \ - JOYSTICK "Enable joystick support" off \ - REDBLUE "Enable 3D glasses rendering" off \ - IPV6 "Enable experimental IPv6 support" off \ - ARTS "Enable support for aRts sound daemon" off \ - OPTIMIZED_CFLAGS "Enable extra optimization options" off \ - X86_ASM "Enable use of x86 assembly code" on +OPTIONS_DEFINE= X11 GLX EYECANDY SDL SDLGL SDLCLIENT AA CLIENT \ + SERVER GAME CTF RETEXTURE JOYSTICK REDBLUE IPV6 ARTS \ + ARTS OPTIMIZED_CFLAGS DOCS +OPTIONS_DEFINE_i386= SVGA X86_ASM + +OPTIONS_DEFAULT= X11 GLX CLIENT SERVER X86_ASM DOCS + +EYECANDY_DESC= Executable with fancier GL graphics +SDLGL_DESC= SDL OpenGL driver +SDLCLIENT_DESC= Executable that uses SDL +SVGA_DESC= SVGA driver +AA_DESC= ASCII software renderer +CLIENT_DESC= Client executable +SERVER_DESC= Dedicated server executable +GAME_DESC= Main game .so file +CTF_DESC= Capture The Flag mod +RETEXTURE_DESC= Support of retextured graphics +JOYSTICK_DESC= Joystick support +REDBLUE_DESC= 3D glasses rendering +X86_ASM_DESC= Use of x86 assembly code + ALL_TARGET= build_release PLIST_SUB+= LIBDIR="${LIBDIR:S/${PREFIX}\///}" @@ -48,13 +46,13 @@ TGTDIR= ${WRKSRC}/release LIBDIR= ${PREFIX}/lib/${PORTNAME} -.include +.include ### # ## CLIENTS AND RENDERERS ## # ### -.if defined(WITH_X11) +.if ${PORT_OPTIONS:MX11} USE_XORG= x11 xxf86dga MAKE_ARGS+= BUILD_X11=YES REF_TARGETS+= softx @@ -63,7 +61,7 @@ PLIST_SUB+= X11="@comment " .endif -.if defined(WITH_GLX) || defined(WITH_EYECANDY) +.if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MEYECANDY} USE_GL= yes MAKE_ARGS+= BUILD_GLX=YES REF_TARGETS+= glx @@ -72,7 +70,7 @@ PLIST_SUB+= GLX="@comment " .endif -.if defined(WITH_EYECANDY) +.if ${PORT_OPTIONS:MEYECANDY} DISTFILES+= maxpak.pak LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg MAKE_ARGS+= BUILD_QMAX=YES @@ -81,7 +79,7 @@ PLIST_SUB+= QMAX="@comment " .endif -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL= sdl MAKE_ARGS+= BUILD_SDL=YES REF_TARGETS+= softsdl @@ -90,7 +88,7 @@ PLIST_SUB+= SDL="@comment " .endif -.if defined(WITH_SDLGL) && defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDLGL} && ${PORT_OPTIONS:MSDL} MAKE_ARGS+= BUILD_SDLGL=YES REF_TARGETS+= sdlgl PLIST_SUB+= SDLGL="" @@ -98,7 +96,7 @@ PLIST_SUB+= SDLGL="@comment " .endif -.if defined(WITH_SDLCLIENT) && defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDLCLIENT} && ${PORT_OPTIONS:MSDL} MAKE_ARGS+= BUILD_SDLQUAKE2=YES EXE_TARGETS+= quake2-sdl PLIST_SUB+= SDLCLIENT="" @@ -106,7 +104,7 @@ PLIST_SUB+= SDLCLIENT="@comment " .endif -.if ${ARCH} == "i386" && defined(WITH_SVGA) +.if ${PORT_OPTIONS:MSVGA} LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib MAKE_ARGS+= BUILD_SVGA=YES REF_TARGETS+= soft @@ -115,7 +113,7 @@ PLIST_SUB+= SVGA="@comment " .endif -.if defined(WITH_AA) +.if ${PORT_OPTIONS:MAA} LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib MAKE_ARGS+= BUILD_AA=YES REF_TARGETS+= softaa @@ -124,7 +122,7 @@ PLIST_SUB+= AA="@comment " .endif -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} MAKE_ARGS+= BUILD_CLIENT=YES EXE_TARGETS+= quake2 PLIST_SUB+= CLIENT="" @@ -132,7 +130,7 @@ PLIST_SUB+= CLIENT="@comment " .endif -.if defined(WITH_SERVER) +.if ${PORT_OPTIONS:MSERVER} MAKE_ARGS+= BUILD_DEDICATED=YES PLIST_SUB+= SERVER="" EXE_TARGETS+= q2ded @@ -144,14 +142,14 @@ ## GAME, MISSION ADDONS, AND MODS ## # ### -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} MAKE_ARGS+= BUILD_GAME=YES PLIST_SUB+= GAME="" .else PLIST_SUB+= GAME="@comment " .endif -.if defined(WITH_CTF) +.if ${PORT_OPTIONS:MCTF} MAKE_ARGS+= BUILD_CTFDLL=YES PLIST_SUB+= CTF="" .else @@ -162,33 +160,33 @@ ## MISCELLANEOUS TUNABLES ## # ### -.if defined(WITH_RETEXTURE) +.if ${PORT_OPTIONS:MRETEXTURE} MAKE_ARGS+= BUILD_RETEXTURE=YES RUN_DEPENDS+= ${Q2DIR}/baseq2/pak10.pak:${PORTSDIR}/games/quake2-extras .endif -.if defined(WITH_JOYSTICK) +.if ${PORT_OPTIONS:MJOYSTICK} MAKE_ARGS+= BUILD_JOYSTICK=YES .endif -.if defined(WITH_REDBLUE) +.if ${PORT_OPTIONS:MREDBLUE} MAKE_ARGS+= BUILD_REDBLUE=YES .endif -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} MAKE_ARGS+= HAVE_IPV6=YES .endif -.if defined(WITH_ARTS) +.if ${PORT_OPTIONS:MARTS} LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts MAKE_ARGS+= BUILD_ARTS=YES .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ARGS+= OPTIMIZED_CFLAGS="-O3 -s -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations" .endif -.if ${ARCH} != "i386" || defined(WITHOUT_X86_ASM) +.if empty(PORT_OPTIONS:MX86_ASM) MAKE_ARGS+= NO_X86_ASM=YES .endif @@ -212,17 +210,17 @@ .for tgt in ${REF_TARGETS} ${INSTALL_PROGRAM} ${TGTDIR}/ref_${tgt}.so ${LIBDIR} .endfor -.if defined(WITH_CTF) +.if ${PORT_OPTIONS:MCTF} @${MKDIR} ${LIBDIR}/ctf ${INSTALL_PROGRAM} ${TGTDIR}/ctf/game.so ${LIBDIR}/ctf .endif -.if defined(WITH_EYECANDY) +.if ${PORT_OPTIONS:MEYECANDY} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/maxpak.pak ${LIBDIR}/baseq2 .endif -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} ${INSTALL_PROGRAM} ${TGTDIR}/game.so ${LIBDIR}/baseq2 .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/src/docs/README ${DOCSDIR}/README.320 @@ -232,4 +230,4 @@ .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +.include Index: games/quake2max/Makefile =================================================================== --- games/quake2max/Makefile (revision 311718) +++ games/quake2max/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2max -# Date created: 24 Jul 2006 -# Whom: alepulver -# +# Created by: alepulver # $FreeBSD$ -# PORTNAME= quake2max PORTVERSION= 0.45 @@ -28,14 +24,16 @@ ALL_TARGET= release WRKSRC= ${WRKDIR}/${DISTNAME:S/quake2max/Quake2maX/} -OPTIONS= CLIENT "Build client" on \ - DEDICATED "Build dedicated server" on \ - GAME "Build a main game .so file" off \ - GLX "Build OpenGL renderer" on \ - OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ - SDL "Build SDL client" on \ - SDLGL "Build SDL OpenGL renderer" on +OPTIONS_DEFINE= CLIENT DEDICATED GAME GLX OPTIMIZED_CFLAGS SDL SDLGL +OPTIONS_DEFAULT= CLIENT DEDICATED GLX OPTIMIZED_CFLAGS SDL SDLGL +CLIENT_DESC= Client +DEDICATED_DESC= Dedicated server +GAME_DESC= Main game .so file +GLX_DESC= OpenGL renderer +SDL_DESC= SDL client +SDLGL_DESC= SDL OpenGL renderer + MAKE_ENV= LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" LIBDIR= ${PREFIX}/lib/${PORTNAME} @@ -44,19 +42,19 @@ .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +.include -.if defined(WITH_GLX) || defined(WITH_SDLGL) +.if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDLGL} LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png USE_GL= yes .endif -.if defined(WITH_SDL) || defined(WITH_SDLGL) +.if ${PORT_OPTIONS:MSDL} || ${PORT_OPTIONS:MSDLGL} USE_SDL= yes .endif -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= BUILD_QUAKE2MAX=YES PLIST_SUB+= CLIENT="" Q2MAX_BIN+= quake2max @@ -64,7 +62,7 @@ PLIST_SUB+= CLIENT="@comment " .endif -.if defined(WITH_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= BUILD_DEDICATED=YES PLIST_SUB+= DEDICATED="" Q2MAX_BIN+= quake2max-ded @@ -72,14 +70,14 @@ PLIST_SUB+= DEDICATED="@comment " .endif -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} MAKE_ENV+= BUILD_GAME=YES PLIST_SUB+= GAME="" .else PLIST_SUB+= GAME="@comment " .endif -.if defined(WITH_GLX) +.if ${PORT_OPTIONS:MGLX} MAKE_ENV+= BUILD_GLX=YES PLIST_SUB+= GLX="" Q2MAX_REF+= glx @@ -87,11 +85,11 @@ PLIST_SUB+= GLX="@comment " .endif -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= WITH_OPTIMIZED_CFLAGS=YES .endif -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} MAKE_ENV+= BUILD_QUAKE2MAX-SDL=YES PLIST_SUB+= SDL="" Q2MAX_BIN+= quake2max-sdl @@ -99,7 +97,7 @@ PLIST_SUB+= SDL="@comment " .endif -.if defined(WITH_SDLGL) +.if ${PORT_OPTIONS:MSDLGL} MAKE_ENV+= BUILD_SDLGL=YES PLIST_SUB+= SDLGL="" Q2MAX_REF+= sdlgl @@ -123,9 +121,9 @@ .for f in ${Q2MAX_REF} ${INSTALL_PROGRAM} ${WRKSRC}/quake2/rfx_${f}.so ${LIBDIR} .endfor -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} ${INSTALL_PROGRAM} ${WRKSRC}/quake2/baseq2/game.so ${LIBDIR}/baseq2 .endif ${INSTALL_DATA} ${WRKSRC}/_maxpak.pak ${LIBDIR}/baseq2/maxpak.pak -.include +.include Index: games/quake3-data/Makefile =================================================================== --- games/quake3-data/Makefile (revision 311718) +++ games/quake3-data/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Quake 3 paks -# Date created: 1st March 2003 -# Whom: nik@FreeBSD.org -# +# Created by: nik@FreeBSD.org # $FreeBSD$ -# PORTNAME= data DISTVERSION= 1.32b-3 @@ -21,8 +17,11 @@ NO_BUILD= yes NO_WRKSUBDIR= yes -OPTIONS= TEAMARENA "Install Quake III Team Arena data files" on +OPTIONS_DEFINE= TEAMARENA +OPTIONS_DEFAULT= TEAMARENA +TEAMARENA_DESC= Install Quake III Team Arena data files + DATADIR= ${Q3DIR} SUB_FILES= pkg-message @@ -35,9 +34,9 @@ .include "Makefile.include" -.include +.include -.if !defined(WITHOUT_TEAMARENA) +.if ${PORT_OPTIONS:MTEAMARENA} PLIST_SUB+= TEAMARENA="" .else PLIST_SUB+= TEAMARENA="@comment " @@ -48,7 +47,7 @@ @${CP} -R ${WRKSRC}/baseq3 ${DATADIR} @${MKDIR} ${PREFIX}/share/pixmaps @${INSTALL_DATA} ${WRKSRC}/quake3.xpm ${PREFIX}/share/pixmaps -.if !defined(WITHOUT_TEAMARENA) +.if ${PORT_OPTIONS:MTEAMARENA} @${CP} -R ${WRKSRC}/missionpack ${DATADIR} .endif @@ -57,4 +56,4 @@ @${CAT} ${PKGMESSAGE} @${ECHO_CMD} -.include +.include Index: games/quakeforge/Makefile =================================================================== --- games/quakeforge/Makefile (revision 311718) +++ games/quakeforge/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: QuakeForge -# Date created: 4 January 2000 -# Whom: darius@dons.net.au -# +# Created by: darius@dons.net.au # $FreeBSD$ -# PORTNAME= quakeforge PORTVERSION= 0.5.5 @@ -31,14 +27,18 @@ --with-sharepath=${DATADIR} \ --disable-optimize -OPTIONS= CLIENTS "Build clients" on \ - OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ - SDL "Build SDL client" off \ - SERVERS "Build dedicated servers" on \ - SKYBOXES "Install skyboxes pak" off \ - VORBIS "Enable Ogg Vorbis support in clients" off \ - XMMS "Enable XMMS support in clients" off +OPTIONS_DEFINE= CLIENTS OPTIMIZED_CFLAGS SDL SERVERS SKYBOXES VORBIS \ + XMMS DOCS +OPTIONS_DEFAULT= CLIENTS OPTIMIZED_CFLAGS SERVERS DOCS + +CLIENTS_DESC= Clients +SDL_DESC= SDL client +SERVERS_DESC= Dedicated servers +SKYBOXES_DESC= Install skyboxes pak +VORBIS_DESC= Ogg Vorbis support in clients +XMMS_DESC= XMMS support in clients + MAN1= pak.1 qfcc.1 qflight.1 qfvis.1 wad.1 SUB_FILES= pkg-message @@ -46,14 +46,14 @@ .include "${.CURDIR}/../quake-data/Makefile.include" -.include +.include -.if !defined(WITHOUT_CLIENTS) +.if ${PORT_OPTIONS:MCLIENTS} USE_GL= yes USE_XORG= x11 xt PLIST_SUB+= CLIENTS="" -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL= sdl CONFIGURE_ARGS+=--with-sdl=${LOCALBASE} PLIST_SUB+= SDL="" @@ -62,7 +62,7 @@ PLIST_SUB+= SDL="@comment " .endif -.if defined(WITH_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} --with-vorbis=${LOCALBASE} PLIST_SUB+= VORBIS="" @@ -71,7 +71,7 @@ PLIST_SUB+= VORBIS="@comment " .endif -.if defined(WITH_XMMS) +.if ${PORT_OPTIONS:MXMMS} LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms CONFIGURE_ARGS+=--with-xmms-prefix=${LOCALBASE} PLIST_SUB+= XMMS="" @@ -83,9 +83,9 @@ .else CONFIGURE_ARGS+=--with-clients="" PLIST_SUB+= CLIENTS="@comment " -.endif # WITH_CLIENTS +.endif -.if !defined(WITHOUT_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -funroll-loops -fomit-frame-pointer -fno-common \ -fexpensive-optimizations -fstrict-aliasing . if ${ARCH} != "alpha" @@ -93,14 +93,14 @@ . endif .endif -.if !defined(WITHOUT_SERVERS) +.if ${PORT_OPTIONS:MSERVERS} PLIST_SUB+= SERVERS="" .else CONFIGURE_ARGS+=--with-servers="" PLIST_SUB+= SERVERS="@comment " .endif -.if defined(WITH_SKYBOXES) +.if ${PORT_OPTIONS:MSKYBOXES} MASTER_SITES+= http://www.quakeforge.net/files/:qf DISTFILES+= skyboxes.pak:qf PLIST_SUB+= SKYBOXES="" @@ -109,10 +109,10 @@ .endif post-install: -.if defined(WITH_SKYBOXES) +.if ${PORT_OPTIONS:MSKYBOXES} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/skyboxes.pak ${DATADIR}/QF .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} . for f in *.txt *.q1 *.q2 *.ico *.gif *.fig *.h CodingStyle ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} @@ -123,4 +123,4 @@ .endif @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} -.include +.include Index: games/qudos/Makefile =================================================================== --- games/qudos/Makefile (revision 311718) +++ games/qudos/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: QuDos -# Date created: 24 May 2006 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= qudos PORTVERSION= 0.40.1 @@ -21,29 +17,33 @@ USE_BZIP2= yes USE_GMAKE= yes -OPTIONS= 3ZB2 "Build 3zb2 modification (bots)" on \ - ARTS "Enable support for aRts sound daemon" off \ - BOTS "Enable Ace Bot support in modifications" on \ - CLIENT "Build client" on \ - CTF "Build CTF (Capture The Flag) modification" off \ - DEDICATED "Build dedicated server" on \ - GAME "Build a main game .so modification" off \ - GAME_MOD "Enable custom addons in main modification" on \ - GLX "Build OpenGL renderer" on \ - IPV6 "Enable IPv6 support" off \ - JABOT "Build JABot modification (bots)" off \ - JOYSTICK "Enable joystick support" off \ - OSS "Enable Open Sound System sound support" on \ - QMAX "Enable fancier OpenGL graphics" on \ - REDBLUE "Enable red-blue 3d glasses renderer" off \ - RETEXTURE "Enable support for retextured graphics" off \ - ROGUE "Build Ground Zero (Rogue) mission pack" off \ - SDL "Enable SDL sound support" on \ - SDLGL "Build SDL OpenGL renderer" on \ - X86_ASM "Enable x86 assembly support" on \ - XATRIX "Build The Reckoning (Xatrix) mission pack" off \ - ZAERO "Build Zaero modification" off +OPTIONS_DEFINE= 3ZB2 ARTS BOTS CLIENT CTF DEDICATED GAME GAME_MOD \ + GLX IPV6 JABOT JOYSTICK OSS QMAX REDBLUE RETEXTURE \ + ROGUE SDL SDLGL XATRIX ZAERO DOCS +OPTIONS_DEFINE_i386= X86_ASM +OPTIONS_DEFINE_amd64= X86_ASM +OPTIONS_DEFAULT= 3ZB2 BOTS CLIENT DEDICATED GAME_MOD GLX JOYSTICK OSS \ + QMAX SDL SDLGL X86_ASM DOCS + +3ZB2_DESC= 3zb2 modification (bots) +BOTS_DESC= Ace Bot support in modifications +CLIENT_DESC= Client +CTF_DESC= CTF (Capture The Flag) modification +DEDICATED_DESC= Dedicated server +GAME_DESC= Main game .so modification +GAME_MOD_DESC= Custom addons in main modification +JABOT_DESC= JABot modification (bots) +JOYSTICK_DESC= Joystick support +QMAX_DESC= Fancier OpenGL graphics +REDBLUE_DESC= Red-blue 3d glasses renderer +RETEXTURE_DESC= Support for retextured graphics +ROGUE_DESC= Ground Zero (Rogue) mission pack +SDLGL_DESC= SDL OpenGL renderer +X86_ASM_DESC= x86 assembly support +XATRIX_DESC= The Reckoning (Xatrix) mission pack +ZAERO_DESC= Zaero modification + MAKE_ENV= WITH_DATADIR=YES WITH_LIBDIR=YES WITH_XMMS=NO \ DATADIR="${Q2DIR}" LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" VER="${PORTVERSION}" @@ -53,10 +53,10 @@ .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +.include .for mod in ${MOD_LIST} -. if defined(WITH_${mod}) +. if ${PORT_OPTIONS:M${mod}} MAKE_ENV+= BUILD_${mod}=YES PLIST_SUB+= ${mod}="" . else @@ -65,17 +65,17 @@ . endif .endfor -.if !defined(WITHOUT_GLX) || !defined(WITHOUT_SDLGL) +.if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDLGL} USE_GL= yes LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png .endif -.if !defined(WITHOUT_SDL) || !defined(WITHOUT_SDLGL) +.if ${PORT_OPTIONS:MSDL} || ${PORT_OPTIONS:MSDLGL} USE_SDL= sdl .endif -.if defined(WITH_ARTS) +.if ${PORT_OPTIONS:MARTS} LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts MAKE_ENV+= BUILD_ARTS_SND=YES PLIST_SUB+= ARTS="" @@ -85,7 +85,7 @@ PLIST_SUB+= ARTS="@comment " .endif -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis MAKE_ENV+= BUILD_QUAKE2=YES PLIST_SUB+= CLIENT="" @@ -95,7 +95,7 @@ PLIST_SUB+= CLIENT="@comment " .endif -.if !defined(WITHOUT_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= BUILD_DEDICATED=YES PLIST_SUB+= DEDICATED="" Q2BIN+= ${PORTNAME}-ded @@ -104,7 +104,7 @@ PLIST_SUB+= DEDICATED="@comment " .endif -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} MAKE_ENV+= BUILD_GAME=YES PLIST_SUB+= GAME="" .else @@ -112,14 +112,14 @@ PLIST_SUB+= GAME="@comment " .endif -.if !defined(WITHOUT_GAME_MOD) +.if ${PORT_OPTIONS:MGAME_MOD} MAKE_ENV+= WITH_GAME_MOD=YES .else MAKE_ENV+= WITH_GAME_MOD=NO .endif .for opt in GLX SDLGL -. if !defined(WITHOUT_${opt}) +. if ${PORT_OPTIONS:M${opt}} MAKE_ENV+= BUILD_${opt}=YES PLIST_SUB+= ${opt}="" Q2REF+= ${opt:L} @@ -129,19 +129,19 @@ . endif .endfor -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} MAKE_ENV+= WITH_IPV6=YES .else MAKE_ENV+= WITH_IPV6=NO .endif -.if defined(WITH_JOYSTICK) +.if ${PORT_OPTIONS:MJOYSTICK} MAKE_ENV+= WITH_JOYSTICK=YES .else MAKE_ENV+= WITH_JOYSTICK=NO .endif -.if !defined(WITHOUT_OSS) +.if ${PORT_OPTIONS:MOSS} MAKE_ENV+= BUILD_OSS_SND=YES PLIST_SUB+= OSS="" Q2SND+= oss @@ -150,25 +150,25 @@ PLIST_SUB+= OSS="@comment " .endif -.if !defined(WITHOUT_QMAX) +.if ${PORT_OPTIONS:MQMAX} MAKE_ENV+= WITH_QMAX=YES .else MAKE_ENV+= WITH_QMAX=NO .endif -.if defined(WITH_REDBLUE) +.if ${PORT_OPTIONS:MREDBLUE} MAKE_ENV+= WITH_REDBLUE=YES .else MAKE_ENV+= WITH_REDBLUE=NO .endif -.if defined(WITH_RETEXTURE) +.if ${PORT_OPTIONS:MRETEXTURE} MAKE_ENV+= WITH_RETEXTURE=YES .else MAKE_ENV+= WITH_RETEXTURE=NO .endif -.if !defined(WITHOUT_SDL) +.if ${PORT_OPTIONS:MSDL} MAKE_ENV+= BUILD_SDL_SND=YES PLIST_SUB+= SDL="" Q2SND+= sdl @@ -177,7 +177,7 @@ PLIST_SUB+= SDL="@comment " .endif -.if !defined(WITHOUT_X86_ASM) +.if ${PORT_OPTIONS:MX86_ASM} MAKE_ENV+= WITH_X86_ASM=YES .else MAKE_ENV+= WITH_X86_ASM=NO @@ -204,20 +204,20 @@ .for snd in ${Q2SND} ${INSTALL_PROGRAM} ${WRKSRC}/quake2/snd_${snd}.so ${LIBDIR} .endfor -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} ${INSTALL_PROGRAM} ${WRKSRC}/quake2/baseq2/game.so ${LIBDIR}/baseq2 .endif .for mod in ${MOD_LIST:L} -.if defined(WITH_${mod:U}) +.if ${PORT_OPTIONS:M${mod:U}} ${MKDIR} ${LIBDIR}/${mod} ${INSTALL_PROGRAM} ${WRKSRC}/quake2/${mod}/game.so ${LIBDIR}/${mod} .endif .endfor ${INSTALL_DATA} ${_DISTDIR}/QuDos-${PORTVERSION}.pk3 ${LIBDIR}/baseq2 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/QuDos.txt ${WRKSRC}/docs/Ogg_readme.txt \ ${DOCSDIR} .endif -.include +.include Index: games/quetoo/Makefile =================================================================== --- games/quetoo/Makefile (revision 311718) +++ games/quetoo/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Quetoo -# Date created: 10 Apr 2006 -# Whom: Alexey Dokuchaev -# +# Created by: Alexey Dokuchaev # $FreeBSD$ -# PORTNAME= quetoo PORTVERSION= 0.6.1 @@ -33,43 +29,47 @@ # Main and CTF game.so files are not built/installed by default since # they're available via `quake2-data' and `quake2-ctf' ports. # -OPTIONS= GAME "Build the main game .so file" off \ - CTF "Build Capture The Flag modification" off \ - VANCTF "Build Vanilla CTF modification" on \ - QMASS "Build QMass deathmatch mod" on \ - MYSQL "Enable MySQL frag logging" off \ -.include +OPTIONS_DEFINE= GAME CTF VANCTF QMASS MYSQL DOCS +OPTIONS_DEFAULT= VANCTF QMASS DOCS -.if !defined(WITHOUT_GAME) +GAME_DESC= Main game .so file +CTF_DESC= Capture The Flag modification +VANCTF_DESC= Vanilla CTF modification +QMASS_DESC= QMass deathmatch mod +MYSQL_DESC= MySQL frag logging + +.include + +.if ${PORT_OPTIONS:MGAME} PLIST_SUB+= GAME="" Q2GAMES+= baseq2 .else PLIST_SUB+= GAME="@comment " .endif -.if defined(WITH_CTF) +.if ${PORT_OPTIONS:MCTF} PLIST_SUB+= CTF="" Q2GAMES+= ctf .else PLIST_SUB+= CTF="@comment " .endif -.if !defined(WITHOUT_QMASS) +.if ${PORT_OPTIONS:MQMASS} PLIST_SUB+= QMASS="" Q2GAMES+= qmass .else PLIST_SUB+= QMASS="@comment " .endif -.if defined(WITH_VANCTF) +.if ${PORT_OPTIONS:MVANCTF} PLIST_SUB+= VANCTF="" Q2GAMES+= vanctf .else PLIST_SUB+= VANCTF="@comment " .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql CONFIGURE_ENV+= MYSQL_LIBS="-L${LOCALBASE}/lib/mysql -lmysqlclient" \ @@ -99,23 +99,23 @@ @${MKDIR} ${LIBDIR}/${g} ${INSTALL_PROGRAM} ${WRKSRC}/src/${g}/.libs/game.so ${LIBDIR}/${g} .endfor -.if !defined(WITHOUT_QMASS) +.if ${PORT_OPTIONS:MQMASS} @${MKDIR} ${DATADIR}/qmass/sound ${INSTALL_DATA} ${WRKSRC}/data/qmass/sound/*.wav ${DATADIR}/qmass/sound -.if !defined(WITHOUT_VANCTF) +.if ${PORT_OPTIONS:MVANCTF} @${MKDIR} ${DATADIR}/vanctf/maps ${INSTALL_DATA} ${WRKSRC}/data/vanctf/maps/*.ent ${DATADIR}/vanctf/maps ${INSTALL_DATA} ${WRKSRC}/data/vanctf/maps.lst ${DATADIR}/vanctf .endif .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -. if !defined(WITHOUT_QMASS) +. if ${PORT_OPTIONS:MQMASS} @${MKDIR} ${DOCSDIR}/qmass ${INSTALL_DATA} ${WRKSRC}/src/qmass/README ${DOCSDIR}/qmass . endif -. if !defined(WITHOUT_VANCTF) +. if ${PORT_OPTIONS:MVANCTF} @${MKDIR} ${DOCSDIR}/vanctf ${INSTALL_DATA} ${WRKSRC}/src/vanctf/*E* ${DOCSDIR}/vanctf . endif @@ -123,4 +123,4 @@ .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +.include Index: games/r1q2/Makefile =================================================================== --- games/r1q2/Makefile (revision 311718) +++ games/r1q2/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: r1q2 -# Date created: 16 May 2006 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= r1q2 PORTVERSION= 7904 @@ -26,11 +22,17 @@ BUILD_WRKSRC= ${WRKSRC}/binaries ALL_TARGET= # -OPTIONS= CLIENT "Build client" on \ - DEDICATED "Build dedicated server" on \ - GAME "Build a main game .so file" off \ - REF_GL "Build renderer (required by CLIENT)" on +OPTIONS_MULTI= TYPE +OPTIONS_MULTI_TYPE= CLIENT DEDICATED +OPTIONS_DEFINE= GAME REF_GL DOCS +OPTIONS_DEFAULT= CLIENT DEDICATED REF_GL DOCS + +CLIENT_DESC= Client +DEDICATED_DESC= Dedicated server +GAME_DESC= Main game .so file +REF_GL_DESC= Renderer (required by CLIENT) + MAKE_ENV= LIBDIR="${LIBDIR}" PTHREAD_LIBS="${PTHREAD_LIBS}" PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" @@ -38,34 +40,30 @@ .include "${.CURDIR}/../quake2-data/Makefile.include" -.include +.include -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) -IGNORE= needs at least one executable (CLIENT and DEDICATED) -.endif - -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} ALL_TARGET+= client PLIST_SUB+= CLIENT="" .else PLIST_SUB+= CLIENT="@comment " .endif -.if !defined(WITHOUT_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} ALL_TARGET+= r1q2ded PLIST_SUB+= DEDICATED="" .else PLIST_SUB+= DEDICATED="@comment " .endif -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} ALL_TARGET+= game PLIST_SUB+= GAME="" .else PLIST_SUB+= GAME="@comment " .endif -.if !defined(WITHOUT_REF_GL) +.if ${PORT_OPTIONS:MREF_GL} USE_GL= yes USE_SDL= sdl LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg \ @@ -89,23 +87,23 @@ @${FIND} ${BUILD_WRKSRC} -type d -depth 1 -exec ${MKDIR} {}/.depends \; do-install: -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/client/quake2 \ ${PREFIX}/bin/${PORTNAME} .endif -.if !defined(WITHOUT_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/r1q2ded/r1q2ded ${PREFIX}/bin .endif ${MKDIR} ${LIBDIR}/baseq2 -.if defined(WITH_GAME) +.if ${PORT_OPTIONS:MGAME} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/game/game.so ${LIBDIR}/baseq2 .endif -.if !defined(WITHOUT_REF_GL) +.if ${PORT_OPTIONS:MREF_GL} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/ref_gl/ref_gl.so ${LIBDIR} .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/r1q2.txt ${WRKSRC}/readme.txt ${DOCSDIR} .endif -.include +.include Index: games/tremulous/Makefile =================================================================== --- games/tremulous/Makefile (revision 311718) +++ games/tremulous/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Tremulous -# Date created: 3 Jun 2006 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= tremulous PORTVERSION= 1.1.0 @@ -22,30 +18,31 @@ WRKSRC= ${WRKDIR}/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/${DISTNAME}-src -OPTIONS= CLIENT "Build client" on \ - GAMELIBS "Build game libraries (when not mandatory)" off \ - DEDICATED "Build dedicated server" on \ - MASTER_SERVER "Build master server" off \ - OPENAL "Enable OpenAL (3D sound) support" off \ - OPENAL_DLOPEN "Enable dynamic loading of OpenAL" off \ - OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ - SDL_AUDIO "Use SDL for audio" off \ - SDL_VIDEO "Use SDL for video" off \ - SMP "Build SMP (threaded) client" on \ - VORBIS "Enable Ogg Vorbis codec support" off +OPTIONS_MULTI= TYPE +OPTIONS_MULTI_TYPE= CLIENT DEDICATED SMP +OPTIONS_DEFINE= GAMELIBS MASTER_SERVER OPENAL OPENAL_DLOPEN \ + OPTIMIZED_CFLAGS SDL_AUDIO SDL_VIDEO VORBIS + +OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS SMP + +CLIENT_DESC= Client +GAMELIBS_DESC= Game libraries (when not mandatory) +DEDICATED_DESC= Dedicated server +MASTER_SERVER_DESC= Master server +OPENAL_DLOPEN_DESC= Dynamic loading of OpenAL +OPTIMIZED_CFLAGS_DESC= Compilation optimizations +SDL_AUDIO_DESC= SDL for audio +SDL_VIDEO_DESC= SDL for video +SMP_DESC= SMP (threaded) client + MAKE_ENV+= DEFAULT_BASEDIR="${DATADIR}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" VM_ARCHS= amd64 i386 -.include +.include -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && \ - defined(WITHOUT_SMP) -IGNORE= needs at least one of CLIENT, DEDICATED, or SMP options -.endif - .for i in ${ARCH} . if ${VM_ARCHS:M${i}} != "" HAVE_VM_COMPILED= yes @@ -56,21 +53,21 @@ MAKE_ENV+= HAVE_VM_COMPILED=true .endif -.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP) +.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP} # OpenAL -. if defined(WITH_OPENAL) +. if ${PORT_OPTIONS:MOPENAL} USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 -. if defined(WITH_OPENAL_DLOPEN) +. if ${PORT_OPTIONS:MOPENAL_DLOPEN} MAKE_ENV+= USE_OPENAL_DLOPEN=1 . endif . endif # SDL -. if defined(WITH_SDL_AUDIO) +. if ${PORT_OPTIONS:MSDL_AUDIO} USE_SDL= sdl MAKE_ENV+= USE_SDL_AUDIO=1 . endif -. if defined(WITH_SDL_VIDEO) +. if ${PORT_OPTIONS:MSDL_VIDEO} USE_SDL= sdl MAKE_ENV+= USE_SDL_VIDEO=1 . else @@ -78,13 +75,13 @@ USE_XORG= x11 xxf86dga . endif # Vorbis -. if defined(WITH_VORBIS) +. if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis MAKE_ENV+= USE_CODEC_VORBIS=1 . endif .endif -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= BUILD_CLIENT=1 PLIST_SUB+= CLIENT="" TRBIN+= tremulous @@ -92,7 +89,7 @@ PLIST_SUB+= CLIENT="@comment " .endif -.if !defined(WITHOUT_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= BUILD_SERVER=1 PLIST_SUB+= DEDICATED="" TRBIN+= tremded @@ -100,14 +97,14 @@ PLIST_SUB+= DEDICATED="@comment " .endif -.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED) +.if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= BUILD_GAME_SO=1 PLIST_SUB+= GAMELIBS="" .else PLIST_SUB+= GAMELIBS="@comment " .endif -.if defined(WITH_MASTER_SERVER) +.if ${PORT_OPTIONS:MMASTER_SERVER} LIB_DEPENDS+= tdb.1:${PORTSDIR}/databases/tdb MAKE_ENV+= BUILD_MASTER_SERVER=1 PLIST_SUB+= MASTER_SERVER="" @@ -115,11 +112,11 @@ PLIST_SUB+= MASTER_SERVER="@comment " .endif -.if !defined(WITHOUT_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= USE_OPTIMIZED_CFLAGS=1 .endif -.if !defined(WITHOUT_SMP) +.if ${PORT_OPTIONS:MSMP} MAKE_ENV+= BUILD_CLIENT_SMP=1 PLIST_SUB+= SMP="" TRBIN+= tremulous-smp @@ -138,7 +135,7 @@ .for bin in ${TRBIN} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/build/release/${bin} ${PREFIX}/bin .endfor -.if defined(WITH_MASTER_SERVER) +.if ${PORT_OPTIONS:MMASTER_SERVER} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/master/release/tremmaster \ ${PREFIX}/bin .endif @@ -152,4 +149,4 @@ @${CAT} ${PKGMESSAGE} @${ECHO_CMD} -.include +.include Index: games/yadex/Makefile =================================================================== --- games/yadex/Makefile (revision 311718) +++ games/yadex/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Yadex -# Date created: 17 June 2001 -# Whom: Jordan DeLong -# +# Created by: Jordan DeLong # $FreeBSD$ -# PORTNAME= yadex PORTVERSION= 1.7.0 @@ -27,14 +23,16 @@ MAN6= yadex.6 -OPTIONS= WHITE_BG "Use alternative (black-on-white) color scheme" off \ - 3D_RENDER "Build with a 3D preview function" off \ - SEARCH "Search for a thing, linedef or sector by type" off \ - EXTRA_TOOLS "Add a few extra tools to Yadex' repertoire" off \ - LAPTOP_KEYS "Key bindings to make editing easier on laptops" off +OPTIONS_DEFINE= WHITE_BG 3D_RENDER SEARCH EXTRA_TOOLS LAPTOP_KEYS -.include +WHITE_BG_DESC= Alternative (black-on-white) color scheme +3D_RENDER_DESC= 3D preview function +SEARCH_DESC= Search for a thing, linedef or sector by type +EXTRA_TOOLS_DESC= Add a few extra tools to Yadex' repertoire +LAPTOP_KEYS_DESC= Key bindings to make editing easier on laptops +.include + PATCH_SITES= http://glbsp.sourceforge.net/%SUBDIR%/ PATCH_SITE_SUBDIR= ${PORTNAME} PATCH_DIST_STRIP= -p1 @@ -42,32 +40,32 @@ PATCH_SUFFIX= .diff PATCHFILES= ${PATCH_PREFIX}_Depend${PATCH_SUFFIX} -.if defined(WITH_3D_RENDER) +.if ${PORT_OPTIONS:M3D_RENDER} PATCHFILES+= ${PATCH_PREFIX}_Render3D${PATCH_SUFFIX} PLIST_SUB+= 3DRENDER="" .else PLIST_SUB+= 3DRENDER="@comment " .endif -.if defined(WITH_SEARCH) +.if ${PORT_OPTIONS:MSEARCH} PATCHFILES+= ${PATCH_PREFIX}_Find${PATCH_SUFFIX} .endif -.if defined(WITH_EXTRA_TOOLS) +.if ${PORT_OPTIONS:MEXTRA_TOOLS} PATCHFILES+= ${PATCH_PREFIX}_Tools${PATCH_SUFFIX} .endif -.if defined(WITH_LAPTOP_KEYS) +.if ${PORT_OPTIONS:MLAPTOP_KEYS} PATCHFILES+= ${PATCH_PREFIX}_Keys${PATCH_SUFFIX} .endif post-patch: -.if defined(WITH_WHITE_BG) +.if ${PORT_OPTIONS:MWHITE_BG} @${REINPLACE_CMD} -E 's,^#(CXXFLAGS \+= -DWHITE_BACKGROUND)$$,\1,' \ ${WRKSRC}/${MAKEFILE} .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/*.[^6]* ${WRKSRC}/doc/README ${DOCSDIR} .endif -.include +.include Index: graphics/luxrender/Makefile =================================================================== --- graphics/luxrender/Makefile (revision 311718) +++ graphics/luxrender/Makefile (working copy) @@ -15,6 +15,7 @@ LICENSE= GPLv3 +ONLY_FOR_ARCHS= i386 amd64 BROKEN= does not build with boost-1.48.0 BUILD_DEPENDS= ${LOCALBASE}/lib/libfreeimage.a:${PORTSDIR}/graphics/freeimage @@ -35,17 +36,20 @@ "${PREFIX}/share/pixmaps/luxrender.svg" "${PORTNAME}" \ "Graphics;3DGraphics;" false -OPTIONS= QT4 "Build Qt4 GUI executable" on \ - WX "Build wxWidgets GUI executable" off +OPTIONS_DEFINE= QT4 WX +OPTIONS_DEFAULT= QT4 +QT4_DESC= Qt4-enabled GUI executable +WX_DESC= wxWidgets-enabled GUI executable + .include -.if defined(WITH_QT4) +.if ${PORT_OPTIONS:MQT4} USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui PLIST_FILES+= bin/luxrender .endif -.if defined(WITH_WX) +.if ${PORT_OPTIONS:MWX} USE_WX= 2.8+ PLIST_FILES+= bin/luxrenderwx .endif @@ -60,10 +64,4 @@ 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ -e 's|int_p_NULL|NULL|g' ${WRKSRC}/core/external/cimg.h -.include - -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile4: uses i386-specific options -.endif - -.include +.include Index: security/john/Makefile =================================================================== --- security/john/Makefile (revision 311718) +++ security/john/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: John the Ripper -# Date created: Sun Mar 09, 1997 -# Whom: David O'Brien -# +# Created by: David O'Brien # $FreeBSD$ -# PORTNAME= john DISTVERSION= 1.7.9-jumbo-5 @@ -38,9 +34,10 @@ PORTDOCS= CHANGES CONFIG EXAMPLES EXTERNAL FAQ MODES OPTIONS README \ RULES CONTACT CREDITS -OPTIONS= OPENMP "Compile with OpenMP support" off +OPTIONS_DEFINE= OPENMP DOCS +OPTIONS_DEFAULT= DOCS -.include +.include .if ${ARCH} == "i386" . if ${MACHINE_CPU:Msse2} @@ -93,9 +90,9 @@ .if !exists(${PREFIX}/etc/john.conf) ${INSTALL_DATA} ${WRKSRC}/run/john.conf ${PREFIX}/etc .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR} .endif -.include +.include Index: security/ophcrack/Makefile =================================================================== --- security/ophcrack/Makefile (revision 311718) +++ security/ophcrack/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ophcrack -# Date created: 14 Mar 2008 -# Whom: Alexey Dokuchaev -# +# Created by: Alexey Dokuchaev # $FreeBSD$ -# PORTNAME= ophcrack PORTVERSION= 3.4.0 @@ -21,41 +17,40 @@ USE_GMAKE= yes USE_OPENSSL= yes +ONLY_FOR_ARCHS= i386 amd64 + PLIST_FILES= bin/ophcrack PORTDOCS= * -OPTIONS= GUI "Build GUI frontend (Qt4 based)" on \ - GRAPH "Enable graph rendering with Qwt" on \ - DEBUG "Make debug build" off +OPTIONS_DEFINE= GUI GRAPH DEBUG +OPTIONS_DEFAULT= GUI GRAPH +GUI_DESC= Qt4-based GUI frontend +GRAPH_DESC= Graph rendering with Qwt +DEBUG_DESC= Add debugging information + .include -.if defined(WITH_GUI) || defined(WITH_GRAPH) +.if ${PORT_OPTIONS:MGUI} || ${PORT_OPTIONS:MGRAPH} USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui .else CONFIGURE_ARGS+= --disable-gui .endif -.if defined(WITH_GRAPH) +.if ${PORT_OPTIONS:MGRAPH} LIB_DEPENDS= qwt.5:${PORTSDIR}/x11-toolkits/qwt5 .else CONFIGURE_ARGS+= --disable-graph .endif -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/README ${DOCSDIR} .endif -.include - -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on ia64, powerpc, or sparc64 -.endif - -.include +.include Index: sysutils/nvclock/Makefile =================================================================== --- sysutils/nvclock/Makefile (revision 311718) +++ sysutils/nvclock/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: NVClock -# Date created: August 4, 2003 -# Whom: Samy Al Bahra -# +# Created by: Samy Al Bahra # $FreeBSD$ -# PORTNAME= nvclock DISTVERSION= 0.8b4 @@ -24,27 +20,30 @@ MAN1= nvclock.1 PORTDOCS= ABOUT AUTHORS ChangeLog FAQ README -OPTIONS= NVCONTROL "Enable NV-CONTROL support" on \ - GTK "Build GTK+ user interface" on \ - QT "Build Qt 3.x user interface" off +OPTIONS_DEFINE= NVCONTROL GTK QT DOCS +OPTIONS_DEFAULT= NVCONTROL GTK DOCS +NVCONTROL_DESC= NV-CONTROL support +GTK_DESC= GTK+ user interface +QT_DESC= Qt 3.x user interface + .include -.if defined(WITH_NVCONTROL) +.if ${PORT_OPTIONS:MNVCONTROL} USE_XORG= xext USE_GNOME= pkgconfig .else CONFIGURE_ARGS+= --disable-nvcontrol .endif -.if defined(WITH_GTK) +.if ${PORT_OPTIONS:MGTK} USE_GNOME= gtk20 PLIST_FILES+= bin/nvclock_gtk .else CONFIGURE_ARGS+= --disable-gtk .endif -.if defined(WITH_QT) +.if ${PORT_OPTIONS:MQT} USE_QT_VER= 3 CONFIGURE_ARGS+= --enable-qt --with-qtdir=${LOCALBASE} PLIST_FILES+= bin/nvclock_qt @@ -60,7 +59,7 @@ do-install: ${GMAKE} -C ${WRKSRC}/src install ${GMAKE} -C ${WRKSRC} install-man -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${GMAKE} -C ${WRKSRC} install-docs .endif