Adjust port Makefiles to new EXTRACT_* variable defaults. See log of

bsd.port.mk rev. 1.304 for details on the change.

The fix here is one of the following.

(1) Define USE_BZIP2 instead of BUILD_DEPENDS on bzip2 and redefining
    EXTRACT_* commands.

(2) Change ${EXTRACT_CMD} to ${TAR} when the command is obviously
    calling the "tar" command (i.e., arguments like "-xzf" are spelled
    out).

(3) If ${EXTRACT_CMD} is called directly with ${EXTRACT_BEFORE_ARGS},
    add ${EXTRACT_AFTER_ARGS} to the command line as well.

(4) If any of EXTRACT_CMD, EXTRACT_BEFORE_ARGS or EXTRACT_AFTER_ARGS
    is set, define the other two too.

18 files changed, 45 insertions, 35 deletions

diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 14f5fc88e8a4..ee475394149b 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.19 1997/09/23 02:17:58 max Exp $
+# $Id: Makefile,v 1.20 1998/10/04 12:54:11 kuriyama Exp $
 #
 
 DISTNAME=	Wnn4.2
@@ -32,8 +32,9 @@ DOC_FROM=	${WRKSRC}/cWnn
 .endif  # kWnn has no manual.
 
 post-extract:
-	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} \
-		${_DISTDIR}/Wnn4.2.patch.tar.gz
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${_DISTDIR}/Wnn4.2.patch.tar.gz ${EXTRACT_AFTER_ARGS} \
+		-C ${WRKSRC}
 	${LN} -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
 
 pre-patch:
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index 14f5fc88e8a4..ee475394149b 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.19 1997/09/23 02:17:58 max Exp $
+# $Id: Makefile,v 1.20 1998/10/04 12:54:11 kuriyama Exp $
 #
 
 DISTNAME=	Wnn4.2
@@ -32,8 +32,9 @@ DOC_FROM=	${WRKSRC}/cWnn
 .endif  # kWnn has no manual.
 
 post-extract:
-	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} \
-		${_DISTDIR}/Wnn4.2.patch.tar.gz
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${_DISTDIR}/Wnn4.2.patch.tar.gz ${EXTRACT_AFTER_ARGS} \
+		-C ${WRKSRC}
 	${LN} -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
 
 pre-patch:
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index e03c23e99431..ed52fcc9ce53 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -3,7 +3,7 @@
 # Date created:         98/11/17
 # Whom:                 Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.7 1998/11/28 02:18:44 asami Exp $
+# $Id: Makefile,v 1.8 1999/01/26 01:01:52 asami Exp $
 #
 
 DISTNAME=	vim
@@ -90,7 +90,8 @@ FEPOPT+=	-DFEPCTRL
 .endif
 
 post-extract:
