Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Jun 2014 15:26:41 +0000 (UTC)
From:      Alex Kozlov <ak@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356803 - in head: archivers/qpress audio/squeezeboxserver-dynamicplaylist audio/squeezeboxserver-sqlplaylist audio/squeezeboxserver-trackstat deskutils/fengoffice devel/jgoodies-common...
Message-ID:  <201406061526.s56FQfYD092540@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ak
Date: Fri Jun  6 15:26:41 2014
New Revision: 356803
URL: http://svnweb.freebsd.org/changeset/ports/356803
QAT: https://qat.redports.org/buildarchive/r356803/

Log:
  - Use /usr/bin/unzip for zip files extraction (part 2)
    Remove most of USES=zip:infozip
  
  PR:        ports/188419
  Approved by:	portmgr (bapt)
  Exp-run:	antoine

Deleted:
  head/games/doom-hr/scripts/
Modified:
  head/archivers/qpress/Makefile
  head/audio/squeezeboxserver-dynamicplaylist/Makefile
  head/audio/squeezeboxserver-sqlplaylist/Makefile
  head/audio/squeezeboxserver-trackstat/Makefile
  head/deskutils/fengoffice/Makefile
  head/devel/jgoodies-common/Makefile
  head/devel/tnt/Makefile
  head/editors/uemacs/Makefile
  head/games/daimonin-music/Makefile
  head/games/dmjava/Makefile
  head/games/doom-data/Makefile.include
  head/games/doom-freedoom/Makefile
  head/games/doom-hr/Makefile
  head/games/flightgear-aircraft/Makefile
  head/games/flightgear-mb339-pan/Makefile
  head/games/freedoko/Makefile
  head/games/glest/Makefile
  head/games/hlstatsx/Makefile
  head/games/lwjgl/Makefile
  head/games/megamario/Makefile
  head/games/openjazz/Makefile
  head/games/pykawari/Makefile
  head/games/quake3-data/Makefile.include
  head/games/smashbattle/Makefile
  head/graphics/aoi/Makefile
  head/graphics/cbviewer/Makefile
  head/graphics/libecwj2/Makefile
  head/japanese/ASCIIdates98-fpw/Makefile
  head/japanese/CGdic-fpw/Makefile
  head/japanese/another-htmllint/Makefile
  head/japanese/bible_names-fpw/Makefile
  head/japanese/devil-fpw/Makefile
  head/japanese/ebd-fpw/Makefile
  head/japanese/edict-fpw/Makefile
  head/japanese/flower-fpw/Makefile
  head/japanese/foldoc-fpw/Makefile
  head/japanese/font-ipa-uigothic/Makefile
  head/japanese/fumeikai-fpw/Makefile
  head/japanese/jargon-fpw/Makefile
  head/japanese/lsd-fpw/Makefile
  head/japanese/pejv-fpw/Makefile
  head/japanese/roget-fpw/Makefile
  head/japanese/ryaku-fpw/Makefile
  head/japanese/vera-fpw/Makefile
  head/japanese/wdic-fpw/Makefile
  head/japanese/web1913-fpw/Makefile
  head/japanese/wordnet-fpw/Makefile
  head/japanese/wwasw-fpw/Makefile
  head/japanese/yasou-fpw/Makefile
  head/mail/assp/Makefile
  head/mail/ftrack/Makefile
  head/mail/thunderbird-i18n/Makefile
  head/math/jama/Makefile
  head/math/miracl/Makefile
  head/net/wizd/Makefile

Modified: head/archivers/qpress/Makefile
==============================================================================
--- head/archivers/qpress/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/archivers/qpress/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -12,7 +12,7 @@ COMMENT=	Portable file archiver using Qu
 
 LICENSE=	GPLv2
 
-USES=		dos2unix zip:infozip
+USES=		dos2unix zip
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
 PLIST_FILES=	bin/qpress

Modified: head/audio/squeezeboxserver-dynamicplaylist/Makefile
==============================================================================
--- head/audio/squeezeboxserver-dynamicplaylist/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/audio/squeezeboxserver-dynamicplaylist/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -16,7 +16,7 @@ COMMENT=	Squeezebox Server plugin to cre
 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

