aboutsummaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorAlexey Dokuchaev <danfe@FreeBSD.org>2013-05-12 13:00:07 +0000
committerAlexey Dokuchaev <danfe@FreeBSD.org>2013-05-12 13:00:07 +0000
commitc23e6e8c43941e777fe53b23b875682f24161929 (patch)
tree681f2350239e886f37ff6efb61d6978d24b1a3db /games
parent959840222913e8b9349f659cb6fc3307260e8796 (diff)
downloadports-c23e6e8c43941e777fe53b23b875682f24161929.tar.gz
ports-c23e6e8c43941e777fe53b23b875682f24161929.zip
Cleanup quake3-data a bit more:
- Remove USE_CRLF knob: instead, when extracting ZIP archives, ask it to convert text files to Unix style. This should be no-op change, as all consumers of USE_CRLF also USE_ZIP - While here, remove unneeded output redirection in `do-extract' target
Notes
Notes: svn path=/head/; revision=317955
Diffstat (limited to 'games')
-rw-r--r--games/quake3-data/Makefile4
-rw-r--r--games/quake3-data/Makefile.include11
-rw-r--r--games/quake3-excessive/Makefile1
-rw-r--r--games/quake3-freezetag/Makefile1
-rw-r--r--games/quake3-ra3/Makefile3
-rw-r--r--games/quake3-ut/Makefile1
-rw-r--r--games/quake3-wfa/Makefile3
7 files changed, 6 insertions, 18 deletions
diff --git a/games/quake3-data/Makefile b/games/quake3-data/Makefile
index 549e639dbda3..fe12e27118d4 100644
--- a/games/quake3-data/Makefile
+++ b/games/quake3-data/Makefile
@@ -37,8 +37,8 @@ PLIST_SUB+= TEAMARENA="@comment "
do-extract:
@${RM} -rf ${WRKDIR}
@${MKDIR} ${WRKDIR}
- @cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
- ${TAR} zxf - >/dev/null
+ @cd ${WRKDIR} && ${TAIL} +356 \
+ ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${TAR} xzf -
do-install:
@${MKDIR} ${DATADIR}
diff --git a/games/quake3-data/Makefile.include b/games/quake3-data/Makefile.include
index e976c4b57723..a7f196158479 100644
--- a/games/quake3-data/Makefile.include
+++ b/games/quake3-data/Makefile.include
@@ -16,14 +16,7 @@ SUB_LIST+= Q3DIR="${Q3DIR}"
RUN_DEPENDS+= ${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data
.endif
-.if defined(USE_CRLF)
-. if defined(USE_ZIP)
+# When extracting ZIP archives, ask it to convert text files to Unix style
+.if defined(USE_ZIP)
EXTRACT_BEFORE_ARGS= -aqo
-. else
-pre-patch:
- @${FIND} ${WRKDIR} -type f -print0 | \
- ${XARGS} -0 ${FILE} | ${GREP} 'CRLF' | \
- ${SED} -e "s/:.*//" | ${SED} -e 's/ /\\ /g' | \
- ${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//"
-. endif
.endif
diff --git a/games/quake3-excessive/Makefile b/games/quake3-excessive/Makefile
index 0abd45363e57..e6fa3e81d895 100644
--- a/games/quake3-excessive/Makefile
+++ b/games/quake3-excessive/Makefile
@@ -19,7 +19,6 @@ COMMENT= Quake III Arena Mod: Excessive
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_ZIP= yes
-USE_CRLF= yes
NO_BUILD= yes
DATADIR= ${Q3DIR}/${PORTNAME}
diff --git a/games/quake3-freezetag/Makefile b/games/quake3-freezetag/Makefile
index fb776633c8c0..5681360f7402 100644
--- a/games/quake3-freezetag/Makefile
+++ b/games/quake3-freezetag/Makefile
@@ -20,7 +20,6 @@ COMMENT= Quake III Arena Mod: Freeze Tag
WRKSRC= ${WRKDIR}/freeze
USE_ZIP= yes
-USE_CRLF= yes
NO_BUILD= yes
DATADIR= ${Q3DIR}/${PORTNAME}
diff --git a/games/quake3-ra3/Makefile b/games/quake3-ra3/Makefile
index 6c45765fa693..0b5572188be6 100644
--- a/games/quake3-ra3/Makefile
+++ b/games/quake3-ra3/Makefile
@@ -11,10 +11,9 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= ports@FreeBSD.org
COMMENT= Quake III Arena mod: Rocket Arena 3
-NO_PACKAGE= Package will be 131MB, set FORCE_PACKAGE if you really want it
+NO_PACKAGE= package will be 131MB, set FORCE_PACKAGE if you really want it
USE_ZIP= yes
-USE_CRLF= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/arena
diff --git a/games/quake3-ut/Makefile b/games/quake3-ut/Makefile
index f17faa14b9a9..a2df46639f4a 100644
--- a/games/quake3-ut/Makefile
+++ b/games/quake3-ut/Makefile
@@ -14,7 +14,6 @@ COMMENT= Quake III Arena mod: Urban Terror
NO_PACKAGE= package will be 445MB, set FORCE_PACKAGE if you really want it
USE_ZIP= yes
-USE_CRLF= yes
.if defined(.PARSEDIR)
USE_GMAKE= yes
.endif
diff --git a/games/quake3-wfa/Makefile b/games/quake3-wfa/Makefile
index 5a4dfcf0046a..729ae621784a 100644
--- a/games/quake3-wfa/Makefile
+++ b/games/quake3-wfa/Makefile
@@ -13,10 +13,9 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Quake III Arena mod: Weapons Factory Arena
-NO_PACKAGE= Package will be 200MB, set FORCE_PACKAGE if you really want it
+NO_PACKAGE= package will be 200MB, set FORCE_PACKAGE if you really want it
USE_ZIP= yes
-USE_CRLF= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes