- 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

22 files changed, 23 insertions, 23 deletions

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