- Bump PORTREVISION.

- Add GAME and CTF options (disabled by default because provided by
  "games/quake2-data" and "games/quake2-ctf" respectively).

PR:		ports/101011
Submitted by:	alepulver
Approved by:	maintainer (timeout)

2 files changed, 38 insertions, 16 deletions

diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile
index 9166c4b7ff05..a49183b68f12 100644
--- a/games/quetoo/Makefile
+++ b/games/quetoo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	quetoo
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://jdolan.dyndns.org/jaydolan/files/ \
 		http://freebsd.nsu.ru/distfiles/
@@ -18,16 +19,17 @@ USE_BZIP2=	yes
 USE_SDL=	sdl
 USE_GL=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-		${PTHREAD_CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib \
-		-L${X11BASE}/lib ${PTHREAD_LIBS}" \
-		OPENGL_CFLAGS="-I${X11BASE}/include" \
-		OPENGL_LIBS="-L${X11BASE}/lib" \
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		OPENGL_CFLAGS="${CPPFLAGS}" OPENGL_LIBS="${LDFLAGS}"
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
-PLIST_SUB+=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
+PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
 
-OPTIONS=	QMASS		"Build QMass deathmatch mod"		on \
+OPTIONS=	GAME		"Build a main game .so file (required)"	on \
+		CTF		"Build the Capture The Flag modification" off \
+		QMASS		"Build QMass deathmatch mod"		on \
 		MYSQL		"Enable MySQL frag logging"		off \
 		OPTIMIZED_CFLAGS "Enable extra optimization options"	off
 
@@ -43,26 +45,42 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-fbsd4
 .   endif
 .endif
 
+.if !defined(WITHOUT_GAME)
+PLIST_SUB+=	GAME=""
+Q2GAMES+=	baseq2
+.else
+PLIST_SUB+=	GAME="@comment "
+Q2GAMES_NOT+=	baseq2
+.endif
+
+.if defined(WITH_CTF)
+PLIST_SUB+=	CTF=""
+Q2GAMES+=	ctf
+.else
+PLIST_SUB+=	CTF="@comment "
+Q2GAMES_NOT+=	ctf
+.endif
+
 .if !defined(WITHOUT_QMASS)
-Q2GAMES=	baseq2 ctf qmass
 CONFIGURE_ARGS+=	--enable-qmass
 PLIST_SUB+=	QMASS=""
+Q2GAMES+=	qmass
 .else
-Q2GAMES=	baseq2 ctf
 PLIST_SUB+=	QMASS="@comment "
+Q2GAMES_NOT+=	qmass
 .endif
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
-CONFIGURE_ARGS+=	--with-mysql
+CONFIGURE_ARGS+=--with-mysql
 CONFIGURE_ENV+=	MYSQL_LIBS="-L${LOCALBASE}/lib/mysql -lmysqlclient" \
 		MYSQL_CFLAGS="-I${LOCALBASE}/include"
 .else
-CONFIGURE_ARGS+=	--without-mysql
+CONFIGURE_ARGS+=--without-mysql
 .endif
 
 .if !defined(WITH_OPTIMIZED_CFLAGS)
-CONFIGURE_ARGS+=	--disable-opt --disable-sse
+CONFIGURE_ARGS+=--disable-opt --disable-sse
 .endif
 
 post-extract: .SILENT
@@ -70,6 +88,10 @@ post-extract: .SILENT
 		s,sdl-config,${SDL_CONFIG},' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's,-ldl,,' ${WRKSRC}/src/Makefile.in
 	${REINPLACE_CMD} -e 's,alsa,sdl,' ${WRKSRC}/src/snd_ref.c
+.for f in ${Q2GAMES_NOT}
+	${REINPLACE_CMD} -i "" -Ee 's,^(SRC_SUBDIRS=".*)${f}(.*),\1\2,' \
+		${WRKSRC}/configure
+.endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/quetoo ${PREFIX}/bin/quetoo
diff --git a/games/quetoo/pkg-plist b/games/quetoo/pkg-plist
index 7507725b5c7d..89ea33103fea 100644
--- a/games/quetoo/pkg-plist
+++ b/games/quetoo/pkg-plist
@@ -1,6 +1,6 @@
 bin/quetoo
-%%LIBDIR%%/baseq2/game.so
-%%LIBDIR%%/ctf/game.so
+%%GAME%%%%LIBDIR%%/baseq2/game.so
+%%CTF%%%%LIBDIR%%/ctf/game.so
 %%QMASS%%%%LIBDIR%%/qmass/game.so
 %%LIBDIR%%/vid_glsdl.so
 %%LIBDIR%%/vid_glx.so
@@ -10,7 +10,7 @@ bin/quetoo
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%QMASS%%%%PORTDOCS%%%%DOCSDIR%%/qmass-README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%LIBDIR%%/baseq2
-@dirrm %%LIBDIR%%/ctf
+%%GAME%%@dirrm %%LIBDIR%%/baseq2
+%%CTF%%@dirrm %%LIBDIR%%/ctf
 %%QMASS%%@dirrm %%LIBDIR%%/qmass
 @dirrm %%LIBDIR%%