Modified: head/audio/squeezeboxserver-sqlplaylist/Makefile
==============================================================================
--- head/audio/squeezeboxserver-sqlplaylist/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/audio/squeezeboxserver-sqlplaylist/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -17,7 +17,7 @@ RUN_DEPENDS=	softsqueeze:${PORTSDIR}/aud
 		${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

Modified: head/audio/squeezeboxserver-trackstat/Makefile
==============================================================================
--- head/audio/squeezeboxserver-trackstat/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/audio/squeezeboxserver-trackstat/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -16,7 +16,7 @@ COMMENT=	Squeezebox Server plugin to sto
 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

Modified: head/deskutils/fengoffice/Makefile
==============================================================================
--- head/deskutils/fengoffice/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/deskutils/fengoffice/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/devel/jgoodies-common/Makefile
==============================================================================
--- head/devel/jgoodies-common/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/devel/jgoodies-common/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/devel/tnt/Makefile
==============================================================================
--- head/devel/tnt/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/devel/tnt/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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>

Modified: head/editors/uemacs/Makefile
==============================================================================
--- head/editors/uemacs/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/editors/uemacs/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/games/daimonin-music/Makefile
==============================================================================
--- head/games/daimonin-music/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/daimonin-music/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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>

Modified: head/games/dmjava/Makefile
==============================================================================
--- head/games/dmjava/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/dmjava/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -15,7 +15,7 @@ COMMENT=	Dungeon Master Java is a remake
 
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
-USES=		zip:infozip
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes

Modified: head/games/doom-data/Makefile.include
==============================================================================
--- head/games/doom-data/Makefile.include	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/doom-data/Makefile.include	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/games/doom-freedoom/Makefile
==============================================================================
--- head/games/doom-freedoom/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/doom-freedoom/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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}

Modified: head/games/doom-hr/Makefile
==============================================================================
--- head/games/doom-hr/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/doom-hr/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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>

Modified: head/games/flightgear-aircraft/Makefile
==============================================================================
--- head/games/flightgear-aircraft/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/flightgear-aircraft/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/games/flightgear-mb339-pan/Makefile
==============================================================================
--- head/games/flightgear-mb339-pan/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/flightgear-mb339-pan/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/flightge
 RESTRICTED=	Redistribution prohibited
 
 NO_BUILD=	yes
-USES=		zip:infozip
+USES=		zip
 WRKSRC=	${WRKDIR}/${PORTNAME}
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 DATADIR=	${PREFIX}/share/flightgear/Aircraft

Modified: head/games/freedoko/Makefile
==============================================================================
--- head/games/freedoko/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/freedoko/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/
 
 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}"
 

Modified: head/games/glest/Makefile
==============================================================================
--- head/games/glest/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/glest/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/
 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

Modified: head/games/hlstatsx/Makefile
==============================================================================
--- head/games/hlstatsx/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/hlstatsx/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -13,7 +13,7 @@ COMMENT=	Real-time player and clan ranki
 NO_BUILD=	yes
 USE_APACHE_RUN=	22+
 USE_PHP=	gd mysql
-USES=		perl5 zip:infozip
+USES=		perl5 zip
 USE_PERL5=	run
 
 WRKSRC=		${WRKDIR}/${PORTNAME}

Modified: head/games/lwjgl/Makefile
==============================================================================
--- head/games/lwjgl/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/lwjgl/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/games/megamario/Makefile
==============================================================================
--- head/games/megamario/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/megamario/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/games/openjazz/Makefile
==============================================================================
--- head/games/openjazz/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/openjazz/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/games/pykawari/Makefile
==============================================================================
--- head/games/pykawari/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/pykawari/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -9,18 +9,16 @@ MASTER_SITES=	SF/kawari/kawari/${PORTVER
 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}

Modified: head/games/quake3-data/Makefile.include
==============================================================================
--- head/games/quake3-data/Makefile.include	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/quake3-data/Makefile.include	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/games/smashbattle/Makefile
==============================================================================
--- head/games/smashbattle/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/games/smashbattle/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -14,7 +14,7 @@ COMMENT=	8-bit style platform battle gam
 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

Modified: head/graphics/aoi/Makefile
==============================================================================
--- head/graphics/aoi/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/graphics/aoi/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/graphics/cbviewer/Makefile
==============================================================================
--- head/graphics/cbviewer/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/graphics/cbviewer/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -17,10 +17,9 @@ COMMENT=	Comic book viewer for comic boo
 
 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+

Modified: head/graphics/libecwj2/Makefile
==============================================================================
--- head/graphics/libecwj2/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/graphics/libecwj2/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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} && \

Modified: head/japanese/ASCIIdates98-fpw/Makefile
==============================================================================
--- head/japanese/ASCIIdates98-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/ASCIIdates98-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME:S/-fpw//}-${PORTVER
 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

