- Update to version 1.32c (security patch, see below).

- Take maintainership.
- Fix OPTIONS detection code, and add more.
- There were 2 security vulnerabilities that are fixed by the update.

Security:	CVE-2006-2082

3 files changed, 49 insertions, 25 deletions

diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index 9472604..4acdf68 100644
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@@ -6,56 +6,77 @@
 #
 
 PORTNAME=	quake3
-DISTVERSION=	1.32b-3
+PORTVERSION=	1.32c
 CATEGORIES=	games linux
-MASTER_SITES=	${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR=	quake3/linux
+MASTER_SITES=	${MASTER_SITE_IDSOFTWARE:S|$|quake3/linux/:data|} \
+		${MASTER_SITE_IDSOFTWARE:S|$|quake3/:patch|}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	linuxq3apoint-${DISTVERSION}.x86
-EXTRACT_SUFX=	.run
+DISTFILES=	${Q3DATAFILE}:data \
+		${Q3PATCHFILE}:patch
 DIST_SUBDIR=	${Q3PKGNAMEPREFIX}data
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Quake III Arena for Linux
 
 ONLY_FOR_ARCHS=	i386
+USE_ZIP=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	CLIENT "Install OpenGL client" on \
+OPTIONS=	CLIENT "Install client" on \
+		DEDICATED "Install dedicated server" on \
 		PUNKBUSTER "Install PunkBuster" on \
-		SMP "Install threaded version" on
-
-BINDIR=		${PREFIX}/libexec/${PKGNAMEPREFIX}${PORTNAME}
-PLIST_SUB+=	BINDIR="${BINDIR:S/${PREFIX}\///}"
+		SMP "Install SMP (threaded) client" on
 
+PLIST_SUB+=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 
+LIBDIR=		${PREFIX}/libexec/${PKGNAMEPREFIX}${PORTNAME}
+Q3DATAFILE=	linuxq3apoint-1.32b-3.x86.run
+Q3PATCHFILE=	quake3-${PORTVERSION}.zip
+
 do-extract:
 	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+	@cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${Q3DATAFILE} | \
 		${TAR} zxf -
+	@${UNZIP_CMD} -qo ${_DISTDIR}/${Q3PATCHFILE} -d ${WRKDIR}
+
+post-extract:
+.for f in q3ded quake3.x86 quake3-smp.x86
+	@${MV} "${WRKSRC}/Quake III Arena 1.32c/linux/${f}" \
+		${WRKSRC}/bin/Linux/x86/${f}
+.endfor
 
 .include "${.CURDIR}/../quake3-data/Makefile.include"
 
 .include <bsd.port.pre.mk>
 
-PROGS=		q3ded
+.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && \
+    defined(WITHOUT_SMP)
+IGNORE=		needs at least one of the CLIENT, DEDICATED and SMP options
+.endif
+
+.if !defined(WITHOUT_DEDICATED)
+PROGS+=		q3ded
+PLIST_SUB+=	DEDICATED=""
+.else
+PLIST_SUB+=	DEDICATED="@comment "
+.endif
 
-.if defined(WITH_CLIENT)
+.if !defined(WITHOUT_CLIENT)
 PROGS+=		quake3.x86
 PLIST_SUB+=	CLIENT=""
 .else
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if defined(WITH_PUNKBUSTER)
+.if !defined(WITHOUT_PUNKBUSTER)
 PLIST_SUB+=	PUNKBUSTER=""
 .else
 PLIST_SUB+=	PUNKBUSTER="@comment "
 .endif
 
-.if defined(WITH_SMP)
+.if !defined(WITHOUT_SMP)
 PROGS+=		quake3-smp.x86
 PLIST_SUB+=	SMP=""
 .else
@@ -66,16 +87,16 @@ do-build:
 .for f in ${PROGS}
 	@(${ECHO_CMD} "#!${SH}"; \
 		${ECHO_CMD} "cd ${DATADIR} || exit 1"; \
-		${ECHO_CMD} "exec ${BINDIR}/${f:R} \"$$@\"") > ${WRKDIR}/${f:R}
+		${ECHO_CMD} "exec ${LIBDIR}/${f:R} \"$$@\"") > ${WRKDIR}/${f:R}
 .endfor
 
 do-install:
