svn commit: r361325 - in head/games: quake2-3zb2 quake2-ctf quake2-extras quake2-lights quake2-matrix quake2-psychomod quake2-relay quake2-rogue quake2-source quake2-xatrix quake2lnx
Alexey Dokuchaev
danfe at FreeBSD.org
Wed Jul 9 02:29:25 UTC 2014
Author: danfe
Date: Wed Jul 9 02:29:21 2014
New Revision: 361325
URL: http://svnweb.freebsd.org/changeset/ports/361325
QAT: https://qat.redports.org/buildarchive/r361325/
Log:
Mostly cosmetic fixes over various Quake2 ports:
- Wrap overly long lines to fit standard terminal width
- When installing pre-generated docs, do not check PORT_OPTIONS:MDOCS
which is useless in post-stage era
- Simplify MASTER_SITES, optimize away MASTER_SITE_SUBDIR if possible
- Amend COMMENT text and pkg-descr in `quake2-lights' port
- Unbreak installation of Quake2-LNX (icculus.org port)
Modified:
head/games/quake2-3zb2/Makefile
head/games/quake2-ctf/Makefile
head/games/quake2-extras/Makefile
head/games/quake2-lights/Makefile
head/games/quake2-lights/pkg-descr
head/games/quake2-matrix/Makefile
head/games/quake2-psychomod/Makefile
head/games/quake2-relay/Makefile
head/games/quake2-relay/pkg-descr
head/games/quake2-rogue/Makefile
head/games/quake2-source/Makefile
head/games/quake2-source/pkg-descr
head/games/quake2-xatrix/Makefile
head/games/quake2lnx/Makefile
Modified: head/games/quake2-3zb2/Makefile
==============================================================================
--- head/games/quake2-3zb2/Makefile Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-3zb2/Makefile Wed Jul 9 02:29:21 2014 (r361325)
@@ -13,7 +13,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:pr
${PORTNAME}src${PORTVERSION:S/0.//}${EXTRACT_SUFX}:prog
DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= danfe at FreeBSD.org
COMMENT= 3rd Zigock II bots for Quake II
USES= dos2unix zip
@@ -55,20 +55,22 @@ post-extract:
do-install:
.for f in chctf chdtm
@${MKDIR} ${STAGEDIR}${Q2DIR}/${PORTNAME}/${f}
- ${INSTALL_DATA} ${WRKSRC}/3zb2/${f}/* ${STAGEDIR}${Q2DIR}/${PORTNAME}/${f}
+ ${INSTALL_DATA} ${WRKSRC}/3zb2/${f}/* \
+ ${STAGEDIR}${Q2DIR}/${PORTNAME}/${f}
.endfor
- ${INSTALL_PROGRAM} ${WRKSRC}/game.so ${STAGEDIR}${Q2DIR}/${PORTNAME}
+ ${INSTALL_PROGRAM} ${WRKSRC}/game.so \
+ ${STAGEDIR}${Q2DIR}/${PORTNAME}
cd ${WRKSRC}/3zb2 && ${INSTALL_DATA} *.cfg 3ZBMaps.lst pak6.pak \
${STAGEDIR}${Q2DIR}/${PORTNAME}
.if ${PORT_OPTIONS:MROUTES}
${INSTALL_DATA} ${WRKSRC}/*.chn ${STAGEDIR}${Q2DIR}/${PORTNAME}/chdtm
${INSTALL_DATA} ${WRKSRC}/*.chf ${STAGEDIR}${Q2DIR}/${PORTNAME}/chctf
.endif
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/3zb2 && ${CP} -a *.txt "User Guide" ${STAGEDIR}${DOCSDIR}
- @${FIND} ${STAGEDIR}${DOCSDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE}
- @${FIND} ${STAGEDIR}${DOCSDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
-.endif
+ @${FIND} ${STAGEDIR}${DOCSDIR} -type d -print0 | \
+ ${XARGS} -0 ${CHMOD} ${BINMODE}
+ @${FIND} ${STAGEDIR}${DOCSDIR} -type f -print0 | \
+ ${XARGS} -0 ${CHMOD} ${SHAREMODE}
.include <bsd.port.mk>
Modified: head/games/quake2-ctf/Makefile
==============================================================================
--- head/games/quake2-ctf/Makefile Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-ctf/Makefile Wed Jul 9 02:29:21 2014 (r361325)
@@ -4,15 +4,13 @@
PORTNAME= ctf
PORTVERSION= 1.52
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|:data|} \
+MASTER_SITES= IDSOFTWARE/quake2/ctf/:data \
http://offload1.icculus.org/quake2/files/:src
-MASTER_SITE_SUBDIR= quake2/ctf/:data
PKGNAMEPREFIX= ${Q2PKGNAMEPREFIX}
-DISTFILES= ${CTF_DATA}:data \
- ${CTF_SRC}:src
+DISTFILES= ${CTF_DATA}:data ${CTF_SRC}:src
DIST_SUBDIR= quake2lnx
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= danfe at FreeBSD.org
COMMENT= Quake II CTF (Capture The Flag) mod
USES= dos2unix zip:infozip
@@ -46,10 +44,8 @@ do-install:
.for f in *.cfg *.pak
${INSTALL_DATA} ${WRKDIR}/ctf/${f} ${STAGEDIR}${Q2DIR}/ctf
.endfor
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKDIR}/ctf/readme.txt ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/games/quake2-extras/Makefile
==============================================================================
--- head/games/quake2-extras/Makefile Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-extras/Makefile Wed Jul 9 02:29:21 2014 (r361325)
@@ -13,12 +13,18 @@ DISTFILES= #
DIST_SUBDIR= ${LATEST_LINK}
EXTRACT_ONLY= #
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= danfe at FreeBSD.org
COMMENT= Quake II extras (high quality textures and skins)
USES= zip
NO_WRKSUBDIR= yes
+LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}
+
+RETEX_PAKS= 10 11 12 13 14 16 17 19
+RETEX_FULL= all_q2_textures_07_17_2006zip
+SKINS= models.zip
+
OPTIONS_DEFINE= RETEXTURE RETEXTURE_FULL SKINS
OPTIONS_DEFAULT= RETEXTURE
@@ -26,12 +32,6 @@ RETEXTURE_DESC= Install high quality te
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
-RETEX_FULL= all_q2_textures_07_17_2006zip
-SKINS= models.zip
-
.include "${.CURDIR}/../quake2-data/Makefile.include"
.include <bsd.port.options.mk>
@@ -84,7 +84,8 @@ do-install:
@${MKDIR} ${STAGEDIR}${Q2DIR}/baseq2
.if ${PORT_OPTIONS:MRETEXTURE} && empty(PORT_OPTIONS:MRETEXTURE_FULL)
. for i in ${RETEX_PAKS}
- ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/pak${i}.pak ${STAGEDIR}${Q2DIR}/baseq2
+ ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/pak${i}.pak \
+ ${STAGEDIR}${Q2DIR}/baseq2
. endfor
.endif
.if ${PORT_OPTIONS:MRETEXTURE_FULL}
Modified: head/games/quake2-lights/Makefile
==============================================================================
--- head/games/quake2-lights/Makefile Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-lights/Makefile Wed Jul 9 02:29:21 2014 (r361325)
@@ -12,7 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:da
Lights-Bots${EXTRACT_SUFX}:src
MAINTAINER= danfe at FreeBSD.org
-COMMENT= Lights modification for Quake II
+COMMENT= Lights and weapon effects modification for Quake II
USES= gmake tar:bzip2
NO_WRKSUBDIR= yes
Modified: head/games/quake2-lights/pkg-descr
==============================================================================
--- head/games/quake2-lights/pkg-descr Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-lights/pkg-descr Wed Jul 9 02:29:21 2014 (r361325)
@@ -4,7 +4,7 @@ for the weapons shots.
This mod is intended to play it with Quake2Max supported binaries because
the lights and effects are better saw compared to original Quake2 binaries.
-There are already a lot of new commands, scanner, flashlight, decoys,
+This mod introduces a lot of new commands, scanner, flashlight, decoys,
defense laser, chasecam, hook, etc. Some keys in the autoexec.cfg are set
by default.
Modified: head/games/quake2-matrix/Makefile
==============================================================================
--- head/games/quake2-matrix/Makefile Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-matrix/Makefile Wed Jul 9 02:29:21 2014 (r361325)
@@ -1,4 +1,4 @@
-# Created by: alepulver
+# Created by: Alejandro Pulver <alepulver at FreeBSD.org>
# $FreeBSD$
PORTNAME= matrix
@@ -8,7 +8,7 @@ MASTER_SITES= http://qudos.quakedev.com/
PKGNAMEPREFIX= ${Q2PKGNAMEPREFIX}
DISTNAME= Matrix-v${PORTVERSION}.fixed.Linux
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= danfe at FreeBSD.org
COMMENT= Matrix modification for Quake II
USES= gmake tar:bzip2
@@ -30,7 +30,8 @@ do-install:
@${MKDIR} ${STAGEDIR}${Q2DIR}/${PORTNAME}
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/matrix/game.so \
${STAGEDIR}${Q2DIR}/${PORTNAME}
- cd ${WRKSRC} && ${INSTALL_DATA} *.cfg *.ini *.pak ${STAGEDIR}${Q2DIR}/${PORTNAME}
+ cd ${WRKSRC} && ${INSTALL_DATA} *.cfg *.ini *.pak \
+ ${STAGEDIR}${Q2DIR}/${PORTNAME}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
Modified: head/games/quake2-psychomod/Makefile
==============================================================================
--- head/games/quake2-psychomod/Makefile Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-psychomod/Makefile Wed Jul 9 02:29:21 2014 (r361325)
@@ -1,14 +1,13 @@
-# Created by: alepulver
+# Created by: Alejandro Pulver <alepulver at FreeBSD.org>
# $FreeBSD$
PORTNAME= psychomod
PORTVERSION= 3.1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alepulver
+MASTER_SITES= LOCAL/alepulver
PKGNAMEPREFIX= ${Q2PKGNAMEPREFIX}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= danfe at FreeBSD.org
COMMENT= Psychomod modification for Quake II
USES= gmake tar:bzip2
@@ -18,6 +17,8 @@ ALL_TARGET= release
DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK}
+OPTIONS_DEFINE= DOCS
+
.include "${.CURDIR}/../quake2-data/Makefile.include"
post-patch:
@@ -28,7 +29,8 @@ do-install:
@${MKDIR} ${STAGEDIR}${Q2DIR}/${PORTNAME}
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/psychomod/game.so \
${STAGEDIR}${Q2DIR}/${PORTNAME}
- cd ${WRKSRC} && ${INSTALL_DATA} *.cfg pak0.pak ${STAGEDIR}${Q2DIR}/${PORTNAME}
+ cd ${WRKSRC} && ${INSTALL_DATA} *.cfg pak0.pak \
+ ${STAGEDIR}${Q2DIR}/${PORTNAME}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
Modified: head/games/quake2-relay/Makefile
==============================================================================
--- head/games/quake2-relay/Makefile Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-relay/Makefile Wed Jul 9 02:29:21 2014 (r361325)
@@ -8,21 +8,20 @@ MASTER_SITES= LOCAL/danfe http://freebsd
PKGNAMEPREFIX= ${Q2PKGNAMEPREFIX}
DISTNAME= relay-${PORTVERSION}.src
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= danfe at FreeBSD.org
COMMENT= Quake II multi-view demo recording facility
LICENSE= GPLv2
USES= gmake
MAKE_ARGS= MODE=release OBJ_DIR=. OUT_DIR=. Q2MODULE=game.so \
- QUAKE2_DIR="${STAGEDIR}${Q2DIR}" BIN_DIR="${STAGEDIR}${PREFIX}/bin" \
+ QUAKE2_DIR="${STAGEDIR}${Q2DIR}" \
+ BIN_DIR="${STAGEDIR}${PREFIX}/bin" \
CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS}"
WRKSRC= ${WRKDIR}/relay-${PORTVERSION}
PORTDOCS= FAQ README
-ED?= /bin/ed
-
OPTIONS_DEFINE= DOCS
.include "${.CURDIR}/../quake2-data/Makefile.include"
@@ -48,4 +47,6 @@ post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+ED?= /bin/ed
+
.include <bsd.port.mk>
Modified: head/games/quake2-relay/pkg-descr
==============================================================================
--- head/games/quake2-relay/pkg-descr Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-relay/pkg-descr Wed Jul 9 02:29:21 2014 (r361325)
@@ -7,7 +7,7 @@ player's view, relay demos can record ev
entire duration of the match. With Replay, you can watch these matches
through any player's perspective, chase-cam mode, or free-fly mode.
-Benefits of Relay:
+Benefits of Quake2 Relay:
- Every player's perspective is recorded
- No lag
Modified: head/games/quake2-rogue/Makefile
==============================================================================
--- head/games/quake2-rogue/Makefile Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-rogue/Makefile Wed Jul 9 02:29:21 2014 (r361325)
@@ -4,13 +4,12 @@
PORTNAME= rogue
PORTVERSION= 3.20
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR= quake2/source
+MASTER_SITES= IDSOFTWARE/quake2/source
PKGNAMEPREFIX= ${Q2PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}src${PORTVERSION:S/.//}
EXTRACT_SUFX= .shar.Z
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= danfe at FreeBSD.org
COMMENT= Quake II: Ground Zero (Rogue) official mission pack
NO_WRKSUBDIR= yes
Modified: head/games/quake2-source/Makefile
==============================================================================
--- head/games/quake2-source/Makefile Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-source/Makefile Wed Jul 9 02:29:21 2014 (r361325)
@@ -13,7 +13,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:ic
DIST_SUBDIR= quake2lnx
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= danfe at FreeBSD.org
COMMENT= Quake II game source
NO_BUILD= yes
@@ -46,19 +46,19 @@ XATRIX_OFF= 441
post-extract:
.for f in rogue xatrix
-. if ${PORT_OPTIONS:M${f:tu}}
+. if ${PORT_OPTIONS:M${f:tu}}
@${MKDIR} ${WRKSRC}/src/${f}
@(cd ${WRKSRC}/src/${f} && ${GUNZIP_CMD} -c \
${DISTDIR}/${DIST_SUBDIR}/${f}src320.shar.Z > \
${f}src320.shar && \
${TAIL} +${${f:tu}_OFF} ${f}src320.shar | ${SH})
-. endif
+. endif
.endfor
pre-install:
- @${FIND} -E ${WRKSRC} -type f \
- -iregex "(Makefile|.*\.(def|dsp|orig|shar))" -print0 | \
- ${XARGS} -0 ${RM}
+ @${FIND} -E ${WRKSRC} -type f -iregex \
+ "(Makefile|.*\.(def|dsp|orig|shar))" -print0 | \
+ ${XARGS} -0 ${RM}
do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}
Modified: head/games/quake2-source/pkg-descr
==============================================================================
--- head/games/quake2-source/pkg-descr Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-source/pkg-descr Wed Jul 9 02:29:21 2014 (r361325)
@@ -1,5 +1,3 @@
-Quake II game source.
-
This port installs the Quake II game source, together with BSD Makefiles, for
-building modifications. It can also install the Capture the Flag mod, Rogue
-and Xatrix game source.
+building modifications. It can also install the Capture the Flag mod, Rogue,
+and Xatrix game sources.
Modified: head/games/quake2-xatrix/Makefile
==============================================================================
--- head/games/quake2-xatrix/Makefile Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2-xatrix/Makefile Wed Jul 9 02:29:21 2014 (r361325)
@@ -4,13 +4,12 @@
PORTNAME= xatrix
PORTVERSION= 3.20
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR= quake2/source
+MASTER_SITES= IDSOFTWARE/quake2/source
PKGNAMEPREFIX= ${Q2PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}src${PORTVERSION:S/.//}
EXTRACT_SUFX= .shar.Z
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= danfe at FreeBSD.org
COMMENT= Quake II: The Reckoning (Xatrix) official mission pack
NO_WRKSUBDIR= yes
Modified: head/games/quake2lnx/Makefile
==============================================================================
--- head/games/quake2lnx/Makefile Wed Jul 9 01:21:58 2014 (r361324)
+++ head/games/quake2lnx/Makefile Wed Jul 9 02:29:21 2014 (r361325)
@@ -207,13 +207,13 @@ do-install:
.for tgt in ${EXE_TARGETS}
${INSTALL_PROGRAM} ${WRKSRC}/release/${tgt} ${STAGEDIR}${PREFIX}/bin
.endfor
- @${MKDIR} ${LIBDIR}/baseq2
+ @${MKDIR} ${STAGEDIR}${LIBDIR}/baseq2
.for tgt in ${REF_TARGETS}
${INSTALL_PROGRAM} ${WRKSRC}/release/ref_${tgt}.so \
${STAGEDIR}${LIBDIR}
.endfor
.if ${PORT_OPTIONS:MCTF}
- @${MKDIR} ${LIBDIR}/ctf
+ @${MKDIR} ${STAGEDIR}${LIBDIR}/ctf
${INSTALL_PROGRAM} ${WRKSRC}/release/ctf/game.so \
${STAGEDIR}${LIBDIR}/ctf
.endif
More information about the svn-ports-head
mailing list