From owner-svn-ports-all@FreeBSD.ORG Thu May 22 09:51:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E055AE4; Thu, 22 May 2014 09:51:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A72D2F5C; Thu, 22 May 2014 09:51:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4M9pbWW056258; Thu, 22 May 2014 09:51:37 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4M9pZwR056252; Thu, 22 May 2014 09:51:35 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201405220951.s4M9pZwR056252@svn.freebsd.org> From: Alex Kozlov Date: Thu, 22 May 2014 09:51:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354818 - in head: Mk Mk/Uses games/ioquake3 games/urbanterror-data polish/hunspell textproc/no-hunspell X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 May 2014 09:51:37 -0000 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@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@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}/