1 files changed, 44 insertions, 39 deletions

diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile
index d14795480b35..4f432a6961be 100644
--- a/games/quetoo/Makefile
+++ b/games/quetoo/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	quetoo
-PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTVERSION=	0.6.1
 CATEGORIES=	games
 MASTER_SITES=	http://jdolan.dyndns.org/jaydolan/files/ \
+		http://tastyspleen.net/~jdolan/ \
 		http://freebsd.nsu.ru/distfiles/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-full
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Fast, stable, compatible, and secure Quake II client
@@ -19,32 +20,25 @@ USE_BZIP2=	yes
 USE_SDL=	sdl
 USE_GL=		yes
 GNU_CONFIGURE=	yes
-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}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
+		OPENGL_CFLAGS="-I${X11BASE}/include" OPENGL_LIBS="-L${X11BASE}/lib"
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
-PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
+PLIST_SUB+=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
 
-OPTIONS=	GAME		"Build a main game .so file (required)"	on \
-		CTF		"Build the Capture The Flag modification" off \
+# 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 a 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 \
-		OPTIMIZED_CFLAGS "Enable extra optimization options"	off
 
 .include <bsd.port.pre.mk>
 
-.if defined(GCCVERSION)
-.   if ${GCCVERSION} < 030000
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-fbsd4
-.   endif
-.else
-.   if ${OSVERSION} < 500035
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-fbsd4
-.   endif
-.endif
-
 .if !defined(WITHOUT_GAME)
 PLIST_SUB+=	GAME=""
 Q2GAMES+=	baseq2
@@ -58,54 +52,65 @@ PLIST_SUB+=	CTF=""
 Q2GAMES+=	ctf
 .else
 PLIST_SUB+=	CTF="@comment "
-Q2GAMES_NOT+=	ctf
 .endif
 
 .if !defined(WITHOUT_QMASS)
-CONFIGURE_ARGS+=	--enable-qmass
 PLIST_SUB+=	QMASS=""
 Q2GAMES+=	qmass
 .else
 PLIST_SUB+=	QMASS="@comment "
-Q2GAMES_NOT+=	qmass
+.endif
+
+.if defined(WITH_VANCTF)
+PLIST_SUB+=	VANCTF=""
+Q2GAMES+=	vanctf
+.else
+PLIST_SUB+=	VANCTF="@comment "
 .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
-.endif
+CONFIGURE_ARGS+=	--with-games='${Q2GAMES}'
 
 post-extract: .SILENT
-	${REINPLACE_CMD} -E 's,^(eval PKGDATADIR=).*$$,\1"${Q2DIR}",; \
-		s,sdl-config,${SDL_CONFIG},' ${WRKSRC}/configure
+	${REINPLACE_CMD} -E 's,^(eval PKGDATADIR=).*$$,\1"${Q2DIR}", ; \
+		20055s,sdl-config,${SDL_CONFIG}, ; \
+		s,^(GAME_MODULES=")baseq2",\1",' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's,const struct,struct,' ${WRKSRC}/src/files.c
 	${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
-	@${MKDIR} ${LIBDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/*.so ${LIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/quetoo ${PREFIX}/bin
 .for g in ${Q2GAMES}
 	@${MKDIR} ${LIBDIR}/${g}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${g}/.libs/game.so ${LIBDIR}/${g}
 .endfor
+.if !defined(WITHOUT_QMASS)
+	@${MKDIR} ${DATADIR}/qmass/sound
+	${INSTALL_DATA} ${WRKSRC}/data/qmass/sound/*.wav ${DATADIR}/qmass/sound
+.if !defined(WITHOUT_VANCTF)
+	@${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)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .   if !defined(WITHOUT_QMASS)
-	${INSTALL_DATA} ${WRKSRC}/src/qmass/README ${DOCSDIR}/qmass-README
+	@${MKDIR} ${DOCSDIR}/qmass
+	${INSTALL_DATA} ${WRKSRC}/src/qmass/README ${DOCSDIR}/qmass
+.   endif
+.   if !defined(WITHOUT_VANCTF)
+	@${MKDIR} ${DOCSDIR}/vanctf
+	${INSTALL_DATA} ${WRKSRC}/src/vanctf/*E* ${DOCSDIR}/vanctf
 .   endif
 .endif