svn commit: r354818 - in head: Mk Mk/Uses games/ioquake3 games/urbanterror-data polish/hunspell textproc/no-hunspell
Alex Kozlov
ak at FreeBSD.org
Thu May 22 09:51:37 UTC 2014
Author: ak
Date: Thu May 22 09:51:35 2014
New Revision: 354818
URL: http://svnweb.freebsd.org/changeset/ports/354818
QAT: https://qat.redports.org/buildarchive/r354818/
Log:
- Use /usr/bin/unzip for zip files extraction (part 1)
PR: ports/188419
Exp-run: bdrewery
Approved by: portmgr (bapt)
Modified:
head/Mk/Uses/zip.mk
head/Mk/bsd.commands.mk
head/games/ioquake3/Makefile
head/games/urbanterror-data/Makefile
head/polish/hunspell/Makefile
head/textproc/no-hunspell/Makefile
Modified: head/Mk/Uses/zip.mk
==============================================================================
--- head/Mk/Uses/zip.mk Thu May 22 09:43:03 2014 (r354817)
+++ head/Mk/Uses/zip.mk Thu May 22 09:51:35 2014 (r354818)
@@ -14,13 +14,15 @@ zip_ARGS?= none
EXTRACT_SUFX?= .zip
+EXTRACT_BEFORE_ARGS?= -qo
+EXTRACT_AFTER_ARGS?= -d ${WRKDIR}
+
.if ${zip_ARGS} == infozip
EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
-
EXTRACT_CMD?= ${UNZIP_CMD}
-EXTRACT_BEFORE_ARGS?= -qo
-EXTRACT_AFTER_ARGS?= -d ${WRKDIR}
-.elif ${zip_ARGS} != none
+.elif ${zip_ARGS} == none
+EXTRACT_CMD?= ${UNZIP_NATIVE_CMD}
+.else
IGNORE= Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'
.endif
.endif
Modified: head/Mk/bsd.commands.mk
==============================================================================
--- head/Mk/bsd.commands.mk Thu May 22 09:43:03 2014 (r354817)
+++ head/Mk/bsd.commands.mk Thu May 22 09:51:35 2014 (r354818)
@@ -95,6 +95,7 @@ UMOUNT?= /sbin/umount
UNAME?= /usr/bin/uname
UNMAKESELF_CMD?= ${LOCALBASE}/bin/unmakeself
UNZIP_CMD?= ${LOCALBASE}/bin/unzip
+UNZIP_NATIVE_CMD?= /usr/bin/unzip
WHICH?= /usr/bin/which
XARGS?= /usr/bin/xargs
XMKMF?= ${LOCALBASE}/bin/xmkmf
Modified: head/games/ioquake3/Makefile
==============================================================================
--- head/games/ioquake3/Makefile Thu May 22 09:43:03 2014 (r354817)
+++ head/games/ioquake3/Makefile Thu May 22 09:51:35 2014 (r354818)
@@ -7,11 +7,12 @@ PORTREVISION?= 13
CATEGORIES= games
MASTER_SITES?= http://ioquake3.org/files/${DISTVERSION}/
# Using zip this way enables slaves to override it.
+EXTRACT_SUFX?= .zip
MAINTAINER?= kamikaze at bsdforen.de
COMMENT?= Cleaned-up and enhanced version of Quake 3
-USES= pkgconfig gmake zip
+USES= pkgconfig gmake
NO_STAGE= yes
# Port configuration flags:
Modified: head/games/urbanterror-data/Makefile
==============================================================================
--- head/games/urbanterror-data/Makefile Thu May 22 09:43:03 2014 (r354817)
+++ head/games/urbanterror-data/Makefile Thu May 22 09:51:35 2014 (r354818)
@@ -9,12 +9,12 @@ MASTER_SITES= http://cdn.urbanterror.inf
http://mirror.urtstats.net/urbanterror/
PKGNAMEPREFIX= urbanterror-
DISTNAME= UrbanTerror${URT_VER}_full${URT_REV}
+EXTRACT_SUFX= .zip
EXTRACT_ONLY=
MAINTAINER= kamikaze at bsdforen.de
COMMENT= Standalone realism based mod originally for Quake III Arena
-USES= zip
NO_BUILD= yes
NO_CDROM= The mod files may not be sold or distributed on physical media unless with permission from id Software.
Modified: head/polish/hunspell/Makefile
==============================================================================
--- head/polish/hunspell/Makefile Thu May 22 09:43:03 2014 (r354817)
+++ head/polish/hunspell/Makefile Thu May 22 09:51:35 2014 (r354818)
@@ -22,7 +22,7 @@ PLIST_DIRSTRY= %%DATADIR%%
post-extract:
@${MKDIR} ${WRKSRC}
- @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/pl_PL.zip -C ${WRKSRC}/
+ @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/pl_PL.zip -d ${WRKSRC}
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}/
Modified: head/textproc/no-hunspell/Makefile
==============================================================================
--- head/textproc/no-hunspell/Makefile Thu May 22 09:43:03 2014 (r354817)
+++ head/textproc/no-hunspell/Makefile Thu May 22 09:51:35 2014 (r354818)
@@ -23,8 +23,8 @@ PLIST_DIRSTRY= %%DATADIR%%
post-extract:
@${MKDIR} ${WRKSRC}
- @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/nb_NO.zip -C ${WRKSRC}/
- @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/nn_NO.zip -C ${WRKSRC}/
+ @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/nb_NO.zip -d ${WRKSRC}
+ @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/nn_NO.zip -d ${WRKSRC}
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}/
More information about the svn-ports-head
mailing list