Modified: head/japanese/CGdic-fpw/Makefile
==============================================================================
--- head/japanese/CGdic-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/CGdic-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/another-htmllint/Makefile
==============================================================================
--- head/japanese/another-htmllint/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/another-htmllint/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -11,9 +11,9 @@ COMMENT=	Another HTML-lint (all messages
 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

Modified: head/japanese/bible_names-fpw/Makefile
==============================================================================
--- head/japanese/bible_names-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/bible_names-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/devil-fpw/Makefile
==============================================================================
--- head/japanese/devil-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/devil-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/ebd-fpw/Makefile
==============================================================================
--- head/japanese/ebd-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/ebd-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/edict-fpw/Makefile
==============================================================================
--- head/japanese/edict-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/edict-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/flower-fpw/Makefile
==============================================================================
--- head/japanese/flower-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/flower-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/foldoc-fpw/Makefile
==============================================================================
--- head/japanese/foldoc-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/foldoc-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/font-ipa-uigothic/Makefile
==============================================================================
--- head/japanese/font-ipa-uigothic/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/font-ipa-uigothic/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fo
 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

Modified: head/japanese/fumeikai-fpw/Makefile
==============================================================================
--- head/japanese/fumeikai-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/fumeikai-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/jargon-fpw/Makefile
==============================================================================
--- head/japanese/jargon-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/jargon-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/lsd-fpw/Makefile
==============================================================================
--- head/japanese/lsd-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/lsd-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/pejv-fpw/Makefile
==============================================================================
--- head/japanese/pejv-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/pejv-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/roget-fpw/Makefile
==============================================================================
--- head/japanese/roget-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/roget-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/ryaku-fpw/Makefile
==============================================================================
--- head/japanese/ryaku-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/ryaku-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/vera-fpw/Makefile
==============================================================================
--- head/japanese/vera-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/vera-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -11,7 +11,7 @@ DISTNAME=	vera-${VERA_VER}-fpw${VERAFPW_
 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

Modified: head/japanese/wdic-fpw/Makefile
==============================================================================
--- head/japanese/wdic-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/wdic-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/web1913-fpw/Makefile
==============================================================================
--- head/japanese/web1913-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/web1913-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/wordnet-fpw/Makefile
==============================================================================
--- head/japanese/wordnet-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/wordnet-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -11,7 +11,7 @@ DISTNAME=	wordnet-${WN_VER}-fpw${WNFPW_V
 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

Modified: head/japanese/wwasw-fpw/Makefile
==============================================================================
--- head/japanese/wwasw-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/wwasw-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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

Modified: head/japanese/yasou-fpw/Makefile
==============================================================================
--- head/japanese/yasou-fpw/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/japanese/yasou-fpw/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -12,7 +12,7 @@ COMMENT=	Yasou picture book (EPWING V1 f
 
 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

Modified: head/mail/assp/Makefile
==============================================================================
--- head/mail/assp/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/mail/assp/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME:tu}_${PORTVERSION}_
 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	Anti-Spam SMTP Proxy
 
-USES=		perl5 zip:infozip
+USES=		perl5 zip
 NO_BUILD=	yes
 USE_PERL5=	run
 

Modified: head/mail/ftrack/Makefile
==============================================================================
--- head/mail/ftrack/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/mail/ftrack/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -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}

Modified: head/mail/thunderbird-i18n/Makefile
==============================================================================
--- head/mail/thunderbird-i18n/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/mail/thunderbird-i18n/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -14,7 +14,7 @@ COMMENT=	Localized interface for Thunder
 
 EXTRACT_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
-USES=		zip:infozip gecko:thunderbird
+USES=		gecko:thunderbird zip
 USE_XPI=	thunderbird
 
 NO_BUILD=	yes

Modified: head/math/jama/Makefile
==============================================================================
--- head/math/jama/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/math/jama/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/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})
 

Modified: head/math/miracl/Makefile
==============================================================================
--- head/math/miracl/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/math/miracl/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -24,10 +24,10 @@ LICENSE_PERMS_COMMERCIAL=	dist-mirror di
 
 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 \

Modified: head/net/wizd/Makefile
==============================================================================
--- head/net/wizd/Makefile	Fri Jun  6 15:26:31 2014	(r356802)
+++ head/net/wizd/Makefile	Fri Jun  6 15:26:41 2014	(r356803)
@@ -18,7 +18,7 @@ RUN_DEPENDS=	nkf:${PORTSDIR}/japanese/nk
 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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406061526.s56FQfYD092540>