-	${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${JPATCH}
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${JPATCH} \
+		${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
 
 pre-patch:
 	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/jvim.diff
diff --git a/japanese/netscape3.language/Makefile b/japanese/netscape3.language/Makefile
index f0623822f640..4f52f32c3c96 100644
--- a/japanese/netscape3.language/Makefile
+++ b/japanese/netscape3.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 November 1997
 # Whom:			SADA Kenji <sada@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1998/11/23 07:51:07 asami Exp $
+# $Id: Makefile,v 1.4 1998/12/10 15:10:19 sada Exp $
 #
 
 DISTNAME=	ja-netscape-3.04
@@ -40,7 +40,7 @@ STARTFILE_SRC=	${FILESDIR}/netscape.sh
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
-	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/NLS.tar.gz -C ${WRKDIR}
+	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/NLS.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/Netscape-JPfont ${WRKDIR}
 	@${CAT} ${DISTDIR}/${DIST_SUBDIR}/Netscape-v301-ja_euc.ad.gz \
 		| ${GUNZIP_CMD} > ${WRKDIR}/Netscape.jp.ad
diff --git a/japanese/netscape4-communicator/Makefile b/japanese/netscape4-communicator/Makefile
index 82ffa674497f..0b4eb846b38b 100644
--- a/japanese/netscape4-communicator/Makefile
+++ b/japanese/netscape4-communicator/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 Mar 1998
 # Whom:			sada@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.13 1998/12/27 19:43:52 sada Exp $
+# $Id: Makefile,v 1.14 1998/12/29 21:53:19 sada Exp $
 #
 
 DISTNAME=	ja-netscape-${BROWSER}-${BROWSER_VERSION}
@@ -68,7 +68,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/$f ${NDIR}/${LANG}/
 .endfor
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/nethelp-v406.nif \
-		-C ${NDIR}/${LANG}
+		${EXTRACT_AFTER_ARGS} -C ${NDIR}/${LANG}
 	${INSTALL_SCRIPT} ${WRKDIR}/start.sh ${PREFIX}/bin/${BROWSER_CMD}
 	${LN} -sf ${BROWSER_CMD} ${PREFIX}/bin/netscape
 	${MKDIR} ${MANDIR}/man1
diff --git a/japanese/netscape48-communicator/Makefile b/japanese/netscape48-communicator/Makefile
index 82ffa674497f..0b4eb846b38b 100644
--- a/japanese/netscape48-communicator/Makefile
+++ b/japanese/netscape48-communicator/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 Mar 1998
 # Whom:			sada@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.13 1998/12/27 19:43:52 sada Exp $
+# $Id: Makefile,v 1.14 1998/12/29 21:53:19 sada Exp $
 #
 
 DISTNAME=	ja-netscape-${BROWSER}-${BROWSER_VERSION}
@@ -68,7 +68,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/$f ${NDIR}/${LANG}/
 .endfor
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/nethelp-v406.nif \
-		-C ${NDIR}/${LANG}
+		${EXTRACT_AFTER_ARGS} -C ${NDIR}/${LANG}
 	${INSTALL_SCRIPT} ${WRKDIR}/start.sh ${PREFIX}/bin/${BROWSER_CMD}
 	${LN} -sf ${BROWSER_CMD} ${PREFIX}/bin/netscape
 	${MKDIR} ${MANDIR}/man1
diff --git a/japanese/p5-manual/Makefile b/japanese/p5-manual/Makefile
index 245094d4a0ba..cfae16984cfb 100644
--- a/japanese/p5-manual/Makefile
+++ b/japanese/p5-manual/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 June 1998
 # Whom:			SADA Kenji <sada@e-mail.ne.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/12 23:18:58 steve Exp $
 #
 
 DISTNAME=	perl5.000man-j
@@ -30,7 +30,8 @@ CAT3=		Abbrev.3pm AnyDBMFile.3pm AutoLoader.3pm AutoSplit.3pm \
 		integer.3pm less.3pm sigtrap.3pm strict.3pm subs.3pm
 
 post-extract:
-	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} perl5man.tgz
+	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		perl5man.tgz ${EXTRACT_AFTER_ARGS}
 do-configure:
 .for item in 1 3
 	@cd ${WRKDIR}/man/japanese/cat${item} && ${GZIP_CMD} ${CAT${item}}
diff --git a/japanese/pgp.language/Makefile b/japanese/pgp.language/Makefile
index 7a09dbc8ba34..08fa183c4ab5 100644
--- a/japanese/pgp.language/Makefile
+++ b/japanese/pgp.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:         9 May 1997
 # Whom:                 Hironori Ikura <hikura@kaisei.org>
 #
-# $Id: Makefile,v 1.3 1998/10/16 03:26:07 jseger Exp $
+# $Id: Makefile,v 1.4 1998/10/16 03:42:28 jseger Exp $
 #
 
 DISTNAME=	pgp263i-${PGP_LANGUAGE}
@@ -21,7 +21,8 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	pgp:${PORTSDIR}/security/pgp
 
 EXTRACT_CMD=	unzip
-EXTRACT_ARGS=	-q
+EXTRACT_BEFORE_ARGS=	-q
+EXTRACT_AFTER_ARGS=	# empty
 NO_BUILD=	YES
 
 # version and language specifications
diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile
index 1dff99922421..d2caf641e82c 100644
--- a/japanese/ptex-base/Makefile
+++ b/japanese/ptex-base/Makefile
@@ -3,7 +3,7 @@
 # Date created:		05 Oct 1997
 # Whom:			max
 #
-# $Id: Makefile,v 1.23 1997/12/04 03:48:19 asami Exp $
+# $Id: Makefile,v 1.24 1998/06/24 01:14:27 max Exp $
 #
 
 DISTNAME=	web2c-7.2
@@ -44,7 +44,7 @@ pre-install:
 .else
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 .endif
-	@${EXTRACT_CMD} --exclude 'texmf/tex/latex/base/*' -C ${PREFIX}/share \
+	@${TAR} --exclude 'texmf/tex/latex/base/*' -C ${PREFIX}/share \
 	  -zxf ${DISTDIR}/${DIST_SUBDIR}/texmflib-7.3.tar.gz
 	#@${RMDIR} ${PREFIX}/share/texmf/tex/generic/images ${PREFIX}/share/texmf/bibtex/bib/misc
 	@if [ ! -f ${PREFIX}/info/dir ]; then \
diff --git a/japanese/ptex-common/Makefile b/japanese/ptex-common/Makefile
index 1dff99922421..d2caf641e82c 100644
--- a/japanese/ptex-common/Makefile
+++ b/japanese/ptex-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		05 Oct 1997
 # Whom:			max
 #
-# $Id: Makefile,v 1.23 1997/12/04 03:48:19 asami Exp $
+# $Id: Makefile,v 1.24 1998/06/24 01:14:27 max Exp $
 #
 
 DISTNAME=	web2c-7.2
@@ -44,7 +44,7 @@ pre-install:
 .else
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
 .endif
-	@${EXTRACT_CMD} --exclude 'texmf/tex/latex/base/*' -C ${PREFIX}/share \
+	@${TAR} --exclude 'texmf/tex/latex/base/*' -C ${PREFIX}/share \
 	  -zxf ${DISTDIR}/${DIST_SUBDIR}/texmflib-7.3.tar.gz
 	#@${RMDIR} ${PREFIX}/share/texmf/tex/generic/images ${PREFIX}/share/texmf/bibtex/bib/misc
 	@if [ ! -f ${PREFIX}/info/dir ]; then \
diff --git a/japanese/ptex-euc/Makefile b/japanese/ptex-euc/Makefile
index 781b4c37a7c9..e6adb0ca63b9 100644
--- a/japanese/ptex-euc/Makefile
+++ b/japanese/ptex-euc/Makefile
@@ -3,7 +3,7 @@
 # Date created:		05 Oct 1997
 # Whom:			max
 #
-# $Id: Makefile,v 1.6 1998/10/09 01:41:14 asami Exp $
+# $Id: Makefile,v 1.7 1998/12/02 05:57:04 asami Exp $
 #
 
 DISTNAME=	ptex218
@@ -43,7 +43,7 @@ pre-patch:
 	  ${PATCH} ${PATCH_DIST_ARGS}
 
 pre-install:
-	@${EXTRACT_CMD} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-euc.tar.gz
+	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-euc.tar.gz
 
 post-install:
 .for bin in ${BINARIES}
diff --git a/japanese/ptex-jis/Makefile b/japanese/ptex-jis/Makefile
index 8387022e2d30..957231713d7f 100644
--- a/japanese/ptex-jis/Makefile
+++ b/japanese/ptex-jis/Makefile
@@ -3,7 +3,7 @@
 # Date created:		05 Oct 1997
 # Whom:			max
 #
-# $Id: Makefile,v 1.6 1998/10/09 01:41:14 asami Exp $
+# $Id: Makefile,v 1.7 1998/12/02 05:57:05 asami Exp $
 #
 
 DISTNAME=	ptex218
@@ -43,7 +43,7 @@ pre-patch:
 	  ${PATCH} ${PATCH_DIST_ARGS}
 
 pre-install:
-	@${EXTRACT_CMD} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-jis.tar.gz
+	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-jis.tar.gz
 
 post-install:
 .for bin in ${BINARIES}
diff --git a/japanese/ptex-sjis/Makefile b/japanese/ptex-sjis/Makefile
index 91f797de2a4c..0e4984318a24 100644
--- a/japanese/ptex-sjis/Makefile
+++ b/japanese/ptex-sjis/Makefile
@@ -3,7 +3,7 @@
 # Date created:		05 Oct 1997
 # Whom:			max
 #
-# $Id: Makefile,v 1.6 1998/10/09 01:41:14 asami Exp $
+# $Id: Makefile,v 1.7 1998/12/02 05:57:06 asami Exp $
 #
 
 DISTNAME=	ptex218
@@ -43,7 +43,7 @@ pre-patch:
 	  ${PATCH} ${PATCH_DIST_ARGS}
 
 pre-install:
-	@${EXTRACT_CMD} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-sj.tar.gz
+	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-sj.tar.gz
 
 post-install:
 .for bin in ${BINARIES}
diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index 781b4c37a7c9..e6adb0ca63b9 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -3,7 +3,7 @@
 # Date created:		05 Oct 1997
 # Whom:			max
 #
-# $Id: Makefile,v 1.6 1998/10/09 01:41:14 asami Exp $
+# $Id: Makefile,v 1.7 1998/12/02 05:57:04 asami Exp $
 #
 
 DISTNAME=	ptex218
@@ -43,7 +43,7 @@ pre-patch:
 	  ${PATCH} ${PATCH_DIST_ARGS}
 
 pre-install:
-	@${EXTRACT_CMD} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-euc.tar.gz
+	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-euc.tar.gz
 
 post-install:
 .for bin in ${BINARIES}
diff --git a/japanese/qkc/Makefile b/japanese/qkc/Makefile
index 1c0ac110c375..d1b964e02b7b 100644
--- a/japanese/qkc/Makefile
+++ b/japanese/qkc/Makefile
@@ -3,7 +3,7 @@
 # Date created:			03 May 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.8 1998/08/30 20:35:41 max Exp $
+# $Id: Makefile,v 1.9 1998/10/10 05:39:24 steve Exp $
 #
 
 DISTNAME=	qkcc100
@@ -18,7 +18,8 @@ MAINTAINER=	max@FreeBSD.ORG
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 EXTRACT_CMD=	unzip
-EXTRACT_ARGS=	-q
+EXTRACT_BEFORE_ARGS=	-q
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
 ALL_TARGET=
 MAN1=		qkc.1
diff --git a/japanese/today/Makefile b/japanese/today/Makefile
index 8fd3f34bd3b5..3c7843f7ce99 100644
--- a/japanese/today/Makefile
+++ b/japanese/today/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 June 1996
 # Whom:			ABURAYER Rewsirow <pcs51674@asciinet.or.jp>
 #
-# $Id: Makefile,v 1.5 1997/09/14 21:36:10 max Exp $
+# $Id: Makefile,v 1.6 1997/09/19 11:57:50 max Exp $
 #
 
 DISTNAME=	td210bs
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
 
 EXTRACT_CMD=	lha
 EXTRACT_BEFORE_ARGS=	xfqw=${WRKDIR}
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
 
 post-extract:
diff --git a/japanese/vftool/Makefile b/japanese/vftool/Makefile
index 96561af4f5a1..1ad05c23cce8 100644
--- a/japanese/vftool/Makefile
+++ b/japanese/vftool/Makefile
@@ -3,7 +3,7 @@
 # Date created:		12 September 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.5 1998/08/09 00:58:46 steve Exp $
+# $Id: Makefile,v 1.6 1998/08/24 00:39:46 steve Exp $
 #
 
 DISTNAME=	vftool-1.2
@@ -35,8 +35,10 @@ TARGETDIRS=	vf-n2a vf-a2n vf-a2bk vf-p2pn
 post-extract:
 	(cd ${WRKDIR}; \
 		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/plib13-euc.tar.gz \
+			${EXTRACT_AFTER_ARGS} \
 			share/texmf/fonts/tfm/ptex; \
 		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/jtex-1.52.tar.gz \
+			${EXTRACT_AFTER_ARGS} \
 			jtex-1.52/JTeXfonts/dnpfonts/mincho/tfm \
 			jtex-1.52/JTeXfonts/dnpfonts/gothic/tfm; \
 	)
diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile
index 52d71a869846..eeb1ce36ab4b 100644
--- a/japanese/zipcodes/Makefile
+++ b/japanese/zipcodes/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Nov 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.8 1999/01/09 14:45:20 itojun Exp $
+# $Id: Makefile,v 1.9 1999/01/09 14:54:59 itojun Exp $
 #
 
 DISTNAME=	ken_all
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
 
 EXTRACT_CMD=	lha
 EXTRACT_BEFORE_ARGS=	xfqw=${WRKDIR}
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
 
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}" SCRIPTDIR=${SCRIPTDIR}