diff options
56 files changed, 65 insertions, 97 deletions
diff --git a/archivers/qpress/Makefile b/archivers/qpress/Makefile index 14962ce4ad2c..f958c739fa80 100644 --- a/archivers/qpress/Makefile +++ b/archivers/qpress/Makefile @@ -12,7 +12,7 @@ COMMENT= Portable file archiver using QuickLZ LICENSE= GPLv2 -USES= dos2unix zip:infozip +USES= dos2unix zip EXTRACT_AFTER_ARGS= -d ${WRKSRC} PLIST_FILES= bin/qpress diff --git a/audio/squeezeboxserver-dynamicplaylist/Makefile b/audio/squeezeboxserver-dynamicplaylist/Makefile index e2397429736f..b62b3d8fe31a 100644 --- a/audio/squeezeboxserver-dynamicplaylist/Makefile +++ b/audio/squeezeboxserver-dynamicplaylist/Makefile @@ -16,7 +16,7 @@ COMMENT= Squeezebox Server plugin to create dynamic playlists 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 diff --git a/audio/squeezeboxserver-sqlplaylist/Makefile b/audio/squeezeboxserver-sqlplaylist/Makefile index 57827c6e828e..49af4b2b009f 100644 --- a/audio/squeezeboxserver-sqlplaylist/Makefile +++ b/audio/squeezeboxserver-sqlplaylist/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= softsqueeze:${PORTSDIR}/audio/squeezeboxserver \ ${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 diff --git a/audio/squeezeboxserver-trackstat/Makefile b/audio/squeezeboxserver-trackstat/Makefile index 96fb075a0e81..c3d04ef01e37 100644 --- a/audio/squeezeboxserver-trackstat/Makefile +++ b/audio/squeezeboxserver-trackstat/Makefile @@ -16,7 +16,7 @@ COMMENT= Squeezebox Server plugin to store ratings and statistics about songs 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 diff --git a/deskutils/fengoffice/Makefile b/deskutils/fengoffice/Makefile index f6972ad1cf72..3b2b18b4da95 100644 --- a/deskutils/fengoffice/Makefile +++ b/deskutils/fengoffice/Makefile @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} 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 diff --git a/devel/jgoodies-common/Makefile b/devel/jgoodies-common/Makefile index 865a78f8f450..814093deb05b 100644 --- a/devel/jgoodies-common/Makefile +++ b/devel/jgoodies-common/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt 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 diff --git a/devel/tnt/Makefile b/devel/tnt/Makefile index b78534382ddd..d61302c240ee 100644 --- a/devel/tnt/Makefile +++ b/devel/tnt/Makefile @@ -13,7 +13,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= erik@bz.bzflag.bz COMMENT= Template Numerical Toolkit -USES= zip:infozip +USES= zip NO_BUILD= yes OPTIONS_DEFINE= DOCS @@ -24,7 +24,7 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/tnt ${INSTALL_DATA} ${WRKDIR}/*.h ${STAGEDIR}${PREFIX}/include/tnt ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${UNZIP_CMD} ${DISTDIR}/${DIST_SUBDIR}/tnt120doc \ + ${UNZIP_CMD} ${DISTDIR}/${DIST_SUBDIR}/tnt120doc.zip \ -d ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile index 7c5ba33210b4..2f32edcd8300 100644 --- a/editors/uemacs/Makefile +++ b/editors/uemacs/Makefile @@ -13,8 +13,8 @@ COMMENT= Full screen editor NO_CDROM= Resale allowed for media cost only 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 diff --git a/games/daimonin-music/Makefile b/games/daimonin-music/Makefile index 45452d136c05..af7c07e281ef 100644 --- a/games/daimonin-music/Makefile +++ b/games/daimonin-music/Makefile @@ -12,20 +12,18 @@ DIST_SUBDIR= daimonin MAINTAINER= ports@FreeBSD.org COMMENT= Music for daimonin client -NO_BUILD= true -USES= zip:infozip +NO_BUILD= yes +USES= zip NO_ARCH= yes MYDATADIR= ${PREFIX}/share/daimonin -EXTRACT_BEFORE_ARGS= -aqo - post-extract: @${MV} ${WRKDIR}/media/media.txt ${WRKDIR}/media/media-music.txt @${RM} -f ${WRKDIR}/media/orchestral.ogg do-install: - ${MKDIR} ${STAGEDIR}${MYDATADIR} - cd ${WRKDIR} && ${COPYTREE_SHARE} media ${STAGEDIR}${MYDATADIR}/ + @${MKDIR} ${STAGEDIR}${MYDATADIR} + (cd ${WRKDIR} && ${COPYTREE_SHARE} media ${STAGEDIR}${MYDATADIR}/) .include <bsd.port.mk> diff --git a/games/dmjava/Makefile b/games/dmjava/Makefile index 198083319cd3..cc475d147272 100644 --- a/games/dmjava/Makefile +++ b/games/dmjava/Makefile @@ -15,7 +15,7 @@ COMMENT= Dungeon Master Java is a remake of the classic Dungeon Master by FTL EXTRACT_AFTER_ARGS= -d ${WRKSRC} -USES= zip:infozip +USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes diff --git a/games/doom-data/Makefile.include b/games/doom-data/Makefile.include index 5a14b1879f5e..94aaa17126fa 100644 --- a/games/doom-data/Makefile.include +++ b/games/doom-data/Makefile.include @@ -14,15 +14,3 @@ SUB_LIST+= DMDIR="${DMDIR}" .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 diff --git a/games/doom-freedoom/Makefile b/games/doom-freedoom/Makefile index 3ab413845f2d..6f230e8b587f 100644 --- a/games/doom-freedoom/Makefile +++ b/games/doom-freedoom/Makefile @@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-iwad-${PORTVERSION} 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} diff --git a/games/doom-hr/Makefile b/games/doom-hr/Makefile index 7e289354b639..61c65460c4c6 100644 --- a/games/doom-hr/Makefile +++ b/games/doom-hr/Makefile @@ -17,9 +17,10 @@ DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} 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 @@ -33,9 +34,6 @@ DATADIR= ${DMDIR}/${PORTNAME} DEMO_NM_DISTFILES= hrhelp${EXTRACT_SUFX} DEMO_UV_DISTFILES= hruvlmp2${EXTRACT_SUFX} -post-extract: - @(cd ${WRKDIR} && ${SH} ${SCRIPTDIR}/lowercase.sh) - .include "${.CURDIR}/../doom-data/Makefile.include" .include <bsd.port.options.mk> diff --git a/games/doom-hr/scripts/lowercase.sh b/games/doom-hr/scripts/lowercase.sh deleted file mode 100644 index 0a61219d046d..000000000000 --- a/games/doom-hr/scripts/lowercase.sh +++ /dev/null @@ -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 diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile index 9f67df56f3a8..8ab6ae8449b5 100644 --- a/games/flightgear-aircraft/Makefile +++ b/games/flightgear-aircraft/Makefile @@ -58,7 +58,7 @@ LICENSE= GPLv2 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 diff --git a/games/flightgear-mb339-pan/Makefile b/games/flightgear-mb339-pan/Makefile index 4a041d5d47e1..ccd514b71960 100644 --- a/games/flightgear-mb339-pan/Makefile +++ b/games/flightgear-mb339-pan/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear- RESTRICTED= Redistribution prohibited NO_BUILD= yes -USES= zip:infozip +USES= zip WRKSRC= ${WRKDIR}/${PORTNAME} EXTRACT_AFTER_ARGS= -d ${WRKSRC} DATADIR= ${PREFIX}/share/flightgear/Aircraft diff --git a/games/freedoko/Makefile b/games/freedoko/Makefile index bf94b8443ae1..f02d2178a028 100644 --- a/games/freedoko/Makefile +++ b/games/freedoko/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libgnet-2.0.so:${PORTSDIR}/net/gnet2 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}" diff --git a/games/glest/Makefile b/games/glest/Makefile index 3788c937bfdf..554018571226 100644 --- a/games/glest/Makefile +++ b/games/glest/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \ BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam RUN_DEPENDS= ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data -USES= dos2unix openal:al,alut pkgconfig zip:infozip lua:51 +USES= dos2unix openal:al,alut pkgconfig zip lua:51 USE_AUTOTOOLS= automake:env autoconf:env USE_SDL= yes USE_GL= yes diff --git a/games/hlstatsx/Makefile b/games/hlstatsx/Makefile index 67eba7359d13..eae5e9917040 100644 --- a/games/hlstatsx/Makefile +++ b/games/hlstatsx/Makefile @@ -13,7 +13,7 @@ COMMENT= Real-time player and clan rankings and statistics for HL2 and mods NO_BUILD= yes USE_APACHE_RUN= 22+ USE_PHP= gd mysql -USES= perl5 zip:infozip +USES= perl5 zip USE_PERL5= run WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile index b38e9271116f..201b2a37f430 100644 --- a/games/lwjgl/Makefile +++ b/games/lwjgl/Makefile @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= i386 amd64 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 diff --git a/games/megamario/Makefile b/games/megamario/Makefile index e498ad504f7a..6bb95592b4a9 100644 --- a/games/megamario/Makefile +++ b/games/megamario/Makefile @@ -15,7 +15,7 @@ LICENSE= LGPL21 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 diff --git a/games/openjazz/Makefile b/games/openjazz/Makefile index bee753c4042b..2f638513a1b5 100644 --- a/games/openjazz/Makefile +++ b/games/openjazz/Makefile @@ -17,7 +17,7 @@ LICENSE= GPLv2 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 diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile index f183ad1a3c41..73fd484ced4d 100644 --- a/games/pykawari/Makefile +++ b/games/pykawari/Makefile @@ -9,18 +9,16 @@ MASTER_SITES= SF/kawari/kawari/${PORTVERSION} 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} diff --git a/games/quake3-data/Makefile.include b/games/quake3-data/Makefile.include index a7f196158479..466a586e7ee5 100644 --- a/games/quake3-data/Makefile.include +++ b/games/quake3-data/Makefile.include @@ -15,8 +15,3 @@ SUB_LIST+= Q3DIR="${Q3DIR}" .if ${PORTNAME} != "data" RUN_DEPENDS+= ${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data .endif - -# When extracting ZIP archives, ask it to convert text files to Unix style -.if defined(USE_ZIP) -EXTRACT_BEFORE_ARGS= -aqo -.endif diff --git a/games/smashbattle/Makefile b/games/smashbattle/Makefile index f9c1c80d2579..8ac31af9ee45 100644 --- a/games/smashbattle/Makefile +++ b/games/smashbattle/Makefile @@ -14,7 +14,7 @@ COMMENT= 8-bit style platform battle game 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 diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile index 7bbd722a5259..b56f51e165e7 100644 --- a/graphics/aoi/Makefile +++ b/graphics/aoi/Makefile @@ -18,8 +18,8 @@ LICENSE= GPLv2 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 diff --git a/graphics/cbviewer/Makefile b/graphics/cbviewer/Makefile index e958aa5b6d15..46463873da64 100644 --- a/graphics/cbviewer/Makefile +++ b/graphics/cbviewer/Makefile @@ -17,10 +17,9 @@ COMMENT= Comic book viewer for comic book archives in cbz, cbr, zip, rar 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+ diff --git a/graphics/libecwj2/Makefile b/graphics/libecwj2/Makefile index 329f542baf45..8e4388fdf7d6 100644 --- a/graphics/libecwj2/Makefile +++ b/graphics/libecwj2/Makefile @@ -18,7 +18,7 @@ USE_AUTOTOOLS= libtool autoconf USE_LDCONFIG= yes GNU_CONFIGURE= yes -USES= gmake zip:infozip +USES= gmake zip post-extract: cd ${WRKDIR} && \ diff --git a/japanese/ASCIIdates98-fpw/Makefile b/japanese/ASCIIdates98-fpw/Makefile index c391af63ed22..cc5748c774f5 100644 --- a/japanese/ASCIIdates98-fpw/Makefile +++ b/japanese/ASCIIdates98-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME:S/-fpw//}-${PORTVERSION} 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 diff --git a/japanese/CGdic-fpw/Makefile b/japanese/CGdic-fpw/Makefile index 309c9966704d..869d8c60f2de 100644 --- a/japanese/CGdic-fpw/Makefile +++ b/japanese/CGdic-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= CGdic1.5h-${PORTVERSION} 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 diff --git a/japanese/another-htmllint/Makefile b/japanese/another-htmllint/Makefile index fccc8797fbc2..30cb6c8bc7e3 100644 --- a/japanese/another-htmllint/Makefile +++ b/japanese/another-htmllint/Makefile @@ -11,9 +11,9 @@ COMMENT= Another HTML-lint (all messages are written in Japanese) 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 diff --git a/japanese/bible_names-fpw/Makefile b/japanese/bible_names-fpw/Makefile index 91f0adf56101..0cfd284d0b0c 100644 --- a/japanese/bible_names-fpw/Makefile +++ b/japanese/bible_names-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} 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 diff --git a/japanese/devil-fpw/Makefile b/japanese/devil-fpw/Makefile index cb182818aa7b..59d79e576897 100644 --- a/japanese/devil-fpw/Makefile +++ b/japanese/devil-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} 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 diff --git a/japanese/ebd-fpw/Makefile b/japanese/ebd-fpw/Makefile index a7d1e22333cb..f494bd6c6152 100644 --- a/japanese/ebd-fpw/Makefile +++ b/japanese/ebd-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} 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 diff --git a/japanese/edict-fpw/Makefile b/japanese/edict-fpw/Makefile index ee3983fbc4ec..f6bb1d34cff3 100644 --- a/japanese/edict-fpw/Makefile +++ b/japanese/edict-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} 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 diff --git a/japanese/flower-fpw/Makefile b/japanese/flower-fpw/Makefile index 25306889e24c..696a309b5a38 100644 --- a/japanese/flower-fpw/Makefile +++ b/japanese/flower-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= Flower-${PORTVERSION} 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 diff --git a/japanese/foldoc-fpw/Makefile b/japanese/foldoc-fpw/Makefile index 4dedb2e66aa3..0f0401987635 100644 --- a/japanese/foldoc-fpw/Makefile +++ b/japanese/foldoc-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} 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 diff --git a/japanese/font-ipa-uigothic/Makefile b/japanese/font-ipa-uigothic/Makefile index 2effc0ee93b1..4770a9fdb908 100644 --- a/japanese/font-ipa-uigothic/Makefile +++ b/japanese/font-ipa-uigothic/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig 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 diff --git a/japanese/fumeikai-fpw/Makefile b/japanese/fumeikai-fpw/Makefile index 8e335aff5335..f9de5a623d7d 100644 --- a/japanese/fumeikai-fpw/Makefile +++ b/japanese/fumeikai-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= Fumeikai-${PORTVERSION} 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 diff --git a/japanese/jargon-fpw/Makefile b/japanese/jargon-fpw/Makefile index 34a9ad011f66..be25e2f64341 100644 --- a/japanese/jargon-fpw/Makefile +++ b/japanese/jargon-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= jargon-fpw${PORTVERSION} 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 diff --git a/japanese/lsd-fpw/Makefile b/japanese/lsd-fpw/Makefile index f6917f13fdd4..eb2f7315e348 100644 --- a/japanese/lsd-fpw/Makefile +++ b/japanese/lsd-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} 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 diff --git a/japanese/pejv-fpw/Makefile b/japanese/pejv-fpw/Makefile index 265bf33b3b33..aeabb3f335fe 100644 --- a/japanese/pejv-fpw/Makefile +++ b/japanese/pejv-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} 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 diff --git a/japanese/roget-fpw/Makefile b/japanese/roget-fpw/Makefile index e3ef02b30f06..dca5d77db4dd 100644 --- a/japanese/roget-fpw/Makefile +++ b/japanese/roget-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} 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 diff --git a/japanese/ryaku-fpw/Makefile b/japanese/ryaku-fpw/Makefile index 69a9dd3a965b..b32c5ce06bc0 100644 --- a/japanese/ryaku-fpw/Makefile +++ b/japanese/ryaku-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= Ryaku-${PORTVERSION} 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 diff --git a/japanese/vera-fpw/Makefile b/japanese/vera-fpw/Makefile index 03d3b5fd7aa7..5394763d3dc5 100644 --- a/japanese/vera-fpw/Makefile +++ b/japanese/vera-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= vera-${VERA_VER}-fpw${VERAFPW_VER} 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 diff --git a/japanese/wdic-fpw/Makefile b/japanese/wdic-fpw/Makefile index a6586416ca63..be273386d51f 100644 --- a/japanese/wdic-fpw/Makefile +++ b/japanese/wdic-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} 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 diff --git a/japanese/web1913-fpw/Makefile b/japanese/web1913-fpw/Makefile index 50aa8ae3ed48..2a3a8612b61d 100644 --- a/japanese/web1913-fpw/Makefile +++ b/japanese/web1913-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${WEBFPW_VER} 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 diff --git a/japanese/wordnet-fpw/Makefile b/japanese/wordnet-fpw/Makefile index a756be9a749a..4306a82497a3 100644 --- a/japanese/wordnet-fpw/Makefile +++ b/japanese/wordnet-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= wordnet-${WN_VER}-fpw${WNFPW_VER} 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 diff --git a/japanese/wwasw-fpw/Makefile b/japanese/wwasw-fpw/Makefile index 9c98df889d8d..7d9050a3f1e1 100644 --- a/japanese/wwasw-fpw/Makefile +++ b/japanese/wwasw-fpw/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} 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 diff --git a/japanese/yasou-fpw/Makefile b/japanese/yasou-fpw/Makefile index 021e4772e6c3..16a679f542b0 100644 --- a/japanese/yasou-fpw/Makefile +++ b/japanese/yasou-fpw/Makefile @@ -12,7 +12,7 @@ COMMENT= Yasou picture book (EPWING V1 format) by SAS 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 diff --git a/mail/assp/Makefile b/mail/assp/Makefile index d8231fc66010..e040c73a066e 100644 --- a/mail/assp/Makefile +++ b/mail/assp/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME:tu}_${PORTVERSION}_Install MAINTAINER= rnejdl@ringofsaturn.com COMMENT= Anti-Spam SMTP Proxy -USES= perl5 zip:infozip +USES= perl5 zip NO_BUILD= yes USE_PERL5= run diff --git a/mail/ftrack/Makefile b/mail/ftrack/Makefile index e7d055e7ddf6..f37fd0a9ba65 100644 --- a/mail/ftrack/Makefile +++ b/mail/ftrack/Makefile @@ -17,7 +17,7 @@ BROKEN= Does not compile 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} diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index f43525173c0f..8bc6eee31647 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -14,7 +14,7 @@ COMMENT= Localized interface for Thunderbird EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USES= zip:infozip gecko:thunderbird +USES= gecko:thunderbird zip USE_XPI= thunderbird NO_BUILD= yes diff --git a/math/jama/Makefile b/math/jama/Makefile index 975229207bef..0fdeb4c32750 100644 --- a/math/jama/Makefile +++ b/math/jama/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/tnt/tnt.h:${PORTSDIR}/devel/tnt \ unzip:${PORTSDIR}/archivers/unzip RUN_DEPENDS= ${LOCALBASE}/include/tnt/tnt.h:${PORTSDIR}/devel/tnt -USES= zip:infozip +USES= zip NO_BUILD= yes do-install: @@ -27,7 +27,7 @@ do-install: ${UNZIP_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \ -d ${STAGEDIR}${PREFIX}/include/tnt ${MKDIR} ${WRKDIR}/doc ${STAGEDIR}${DOCSDIR} - ${UNZIP_CMD} -o ${DISTDIR}/${DIST_SUBDIR}/jama102doc \ + ${UNZIP_CMD} -o ${DISTDIR}/${DIST_SUBDIR}/jama102doc.zip \ -d ${WRKDIR}/doc (cd ${WRKDIR}/doc/doxygen && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) diff --git a/math/miracl/Makefile b/math/miracl/Makefile index 85a4008670f2..f2b6989c56bf 100644 --- a/math/miracl/Makefile +++ b/math/miracl/Makefile @@ -24,10 +24,10 @@ LICENSE_PERMS_COMMERCIAL= dist-mirror dist-sell pkg-mirror pkg-sell no-auto-acce 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 \ diff --git a/net/wizd/Makefile b/net/wizd/Makefile index b478d5eea41c..d7d67e5ed42a 100644 --- a/net/wizd/Makefile +++ b/net/wizd/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= nkf:${PORTSDIR}/japanese/nkf 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: |