- Trim old-school Makefile header per recent agreements

- Convert to modern OPTIONS framework (courtesy of jgh@)
- Use more explicit "gl" or "glu" to simple "yes" in USE_GL
- Drop shlib ABI versions from LIB_DEPENDS
- Mute MKDIR's, generally cleanup Makefiles
- Synchronize GAME_DESC description text between ports

2 files changed, 67 insertions, 69 deletions

diff --git a/games/qudos/Makefile b/games/qudos/Makefile
index da9ec9d572f4..7123e91a0285 100644
--- a/games/qudos/Makefile
+++ b/games/qudos/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	QuDos
-# Date created:				24 May 2006
-# Whom:					Alejandro Pulver <alepulver@FreeBSD.org>
-#
+# Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	qudos
 PORTVERSION=	0.40.1
@@ -16,34 +12,11 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	Enhanced OpenGL only Quake II engine
+COMMENT=	Enhanced OpenGL-only Quake II engine
 
 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
-
 MAKE_ENV=	WITH_DATADIR=YES WITH_LIBDIR=YES WITH_XMMS=NO \
 		DATADIR="${Q2DIR}" LIBDIR="${LIBDIR}"
 PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}" VER="${PORTVERSION}"
@@ -51,32 +24,58 @@ LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
 MOD_LIST=	3ZB2 CTF JABOT ROGUE XATRIX ZAERO
 
-.include "${.CURDIR}/../quake2-data/Makefile.include"
-
-.include <bsd.port.pre.mk>
+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=	ASM
+OPTIONS_DEFINE_amd64=	ASM
+OPTIONS_DEFAULT_i386=	ASM
+OPTIONS_DEFAULT_amd64=	ASM
+
+OPTIONS_DEFAULT=	3ZB2 BOTS CLIENT DEDICATED GAME_MOD GLX JOYSTICK OSS \
+			QMAX SDL SDLGL
+
+3ZB2_DESC=	Build 3zb2 mod (bots)
+BOTS_DESC=	Ace Bot support in mods
+CLIENT_DESC=	Build client
+CTF_DESC=	Build CTF (Capture The Flag) mod
+DEDICATED_DESC=	Build dedicated server
+GAME_DESC=	Build main game (default mod)
+GAME_MOD_DESC=	Add custom add-ons to the main game
+JABOT_DESC=	Build JABot mod (bots)
+JOYSTICK_DESC=	Joystick support
+QMAX_DESC=	Enable fancier OpenGL graphics
+REDBLUE_DESC=	Enable red-blue 3D glasses renderer
+RETEXTURE_DESC=	Retextured graphics support
+ROGUE_DESC=	Build Ground Zero (Rogue) mission pack
+SDLGL_DESC=	Build SDL OpenGL renderer
+XATRIX_DESC=	Build The Reckoning (Xatrix) mission pack
+ZAERO_DESC=	Build Zaero mission pack
+
+.include <bsd.port.options.mk>
 
 .for mod in ${MOD_LIST}
-.   if defined(WITH_${mod})
+.  if ${PORT_OPTIONS:M${mod}}
 MAKE_ENV+=	BUILD_${mod}=YES
 PLIST_SUB+=	${mod}=""
-.   else
+.  else
 MAKE_ENV+=	BUILD_${mod}=NO
 PLIST_SUB+=	${mod}="@comment "
-.   endif
+.  endif
 .endfor
 
-.if !defined(WITHOUT_GLX) || !defined(WITHOUT_SDLGL)
-USE_GL=		yes
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
+.if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDLGL}
+USE_GL=		glu
+LIB_DEPENDS+=	jpeg:${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)
-LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+.if ${PORT_OPTIONS:MARTS}
+LIB_DEPENDS+=	artsc:${PORTSDIR}/audio/arts
 MAKE_ENV+=	BUILD_ARTS_SND=YES
 PLIST_SUB+=	ARTS=""
 Q2SND+=		arts
@@ -85,8 +84,8 @@ MAKE_ENV+=	BUILD_ARTS_SND=NO
 PLIST_SUB+=	ARTS="@comment "
 .endif
 
-.if !defined(WITHOUT_CLIENT)
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+.if ${PORT_OPTIONS:MCLIENT}
+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 MAKE_ENV+=	BUILD_QUAKE2=YES
 PLIST_SUB+=	CLIENT=""
 Q2BIN+=		${PORTNAME}
@@ -95,7 +94,7 @@ MAKE_ENV+=	BUILD_QUAKE2=NO
 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 +103,7 @@ MAKE_ENV+=	BUILD_DEDICATED=NO
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if defined(WITH_GAME)
+.if ${PORT_OPTIONS:MGAME}
 MAKE_ENV+=	BUILD_GAME=YES
 PLIST_SUB+=	GAME=""
 .else
@@ -112,36 +111,36 @@ MAKE_ENV+=	BUILD_GAME=NO
 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}
-.   else
+.  else
 MAKE_ENV+=	BUILD_${opt}=NO
 PLIST_SUB+=	${opt}="@comment "
-.   endif
+.  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 +149,25 @@ MAKE_ENV+=	BUILD_OSS_SND=NO
 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 +176,7 @@ MAKE_ENV+=	BUILD_SDL_SND=NO
 PLIST_SUB+=	SDL="@comment "
 .endif
 
-.if !defined(WITHOUT_X86_ASM)
+.if ${PORT_OPTIONS:MASM}
 MAKE_ENV+=	WITH_X86_ASM=YES
 .else
 MAKE_ENV+=	WITH_X86_ASM=NO
@@ -197,27 +196,28 @@ do-install:
 .for bin in ${Q2BIN}
 	${INSTALL_PROGRAM} ${WRKSRC}/quake2/${bin} ${PREFIX}/bin
 .endfor
-	${MKDIR} ${LIBDIR}/baseq2
+	@${MKDIR} ${LIBDIR}/baseq2
 .for ref in ${Q2REF}
 	${INSTALL_PROGRAM} ${WRKSRC}/quake2/ref_q2${ref}.so ${LIBDIR}
 .endfor
 .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})
-	${MKDIR} ${LIBDIR}/${mod}
+.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)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/QuDos.txt ${WRKSRC}/docs/Ogg_readme.txt \
-		${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/QuDos.txt \
+		${WRKSRC}/docs/Ogg_readme.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../quake2-data/Makefile.include"
+.include <bsd.port.mk>
diff --git a/games/qudos/pkg-descr b/games/qudos/pkg-descr
index d3ab099177ae..58c4832b7c0f 100644
--- a/games/qudos/pkg-descr
+++ b/games/qudos/pkg-descr
@@ -1,3 +1 @@
-Enhanced OpenGL only Quake II engine.
-
-WWW: http://qudos.quakedev.com/
+Enhanced, OpenGL-only Quake II engine.