-	@${MKDIR} ${BINDIR}
+	@${MKDIR} ${LIBDIR}
 .for f in ${PROGS}
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/${f} ${BINDIR}/${f:R}
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/${f} ${LIBDIR}/${f:R}
 	@${INSTALL_SCRIPT} ${WRKDIR}/${f:R} ${PREFIX}/bin/linux-${f:R}
 .endfor
-.if defined(WITH_PUNKBUSTER)
+.if !defined(WITHOUT_PUNKBUSTER)
 	@${CP} -Rp ${WRKSRC}/pb ${DATADIR}
 	@${RM} ${DATADIR}/pb/PB_EULA.txt
 .endif
@@ -83,7 +104,7 @@ do-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README-linux.txt ${DOCSDIR}
 	@${CP} -Rp ${WRKSRC}/Docs/LinuxFAQ ${DOCSDIR}
-.   if defined(WITH_PUNKBUSTER)
+.   if !defined(WITHOUT_PUNKBUSTER)
 	@${CP} -Rp ${WRKSRC}/Docs/PunkBuster ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/pb/PB_EULA.txt ${DOCSDIR}/PunkBuster
 .   endif
diff --git a/games/linux-quake3/distinfo b/games/linux-quake3/distinfo
index 123f869..70573b0 100644
--- a/games/linux-quake3/distinfo
+++ b/games/linux-quake3/distinfo
@@ -1,3 +1,6 @@
 MD5 (quake3-data/linuxq3apoint-1.32b-3.x86.run) = c71fdddccb20e8fc393d846e9c61d685
 SHA256 (quake3-data/linuxq3apoint-1.32b-3.x86.run) = c36132c5556b35e01950f1e9c646235033a5130f87ad776ba2bc7becf4f4f186
 SIZE (quake3-data/linuxq3apoint-1.32b-3.x86.run) = 30923961
+MD5 (quake3-data/quake3-1.32c.zip) = 5e55095e654732063621a2ffa95a2da3
+SHA256 (quake3-data/quake3-1.32c.zip) = 643ac677892fb58689a86d71f08d6678393efe2939b82c436a5c92368eebb849
+SIZE (quake3-data/quake3-1.32c.zip) = 3056760
diff --git a/games/linux-quake3/pkg-plist b/games/linux-quake3/pkg-plist
index e5639de..ac0fd86 100644
--- a/games/linux-quake3/pkg-plist
+++ b/games/linux-quake3/pkg-plist
@@ -1,9 +1,9 @@
 bin/linux-q3ded
 %%CLIENT%%bin/linux-quake3
 %%SMP%%bin/linux-quake3-smp
-%%BINDIR%%/q3ded
-%%CLIENT%%%%BINDIR%%/quake3
-%%SMP%%%%BINDIR%%/quake3-smp
+%%LIBDIR%%/q3ded
+%%CLIENT%%%%LIBDIR%%/quake3
+%%SMP%%%%LIBDIR%%/quake3-smp
 %%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/index.html
 %%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/udp_wide_README.txt
@@ -73,7 +73,7 @@ bin/linux-q3ded
 %%PUNKBUSTER%%%%DATADIR%%/pb/pbag.so
 %%PUNKBUSTER%%%%DATADIR%%/pb/pbcl.so
 %%PUNKBUSTER%%%%DATADIR%%/pb/pbsv.so
-@dirrm %%BINDIR%%
+@dirrm %%LIBDIR%%
 %%PUNKBUSTER%%@dirrm %%DATADIR%%/pb/htm
 %%PUNKBUSTER%%@dirrm %%DATADIR%%/pb
 %%PUNKBUSTER%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/PunkBuster/players