Index: archivers/qpress/Makefile =================================================================== --- archivers/qpress/Makefile (revision 354886) +++ archivers/qpress/Makefile (working copy) @@ -12,7 +12,7 @@ LICENSE= GPLv2 -USES= dos2unix zip:infozip +USES= dos2unix zip EXTRACT_AFTER_ARGS= -d ${WRKSRC} PLIST_FILES= bin/qpress Index: audio/squeezeboxserver-dynamicplaylist/Makefile =================================================================== --- audio/squeezeboxserver-dynamicplaylist/Makefile (revision 354886) +++ audio/squeezeboxserver-dynamicplaylist/Makefile (working copy) @@ -16,7 +16,7 @@ RUN_DEPENDS= softsqueeze:${PORTSDIR}/audio/squeezeboxserver FETCH_BEFORE_ARGS= -o ${DISTFILES} -USES= zip:infozip +USES= zip NO_WRKSUBDIR= yes NO_BUILD= yes NO_ARCH= yes Index: audio/squeezeboxserver-sqlplaylist/Makefile =================================================================== --- audio/squeezeboxserver-sqlplaylist/Makefile (revision 354886) +++ audio/squeezeboxserver-sqlplaylist/Makefile (working copy) @@ -17,7 +17,7 @@ ${LOCALBASE}/${SLIMDIR}/Plugins/DynamicPlayList/install.xml:${PORTSDIR}/audio/squeezeboxserver-dynamicplaylist FETCH_BEFORE_ARGS= -o ${DISTFILES} -USES= zip:infozip +USES= zip NO_WRKSUBDIR= yes NO_BUILD= yes NO_ARCH= yes Index: audio/squeezeboxserver-trackstat/Makefile =================================================================== --- audio/squeezeboxserver-trackstat/Makefile (revision 354886) +++ audio/squeezeboxserver-trackstat/Makefile (working copy) @@ -16,7 +16,7 @@ RUN_DEPENDS= softsqueeze:${PORTSDIR}/audio/squeezeboxserver FETCH_BEFORE_ARGS= -o ${DISTFILES} -USES= zip:infozip +USES= zip NO_WRKSUBDIR= yes NO_BUILD= yes NO_ARCH= yes Index: deskutils/fengoffice/Makefile =================================================================== --- deskutils/fengoffice/Makefile (revision 354886) +++ deskutils/fengoffice/Makefile (working copy) @@ -10,7 +10,7 @@ MAINTAINER= acm@FreeBSD.org COMMENT= An open source web-based collaboration software -USES= zip:infozip +USES= zip NO_BUILD= yes USE_PHP= mysql gd simplexml DEFAULT_PHP_VER=5 Index: devel/jgoodies-common/Makefile =================================================================== --- devel/jgoodies-common/Makefile (revision 354886) +++ devel/jgoodies-common/Makefile (working copy) @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit -USES= dos2unix zip:infozip +USES= dos2unix zip USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ANT= yes Index: devel/tnt/Makefile =================================================================== --- devel/tnt/Makefile (revision 354886) +++ devel/tnt/Makefile (working copy) @@ -13,7 +13,7 @@ MAINTAINER= erik@bz.bzflag.bz COMMENT= Template Numerical Toolkit -USES= zip:infozip +USES= zip NO_BUILD= yes OPTIONS_DEFINE= DOCS @@ -24,7 +24,7 @@ ${MKDIR} ${STAGEDIR}${PREFIX}/include/tnt ${INSTALL_DATA} ${WRKDIR}/*.h ${STAGEDIR}${PREFIX}/include/tnt ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${EXTRACT_CMD} ${DISTDIR}/${DIST_SUBDIR}/tnt120doc \ + ${EXTRACT_CMD} ${DISTDIR}/${DIST_SUBDIR}/tnt120doc.zip \ -d ${STAGEDIR}${DOCSDIR} .include Index: editors/uemacs/Makefile =================================================================== --- editors/uemacs/Makefile (revision 354886) +++ editors/uemacs/Makefile (working copy) @@ -14,8 +14,8 @@ NO_STAGE= yes NO_WRKSUBDIR= yes -USES= zip:infozip -EXTRACT_BEFORE_ARGS= -Laq +USES= dos2unix zip +EXTRACT_BEFORE_ARGS= -Lq post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/*.c Index: games/daimonin-music/Makefile =================================================================== --- games/daimonin-music/Makefile (revision 354886) +++ games/daimonin-music/Makefile (working copy) @@ -11,15 +11,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Music for daimonin client -NO_BUILD= true -USES= zip:infozip +NO_BUILD= yes +USES= zip MYDATADIR= ${PREFIX}/share/daimonin -EXTRACT_BEFORE_ARGS= -aqo - do-install: - ${MKDIR} ${STAGEDIR}${MYDATADIR} - cd ${WRKDIR} && ${COPYTREE_SHARE} media ${STAGEDIR}${MYDATADIR}/ + @${MKDIR} ${STAGEDIR}${MYDATADIR} + (cd ${WRKDIR} && ${COPYTREE_SHARE} media ${STAGEDIR}${MYDATADIR}/) .include Index: games/dmjava/Makefile =================================================================== --- games/dmjava/Makefile (revision 354886) +++ games/dmjava/Makefile (working copy) @@ -15,7 +15,7 @@ EXTRACT_AFTER_ARGS= -d ${WRKSRC} -USES= zip:infozip +USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes Index: games/doom-data/Makefile.include =================================================================== --- games/doom-data/Makefile.include (revision 355276) +++ games/doom-data/Makefile.include (working copy) @@ -14,15 +14,3 @@ .if ${PORTNAME} != "data" RUN_DEPENDS+= ${DMDIR}:${PORTSDIR}/games/doom-data .endif - -.if defined(USE_CRLF) -. 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 Index: games/doom-freedoom/Makefile =================================================================== --- games/doom-freedoom/Makefile (revision 354886) +++ games/doom-freedoom/Makefile (working copy) @@ -12,7 +12,7 @@ MAINTAINER= dhn@FreeBSD.org COMMENT= Complete Doom-based game IWAD that is Free Software -USES= zip:infozip +USES= zip NO_BUILD= yes DATADIR= ${DMDIR}/${PORTNAME} Index: games/doom-hr/Makefile =================================================================== --- games/doom-hr/Makefile (revision 354886) +++ games/doom-hr/Makefile (working copy) @@ -17,9 +17,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Hell Revealed is a megawad, a 32-level replacement for DooM II -USES= zip:infozip +USES= zip NO_BUILD= yes NO_WRKSUBDIR= yes +EXTRACT_BEFORE_ARGS= -Lqo OPTIONS_DEFINE= DEMO_NM DEMO_UV DOCS OPTIONS_DEFAULT= DEMO_NM DEMO_UV Index: games/doom-hr/scripts/lowercase.sh =================================================================== --- games/doom-hr/scripts/lowercase.sh (revision 354886) +++ games/doom-hr/scripts/lowercase.sh (working copy) @@ -1,8 +0,0 @@ -#!/bin/sh - -for x in *; do - y=`echo $x | tr '[A-Z]' '[a-z]'` - if [ $x != $y ]; then - mv $x $y - fi -done Index: games/flightgear-aircraft/Makefile =================================================================== --- games/flightgear-aircraft/Makefile (revision 354886) +++ games/flightgear-aircraft/Makefile (working copy) @@ -58,7 +58,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data NO_BUILD= yes -USES= zip:infozip +USES= zip WRKSRC= ${WRKDIR}/fgaircraft EXTRACT_AFTER_ARGS= -d ${WRKSRC} DATADIR= ${PREFIX}/share/flightgear/Aircraft Index: games/flightgear-mb339-pan/Makefile =================================================================== --- games/flightgear-mb339-pan/Makefile (revision 354886) +++ games/flightgear-mb339-pan/Makefile (working copy) @@ -16,7 +16,7 @@ RESTRICTED= Redistribution prohibited NO_BUILD= yes -USES= zip:infozip +USES= zip WRKSRC= ${WRKDIR}/${PORTNAME} EXTRACT_AFTER_ARGS= -d ${WRKSRC} DATADIR= ${PREFIX}/share/flightgear/Aircraft Index: games/freedoko/Makefile =================================================================== --- games/freedoko/Makefile (revision 354886) +++ games/freedoko/Makefile (working copy) @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/\.src$//}/src -USES= gmake pkgconfig zip:infozip +USES= gmake pkgconfig zip USE_GNOME= gtkmm24 MAKE_ENV= OS="${OPSYS}" DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" Index: games/glest/Makefile =================================================================== --- games/glest/Makefile (revision 354886) +++ games/glest/Makefile (working copy) @@ -17,7 +17,7 @@ BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam RUN_DEPENDS= ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data -USES= dos2unix openal:al,alut pkgconfig zip:infozip +USES= dos2unix openal:al,alut pkgconfig zip USE_AUTOTOOLS= automake:env autoconf:env USE_LUA= 5.1 USE_SDL= yes Index: games/hlstatsx/Makefile =================================================================== --- games/hlstatsx/Makefile (revision 354886) +++ games/hlstatsx/Makefile (working copy) @@ -13,7 +13,7 @@ NO_BUILD= yes USE_APACHE_RUN= 22+ USE_PHP= gd mysql -USES= perl5 zip:infozip +USES= perl5 zip USE_PERL5= run WRKSRC= ${WRKDIR}/${PORTNAME} Index: games/lwjgl/Makefile =================================================================== --- games/lwjgl/Makefile (revision 354886) +++ games/lwjgl/Makefile (working copy) @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} EXTRACT_AFTER_ARGS= -d ${WRKSRC} -USES= dos2unix zip:infozip +USES= dos2unix zip DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$ USE_JAVA= yes USE_LDCONFIG= yes Index: games/megamario/Makefile =================================================================== --- games/megamario/Makefile (revision 354886) +++ games/megamario/Makefile (working copy) @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} EXTRACT_AFTER_ARGS= -d ${WRKSRC} -USES= dos2unix gmake zip:infozip +USES= dos2unix gmake zip DOS2UNIX_GLOB= *.cpp *.h *.ini Makefile* *.txt *.desktop USE_SDL= sdl image mixer ttf USE_GL= glu Index: games/openjazz/Makefile =================================================================== --- games/openjazz/Makefile (revision 354886) +++ games/openjazz/Makefile (working copy) @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} EXTRACT_AFTER_ARGS= -d ${WRKSRC} -USES= dos2unix gmake zip:infozip +USES= dos2unix gmake zip DOS2UNIX_REGEX= .*\.(h|cpp) ALL_TARGET= OpenJazz USE_XORG= x11 xext xrandr xrender xau xdmcp Index: games/pykawari/Makefile =================================================================== --- games/pykawari/Makefile (revision 354886) +++ games/pykawari/Makefile (working copy) @@ -9,18 +9,16 @@ DISTNAME= kawari-${PORTVERSION:S/.//g} MAINTAINER= umeno@rr.iij4u.or.jp -COMMENT= A real kawari8 module for ninix-aya +COMMENT= Real kawari8 module for ninix-aya -EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip RUN_DEPENDS= ninix:${PORTSDIR}/games/ninix-aya -EXTRACT_CMD= ${UNZIP_CMD} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= # empty PLIST_SUB= LOCALBASE=${LOCALBASE} -USES= gmake zip:infozip +USES= gmake zip USE_PYTHON= yes WRKSRC= ${WRKDIR}/kawari-${PORTVERSION:S/.//g} Index: games/smashbattle/Makefile =================================================================== --- games/smashbattle/Makefile (revision 354886) +++ games/smashbattle/Makefile (working copy) @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/battle/Battle EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} -USES= dos2unix gmake zip:infozip +USES= dos2unix gmake zip DOS2UNIX_FILES= *.cpp *.h Makefile USE_SDL= sdl image mixer ALL_TARGET= battle Index: graphics/aoi/Makefile =================================================================== --- graphics/aoi/Makefile (revision 354886) +++ graphics/aoi/Makefile (working copy) @@ -18,8 +18,8 @@ LIB_DEPENDS= libjogl.so:${PORTSDIR}/graphics/jogl RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper -USES= zip:infozip -EXTRACT_BEFORE_ARGS= -a -q +USES= dos2unix zip +DOS2UNIX_FILES= ../AoI_Manual/*.html USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes Index: graphics/cbviewer/Makefile =================================================================== --- graphics/cbviewer/Makefile (revision 354886) +++ graphics/cbviewer/Makefile (working copy) @@ -17,10 +17,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar \ - unzip:${PORTSDIR}/archivers/unzip +RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar -USES= dos2unix zip:infozip +USES= dos2unix zip DOS2UNIX_GLOB= CREDITS USE_JAVA= yes JAVA_VERSION= 1.6+ Index: graphics/libecwj2/Makefile =================================================================== --- graphics/libecwj2/Makefile (revision 354886) +++ graphics/libecwj2/Makefile (working copy) @@ -18,7 +18,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes -USES= gmake zip:infozip +USES= gmake zip post-extract: cd ${WRKDIR} && \ Index: japanese/ASCIIdates98-fpw/Makefile =================================================================== --- japanese/ASCIIdates98-fpw/Makefile (revision 354886) +++ japanese/ASCIIdates98-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Japanese dictionary for PC terms in '98 ASCII Dates Book (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/ascdates EXTRACT_BEFORE_ARGS= -qL Index: japanese/CGdic-fpw/Makefile =================================================================== --- japanese/CGdic-fpw/Makefile (revision 354886) +++ japanese/CGdic-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Japanese dictionary for CG (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/cg EXTRACT_BEFORE_ARGS= -qL Index: japanese/another-htmllint/Makefile =================================================================== --- japanese/another-htmllint/Makefile (revision 354886) +++ japanese/another-htmllint/Makefile (working copy) @@ -11,9 +11,9 @@ RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode -USES= perl5 zip:infozip +USES= dos2unix perl5 zip WRKSRC= ${WRKDIR} -EXTRACT_BEFORE_ARGS= -a -q +DOS2UNIX_FILES= readme.txt DIR= ${PREFIX}/share/htmllint PM= htmllint.pm RFC2396.pm htmllint.env Index: japanese/bible_names-fpw/Makefile =================================================================== --- japanese/bible_names-fpw/Makefile (revision 354886) +++ japanese/bible_names-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Dictionary for HITCHCOCK'S BIBLE NAMES (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/biblenam EXTRACT_BEFORE_ARGS= -qL Index: japanese/devil-fpw/Makefile =================================================================== --- japanese/devil-fpw/Makefile (revision 354886) +++ japanese/devil-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Devil's dictionary (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/devil EXTRACT_BEFORE_ARGS= -qL Index: japanese/ebd-fpw/Makefile =================================================================== --- japanese/ebd-fpw/Makefile (revision 354886) +++ japanese/ebd-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Easton's 1897 Bible Dictionary (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/ebd EXTRACT_BEFORE_ARGS= -qL Index: japanese/edict-fpw/Makefile =================================================================== --- japanese/edict-fpw/Makefile (revision 354886) +++ japanese/edict-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Japanese <-> English Dictionary (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/edict EXTRACT_BEFORE_ARGS= -qL Index: japanese/flower-fpw/Makefile =================================================================== --- japanese/flower-fpw/Makefile (revision 354886) +++ japanese/flower-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Dictionary for flowers (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/flower EXTRACT_BEFORE_ARGS= -qL Index: japanese/foldoc-fpw/Makefile =================================================================== --- japanese/foldoc-fpw/Makefile (revision 354886) +++ japanese/foldoc-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Free On-line Dictionary of Computing (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/foldoc EXTRACT_BEFORE_ARGS= -qL Index: japanese/font-ipa-uigothic/Makefile =================================================================== --- japanese/font-ipa-uigothic/Makefile (revision 354886) +++ japanese/font-ipa-uigothic/Makefile (working copy) @@ -16,7 +16,7 @@ CONFLICTS= ja-font-mplus-ipa-1.0.20060520.p1 \ ja-ipa-ttfonts-[0-9]* -USES= zip:infozip +USES= zip NO_BUILD= yes PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install Index: japanese/fumeikai-fpw/Makefile =================================================================== --- japanese/fumeikai-fpw/Makefile (revision 354886) +++ japanese/fumeikai-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Abbreviation (alphabet-->Japanese) dictionary (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/fumeikai EXTRACT_BEFORE_ARGS= -qL Index: japanese/jargon-fpw/Makefile =================================================================== --- japanese/jargon-fpw/Makefile (revision 354886) +++ japanese/jargon-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The famous jargon file (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/jargon EXTRACT_BEFORE_ARGS= -qL Index: japanese/lsd-fpw/Makefile =================================================================== --- japanese/lsd-fpw/Makefile (revision 354886) +++ japanese/lsd-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Japanese - English Dictionary for Life Science (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/lsd EXTRACT_BEFORE_ARGS= -qL Index: japanese/pejv-fpw/Makefile =================================================================== --- japanese/pejv-fpw/Makefile (revision 354886) +++ japanese/pejv-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Esperanto-Japanese dictionary (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/pejv EXTRACT_BEFORE_ARGS= -qL Index: japanese/roget-fpw/Makefile =================================================================== --- japanese/roget-fpw/Makefile (revision 354886) +++ japanese/roget-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Roget's Thesaurus (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/roget EXTRACT_BEFORE_ARGS= -qL Index: japanese/ryaku-fpw/Makefile =================================================================== --- japanese/ryaku-fpw/Makefile (revision 354886) +++ japanese/ryaku-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Abbreviation (alphabet-->Japanese) dictionary (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/ryaku EXTRACT_BEFORE_ARGS= -qL Index: japanese/vera-fpw/Makefile =================================================================== --- japanese/vera-fpw/Makefile (revision 354886) +++ japanese/vera-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Virtual Entity of Relevant Aconyms (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/vera EXTRACT_BEFORE_ARGS= -qL Index: japanese/wdic-fpw/Makefile =================================================================== --- japanese/wdic-fpw/Makefile (revision 354886) +++ japanese/wdic-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Wired and Wireless Dictionary in Japanese (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/wdic EXTRACT_BEFORE_ARGS= -qL Index: japanese/web1913-fpw/Makefile =================================================================== --- japanese/web1913-fpw/Makefile (revision 354886) +++ japanese/web1913-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Webster's Revised Unabridged Dictionary (1913) (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/web EXTRACT_BEFORE_ARGS= -qL Index: japanese/wordnet-fpw/Makefile =================================================================== --- japanese/wordnet-fpw/Makefile (revision 354886) +++ japanese/wordnet-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= English - English Dictionary (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/wordnet EXTRACT_BEFORE_ARGS= -qL Index: japanese/wwasw-fpw/Makefile =================================================================== --- japanese/wwasw-fpw/Makefile (revision 354886) +++ japanese/wwasw-fpw/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Biographical dictionary (EPWING V1 format) -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/wwasw EXTRACT_BEFORE_ARGS= -qL Index: japanese/yasou-fpw/Makefile =================================================================== --- japanese/yasou-fpw/Makefile (revision 354886) +++ 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 -USES= zip:infozip +USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/yasou EXTRACT_BEFORE_ARGS= -qL Index: mail/assp/Makefile =================================================================== --- mail/assp/Makefile (revision 354886) +++ mail/assp/Makefile (working copy) @@ -11,7 +11,7 @@ MAINTAINER= rnejdl@ringofsaturn.com COMMENT= Anti-Spam SMTP Proxy -USES= perl5 zip:infozip +USES= perl5 zip NO_BUILD= yes USE_PERL5= run Index: mail/ftrack/Makefile =================================================================== --- mail/ftrack/Makefile (revision 354886) +++ mail/ftrack/Makefile (working copy) @@ -17,7 +17,7 @@ LIB_DEPENDS= smapi.2:${PORTSDIR}/news/husky-smapi -USES= perl5 gmake zip:infozip +USES= perl5 gmake zip ALL_TARGET= ftrack MAKEFILE= ${WRKSRC}/MakeFiles/FreeBSD/Makefile EXTRACT_AFTER_ARGS= -d ${WRKSRC} Index: mail/thunderbird-i18n/Makefile =================================================================== --- mail/thunderbird-i18n/Makefile (revision 354886) +++ mail/thunderbird-i18n/Makefile (working copy) @@ -14,7 +14,7 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USES= zip:infozip gecko:thunderbird +USES= gecko:thunderbird zip USE_XPI= thunderbird NO_BUILD= yes Index: math/jama/Makefile =================================================================== --- math/jama/Makefile (revision 354886) +++ math/jama/Makefile (working copy) @@ -19,7 +19,7 @@ unzip:${PORTSDIR}/archivers/unzip RUN_DEPENDS= ${LOCALBASE}/include/tnt/tnt.h:${PORTSDIR}/devel/tnt -USES= zip:infozip +USES= zip NO_BUILD= yes do-install: Index: math/miracl/Makefile =================================================================== --- math/miracl/Makefile (revision 354886) +++ math/miracl/Makefile (working copy) @@ -24,10 +24,10 @@ ONLY_FOR_ARCHS= i386 amd64 -USES= zip:infozip +USES= zip USE_LDCONFIG= yes -EXTRACT_BEFORE_ARGS= -j -aa -L -q +EXTRACT_BEFORE_ARGS= -j -L -q EXTRACT_AFTER_ARGS= -d ${WRKSRC} PLIST_FILES= lib/libmiracl.a \ Index: net/wizd/Makefile =================================================================== --- net/wizd/Makefile (revision 354886) +++ net/wizd/Makefile (working copy) @@ -18,7 +18,7 @@ DOS2UNIX_FILES= Makefile nkfwrap/Makefile nkfwrap/nkfwrap_test.c \ wizd_http.c wizd_menu.c USE_RC_SUBR= wizd -USES= dos2unix zip:infozip +USES= dos2unix zip EXTRACT_AFTER_ARGS= -d ${WRKSRC} post-patch: Index: net-im/mercury/Makefile =================================================================== --- net-im/mercury/Makefile (revision 354886) +++ net-im/mercury/Makefile (working copy) @@ -24,7 +24,7 @@ RCVER= rc8a -USES= zip:infozip +USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes Index: vietnamese/unicode-uhoai/Makefile =================================================================== --- vietnamese/unicode-uhoai/Makefile (revision 354886) +++ vietnamese/unicode-uhoai/Makefile (working copy) @@ -13,9 +13,10 @@ MAINTAINER= obrien@FreeBSD.org COMMENT= Unicode TrueType Font with UHoai Vietnamese encoding -USES= zip:infozip +USES= zip NO_WRKSUBDIR= yes NO_BUILD= taken care of in do-install target +EXTRACT_BEFORE_ARGS= -qo -L BUILD_DEPENDS= ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir \ bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf @@ -30,5 +31,3 @@ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include - -EXTRACT_BEFORE_ARGS+= -L Index: vietnamese/vis2u/Makefile =================================================================== --- vietnamese/vis2u/Makefile (revision 354886) +++ vietnamese/vis2u/Makefile (working copy) @@ -11,8 +11,9 @@ MAINTAINER= obrien@FreeBSD.org COMMENT= VISCII->Unicode conversion -USES= zip:infozip +USES= zip NO_WRKSUBDIR= yes +EXTRACT_BEFORE_ARGS= -qo -L do-build: cd ${WRKSRC} ; make vis2u @@ -21,5 +22,3 @@ ${INSTALL_PROGRAM} ${WRKSRC}/vis2u ${STAGEDIR}${PREFIX}/bin .include - -EXTRACT_BEFORE_ARGS+= -L Index: www/firefox-esr-i18n/Makefile =================================================================== --- www/firefox-esr-i18n/Makefile (revision 354886) +++ www/firefox-esr-i18n/Makefile (working copy) @@ -15,7 +15,7 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USES= zip:infozip gecko:firefox +USES= gecko:firefox zip USE_XPI= firefox NO_ARCH= yes Index: www/firefox-i18n/Makefile =================================================================== --- www/firefox-i18n/Makefile (revision 354886) +++ www/firefox-i18n/Makefile (working copy) @@ -14,7 +14,7 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USES= zip:infozip gecko:firefox,29 +USES= gecko:firefox,29 zip USE_XPI= firefox linux-firefox NO_ARCH= yes Index: www/phpgedview/Makefile =================================================================== --- www/phpgedview/Makefile (revision 354886) +++ www/phpgedview/Makefile (working copy) @@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} EXTRACT_AFTER_ARGS= -d ${WRKSRC} -USES= zip:infozip +USES= zip USE_PHP= calendar dom gd pcre session xml NO_BUILD= yes Index: www/phproxy/Makefile =================================================================== --- www/phproxy/Makefile (revision 354886) +++ www/phproxy/Makefile (working copy) @@ -13,7 +13,7 @@ NO_BUILD= YES WANT_PHP_WEB= YES -USES= zip:infozip +USES= zip USE_PHP= ctype pcre EXTRACT_AFTER_ARGS+= -d ${WRKSRC} Index: www/seamonkey-i18n/Makefile =================================================================== --- www/seamonkey-i18n/Makefile (revision 354886) +++ www/seamonkey-i18n/Makefile (working copy) @@ -14,7 +14,7 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USES= zip:infozip gecko:seamonkey +USES= gecko:seamonkey zip USE_XPI= seamonkey linux-seamonkey NO_ARCH= yes Index: www/webtrees/Makefile =================================================================== --- www/webtrees/Makefile (revision 354886) +++ www/webtrees/Makefile (working copy) @@ -12,7 +12,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} EXTRACT_AFTER_ARGS= -d ${WRKSRC} -USES= zip:infozip +USES= zip USE_PHP= calendar dom gd pcre session xml pdo_mysql NO_BUILD= yes Index: www/yourls/Makefile =================================================================== --- www/yourls/Makefile (revision 354886) +++ www/yourls/Makefile (working copy) @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} EXTRACT_AFTER_ARGS= -d ${WRKSRC} -USES= zip:infozip +USES= zip NO_BUILD= YES USE_PHP= bcmath curl json mysql pcre xml Index: x11-fonts/roboto-fonts-ttf/Makefile =================================================================== --- x11-fonts/roboto-fonts-ttf/Makefile (revision 354886) +++ x11-fonts/roboto-fonts-ttf/Makefile (working copy) @@ -18,7 +18,7 @@ fc-cache:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig -USES= zip:infozip +USES= zip WRKSRC= ${WRKDIR}/Roboto_v${PORTVERSION} FONTDIR= lib/X11/fonts/Roboto Index: x11-themes/gnome-icons-elementary/Makefile =================================================================== --- x11-themes/gnome-icons-elementary/Makefile (revision 354886) +++ x11-themes/gnome-icons-elementary/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= GPLv2 -USES= zip:infozip +USES= zip EXTRACT_AFTER_ARGS?= -d ${WRKDIR} -x 'elementary/.bzrignore' .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"