Index: games/quake2-data/Makefile =================================================================== --- games/quake2-data/Makefile (revision 317525) +++ games/quake2-data/Makefile (working copy) @@ -16,7 +16,7 @@ COMMENT= Quake II data files # XXX we need info-unzip for q2-314-demo-x86.exe -USE_ZIP= yes +USE_INFOZIP= yes NO_WRKSUBDIR= yes OPTIONS_DEFINE= MANUAL OPTIMIZED_CFLAGS SHAREWARE Index: math/miracl/Makefile =================================================================== --- math/miracl/Makefile (revision 317525) +++ math/miracl/Makefile (working copy) @@ -24,7 +24,7 @@ ONLY_FOR_ARCHS= i386 amd64 -USE_ZIP= yes +USE_INFOZIP= yes USE_LDCONFIG= yes EXTRACT_BEFORE_ARGS= -j -aa -L -q Index: audio/mbrolavox/Makefile =================================================================== --- audio/mbrolavox/Makefile (revision 317525) +++ audio/mbrolavox/Makefile (working copy) @@ -40,7 +40,7 @@ do-extract: @${MKDIR} ${WRKSRC} .for ii in ${MYFILES} - @${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${ii} -d ${WRKSRC} + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/${ii} -C ${WRKSRC} .endfor do-install: Index: graphics/jumpgis/Makefile =================================================================== --- graphics/jumpgis/Makefile (revision 317525) +++ graphics/jumpgis/Makefile (working copy) @@ -15,7 +15,7 @@ COMMENT= A GUI based application for viewing and processing spatial data WRKSRC= ${WRKDIR}/jump -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} TARGET_DIR= ${PREFIX}/${PORTNAME} USE_JAVA= yes @@ -35,6 +35,9 @@ PLIST_SUB+= GNOMELINKS="@comment " .endif +pre-extract: + @${MKDIR} ${WRKSRC} + post-patch: @${REINPLACE_CMD} -e "s,#!sh,#!/bin/sh,g" \ -e "s,^LIB=../lib,LIB=${TARGET_DIR}/lib,g" \ Index: devel/tnt/Makefile =================================================================== --- devel/tnt/Makefile (revision 317525) +++ devel/tnt/Makefile (working copy) @@ -1,9 +1,5 @@ -# Ports collection makefile for: tnt -# Date created: Mar 15, 2003 -# Whom: Pedro F. Giffuni -# +# Created by: Pedro F. Giffuni # $FreeBSD$ -# PORTNAME= tnt PORTVERSION= 1.2.6 @@ -19,7 +15,7 @@ MAINTAINER= erik@bz.bzflag.bz COMMENT= Template Numerical Toolkit -BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip +BUILD_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip USE_ZIP= yes NO_BUILD= yes @@ -33,8 +29,7 @@ ${INSTALL_DATA} ${WRKDIR}/*.h ${PREFIX}/include/tnt .ifndef NOPORTDOCS ${MKDIR} ${DOCSDIR} - ${EXTRACT_CMD} ${DISTDIR}/${DIST_SUBDIR}/tnt120doc \ - -d ${DOCSDIR} + ${UNZIP_CMD} -q ${DISTDIR}/${DIST_SUBDIR}/tnt120doc -d ${DOCSDIR} .endif .include Index: games/darkplaces/Makefile =================================================================== --- games/darkplaces/Makefile (revision 317525) +++ games/darkplaces/Makefile (working copy) @@ -69,9 +69,9 @@ .endif post-extract: - @${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${WRKDIR}/${PORTNAME}enginesource${PORTVERSION}.zip \ - -d ${WRKDIR} + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ + ${WRKDIR}/${PORTNAME}enginesource${PORTVERSION}.zip \ + -C ${WRKDIR} do-install: .for f in ${EXE_TARGETS} Index: multimedia/projectx/Makefile =================================================================== --- multimedia/projectx/Makefile (revision 317525) +++ multimedia/projectx/Makefile (working copy) @@ -12,15 +12,16 @@ COMMENT= DVB (mpeg) cutting/demux tool RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper +EXTRACT_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip -USE_ZIP= yes +USE_INFOZIP= yes USE_JAVA= yes JAVA_VERSION= 1.6+ SUB_FILES= project-x.sh DATADIR= ${JAVASHAREDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/Project-X_${PORTVERSION} -EXTRACT_BEFORE_ARGS+= -aq +EXTRACT_BEFORE_ARGS= -aq do-configure: ${SED} -e "s|^javac|${JAVAC}|" ${WRKSRC}/build.sh >${WRKSRC}/build-fbsd.sh Index: security/quantis-kmod/Makefile =================================================================== --- security/quantis-kmod/Makefile (revision 317525) +++ security/quantis-kmod/Makefile (working copy) @@ -18,7 +18,6 @@ LICENSE_FILE= ${WRKDIR}/Quantis-${DISTVERSION}/License.txt USE_ZIP= yes -EXTRACT_BEFORE_ARGS= -aqo WRKSRC= ${WRKDIR}/Quantis-${DISTVERSION}/Drivers/Unix/QuantisPci @@ -33,10 +32,6 @@ .include -.if ${OSVERSION} < 700000 -IGNORE= requires FreeBSD >= 7 -.endif - .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= requires kernel source to be installed .endif Index: games/linux-enemyterritory/Makefile =================================================================== --- games/linux-enemyterritory/Makefile (revision 317525) +++ games/linux-enemyterritory/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Enemy Territory -# Date created: Sun Jan 18 18:54:00 CET 2004 -# Whom: benlutz@datacomm.ch -# +# Created by: benlutz@datacomm.ch # $FreeBSD$ -# PORTNAME= enemyterritory PORTVERSION= 2.60b @@ -30,9 +26,9 @@ do-extract: @${MKDIR} ${WRKSRC} @cd ${WRKSRC} && \ - ${TAIL} +374 ${_DISTDIR}et-linux-2.60.x86.run | ${TAR} xfz - + ${TAIL} +374 ${_DISTDIR}et-linux-2.60.x86.run | ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} - @cd ${WRKSRC} && \ - ${UNZIP_CMD} -q ${_DISTDIR}ET-2.60b.zip + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}ET-2.60b.zip post-patch: .for FILE in et etded Index: devel/libgpc/Makefile =================================================================== --- devel/libgpc/Makefile (revision 317525) +++ devel/libgpc/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gpc -# Date created: 22 October 2005 -# Whom: Mikhail Teterin -# +# Created by: Mikhail Teterin # $FreeBSD$ -# PORTNAME= libgpc PORTVERSION= 2.32 @@ -23,6 +19,4 @@ MAKEFILE= ${FILESDIR}/BSDmakefile -EXTRACT_BEFORE_ARGS=-qoa - .include Index: x11-toolkits/swt-devel/Makefile =================================================================== --- x11-toolkits/swt-devel/Makefile (revision 317525) +++ x11-toolkits/swt-devel/Makefile (working copy) @@ -81,11 +81,8 @@ .include post-extract: -.if ${OSVERSION} > 900044 - @(cd ${WRKSRC} && /usr/bin/unzip -qo *.zip) -.else - @(cd ${WRKSRC} && ${UNZIP_CMD} -qo *.zip) -.endif + @cd ${WRKSRC} && \ + for zip in *.zip; do ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $$zip ${EXTRACT_AFTER_ARGS} ; done @${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar post-patch: Index: x11-toolkits/swt/Makefile =================================================================== --- x11-toolkits/swt/Makefile (revision 317525) +++ x11-toolkits/swt/Makefile (working copy) @@ -79,7 +79,8 @@ .endif post-extract: - @(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip") + @cd ${WRKSRC} && \ + for zip in *.zip; do ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $$zip ${EXTRACT_AFTER_ARGS} ; done @${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar do-install: Index: japanese/ASCIIdates98-fpw/Makefile =================================================================== --- japanese/ASCIIdates98-fpw/Makefile (revision 317525) +++ japanese/ASCIIdates98-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ASCIIdates98 Dictionary - JIS X 4081 version -# Date created: 2000.11.28 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= ASCIIdates98-fpw PORTVERSION= 1.0 @@ -15,7 +11,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Japanese dictionary for PC terms in '98 ASCII Dates Book (EPWING V1 format) -USE_ZIP= yes +EXTRACT_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/ascdates EXTRACT_BEFORE_ARGS= -qL Index: java/eclipse-EPIC/Makefile =================================================================== --- java/eclipse-EPIC/Makefile (revision 317525) +++ java/eclipse-EPIC/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: EPIC -# Date created: 28 Nov 2004 -# Whom: tux@pinguru.net -# +# Created by: tux@pinguru.net # $FreeBSD$ -# PORTNAME= EPIC PORTVERSION= 0.6.35 @@ -36,7 +32,7 @@ .for file in ${EPICFILES} cd ${WRKSRC} \ && ${MKDIR} ${file} \ - && ${UNZIP_CMD} ${file}.jar -d ${file} + && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${file}.jar ${EXTRACT_AFTER_ARGS} -C ${file} .endfor do-install: Index: games/hlstatsx/Makefile =================================================================== --- games/hlstatsx/Makefile (revision 317525) +++ games/hlstatsx/Makefile (working copy) @@ -19,8 +19,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME} HLSTATSX?= www/${PORTNAME} PLIST_SUB+= HLSTATSX=${HLSTATSX} -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} +pre-extract: + @${MKDIR} ${WRKSRC} + do-install: @ ${MKDIR} ${PREFIX}/${HLSTATSX} @ ${CP} -R ${WRKSRC}/* ${PREFIX}/${HLSTATSX} Index: games/pysycache-lang/Makefile =================================================================== --- games/pysycache-lang/Makefile (revision 317525) +++ games/pysycache-lang/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: pysycache-lang -# Date created: 2006-02-22 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= lang PORTVERSION= 2.0 @@ -92,7 +88,7 @@ do-extract: @${MKDIR} ${WRKSRC} .for OPT in ${HAVE_LANG} - @${UNZIP_CMD} -q ${_DISTDIR}/pysycache-lang-${OPT}-${PORTVERSION}.zip -d ${WRKSRC} + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/pysycache-lang-${OPT}-${PORTVERSION}.zip -C ${WRKSRC} .endfor do-install: Index: games/glest/Makefile =================================================================== --- games/glest/Makefile (revision 317525) +++ games/glest/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: glest -# Date created: 2005-10-30 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= glest PORTVERSION= 3.2.2 @@ -38,7 +34,7 @@ OPTIONS= EDITOR "Build map editor" off -EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} +EXTRACT_AFTER_ARGS= -C ${WRKDIR}/${DISTNAME} .include Index: sysutils/megacli/Makefile =================================================================== --- sysutils/megacli/Makefile (revision 317525) +++ sysutils/megacli/Makefile (working copy) @@ -33,9 +33,9 @@ .include post-extract: .if ${ARCH} == "i386" - @cd ${WRKSRC}/MegaCli_FreeBSD && ${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} MegaCli.zip + @cd ${WRKSRC}/MegaCli_FreeBSD && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} MegaCli.zip .elif ${ARCH} == "amd64" - @cd ${WRKSRC}/MegaCli_FreeBSD && ${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} MegaCli64.zip + @cd ${WRKSRC}/MegaCli_FreeBSD && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} MegaCli64.zip .endif do-install: Index: japanese/jargon-fpw/Makefile =================================================================== --- japanese/jargon-fpw/Makefile (revision 317525) +++ japanese/jargon-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: The Jargon File - JIS X 4081 format version -# Date created: 00/06/19 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= jargon-fpw PORTVERSION= 2.0 @@ -15,8 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The famous jargon file (EPWING V1 format) - -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/jargon EXTRACT_BEFORE_ARGS= -qL Index: japanese/roget-fpw/Makefile =================================================================== --- japanese/roget-fpw/Makefile (revision 317525) +++ japanese/roget-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Roget's Thesaurus - JIS X 4081 version -# Date created: 2000.11.28 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= roget-fpw PORTVERSION= 1.0.2 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Roget's Thesaurus (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/roget EXTRACT_BEFORE_ARGS= -qL Index: www/xpi-adblock/Makefile.xpi =================================================================== --- www/xpi-adblock/Makefile.xpi (revision 317525) +++ www/xpi-adblock/Makefile.xpi (working copy) @@ -82,7 +82,7 @@ NO_BUILD= yes USE_ZIP= yes -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} XPI_DISTNAME?= ${PORTNAME} XPI_APPS_ALL_WC= *firefox* *thunderbird* *seamonkey* @@ -188,6 +188,9 @@ ${LN} -sf $$_xpi $$_app ${_Q} ; } ; } .endif +pre-extract: + @${MKDIR} ${WRKSRC} + .if !target(xpi-post-extract) xpi-post-extract: .endif Index: vietnamese/unicode-uhoai/Makefile =================================================================== --- vietnamese/unicode-uhoai/Makefile (revision 317525) +++ vietnamese/unicode-uhoai/Makefile (working copy) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: unicode-uhoai -# Date created: Tue Nov 27, 2001 -# Whom: David O'Brien (obrien@NUXI.com) -# +# Created by: David O'Brien (obrien@NUXI.com) # $FreeBSD$ -# PORTNAME= unicode-uhoai PORTVERSION= 2.1 @@ -18,7 +13,8 @@ MAINTAINER= obrien@FreeBSD.org COMMENT= Unicode TrueType Font with UHoai Vietnamese encoding -USE_ZIP= yes +EXTRACT_BEFORE_ARGS= -qL +USE_INFOZIP= yes NO_WRKSUBDIR= yes NO_BUILD= taken care of in do-install target @@ -34,5 +30,3 @@ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include - -EXTRACT_BEFORE_ARGS+= -L Index: graphics/aoi/Makefile =================================================================== --- graphics/aoi/Makefile (revision 317525) +++ graphics/aoi/Makefile (working copy) @@ -16,7 +16,9 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper -USE_ZIP= yes +EXTRACT_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip + +USE_INFOZIP= yes EXTRACT_BEFORE_ARGS= -a -q USE_JAVA= yes JAVA_VERSION= 1.6+ Index: emulators/mame/Makefile =================================================================== --- emulators/mame/Makefile (revision 317525) +++ emulators/mame/Makefile (working copy) @@ -27,7 +27,7 @@ NO_WRKSUBDIR= yes -USE_ZIP= yes +USE_INFOZIP= yes USE_XORG= xext xi xinerama xrender USE_GL= gl USE_SDL= sdl ttf Index: games/linux-quake3/Makefile =================================================================== --- games/linux-quake3/Makefile (revision 317525) +++ games/linux-quake3/Makefile (working copy) @@ -42,8 +42,8 @@ do-extract: @${MKDIR} ${WRKDIR} @cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${Q3DATAFILE} | \ - ${TAR} zxf - - @${UNZIP_CMD} -qo ${_DISTDIR}/${Q3PATCHFILE} -d ${WRKDIR} + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} - + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${Q3PATCHFILE} -C ${WRKDIR} post-extract: .for f in q3ded quake3.x86 quake3-smp.x86 Index: vietnamese/vis2u/Makefile =================================================================== --- vietnamese/vis2u/Makefile (revision 317525) +++ vietnamese/vis2u/Makefile (working copy) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: vis2u -# Date created: Tue Nov 27, 2001 -# Whom: David O'Brien (obrien@NUXI.com) -# +# Created by: David O'Brien (obrien@NUXI.com) # $FreeBSD$ -# PORTNAME= vis2u PORTVERSION= 1.0 @@ -17,7 +12,12 @@ MAINTAINER= obrien@FreeBSD.org COMMENT= VISCII->Unicode conversion -USE_ZIP= yes +EXTRACT_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip +EXTRACT_CMD= ${UNZIP_CMD} +EXTRACT_BEFORE_ARGS= -qL +EXTRACT_AFTER_ARGS= + +USE_INFOZIP= yes NO_WRKSUBDIR= yes do-build: @@ -27,5 +27,3 @@ ${INSTALL_PROGRAM} ${WRKSRC}/vis2u ${PREFIX}/bin .include - -EXTRACT_BEFORE_ARGS+= -L Index: net-mgmt/airport/Makefile =================================================================== --- net-mgmt/airport/Makefile (revision 317525) +++ net-mgmt/airport/Makefile (working copy) @@ -17,8 +17,6 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper -EXTRACT_BEFORE_ARGS= -q -o - USE_ZIP= YES USE_JAVA= yes JAVA_VERSION= 1.6+ Index: math/physcalc/Makefile =================================================================== --- math/physcalc/Makefile (revision 317525) +++ math/physcalc/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: physcalc -# Date created: Sun 27 Aug 2000 -# Whom: Will Andrews -# +# Created by: Will Andrews # $FreeBSD$ -# PORTNAME= physcalc PORTVERSION= 2.4 @@ -19,7 +15,7 @@ EXTRACT_AFTER_ARGS= -x physcalc -d ${WRKDIR} NO_WRKSUBDIR= yes -USE_ZIP= yes +USE_INFOZIP= yes DEFS= -DSHAREDIR="\"${PREFIX}/share/physcalc/\"" SRCS= physconv.c physmain.c physmlib.c physnode.c physoper.c \ Index: japanese/edict-fpw/Makefile =================================================================== --- japanese/edict-fpw/Makefile (revision 317525) +++ japanese/edict-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: EDICT - JIS X 4081 format version -# Date created: 00/01/14 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= edict-fpw PORTVERSION= 1.2.2 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Japanese <-> English Dictionary (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/edict EXTRACT_BEFORE_ARGS= -qL Index: databases/jasperserver/Makefile =================================================================== --- databases/jasperserver/Makefile (revision 317525) +++ databases/jasperserver/Makefile (working copy) @@ -149,14 +149,13 @@ @${ECHO_MSG} " [ DONE ]" .endfor @${REINPLACE_CMD} -e 's|--DROP|-- DROP|' ${SQLSRC}/mysql/quartz.ddl - -post-patch-script: @${ECHO_MSG} -n ">> Removing unneeded patched files..." @${FIND} ${WRKDIR} -type f \( -name '*.orig' \) -delete @${ECHO_MSG} " [ DONE ]" -post-extract-script: - @${LN} -fs ${WRKDIR}/.m2 ~/.m2 && ${UNZIP_CMD} -qq ${DISTDIR}/${JSMAVENARCH} -d ${WRKDIR}/.m2 +post-extract: + @${MKDIR} ${WRKDIR}/.m2 + @${LN} -fs ${WRKDIR}/.m2 ~/.m2 && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${JSMAVENARCH} -C ${WRKDIR}/.m2 pre-build: @${ECHO} "appServerType = ${APPTYPE}" > ${APP_PROPERTIES} Index: japanese/foldoc-fpw/Makefile =================================================================== --- japanese/foldoc-fpw/Makefile (revision 317525) +++ japanese/foldoc-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: foldoc - JIS X 4081 format version -# Date created: 01/08/23 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= foldoc-fpw PORTVERSION= 1.0.2 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Free On-line Dictionary of Computing (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/foldoc EXTRACT_BEFORE_ARGS= -qL Index: german/mediathek/Makefile =================================================================== --- german/mediathek/Makefile (revision 317525) +++ german/mediathek/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mediathek -# Date created: 2010-10-17 -# Whom: Lars Engels -# +# Created by: Lars Engels # $FreeBSD$ -# PORTNAME= mediathek PORTVERSION= 3.1.0 @@ -22,6 +18,7 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ SUB_FILES= mediathek +EXTRACT_AFTER_ARGS= -C ${WRKSRC} INSTALLFILES= MediathekView.jar MediathekView.ico INSTALLDOCS= Anleitung.pdf @@ -51,10 +48,8 @@ "Video;AudioVideo;Java;" \ false -do-extract: - @${RM} -rf ${WRKDIR} +pre-extract: @${MKDIR} ${WRKSRC} - @${UNZIP_CMD} -q -d ${WRKSRC} ${DISTDIR}/${EXTRACT_ONLY} do-install: @${MKDIR} ${DATADIR} Index: games/linux-etqw-demo-server/Makefile =================================================================== --- games/linux-etqw-demo-server/Makefile (revision 317525) +++ games/linux-etqw-demo-server/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: etqw-demo-server -# Date created: 2008-04-21 -# Whom: ayu -# +# Created by: ayu # $FreeBSD$ -# PORTNAME= etqw PORTVERSION= 2.0.r1 @@ -32,9 +28,8 @@ do-extract: @${MKDIR} ${WRKSRC} @cd ${WRKSRC} && \ - ${TAIL} -c +194885 ${_DISTDIR}${DISTNAME}.run > full.zip - @(cd ${WRKSRC} && ${UNZIP_CMD} -q ${WRKSRC}/full.zip) - @${RM} ${WRKSRC}/full.zip + ${TAIL} -c +194885 ${_DISTDIR}${DISTNAME}.run | \ + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} - post-patch: @${SED} -e 's|@ETQWDIR@|${ETQWDIR}|' ${FILESDIR}/etqwded-demo.in > ${WRKSRC}/etqwded-demo Index: japanese/vera-fpw/Makefile =================================================================== --- japanese/vera-fpw/Makefile (revision 317525) +++ japanese/vera-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: V.E.R.A - JIS X 4081 format version -# Date created: 00/06/19 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= vera-fpw PORTVERSION= ${VERA_VER}.${VERAFPW_VER} @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Virtual Entity of Relevant Aconyms (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/vera EXTRACT_BEFORE_ARGS= -qL Index: editors/uemacs/Makefile =================================================================== --- editors/uemacs/Makefile (revision 317525) +++ editors/uemacs/Makefile (working copy) @@ -13,7 +13,7 @@ NO_CDROM= Resale allowed for media cost only NO_WRKSUBDIR= yes -USE_ZIP= yes +USE_INFOZIP= yes EXTRACT_BEFORE_ARGS= -Laq post-patch: Index: graphics/fli2gif/Makefile =================================================================== --- graphics/fli2gif/Makefile (revision 317525) +++ graphics/fli2gif/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fli2gif -# Date created: 7 Jan 1998 -# Whom: giffunip@asme.org -# +# Created by: giffunip@asme.org # $FreeBSD$ -# PORTNAME= fli2gif PORTVERSION= 1.1 @@ -21,7 +17,7 @@ USE_DOS2UNIX= fli2gif.cpp FLI2GIF.TXT post-extract: - @cd ${WRKSRC} && ${UNZIP_CMD} -q source.zip \ + @cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} source.zip \ && ${LN} -sf GIF.CPP gif.cpp \ && ${LN} -sf FLIPLAY.CPP fliplay.cpp Index: textproc/iso-schematron-xslt/Makefile =================================================================== --- textproc/iso-schematron-xslt/Makefile (revision 317525) +++ textproc/iso-schematron-xslt/Makefile (working copy) @@ -17,8 +17,8 @@ do-extract: ${MKDIR} ${WRKDIR}/xslt1 ${MKDIR} ${WRKDIR}/xslt2 - ( cd ${WRKDIR}/xslt1 && ${UNZIP_CMD} ${DISTDIR}/iso-schematron-xslt1.zip ) - ( cd ${WRKDIR}/xslt2 && ${UNZIP_CMD} ${DISTDIR}/iso-schematron-xslt2.zip ) + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/iso-schematron-xslt1.zip -C ${WRKDIR}/xslt1 + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/iso-schematron-xslt2.zip -C ${WRKDIR}/xslt2 INSTDIR= share/xsl/iso-schematron PLIST_SUB+= INSTDIR="${INSTDIR}" Index: german/pecl-konto_check/Makefile =================================================================== --- german/pecl-konto_check/Makefile (revision 317525) +++ german/pecl-konto_check/Makefile (working copy) @@ -23,7 +23,7 @@ .include post-extract: - @${UNZIP_CMD} -q -d ${WRKDIR} ${WRKDIR}/php.zip + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/php.zip -C ${WRKDIR} post-patch: @${REINPLACE_CMD} -e "s|\"/etc|\"${ETCDIR}|g;" ${WRKSRC}/konto_check.c ${WRKSRC}/konto_check.lxx Index: java/eclipse-RDT/Makefile =================================================================== --- java/eclipse-RDT/Makefile (revision 317525) +++ java/eclipse-RDT/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: RDT -# Date created: 13 Jan 2008 -# Whom: rehsack@web.de -# +# Created by: rehsack@web.de # $FreeBSD$ -# PORTNAME= RDT PORTVERSION= 0.9.1 @@ -50,7 +46,7 @@ .for FILE in ${RDTFILES} cd ${WRKSRC} \ && ${MKDIR} ${FILE} \ - && ${UNZIP_CMD} ${WRKDIR}/${FILE}.jar -d ${FILE} + && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/${FILE}.jar -C ${FILE} .endfor do-install: Index: japanese/wordnet-fpw/Makefile =================================================================== --- japanese/wordnet-fpw/Makefile (revision 317525) +++ japanese/wordnet-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: WordNet - JIS X 4081 format version -# Date created: 00/06/19 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= wordnet-fpw PORTVERSION= ${WN_VER}.${WNFPW_VER} @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A English - English Dictionary (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/wordnet EXTRACT_BEFORE_ARGS= -qL Index: emulators/ia64sim/Makefile =================================================================== --- emulators/ia64sim/Makefile (revision 317525) +++ emulators/ia64sim/Makefile (working copy) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: ia64sim -# Date created: Tue Oct 10, 2000 -# Whom: David O'Brien (obrien@NUXI.com) -# +# Created by: David O'Brien (obrien@NUXI.com) # $FreeBSD$ -# PORTNAME= ia64sim PORTVERSION= 0.5 @@ -16,7 +11,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= IA64 simulator (Intel(R) Architecture 64) -USE_ZIP= yes +USE_INFOZIP= yes +EXTRACT_BEFORE_ARGS= -qLa .include @@ -24,7 +20,6 @@ BROKEN= Does not compile on alpha .endif -EXTRACT_BEFORE_ARGS= -qLa WRKSRC= ${WRKDIR}/home/chuck/ia64simcc USE_GMAKE= yes MAKEFILE= makefile.unx Index: deskutils/freemind/Makefile =================================================================== --- deskutils/freemind/Makefile (revision 317525) +++ deskutils/freemind/Makefile (working copy) @@ -25,11 +25,14 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION} DATAFILES= accessories browser doc lib plugins patterns.xml -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} ZIP_CMD= zip SUB_FILES= freemind.sh +pre-extract: + @${MKDIR} ${WRKSRC} + do-build: (cd ${WRKSRC}; \ ${UNZIP_CMD} lib/freemind.jar freemind.properties; \ Index: graphics/libecwj2/Makefile =================================================================== --- graphics/libecwj2/Makefile (revision 317525) +++ graphics/libecwj2/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libecwj2 -# Date created: 3 August 2010 -# Whom: glebius@FreeBSD.org -# +# Created by: glebius@FreeBSD.org # $FreeBSD$ -# PORTNAME= libecwj2 PORTVERSION= 3.3 @@ -24,17 +20,11 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -.include - -.if ${OSVERSION} < 800000 -BROKEN= does not build on 7.X -.endif - post-extract: cd ${WRKDIR} && \ - ${EXTRACT_CMD} ImageCompressionSDKSourceCode3.3Setup_20070509.zip + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ImageCompressionSDKSourceCode3.3Setup_20070509.zip post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure.in -.include +.include Index: games/doom-data/Makefile.include =================================================================== --- games/doom-data/Makefile.include (revision 317525) +++ games/doom-data/Makefile.include (working copy) @@ -22,6 +22,7 @@ .if defined(USE_CRLF) . if defined(USE_ZIP) +USE_INFOZIP= yes EXTRACT_BEFORE_ARGS= -aqo . else pre-patch: Index: devel/adabooch-doc-html/Makefile =================================================================== --- devel/adabooch-doc-html/Makefile (revision 317525) +++ devel/adabooch-doc-html/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: adabooch -# Date created: 21 December 2002 -# Whom: David Holm -# +# Created by: David Holm # $FreeBSD$ -# PORTNAME= adabooch-doc PORTVERSION= 20030309 @@ -21,7 +17,7 @@ NO_BUILD= yes NO_MTREE= yes WRKSRC= ${WRKDIR}/adabooch-doc-html -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} pre-extract: @${MKDIR} ${WRKSRC} Index: mail/ftrack/Makefile =================================================================== --- mail/ftrack/Makefile (revision 317525) +++ mail/ftrack/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ftrack -# Date created: Thu Dec 21 14:20:49 MSK 2000 -# Whom: Sergey Samoyloff -# +# Created by: Sergey Samoyloff # $FreeBSD$ -# PORTNAME= ftrack PORTVERSION= 3.1 @@ -23,11 +19,14 @@ USE_GMAKE= yes ALL_TARGET= ftrack MAKEFILE= ${WRKSRC}/MakeFiles/FreeBSD/Makefile -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} USE_PERL5= yes PORTDOCS= ftrack.faq readme report.err +pre-extract: + @${MKDIR} ${WRKSRC} + pre-patch: ${REINPLACE_CMD} -e "s@-I../../hpp -I../../.. -O3@-Ihpp -I${LOCALBASE}/include ${CFLAGS}@g; \ s@../../src/@src/@g; \ Index: japanese/pejv-fpw/Makefile =================================================================== --- japanese/pejv-fpw/Makefile (revision 317525) +++ japanese/pejv-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: pejv 100 - JIS X 4081 format version -# Date created: 2000.11.08 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= pejv-fpw PORTVERSION= 1.0.4 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Esperanto-Japanese dictionary (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/pejv EXTRACT_BEFORE_ARGS= -qL Index: archivers/paq/Makefile =================================================================== --- archivers/paq/Makefile (revision 317525) +++ archivers/paq/Makefile (working copy) @@ -18,7 +18,7 @@ USE_DOS2UNIX= yes USE_ZIP= yes -EXTRACT_AFTER_ARGS= -x *.bat *.exe readme.txt -d ${WRKDIR} +EXTRACT_AFTER_ARGS= --exclude *.bat --exclude *.exe --exclude readme.txt -C ${WRKDIR} NO_WRKSUBDIR= yes OPTIONS_DEFINE= OPENMP SUB_FILES= pkg-message @@ -77,7 +77,7 @@ @${CP} ${_DISTDIR}/zpsfx101.cpp ${WRKSRC}/zpsfx.cpp .if ${PORT_OPTIONS:MDOCS} .for r in ${READMES} - @${UNZIP_CMD} -pq ${_DISTDIR}/${r}.zip readme.txt > ${WRKSRC}/readme_${r:R}.txt + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${r}.zip -qO readme.txt > ${WRKSRC}/readme_${r:R}.txt .endfor .endif Index: audio/py-fastaudio/Makefile =================================================================== --- audio/py-fastaudio/Makefile (revision 317525) +++ audio/py-fastaudio/Makefile (working copy) @@ -1,10 +1,5 @@ -# New ports collection makefile for: py-fastaudio -# Date created: 3 March 2007 -# Whom: Pontus Stenetorp -# Carl Johan Gustavsson -# +# Created by: Pontus Stenetorp Carl Johan Gustavsson # $FreeBSD$ -# PORTNAME= fastaudio PORTVERSION= 0.1 @@ -41,12 +36,6 @@ PLIST_FILES+= share/examples/py-${PORTNAME}/demo.py .endif -do-extract: - @${MKDIR} ${WRKDIR} - @${TAR} zxf ${DISTDIR}/${DIST_SUBDIR}/${FASTA_SRCFILE} -C ${WRKDIR} - @${UNZIP_CMD} -q -d ${WRKDIR}/ \ - ${DISTDIR}/${DIST_SUBDIR}/${PORTA_SRCFILE} - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/setup.py ${WRKSRC}/mysndfile.h ${WRKSRC}/fastaudio.pyx Index: www/phpgedview/Makefile =================================================================== --- www/phpgedview/Makefile (revision 317525) +++ www/phpgedview/Makefile (working copy) @@ -11,7 +11,7 @@ COMMENT= Online genealogy viewer WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} FETCH_ARGS= -pRr USE_ZIP= yes @@ -42,6 +42,9 @@ USE_PHP += pdo_sqlite .endif +pre-extract: + @${MKDIR} ${WRKSRC} + post-extract: .for f in ${DISTATE} @${MV} ${WRKSRC}/${f} ${WRKSRC}/${f}-dist Index: devel/jgoodies-common/Makefile =================================================================== --- devel/jgoodies-common/Makefile (revision 317525) +++ devel/jgoodies-common/Makefile (working copy) @@ -21,7 +21,7 @@ USE_ANT= yes MAKE_ARGS+= -Djunit4.jar=${LOCALBASE}/share/java/classes/junit.jar ALL_TARGET= jar test -EXTRACT_AFTER_ARGS=-d ${WRKDIR} -x '*/api/*' '*.jar' +EXTRACT_AFTER_ARGS=-C ${WRKDIR} --exclude '*/api/*' --exclude '*.jar' USE_DOS2UNIX= yes REINPLACE_ARGS= -i "" Index: audio/abcmidi/Makefile =================================================================== --- audio/abcmidi/Makefile (revision 317525) +++ audio/abcmidi/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: abcmidi -# Date created: 10 March 2002 -# Whom: Sue Blake -# +# Created by: Sue Blake # $FreeBSD$ -# PORTNAME= abcmidi PORTVERSION= 2011.04.29 @@ -20,7 +16,7 @@ EXTRACT_BEFORE_ARGS= -aqo -USE_ZIP= yes +USE_INFOZIP= yes USE_GMAKE= yes MAKEFILE= makefiles/unix.mak MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DANSILIBS -c" LNK="${CC}" Index: japanese/web1913-fpw/Makefile =================================================================== --- japanese/web1913-fpw/Makefile (revision 317525) +++ japanese/web1913-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Web1913 - JIS X 4081 format version -# Date created: 00/06/19 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= web1913-fpw PORTVERSION= ${WEBFPW_VER} @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Webster's Revised Unabridged Dictionary (1913) (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/web EXTRACT_BEFORE_ARGS= -qL Index: games/quake3-data/Makefile.include =================================================================== --- games/quake3-data/Makefile.include (revision 317525) +++ games/quake3-data/Makefile.include (working copy) @@ -22,6 +22,7 @@ .if defined(USE_CRLF) . if defined(USE_ZIP) +USE_INFOZIP= yes EXTRACT_BEFORE_ARGS= -aqo . else pre-patch: Index: japanese/wdic-fpw/Makefile =================================================================== --- japanese/wdic-fpw/Makefile (revision 317525) +++ japanese/wdic-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: wdic - JIS X 4081 format version -# Date created: 2000.07.12 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= wdic-fpw PORTVERSION= 1.4 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Wired and Wireless Dictionary in Japanese (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/wdic EXTRACT_BEFORE_ARGS= -qL Index: mail/thunderbird-dictionaries/Makefile =================================================================== --- mail/thunderbird-dictionaries/Makefile (revision 317525) +++ mail/thunderbird-dictionaries/Makefile (working copy) @@ -1,10 +1,5 @@ -# Ports collection Makefile for: thunderbird-dictionaries -# Date created: 19 February 2006 -# Whom: Matthew Luckie -# Based on: multimedia/mplayer-skins -# +# Created by: Matthew Luckie # $FreeBSD$ -# PORTNAME= thunderbird-dictionaries PORTVERSION= 20060220 @@ -153,7 +148,8 @@ @${MKDIR} ${WRKSRC} .for f in ${ALLDICTS} .ifdef(WITH_DICT_${f}) - @${UNZIP_CMD} -q ${DISTDIR}/${DIST_SUBDIR}/${${f}_FILE} -d ${WRKSRC}/${${f}_FILE} + @${MKDIR} ${WRKSRC}/${${f}_FILE} + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/${${f}_FILE} -C ${WRKSRC}/${${f}_FILE} .endif .endfor Index: games/megamario/Makefile =================================================================== --- games/megamario/Makefile (revision 317525) +++ games/megamario/Makefile (working copy) @@ -1,5 +1,4 @@ # Created by: nemysis@gmx.ch -# # $FreeBSD$ PORTNAME= megamario @@ -17,7 +16,7 @@ FETCH_ARGS?= -Fpr USE_ZIP= yes -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} USE_GMAKE= yes USE_DOS2UNIX= *.cpp *.h *.ini Makefile* *.txt *.desktop ALL_TARGET= ${PORTNAME} Index: devel/subclipse/Makefile =================================================================== --- devel/subclipse/Makefile (revision 317525) +++ devel/subclipse/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: subclipse -# Date created: 06 Mar 2005 -# Whom: tux@pinguru.net -# +# Created by: tux@pinguru.net # $FreeBSD$ -# PORTNAME= subclipse PORTVERSION= 1.6.5 @@ -51,7 +47,7 @@ .for f in ${SUBCLIPSEFILES} cd ${WRKSRC} \ && ${MKDIR} ${f} \ - && ${UNZIP_CMD} ${f}.jar -d ${f} + && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${f}.jar -C ${f} .endfor do-install: Index: japanese/another-htmllint/Makefile =================================================================== --- japanese/another-htmllint/Makefile (revision 317525) +++ japanese/another-htmllint/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Another HTML-lint -# Date created: 29 Sep 2000 -# Whom: Jun Kuriyama -# +# Created by: Jun Kuriyama # $FreeBSD$ -# PORTNAME= another-htmllint PORTVERSION= 20060601 @@ -17,9 +13,9 @@ ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode USE_PERL5= YES -USE_ZIP= YES +USE_INFOZIP= YES WRKSRC= ${WRKDIR} -EXTRACT_BEFORE_ARGS= -a -q +EXTRACT_BEFORE_ARGS= -aqo DIR= ${PREFIX}/share/htmllint PM= htmllint.pm RFC2396.pm htmllint.env Index: japanese/flower-fpw/Makefile =================================================================== --- japanese/flower-fpw/Makefile (revision 317525) +++ japanese/flower-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: A Flower Dictionary - JIS X 4081 version -# Date created: 2000.11.28 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= flower-fpw PORTVERSION= 1.0 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A dictionary for flowers (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/flower EXTRACT_BEFORE_ARGS= -qL Index: japanese/yasou-fpw/Makefile =================================================================== --- japanese/yasou-fpw/Makefile (revision 317525) +++ japanese/yasou-fpw/Makefile (working copy) @@ -12,7 +12,7 @@ NO_CDROM= No commercial use, and no redistribution allowed with fee except media and/or shipping cost -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/yasou EXTRACT_BEFORE_ARGS= -qL Index: japanese/ebd-fpw/Makefile =================================================================== --- japanese/ebd-fpw/Makefile (revision 317525) +++ japanese/ebd-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ebd - JIS X 4081 format version -# Date created: 01/08/23 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= ebd-fpw PORTVERSION= 1.0 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Easton's 1897 Bible Dictionary (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/ebd EXTRACT_BEFORE_ARGS= -qL Index: textproc/s5/Makefile =================================================================== --- textproc/s5/Makefile (revision 317525) +++ textproc/s5/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: s5 -# Date created: 28 October 2005 -# Whom: Peter Pentchev -# +# Created by: Peter Pentchev # $FreeBSD$ -# PORTNAME= s5 PORTVERSION= 1.1 @@ -15,8 +11,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A simple HTML-based presentation system -BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip - USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.(css|htc|html|js|txt) USE_ZIP= yes @@ -30,7 +24,7 @@ S5_SUBDIRS= pix primer s5-blank ui post-extract: - cd ${WRKSRC} && ${UNZIP_CMD} s5-blank.zip + cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} s5-blank.zip ${SED} -e "s,/usr/local,${PREFIX}," ${FILESDIR}/s5.sh > ${WRKDIR}/s5 ${SED} -e "s,/usr/local,${PREFIX}," ${FILESDIR}/s5.1 > ${WRKDIR}/s5.1 ${FIND} ${WRKDIR} -type f -name .DS_Store -delete Index: japanese/fumeikai-fpw/Makefile =================================================================== --- japanese/fumeikai-fpw/Makefile (revision 317525) +++ japanese/fumeikai-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Fumeikai Dictionary - JIS X 4081 version -# Date created: 2000.11.28 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= fumeikai-fpw PORTVERSION= 1.0 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An abbreviation (alphabet-->Japanese) dictionary (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/fumeikai EXTRACT_BEFORE_ARGS= -qL Index: polish/hunspell/Makefile =================================================================== --- polish/hunspell/Makefile (revision 317525) +++ polish/hunspell/Makefile (working copy) @@ -1,4 +1,3 @@ -# Created by: Baptiste Daroussin # $FreeBSD$ PORTNAME= hunspell @@ -22,8 +21,9 @@ %%DATADIR%%/pl_PL.dic PLIST_DIRSTRY= %%DATADIR%% -post-extract: - @${EXTRACT_CMD} ${WRKDIR}/pl_PL.zip -d ${WRKSRC}/ +EXTRACT_AFTER_ARGS= -O pl_PL.zip | ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} - -C ${WRKSRC} +pre-extract: + @${MKDIR} ${WRKSRC} do-install: ${MKDIR} ${DATADIR}/ Index: japanese/bible_names-fpw/Makefile =================================================================== --- japanese/bible_names-fpw/Makefile (revision 317525) +++ japanese/bible_names-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: HITCHCOCK'S BIBLE NAMES Dictionary - JIS X 4081 version -# Date created: 2000.11.28 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= bible_names-fpw PORTVERSION= 1.1.3 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A dictionary for HITCHCOCK'S BIBLE NAMES (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/biblenam EXTRACT_BEFORE_ARGS= -qL Index: graphics/proj/Makefile =================================================================== --- graphics/proj/Makefile (revision 317525) +++ graphics/proj/Makefile (working copy) @@ -1,7 +1,4 @@ -# New ports collection makefile for: proj -# Date created: 15 November 2001 -# Whom: jedgar@FreeBSD.org -# +# Created by: jedgar@FreeBSD.org # $FreeBSD$ PORTNAME= proj @@ -29,7 +26,8 @@ MAN3= pj_init.3 post-extract: - @${UNZIP_CMD} -q ${DISTDIR}/${DATUM_GRID_FILES} -d ${WRKSRC}/nad + @${MKDIR} ${WRKSRC}/nad + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DATUM_GRID_FILES} -C ${WRKSRC}/nad post-patch: @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$${PREFIX}/libdata/pkgconfig|g' \ Index: textproc/sdocbook-xml/Makefile =================================================================== --- textproc/sdocbook-xml/Makefile (revision 317525) +++ textproc/sdocbook-xml/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: "Simplified" DocBook XML DTD -# Date created: 25 December 2000 -# Whom: KIRIYAMA Kazuhiko -# +# Created by: KIRIYAMA Kazuhiko # $FreeBSD$ -# PORTNAME= sdocbook-xml PORTVERSION= 1.1 @@ -35,10 +31,6 @@ sdocbook.css sdocbook.dtd sdocbookref-custom.dtd \ sdocbookref.dtd sinclist.mod -do-extract: - ${MKDIR} ${WRKDIR}; \ - (cd ${WRKDIR} && ${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES}) - post-patch: ${SED} -e 's#@@DTDDIR@@#${SDOCBOOKDIR}#' < ${FILESDIR}/catalog.xml > ${WRKSRC}/catalog.xml Index: www/yourls/Makefile =================================================================== --- www/yourls/Makefile (revision 317525) +++ www/yourls/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: yourls -# Date created: 2010-01-28 -# Whom: Joe Horn -# +# Created by: Joe Horn # $FreeBSD$ -# PORTNAME= yourls DISTVERSION= 1.5.1 @@ -16,7 +12,7 @@ LICENSE= GPLv3 WRKSRC= ${WRKDIR}/${PORTNAME} -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} USE_ZIP= YES NO_BUILD= YES @@ -26,7 +22,8 @@ SUB_LIST+= PKGNAME=${PKGNAME} SUB_FILES+= pkg-message -.include +pre-extract: + @${MKDIR} ${WRKSRC} do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR} @@ -43,4 +40,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include +.include Index: textproc/no-hunspell/Makefile =================================================================== --- textproc/no-hunspell/Makefile (revision 317525) +++ textproc/no-hunspell/Makefile (working copy) @@ -1,9 +1,4 @@ -# New ports collection makefile for: no-hunspell -# Date created: 2011-07-21 -# Whom: Baptiste Daroussin -# # $FreeBSD$ -# PORTNAME= hunspell PORTVERSION= 2.0.10 @@ -27,8 +22,9 @@ PLIST_DIRSTRY= %%DATADIR%% post-extract: - @${EXTRACT_CMD} ${WRKDIR}/nb_NO.zip -d ${WRKSRC}/ - @${EXTRACT_CMD} ${WRKDIR}/nn_NO.zip -d ${WRKSRC}/ + @${MKDIR} ${WRKSRC} + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/nb_NO.zip -C ${WRKSRC}/ + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/nn_NO.zip -C ${WRKSRC}/ do-install: ${MKDIR} ${DATADIR}/ Index: japanese/wwasw-fpw/Makefile =================================================================== --- japanese/wwasw-fpw/Makefile (revision 317525) +++ japanese/wwasw-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: A Biographical Dictionary - JIS X 4081 version -# Date created: 2000.11.28 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= wwasw-fpw PORTVERSION= 1.0.2 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A biographical dictionary (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/wwasw EXTRACT_BEFORE_ARGS= -qL Index: japanese/zangband/Makefile =================================================================== --- japanese/zangband/Makefile (revision 317525) +++ japanese/zangband/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ja-zangband -# Date Created: 31 May 2000 -# Whom: Makoto YAMAKURA -# +# Created by: Makoto YAMAKURA # $FreeBSD$ -# PORTNAME= zangband PORTVERSION= 2.4.0${JA_VERSION} @@ -19,8 +15,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Zangband (Zelazny Angband) with Japanese, color, X11 support -USE_ZIP= yes -EXTRACT_BEFORE_ARGS= -qa +USE_INFOZIP= yes +EXTRACT_BEFORE_ARGS= -aqo USE_XORG= x11 NO_CDROM= Possible copyright infringement Index: security/cryptlib/Makefile =================================================================== --- security/cryptlib/Makefile (revision 317525) +++ security/cryptlib/Makefile (working copy) @@ -14,7 +14,10 @@ ONLY_FOR_ARCHS= i386 amd64 USE_ZIP= yes -EXTRACT_BEFORE_ARGS= -aq +EXTRACT_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip +EXTRACT_CMD= ${UNZIP_CMD} +EXTRACT_BEFORE_ARGS= -aqo +EXTRACT_AFTER_ARGS= NO_WRKSUBDIR= yes USE_GMAKE= yes MAKEFILE= makefile Index: www/phproxy/Makefile =================================================================== --- www/phproxy/Makefile (revision 317525) +++ www/phproxy/Makefile (working copy) @@ -1,6 +1,4 @@ -# New ports collection makefile for: eventum -# Date created: 2006-01-06 -# Whom: Babak Farrokhi +# Created by: Babak Farrokhi # # $FreeBSD$ # @@ -19,10 +17,13 @@ WANT_PHP_WEB= YES USE_ZIP= YES USE_PHP= ctype pcre -EXTRACT_AFTER_ARGS+= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} DOCFILES= ChangeLog.txt LICENSE.txt README.txt TODO.txt +pre-extract: + @${MKDIR} ${WRKSRC} + do-install: .if !defined(NOPORTDOCS) Index: games/dmjava/Makefile =================================================================== --- games/dmjava/Makefile (revision 317525) +++ games/dmjava/Makefile (working copy) @@ -13,13 +13,16 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= Dungeon Master Java is a remake of the classic Dungeon Master by FTL -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} USE_ZIP= yes USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes +pre-extract: + @${MKDIR} ${WRKSRC} + do-install: @${MKDIR} ${PREFIX}/${PORTNAME} @${CP} -r ${WRKSRC}/* ${PREFIX}/${PORTNAME} Index: security/cryptopp/Makefile =================================================================== --- security/cryptopp/Makefile (revision 317525) +++ security/cryptopp/Makefile (working copy) @@ -20,8 +20,8 @@ .include NO_WRKSUBDIR= yes -USE_ZIP= yes -EXTRACT_BEFORE_ARGS= -aq +USE_INFOZIP= yes +EXTRACT_BEFORE_ARGS= -aqo USE_GMAKE= yes MAKE_JOBS_SAFE= yes MAKEFILE= GNUmakefile Index: games/lwjgl/Makefile =================================================================== --- games/lwjgl/Makefile (revision 317525) +++ games/lwjgl/Makefile (working copy) @@ -20,7 +20,7 @@ ONLY_FOR_ARCHS= i386 amd64 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} USE_ZIP= yes USE_JAVA= yes @@ -52,6 +52,9 @@ PLIST_FILES+= lib/${PORTNAME}${PORTVERSION}/lib${PORTNAME}64.so .endif +pre-extract: + @${MKDIR} ${WRKSRC} + post-patch: @${REINPLACE_CMD} -e 's,PREFIX,${PREFIX},g' \ -e '/executable/s/gcc/${CC}/g' \ Index: www/webtrees/Makefile =================================================================== --- www/webtrees/Makefile (revision 317525) +++ www/webtrees/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: webtrees -# Date created: 2010 December 13 -# Whom: J.R. Oldroyd -# +# Created by: J.R. Oldroyd # $FreeBSD$ -# PORTNAME= webtrees PORTVERSION= 1.0.6 @@ -14,7 +10,7 @@ COMMENT= Online genealogy viewer WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -EXTRACT_AFTER_ARGS= -d ${WRKSRC} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} FETCH_ARGS= -pRr USE_ZIP= yes @@ -25,6 +21,9 @@ .include +pre-extract: + @${MKDIR} ${WRKSRC} + post-extract: @# remove files with mis-encoded filenames; these have been dropepd from @# the project's svn and will no longer be present in the 1.0.7 version Index: japanese/lsd-fpw/Makefile =================================================================== --- japanese/lsd-fpw/Makefile (revision 317525) +++ japanese/lsd-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: lsd - JIS X 4081 version -# Date created: 00/02/09 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= lsd-fpw PORTVERSION= 3.0.1 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Japanese - English Dictionary for Life Science (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/lsd EXTRACT_BEFORE_ARGS= -qL Index: games/pysycache-themes/Makefile =================================================================== --- games/pysycache-themes/Makefile (revision 317525) +++ games/pysycache-themes/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: pysycache-themes -# Date created: 2006-02-22 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= themes PORTVERSION= 2.0 @@ -132,7 +128,7 @@ do-extract: @${MKDIR} ${WRKSRC} .for OPT in ${HAVE_THEME} - @${UNZIP_CMD} -q ${_DISTDIR}/${OPT}-${PORTVERSION}.zip -d ${WRKSRC} + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${OPT}-${PORTVERSION}.zip -C ${WRKSRC} .endfor do-install: Index: japanese/devil-fpw/Makefile =================================================================== --- japanese/devil-fpw/Makefile (revision 317525) +++ japanese/devil-fpw/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Devil's Dictionary - JIS X 4081 version -# Date created: 2000.11.28 -# Whom: Satoshi Taoka -# +# Created by: Satoshi Taoka # $FreeBSD$ -# PORTNAME= devil-fpw PORTVERSION= 1.0.3 @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Devil's dictionary (EPWING V1 format) -USE_ZIP= yes +USE_INFOZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/devil EXTRACT_BEFORE_ARGS= -qL Index: games/rescue/Makefile =================================================================== --- games/rescue/Makefile (revision 317525) +++ games/rescue/Makefile (working copy) @@ -36,7 +36,7 @@ .include post-extract: - @(cd ${WRKSRC} && ${UNZIP_CMD} -j Rescue.jar rescue/gui/logo.png) + @(cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} Rescue.jar -q -s ",.*/,,g" rescue/gui/logo.png) do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin Index: print/acrobatviewer/Makefile =================================================================== --- print/acrobatviewer/Makefile (revision 317525) +++ print/acrobatviewer/Makefile (working copy) @@ -13,7 +13,7 @@ COMMENT= Viewer for the PDF files written in Java(TM) #XXX need info-unzip for archive.zip -USE_ZIP= yes +USE_INFOZIP= yes USE_JAVA= yes JAVA_VERSION= 1.6+ JAVA_EXTRACT= yes @@ -39,7 +39,7 @@ @${MKDIR} ${WRKSRC} && \ cd ${WRKSRC} && \ dd if=${DISTDIR}/viewer.bin of=archive.zip bs=${BLOCKSIZE} skip=${ARCHSTART} count=${ARCHBLOCKS} 2>/dev/null && \ - ${LOCALBASE}/bin/unzip -o -a -j -qq archive.zip + ${UNZIP_CMD} -o -a -j -qq archive.zip @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${DISTDIR}/MRJToolkitStubs.zip ${EXTRACT_AFTER_ARGS} Index: devel/tokamak/Makefile =================================================================== --- devel/tokamak/Makefile (revision 317525) +++ devel/tokamak/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: tokamak -# Date created: 24 Jun 2008 -# Whom: Dmitry Marakasov -# +# Created by: Dmitry Marakasov # $FreeBSD$ -# PORTNAME= tokamak PORTVERSION= 1.0.5a @@ -33,7 +29,7 @@ .endif post-extract: - @cd ${WRKSRC} && ${UNZIP_CMD} -q tokamak-premake.zip + @cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} tokamak-premake.zip post-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/include/tokamak.h Index: japanese/p5-PDFJ/Makefile =================================================================== --- japanese/p5-PDFJ/Makefile (revision 317525) +++ japanese/p5-PDFJ/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: p5-PDFJ -# Date created: Oct 22, 2002 -# Whom: kuriyama@FreeBSD.org -# +# Created by: kuriyama@FreeBSD.org # $FreeBSD$ -# PORTNAME= PDFJ PORTVERSION= 0.90 @@ -14,10 +10,10 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= PDFJ module provides methods to generate Japanese PDF file -USE_ZIP= YES +EXTRACT_BEFORE_ARGS= -aqo +USE_INFOZIP= YES PERL_CONFIGURE= YES WRKSRC= ${WRKDIR} -EXTRACT_BEFORE_ARGS= -qo -a .include Index: emulators/ods2reader/Makefile =================================================================== --- emulators/ods2reader/Makefile (revision 317525) +++ emulators/ods2reader/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ods2reader -# Date created: 21 Jan 2006 -# Whom: Jeffrey H. Johnson -# +# Created by: Jeffrey H. Johnson # $FreeBSD$ -# PORTNAME= ods2reader PORTVERSION= 19930601 @@ -17,8 +13,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Copies files from VMS Files-11 (ODS2) file systems -USE_ZIP= yes -EXTRACT_BEFORE_ARGS= -qoa +USE_INFOZIP= yes +EXTRACT_BEFORE_ARGS= -aqo NO_WRKSUBDIR= yes PLIST_FILES= bin/ods2reader Index: french/belote/Makefile =================================================================== --- french/belote/Makefile (revision 317525) +++ french/belote/Makefile (working copy) @@ -28,7 +28,7 @@ false post-extract: - @${UNZIP_CMD} -qo ${WRKSRC}/data.bin rsc/vp.gif -d ${WRKSRC} + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/data.bin -q -C ${WRKSRC} rsc/vp.gif do-install: ${INSTALL_SCRIPT} ${WRKDIR}/belote ${PREFIX}/bin Index: games/domination/Makefile =================================================================== --- games/domination/Makefile (revision 317525) +++ games/domination/Makefile (working copy) @@ -59,9 +59,10 @@ PLIST_SUB+= PORTDOCS="@comment " .endif -post-extract-script: +post-extract: + @${MKDIR} ${WRKSRC}/maps .for f in ${MAPS:S/$/.zip/} - @${UNZIP_CMD} -qo -d ${WRKSRC}/maps ${DISTDIR}/${DIST_SUBDIR}/${f} + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/${f} -C ${WRKSRC}/maps .endfor do-install: Index: astro/aa/Makefile =================================================================== --- astro/aa/Makefile (revision 317525) +++ astro/aa/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: aa -# Date created: 11 August 2006 -# Whom: Frank W. Josellis -# +# Created by: Frank W. Josellis # $FreeBSD$ -# PORTNAME= aa PORTVERSION= 56 @@ -15,10 +11,9 @@ MAINTAINER= frank@dynamical-systems.org COMMENT= Self-contained ephemeris calculator -EXTRACT_AFTER_ARGS= -d ${WRKSRC} EXTRACT_BEFORE_ARGS= -aqo -USE_ZIP= yes +USE_INFOZIP= yes MAKEFILE= makefile ALL_TARGET= aa Index: emulators/mess/Makefile =================================================================== --- emulators/mess/Makefile (revision 317525) +++ emulators/mess/Makefile (working copy) @@ -27,7 +27,7 @@ NO_WRKSUBDIR= yes -USE_ZIP= yes +USE_INFOZIP= yes USE_XORG= xext xi xinerama xrender USE_GL= gl USE_SDL= sdl ttf Index: games/quake2-ctf/Makefile =================================================================== --- games/quake2-ctf/Makefile (revision 317525) +++ games/quake2-ctf/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2-ctf -# Date created: 26 Jul 2006 -# Whom: alepulver -# +# Created by: alepulver # $FreeBSD$ -# PORTNAME= ctf PORTVERSION= 1.52 @@ -19,7 +15,7 @@ MAINTAINER= danfe@FreeBSD.org COMMENT= Quake II CTF (Capture The Flag) modification -USE_ZIP= yes +USE_INFOZIP= yes USE_DOS2UNIX= ../../../ctf/readme.txt ../../../ctf/server.cfg WRKSRC= ${WRKDIR}/${CTF_SRC:S/.tar.gz//}/src/ctf Index: math/jama/Makefile =================================================================== --- math/jama/Makefile (revision 317525) +++ math/jama/Makefile (working copy) @@ -1,9 +1,5 @@ -# Ports collection makefile for: jama -# Date created: May 15, 2003 -# Whom: Pedro F. Giffuni -# +# Created by: Pedro F. Giffuni # $FreeBSD$ -# PORTNAME= jama PORTVERSION= 1.2.5 @@ -28,11 +24,11 @@ do-install: ${MKDIR} ${PREFIX}/include/tnt - ${EXTRACT_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ + unzip ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ -d ${PREFIX}/include/tnt .ifndef NOPORTDOCS ${MKDIR} ${WRKDIR}/doc ${DOCSDIR} - ${EXTRACT_CMD} -o ${DISTDIR}/${DIST_SUBDIR}/jama102doc \ + unzip -o ${DISTDIR}/${DIST_SUBDIR}/jama102doc \ -d ${WRKDIR}/doc (cd ${WRKDIR}/doc/doxygen && ${COPYTREE_SHARE} \* ${DOCSDIR}) .endif Index: x11/gpctool/Makefile =================================================================== --- x11/gpctool/Makefile (revision 317525) +++ x11/gpctool/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gpc -# Date created: 22 October 2005 -# Whom: Mikhail Teterin -# +# Created by: Mikhail Teterin # $FreeBSD$ -# PORTNAME= gpctool PORTVERSION= 1.0.1 @@ -18,7 +14,7 @@ LIB_DEPENDS= gpc:${PORTSDIR}/devel/libgpc \ formsGL.2:${PORTSDIR}/x11-toolkits/xforms -USE_ZIP= yes +USE_INFOZIP= yes USE_GL= yes PLIST_FILES= bin/gpctool USE_LDCONFIG= yes Index: games/smashbattle/Makefile =================================================================== --- games/smashbattle/Makefile (revision 317525) +++ games/smashbattle/Makefile (working copy) @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/battle/Battle USE_ZIP= yes -EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} +EXTRACT_AFTER_ARGS= -C ${WRKDIR}/${DISTNAME} USE_GMAKE= yes USE_DOS2UNIX= *.cpp *.h *.ini Makefile ALL_TARGET= battle Index: security/quantis/Makefile =================================================================== --- security/quantis/Makefile (revision 317525) +++ security/quantis/Makefile (working copy) @@ -27,7 +27,7 @@ TOOL_DESC= Build EasyQuantis application GUI_DESC= Build QT4 GUI for EasyQuantis application -USE_ZIP= yes +USE_INFOZIP= yes EXTRACT_BEFORE_ARGS= -aqo USES= cmake USE_QT4= # empty but required @@ -42,10 +42,6 @@ .include -.if ${OSVERSION} < 700000 -IGNORE= requires FreeBSD >= 7 -.endif - .if ${PORT_OPTIONS:MPCI} RUN_DEPENDS+= ${KMODDIR}/quantis.ko:${PORTSDIR}/security/quantis-kmod .else Index: games/rescue/Makefile =================================================================== --- games/rescue/Makefile (revision 317525) +++ games/rescue/Makefile (working copy) @@ -36,7 +36,7 @@ .include post-extract: - @(cd ${WRKSRC} && ${UNZIP_CMD} -j Rescue.jar rescue/gui/logo.png) + @(cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} Rescue.jar -q -s ",.*/,,g" rescue/gui/logo.png) do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin Index: audio/linux-mbrola/Makefile =================================================================== --- audio/linux-mbrola/Makefile (revision 317525) +++ audio/linux-mbrola/Makefile (working copy) @@ -30,10 +30,10 @@ PLIST_FILES+= share/doc/mbrola/readme.txt .endif -do-extract: +EXTRACT_AFTER_ARGS= -C ${WRKSRC} + +pre-extract: @${MKDIR} ${WRKSRC} - @${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.zip -d ${WRKSRC} do-install: @${INSTALL_PROGRAM} ${WRKSRC}/mbrola-linux-i386 ${PREFIX}/bin/mbrola Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk (revision 317525) +++ Mk/bsd.port.mk (working copy) @@ -1370,7 +1370,7 @@ EXTRACT_SUFX?= .tar.bz2 .elif defined(USE_LHA) EXTRACT_SUFX?= .lzh -.elif defined(USE_ZIP) +.elif defined(USE_ZIP) || defined(USE_INFOZIP) EXTRACT_SUFX?= .zip .elif defined(USE_XZ) EXTRACT_SUFX?= .tar.xz @@ -1679,8 +1679,8 @@ .if defined(USE_LHA) EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha .endif -.if defined(USE_ZIP) -EXTRACT_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip +.if defined(USE_INFOZIP) +EXTRACT_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip .endif .if defined(USE_XZ) && ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 ) EXTRACT_DEPENDS+= ${LOCALBASE}/bin/xz:${PORTSDIR}/archivers/xz @@ -2286,10 +2286,10 @@ EXTRACT_CMD?= ${LHA_CMD} EXTRACT_BEFORE_ARGS?= xfqw=${WRKDIR} EXTRACT_AFTER_ARGS?= -.elif defined(USE_ZIP) -EXTRACT_CMD?= ${UNZIP_CMD} -EXTRACT_BEFORE_ARGS?= -qo -EXTRACT_AFTER_ARGS?= -d ${WRKDIR} +.elif defined(USE_INFOZIP) +EXTRACT_CMD?= ${UNZIP_CMD} +EXTRACT_BEFORE_ARGS?= -qo +EXTRACT_AFTER_ARGS?= -d ${WRKDIR} .elif defined(USE_MAKESELF) EXTRACT_CMD?= ${UNMAKESELF_CMD} EXTRACT_BEFORE_ARGS?= @@ -3557,7 +3557,6 @@ .if !target(do-extract) do-extract: - @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} @for file in ${EXTRACT_ONLY}; do \ if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\