Date: Sun, 12 May 2013 13:00:08 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317955 - in head/games: quake3-data quake3-excessive quake3-freezetag quake3-ra3 quake3-ut quake3-wfa Message-ID: <201305121300.r4CD08hQ004053@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sun May 12 13:00:07 2013 New Revision: 317955 URL: http://svnweb.freebsd.org/changeset/ports/317955 Log: 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 Modified: head/games/quake3-data/Makefile head/games/quake3-data/Makefile.include head/games/quake3-excessive/Makefile head/games/quake3-freezetag/Makefile head/games/quake3-ra3/Makefile head/games/quake3-ut/Makefile head/games/quake3-wfa/Makefile Modified: head/games/quake3-data/Makefile ============================================================================== --- head/games/quake3-data/Makefile Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-data/Makefile Sun May 12 13:00:07 2013 (r317955) @@ -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} Modified: head/games/quake3-data/Makefile.include ============================================================================== --- head/games/quake3-data/Makefile.include Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-data/Makefile.include Sun May 12 13:00:07 2013 (r317955) @@ -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 Modified: head/games/quake3-excessive/Makefile ============================================================================== --- head/games/quake3-excessive/Makefile Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-excessive/Makefile Sun May 12 13:00:07 2013 (r317955) @@ -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} Modified: head/games/quake3-freezetag/Makefile ============================================================================== --- head/games/quake3-freezetag/Makefile Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-freezetag/Makefile Sun May 12 13:00:07 2013 (r317955) @@ -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} Modified: head/games/quake3-ra3/Makefile ============================================================================== --- head/games/quake3-ra3/Makefile Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-ra3/Makefile Sun May 12 13:00:07 2013 (r317955) @@ -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 Modified: head/games/quake3-ut/Makefile ============================================================================== --- head/games/quake3-ut/Makefile Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-ut/Makefile Sun May 12 13:00:07 2013 (r317955) @@ -14,7 +14,6 @@ COMMENT= Quake III Arena mod: Urban Terr 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 Modified: head/games/quake3-wfa/Makefile ============================================================================== --- head/games/quake3-wfa/Makefile Sun May 12 12:48:58 2013 (r317954) +++ head/games/quake3-wfa/Makefile Sun May 12 13:00:07 2013 (r317955) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305121300.r4CD08hQ004053>