143 files changed, 347 insertions, 560 deletions

diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index c339318008e0..853a867b1f83 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -4,7 +4,7 @@
 # Date created:         15 May 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.10 1998/11/14 09:43:01 asami Exp $
+# $Id: Makefile,v 1.11 1998/12/12 16:23:37 obrien Exp $
 #
 
 DISTNAME=       rarbsd
@@ -18,8 +18,9 @@ MAINTAINER=     ache@FreeBSD.ORG
 NO_PACKAGE=     Only unmodified original package can be distributed
 
 NO_WRKSUBDIR=   yes
-EXTRACT_CMD=
-EXTRACT_BEFORE_ARGS=
+EXTRACT_CMD=		# empty
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	# empty
 
 .include <bsd.port.pre.mk>
 
diff --git a/astro/luna/Makefile b/astro/luna/Makefile
index df331055f597..d77b246dbf11 100644
--- a/astro/luna/Makefile
+++ b/astro/luna/Makefile
@@ -3,7 +3,7 @@
 # Date created:		03 July 1996
 # Whom:			ABURAYER Rewsirow <rewsirow@ff.iij4u.or.jp>
 #
-# $Id: Makefile,v 1.3 1997/08/22 11:08:40 asami Exp $
+# $Id: Makefile,v 1.4 1998/09/26 23:24:34 steve Exp $
 #
 
 DISTNAME=	luna19
@@ -18,6 +18,7 @@ BUILD_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
 EXTRACT_CMD=	lha
 EXTRACT_BEFORE_ARGS=	xfw=${WRKDIR}
+EXTRACT_AFTER_ARGS=	# empty
 PATCH_STRIP=	-p1
 
 post-extract:
diff --git a/audio/kdemultimedia11/Makefile b/audio/kdemultimedia11/Makefile
index 99b4012b0b77..f7b06dadad65 100644
--- a/audio/kdemultimedia11/Makefile
+++ b/audio/kdemultimedia11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:17 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/11 02:13:20 asami Exp $
 #
 
 DISTNAME=	kdemultimedia
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index 99b4012b0b77..f7b06dadad65 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:17 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/11 02:13:20 asami Exp $
 #
 
 DISTNAME=	kdemultimedia
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 99b4012b0b77..f7b06dadad65 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:17 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/11 02:13:20 asami Exp $
 #
 
 DISTNAME=	kdemultimedia
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index d18f0d973498..a1b5b580d296 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -3,7 +3,7 @@
 # Date created:         26 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.18 1996/11/18 13:57:01 asami Exp $
+# $Id: Makefile,v 1.19 1998/12/01 23:58:23 billf Exp $
 #
 
 DISTNAME=       iozone-2.01
@@ -17,7 +17,8 @@ FETCH_CMD=      FTP_PASSWORD=portsuser@FreeBSD.org /usr/bin/fetch
 MAINTAINER=	jmz@FreeBSD.org
 
 EXTRACT_CMD=    ( gzcat | awk '{if (/^\#!/) x++} {if(x) print $$0'}| /bin/sh )
-EXTRACT_ARGS=   <
+EXTRACT_BEFORE_ARGS=	<
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=   YES
 MAN1=		iozone.1
 
diff --git a/benchmarks/iozone21/Makefile b/benchmarks/iozone21/Makefile
index d18f0d973498..a1b5b580d296 100644
--- a/benchmarks/iozone21/Makefile
+++ b/benchmarks/iozone21/Makefile
@@ -3,7 +3,7 @@
 # Date created:         26 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.18 1996/11/18 13:57:01 asami Exp $
+# $Id: Makefile,v 1.19 1998/12/01 23:58:23 billf Exp $
 #
 
 DISTNAME=       iozone-2.01
@@ -17,7 +17,8 @@ FETCH_CMD=      FTP_PASSWORD=portsuser@FreeBSD.org /usr/bin/fetch
 MAINTAINER=	jmz@FreeBSD.org
 
 EXTRACT_CMD=    ( gzcat | awk '{if (/^\#!/) x++} {if(x) print $$0'}| /bin/sh )
-EXTRACT_ARGS=   <
+EXTRACT_BEFORE_ARGS=	<
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=   YES
 MAN1=		iozone.1
 
diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index d506d3589603..b982bf2f0150 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Dec 5 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
-# $Id: Makefile,v 1.11 1998/11/03 00:51:24 jseger Exp $
+# $Id: Makefile,v 1.12 1999/01/07 08:19:24 simokawa Exp $
 #
 
 DISTNAME=       seaview
@@ -21,7 +21,9 @@ ONLY_FOR_ARCHS=	i386
 
 USE_X_PREFIX=	YES
 NO_WRKSUBDIR=	YES
+EXTRACT_CMD=		${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
+EXTRACT_AFTER_ARGS=	# empty
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin
diff --git a/cad/mars/Makefile b/cad/mars/Makefile
index 0995c3ebe438..b6605bb2b53b 100644
--- a/cad/mars/Makefile
+++ b/cad/mars/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Mon Nov 18, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.6 1997/10/10 06:53:30 obrien Exp $
+# $Id: Makefile,v 1.7 1998/11/28 00:44:31 asami Exp $
 #
 
 DISTNAME=	MaRS-2.1
@@ -37,7 +37,7 @@ do-install:
 	@${MKDIR} ${PREFIX}/share/doc/mars
 	@chmod a+rx ${PREFIX}/share/doc/mars
 	@(cd ${PREFIX}/share/doc ; \
-		${EXTRACT_CMD} xfpz /${DISTDIR}/MaRS-2-doc.tar.gz ; \
+		${TAR} xfpz /${DISTDIR}/MaRS-2-doc.tar.gz ; \
 		[ -d mars ] && ${RM} -rf mars; \
 		/bin/mv doc mars )
 .endif
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile
index 3bef5b87a848..3263403ed73d 100644
--- a/converters/kdesupport11/Makefile
+++ b/converters/kdesupport11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.15 1999/01/07 00:51:42 se Exp $
+# $Id: Makefile,v 1.16 1999/01/11 02:13:23 asami Exp $
 #
 
 DISTNAME=	kdesupport
@@ -15,12 +15,7 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
-
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index 3bef5b87a848..3263403ed73d 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.15 1999/01/07 00:51:42 se Exp $
+# $Id: Makefile,v 1.16 1999/01/11 02:13:23 asami Exp $
 #
 
 DISTNAME=	kdesupport
@@ -15,12 +15,7 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
-
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/converters/uudx/Makefile b/converters/uudx/Makefile
index 744af6fad271..f39fe3b899ad 100644
--- a/converters/uudx/Makefile
+++ b/converters/uudx/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 June 1996
 # Whom:			ABURAYER Rewsirow <pcs51674@asciinet.or.jp>
 #
-# $Id: Makefile,v 1.6 1997/09/14 17:32:19 max Exp $
+# $Id: Makefile,v 1.7 1998/04/05 04:46:02 max Exp $
 #
 
 DISTNAME=	uudx_299
@@ -19,6 +19,7 @@ BUILD_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
 
 EXTRACT_CMD=	lha
 EXTRACT_BEFORE_ARGS=	xqw=${WRKDIR}
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
 MANLANG=	ja
 MAN1=		uudx.1
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/devel/crossgo32-djgpp2-pdcurses/Makefile b/devel/crossgo32-djgpp2-pdcurses/Makefile
index 3a152b86a2a4..ffc08390eba9 100644
--- a/devel/crossgo32-djgpp2-pdcurses/Makefile
+++ b/devel/crossgo32-djgpp2-pdcurses/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Joel Sutton <sutton@aardvark.apana.org.au)
 # FreeBSD Version:	2.2.1-RELEASE
 #
-# $Id: Makefile,v 1.2 1997/08/22 11:14:50 asami Exp $
+# $Id: Makefile,v 1.3 1998/11/07 07:42:12 asami Exp $
 #
 
 DISTNAME=	pdc22
@@ -22,6 +22,7 @@ RUN_DEPENDS=	i386-go32-stubify:${PORTSDIR}/devel/crossgo32-djgpp2
 
 EXTRACT_CMD=		unzip
 EXTRACT_BEFORE_ARGS=	-La
+EXTRACT_AFTER_ARGS=	# empty
 
 # Since were only taking the library and include files we don't
 # actually need to build anything
diff --git a/devel/crossgo32-djgpp2/Makefile b/devel/crossgo32-djgpp2/Makefile
index f364501e68e4..f0ba8bafb060 100644
--- a/devel/crossgo32-djgpp2/Makefile
+++ b/devel/crossgo32-djgpp2/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Joel Sutton <sutton@aardvark.apana.org.au>
 # FreeBSD Version:	2.2.1-RELEASE
 #
-# $Id: Makefile,v 1.3 1998/08/10 06:26:07 asami Exp $
+# $Id: Makefile,v 1.4 1998/11/08 08:44:59 asami Exp $
 #
 
 DISTNAME=	djcrx201
@@ -23,6 +23,7 @@ BROKEN=		install
 
 EXTRACT_CMD=		unzip
 EXTRACT_BEFORE_ARGS=	-La
+EXTRACT_AFTER_ARGS=	# empty
 
 # Source directories
 #
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 03f894493a1b..c0ffd9bcf76a 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -3,7 +3,7 @@
 # Date created: 	8 November 1997
 # Whom:			jraynard
 #
-# $Id: Makefile,v 1.5 1998/11/07 18:04:04 jraynard Exp $
+# $Id: Makefile,v 1.6 1998/11/10 21:00:14 wosch Exp $
 #
 
 DISTNAME=	sfio_1998
@@ -14,6 +14,7 @@ CATEGORIES=	devel
 EXTRACT_SUFX=	.src.unix.cpio
 EXTRACT_CMD=	cpio
 EXTRACT_BEFORE_ARGS=	-idF
+EXTRACT_AFTER_ARGS=	# empty
 
 MAINTAINER=	jraynard@freebsd.org
 
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 51d07146a87f..160d605236b9 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.35 1998/12/02 07:57:11 asami Exp $
+# $Id: Makefile,v 1.36 1999/01/23 14:28:27 simokawa Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -84,10 +84,10 @@ ELC_DIR=	../lisp
 #   MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org)
 #   MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches
 post-extract:
-	${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src
 .if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH)
-	${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${MKDIR} ${WRKSRC}/lisp/its
 	${CP} ${WRKDIR}/lisp/its/* ${WRKSRC}/lisp/its/
 .endif
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 555dd3db75bc..eaafb5ec72bd 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.34 1998/12/02 08:40:00 asami Exp $
+# $Id: Makefile,v 1.35 1999/01/23 14:28:25 simokawa Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -90,10 +90,10 @@ SITE_START=${PREFIX}/share/${EMACS_PREFIX}/19.34/site-lisp/site-start.el
 #   MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org)
 #   MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches
 post-extract:
-	${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src
 .if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH)
-	${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${MKDIR} ${WRKSRC}/lisp/its
 	${CP} ${WRKDIR}/lisp/its/* ${WRKSRC}/lisp/its/
 .endif
diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile
index cf92975c2906..665914387219 100644
--- a/editors/thoteditor/Makefile
+++ b/editors/thoteditor/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1 Aug 1997
 # Whom:			Pedro Giffuni (orig)
 #
-# $Id: Makefile,v 1.4 1998/12/21 21:08:12 jseger Exp $
+# $Id: Makefile,v 1.5 1999/01/30 01:48:43 fenner Exp $
 #
 
 DISTNAME=	Thot
@@ -26,7 +26,7 @@ USE_GMAKE=	yes
 ALL_TARGET=	all schemas
 
 post-extract:
-	($(EXTRACT_CMD) $(EXTRACT_BEFORE_ARGS) $(DISTDIR)/thoteditor-src-2.1b.tar.gz -C $(WRKSRC))
+	($(EXTRACT_CMD) $(EXTRACT_BEFORE_ARGS) $(DISTDIR)/thoteditor-src-2.1b.tar.gz ${EXTRACT_AFTER_ARGS} -C $(WRKSRC))
 
 post-install:
 	${MKDIR} ${PREFIX}/share/thot/doc
diff --git a/editors/wordperfect/Makefile b/editors/wordperfect/Makefile
index 09b291a21a10..18fdf8abd7db 100644
--- a/editors/wordperfect/Makefile
+++ b/editors/wordperfect/Makefile
@@ -5,7 +5,7 @@
 #					msmith@freebsd.org
 # Relevant URLs:			http://www.corel.com/
 #
-# $Id: Makefile,v 1.2 1999/01/04 16:00:06 obrien Exp $
+# $Id: Makefile,v 1.3 1999/01/07 02:31:39 simokawa Exp $
 
 DISTNAME=	GUILG00
 PKGNAME=	wordperfect-8.0
@@ -32,7 +32,7 @@ IGNORE='The source to this port may not be automatically fetched due to licensin
 .endif
 
 post-extract:
-	@(cd ${WRKDIR} ; for file in b* g* ; do ${EXTRACT_CMD} -xf $$file ; done)
+	@(cd ${WRKDIR} ; for file in b* g* ; do ${TAR} -xf $$file ; done)
 
 post-patch:
 	@${CP} ${WRKDIR}/shared/wpdata ${WRKDIR}/shared/wpdata.old
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 8b2cf23fdafa..e8e012d05eab 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20 July 1997
 # Whom:                 Yukihiro Nakai<Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/12 07:07:19 flathill Exp $
+# $Id: Makefile,v 1.6 1999/01/12 16:51:07 vanilla Exp $
 #
 
 DISTNAME=	snes116a
@@ -25,7 +25,8 @@ USE_X_PREFIX=	YES
 MAKEFILE=	Makefile.linux
 
 EXTRACT_CMD=	unzip
-EXTRACT_BEFORE_ARGS=
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	# empty
 
 WRKSRC=		${WRKDIR}/release
 
diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile
index da18b3e3ed53..a99b40e86ea3 100644
--- a/games/bugsx/Makefile
+++ b/games/bugsx/Makefile
@@ -3,7 +3,7 @@
 # Date created:  7 December 1997
 # Whom:  Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/17 03:13:12 jkoshy Exp $
+# $Id: Makefile,v 1.2 1998/09/28 02:05:15 steve Exp $
 #
 
 DISTNAME=	bugsx108
@@ -18,7 +18,9 @@ MAINTAINER=	croyle@gelemna.ft-wayne.in.us
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/bugsx
 # isn't really gzipped
+EXTRACT_CMD=		${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
+EXTRACT_AFTER_ARGS=	# empty
 MAN1=		bugsx.1
 
 post-install:
diff --git a/games/connect4/Makefile b/games/connect4/Makefile
index b18a9697ff27..4cfab7079dda 100644
--- a/games/connect4/Makefile
+++ b/games/connect4/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Joel Sutton <sutton@aardvark.apana.org.au>
 # FreeBSD Version:	2.1.5-RELEASE
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/06/04 03:21:12 asami Exp $
 #
       
 DISTNAME=	connect4
@@ -19,7 +19,8 @@ MAINTAINER=	sutton@aardvark.apana.org.au
 BUILD_DEPENDS=		gunshar:${PORTSDIR}/archivers/gshar+gunshar
 
 EXTRACT_CMD=		gunshar
-EXTRACT_BEFORE_ARGS=	""
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
 MAN6=		connect4.6
 
diff --git a/games/doom/Makefile b/games/doom/Makefile
index b8e7a8a9e4ae..3eca12980ff9 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Dec 14 21:03:01 MET 1998
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.8 1999/01/15 02:54:18 jmz Exp $
+# $Id: Makefile,v 1.9 1999/01/18 08:44:41 asami Exp $
 #
 
 DISTNAME=	doomsrc-1.8
@@ -21,7 +21,8 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 USE_XLIB=	yes
 EXTRACT_CMD=	unzip
-EXTRACT_ARGS=	-q
+EXTRACT_BEFORE_ARGS=	-q
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
 
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index 686a1cd09027..4ac230d5d9c0 100644
--- a/games/freeciv-gtk2/Makefile
+++ b/games/freeciv-gtk2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Jun 20 1997
 # Whom:			ada@bsd.org
 #
-# $Id: Makefile,v 1.16 1999/02/01 01:22:16 obrien Exp $
+# $Id: Makefile,v 1.17 1999/02/01 22:01:00 asami Exp $
 #
 
 DISTNAME=	freeciv-1.7.2
@@ -13,15 +13,11 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ada@bsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 BROKEN='no route to the *single* mastersite'
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 686a1cd09027..4ac230d5d9c0 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Jun 20 1997
 # Whom:			ada@bsd.org
 #
-# $Id: Makefile,v 1.16 1999/02/01 01:22:16 obrien Exp $
+# $Id: Makefile,v 1.17 1999/02/01 22:01:00 asami Exp $
 #
 
 DISTNAME=	freeciv-1.7.2
@@ -13,15 +13,11 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ada@bsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 BROKEN='no route to the *single* mastersite'
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/games/inform/Makefile b/games/inform/Makefile
index 32dac0aa6ba1..fc38045fef24 100644
--- a/games/inform/Makefile
+++ b/games/inform/Makefile
@@ -3,7 +3,7 @@
 # Date created:				28 June 1998
 # Whom:					Matthew Hunt <mph@FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1998/06/28 15:16:05 mph Exp $
+# $Id: Makefile,v 1.2 1999/01/08 00:15:21 mph Exp $
 #
 
 DISTNAME=	inform-6.15
@@ -27,6 +27,7 @@ NO_WRKSUBDIR=	yes
 EXTRACT_ONLY=		inform615_source.zip
 EXTRACT_CMD=		unzip
 EXTRACT_BEFORE_ARGS=	-qq
+EXTRACT_AFTER_ARGS=	# empty
 
 # I can hardly believe it, but the ".c" and ".h" extensions are
 # not present on the source files.
diff --git a/games/jzip/Makefile b/games/jzip/Makefile
index fdc8522e27a1..613a5bd92602 100644
--- a/games/jzip/Makefile
+++ b/games/jzip/Makefile
@@ -3,7 +3,7 @@
 # Date created:				7 May 1998
 # Whom:					Matthew Hunt <mph@FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1998/06/14 02:26:35 mph Exp $
+# $Id: Makefile,v 1.3 1998/07/05 04:15:04 mph Exp $
 #
 
 DISTNAME=		jzip201g
@@ -18,6 +18,7 @@ BUILD_DEPENDS=		unzip:${PORTSDIR}/archivers/unzip
 
 EXTRACT_CMD=		unzip
 EXTRACT_BEFORE_ARGS=	-qq
+EXTRACT_AFTER_ARGS=	# empty
 
 NO_WRKSUBDIR=		yes
 
diff --git a/games/kdegames11/Makefile b/games/kdegames11/Makefile
index 50e90ecce132..6df711b24b97 100644
--- a/games/kdegames11/Makefile
+++ b/games/kdegames11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/08 09:54:19 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/11 02:13:24 asami Exp $
 #
 
 DISTNAME=	kdegames
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		QwSpriteField.6:${PORTSDIR}/converters/kdesupport11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE= yes
 CONFIGURE_ARGS= "--prefix=$(PREFIX)" \
diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile
index 50e90ecce132..6df711b24b97 100644
--- a/games/kdegames2/Makefile
+++ b/games/kdegames2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/08 09:54:19 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/11 02:13:24 asami Exp $
 #
 
 DISTNAME=	kdegames
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		QwSpriteField.6:${PORTSDIR}/converters/kdesupport11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE= yes
 CONFIGURE_ARGS= "--prefix=$(PREFIX)" \
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 50e90ecce132..6df711b24b97 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/08 09:54:19 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/11 02:13:24 asami Exp $
 #
 
 DISTNAME=	kdegames
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		QwSpriteField.6:${PORTSDIR}/converters/kdesupport11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE= yes
 CONFIGURE_ARGS= "--prefix=$(PREFIX)" \
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index 50e90ecce132..6df711b24b97 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/08 09:54:19 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/11 02:13:24 asami Exp $
 #
 
 DISTNAME=	kdegames
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		QwSpriteField.6:${PORTSDIR}/converters/kdesupport11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE= yes
 CONFIGURE_ARGS= "--prefix=$(PREFIX)" \
diff --git a/games/ladder/Makefile b/games/ladder/Makefile
index c4a7ee501286..a1a8696d77a7 100644
--- a/games/ladder/Makefile
+++ b/games/ladder/Makefile
@@ -3,7 +3,7 @@
 # Date created:        18 Feb 1998
 # Whom:                Stefan Zehl <sec@42.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/02/20 05:46:59 steve Exp $
 #
 
 DISTNAME=	ladder
@@ -18,6 +18,8 @@ MAINTAINER=	sec@42.org
 RESTRICTED=	"possible copyright problems ?"
 
 NO_WRKSUBDIR=	true
-EXTRACT_BEFORE_ARGS=-xf
+EXTRACT_CMD=		${TAR}
+EXTRACT_BEFORE_ARGS=	-xf
+EXTRACT_AFTER_ARGS=	# empty
 
 .include <bsd.port.mk>
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index 2b5f7ad09ff0..7c1c124dbb18 100644
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@@ -3,7 +3,7 @@
 # Date created:         3 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.9 1998/09/28 02:14:47 steve Exp $
+# $Id: Makefile,v 1.10 1998/10/03 13:39:44 jseger Exp $
 #
 
 DISTNAME=       xasteroids
@@ -18,7 +18,8 @@ MAINTAINER=	swallace@FreeBSD.org
 USE_IMAKE=	yes
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	( cd ${WRKDIR}; zcat | sh -s )
-EXTRACT_ARGS=	<
+EXTRACT_BEFORE_ARGS=	<
+EXTRACT_AFTER_ARGS=	# empty
 MAN6=		xasteroids.6
 
 .include <bsd.port.mk>
diff --git a/games/xpacman/Makefile b/games/xpacman/Makefile
index 75a77cfef815..2cc69c30f10e 100644
--- a/games/xpacman/Makefile
+++ b/games/xpacman/Makefile
@@ -3,7 +3,7 @@
 # Date created:         19 Aug 1995
 # Whom:                 joerg
 #
-# $Id: Makefile,v 1.4 1996/11/18 11:26:27 asami Exp $
+# $Id: Makefile,v 1.5 1998/09/28 02:25:21 steve Exp $
 #
 
 DISTNAME=       pacman10
@@ -19,6 +19,7 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 NO_WRKSUBDIR=	Does not unpack into subdir.
 EXTRACT_CMD=	unzip
 EXTRACT_BEFORE_ARGS= -x
+EXTRACT_AFTER_ARGS=  # empty
 USE_IMAKE=      yes
 MAN1=		pacman.1
 
diff --git a/german/manpages/Makefile b/german/manpages/Makefile
index 0b5aca23e384..26b537ddced3 100644
--- a/german/manpages/Makefile
+++ b/german/manpages/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29 September 1997
 # Whom:                 wosch
 #
-# $Id: Makefile,v 1.6 1997/10/03 12:25:15 wosch Exp $
+# $Id: Makefile,v 1.7 1998/08/25 01:25:05 asami Exp $
 #
 
 DISTNAME=       de-manpages-1.0
@@ -30,8 +30,8 @@ do-build:
 
 do-install:
 	cd ${WRKSRC}/${manpages}; \
-	${EXTRACT_CMD} cf - . | \
-		(cd ${mandir}; ${EXTRACT_CMD} xf - )
+	${TAR} cf - . | \
+		(cd ${mandir}; ${TAR} xf - )
 	find ${WRKSRC}/${manpages} -type f -print | \
 		 ${SED} "s%${WRKSRC}/${manpages}%man/${LANG}%" > \
 	   ${WRKSRC}/PLIST
diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile
index 9d4e7315b0c7..dfeccc6a73c2 100644
--- a/graphics/dore/Makefile
+++ b/graphics/dore/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 February 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.6 1997/04/30 03:18:01 asami Exp $
+# $Id: Makefile,v 1.7 1998/08/05 09:31:07 asami Exp $
 #
 
 DISTNAME=	pdore-6.0
@@ -14,7 +14,9 @@ EXTRACT_SUFX=	.tar.Z
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/dore
-EXTRACT_CMD=	mkdir -p dore; cd dore; tar
+EXTRACT_CMD=	mkdir -p dore; cd dore; ${GZIP_CMD}
+EXTRACT_BEFORE_ARGS=	-dc
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 MAKEFILE=	mk.stdx
 MAKE_FLAGS=	DORE_LOC=${WRKDIR} CFLAGS=-O2 MAKEFLAGS=m -f
 ALL_TARGET=
diff --git a/graphics/gifmerge/Makefile b/graphics/gifmerge/Makefile
index 9dceb2c7d9a1..b56978051249 100644
--- a/graphics/gifmerge/Makefile
+++ b/graphics/gifmerge/Makefile
@@ -3,7 +3,7 @@
 # Date created:        20 Oct 1996
 # Whom:                Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/04/30 03:18:02 asami Exp $
+# $Id: Makefile,v 1.3 1999/01/12 16:50:29 vanilla Exp $
 #
 
 DISTNAME=	gifmerge
@@ -16,7 +16,9 @@ MAINTAINER=	nacai@iname.com
 
 ALL_TARGET=	gifmerge
 NO_WRKSUBDIR=	yes
+EXTRACT_CMD=	${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
+EXTRACT_AFTER_ARGS=	# empty
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/gifmerge ${PREFIX}/bin/gifmerge
diff --git a/graphics/gimp-manual-html/Makefile b/graphics/gimp-manual-html/Makefile
index 4ef3cbbfd37b..91590db3ce7d 100644
--- a/graphics/gimp-manual-html/Makefile
+++ b/graphics/gimp-manual-html/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 June 1998
 # Whom:			Brett Taylor
 #
-# $Id: Makefile,v 1.7 1998/12/04 22:10:57 billf Exp $
+# $Id: Makefile,v 1.8 1998/12/07 19:26:02 billf Exp $
 #
 
 DISTNAME=	GimpUserManual-1.0.0
@@ -37,15 +37,10 @@ pre-fetch:
 EXTRACT_SUFX=	-html.tar.bz2
 WRKSRC=		${WRKDIR}/GimpUserManaul_v1.0.0
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
-
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar -xf -
-
 do-install:
 	@${MKDIR} ${PREFIX}/share/doc/gimp
 	@${CP} ${WRKSRC}/* ${PREFIX}/share/doc/gimp
diff --git a/graphics/kdegraphics11/Makefile b/graphics/kdegraphics11/Makefile
index a12c3d427e77..486b41b93599 100644
--- a/graphics/kdegraphics11/Makefile
+++ b/graphics/kdegraphics11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.18 1999/01/08 09:54:19 asami Exp $
+# $Id: Makefile,v 1.19 1999/01/11 02:13:24 asami Exp $
 #
 
 DISTNAME=	kdegraphics
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index a12c3d427e77..486b41b93599 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.18 1999/01/08 09:54:19 asami Exp $
+# $Id: Makefile,v 1.19 1999/01/11 02:13:24 asami Exp $
 #
 
 DISTNAME=	kdegraphics
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index a12c3d427e77..486b41b93599 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.18 1999/01/08 09:54:19 asami Exp $
+# $Id: Makefile,v 1.19 1999/01/11 02:13:24 asami Exp $
 #
 
 DISTNAME=	kdegraphics
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index a12c3d427e77..486b41b93599 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.18 1999/01/08 09:54:19 asami Exp $
+# $Id: Makefile,v 1.19 1999/01/11 02:13:24 asami Exp $
 #
 
 DISTNAME=	kdegraphics
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/graphics/opengl-man/Makefile b/graphics/opengl-man/Makefile
index 6779f6901d6d..d827ebdcc1f2 100644
--- a/graphics/opengl-man/Makefile
+++ b/graphics/opengl-man/Makefile
@@ -3,28 +3,22 @@
 # Date created:         19990120
 # Whom:                 cracauer@cons.org "Martin Cracauer"
 #
-# $Id: Makefile,v 1.3 1998/12/08 08:13:31 obrien Exp $
+# $Id: Makefile,v 1.1.1.1 1999/01/20 16:43:22 cracauer Exp $
 #
 
 DISTNAME=       opengl-man-657
 CATEGORIES=     graphics
 MASTER_SITES=   http://www2.cons.org:8000/freebsd-distfiles/ \
 		http://www.freebsd.org/~cracauer/freebsd-distfiles/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	cracauer@cons.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
-
+USE_BZIP2=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=		bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| tar -xf -
-
 MAN3=	glDisable.3 glDisableClientState.3 glEdgeFlag.3 \
 	glEdgeFlagPointer.3 glEdgeFlagv.3 glEnable.3 \
 	glEnableClientState.3 glEndList.3 glEvalCoord1d.3 \
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index dbfa03676709..081f7234fa39 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Jan 5 1997
 # Whom:			cfs@ing.puc.cl (original)
 #
-# $Id: Makefile,v 1.11 1998/11/25 09:01:20 asami Exp $
+# $Id: Makefile,v 1.12 1999/01/10 18:11:45 steve Exp $
 #
 
 DISTNAME=	urt
@@ -61,13 +61,13 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/urt ${PREFIX}/share/examples/urt
 	cd ${PREFIX}/share/doc/urt; \
-	${EXTRACT_CMD} xf $(DISTDIR)/urt-doc.tar; \
+	${TAR} xf $(DISTDIR)/urt-doc.tar; \
 	cd doc; \
 	find -d . | cpio -dump ..; \
 	cd ..; \
 	${RM} -rf doc; \
 	cd ${PREFIX}/share/examples/urt; \
-	${EXTRACT_CMD} xf $(DISTDIR)/urt-img.tar; \
+	${TAR} xf $(DISTDIR)/urt-img.tar; \
 	chown -R root:wheel . ; \
 	find . -type d -exec chmod 775 '{}' \; ; \
 	find . -type f -exec chmod 664 '{}' \;
diff --git a/graphics/xmandel/Makefile b/graphics/xmandel/Makefile
index 70e74f8d289a..0de32367743a 100644
--- a/graphics/xmandel/Makefile
+++ b/graphics/xmandel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         		18 October 1996
 # Whom:                 		andreas@marvin.robin.de
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/15 10:22:03 asami Exp $
+# $Id: Makefile,v 1.2 1998/08/25 20:21:17 asami Exp $
 #
 
 DISTNAME=	xmandel
@@ -15,7 +15,8 @@ EXTRACT_SUFX=   .shar
 # but this has changed apparently.
 
 EXTRACT_CMD=    sh
-EXTRACT_BEFORE_ARGS=
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	# empty
 USE_IMAKE=      yes
 NO_WRKSUBDIR=   yes
 MAN1=		xmandel.1
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}
diff --git a/korean/pgp.language/Makefile b/korean/pgp.language/Makefile
index 6f020ad0916d..4565738e3556 100644
--- a/korean/pgp.language/Makefile
+++ b/korean/pgp.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:         22 Jul 1998
 # Whom:                 CHOI Junho <junker@jazz.snu.ac.kr>
 #
-# $Id: Makefile,v 1.1.1.1 1998/09/17 14:14:50 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/10/16 02:53:04 jseger Exp $
 #
 # This is based on ja-pgp.
 #
@@ -22,7 +22,8 @@ RUN_DEPENDS=	pgp:${PORTSDIR}/security/pgp
 RESTRICTED=	"Crypto"
 
 EXTRACT_CMD=	unzip
-EXTRACT_ARGS=	-q
+EXTRACT_BEFORE_ARGS=	-q
+EXTRACT_AFTER_ARGS=	# empty
 NO_BUILD=	YES
 
 # version and language specifications
diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 55bc9f05da91..6d3d2c199ab1 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -4,7 +4,7 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.41 1998/12/05 04:00:40 obrien Exp $
+# $Id: Makefile,v 1.42 1998/12/26 20:10:02 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -14,17 +14,13 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.1/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.1/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.1/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.1/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	egcs-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 0e55bef8732f..811f850d85e6 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -4,7 +4,7 @@
 # Date created:				10 Dec 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
-# $Id: Makefile,v 1.12 1998/12/14 10:28:21 obrien Exp $
+# $Id: Makefile,v 1.13 1998/12/14 12:07:48 obrien Exp $
 #
 
 DISTNAME=	egcs-1.1.1
@@ -25,14 +25,12 @@ PATCHFILES=	egcs-1.1.1-pgcc-1.1.1.diff.gz
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2  \
-		autoconf:${PORTSDIR}/devel/autoconf
+BUILD_DEPENDS=  autoconf:${PORTSDIR}/devel/autoconf
+
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| /usr/bin/tar -xf -
 EGCS_REV=	pgcc-2.91.60
 LIBSTDCPP_REV=	2.9.0
 
diff --git a/mail/adcomplain/Makefile b/mail/adcomplain/Makefile
index 13a06d72eaf0..a380f26363f9 100644
--- a/mail/adcomplain/Makefile
+++ b/mail/adcomplain/Makefile
@@ -4,7 +4,7 @@
 # Date created: 13 Sep 1997
 # Whom:         ache@FreeBSD.org
 #
-# $Id: Makefile,v 1.21 1998/12/14 16:33:07 ache Exp $
+# $Id: Makefile,v 1.22 1999/01/15 00:36:52 ache Exp $
 #
 
 DISTNAME=       adcomplain-3.49
@@ -18,6 +18,7 @@ USE_PERL5=      yes
 
 EXTRACT_CMD=    /usr/bin/uudecode
 EXTRACT_BEFORE_ARGS=    <
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	YES
 NO_BUILD=       YES
 
diff --git a/math/bihar/Makefile b/math/bihar/Makefile
index 6fa72e4a63bf..72965c0ab6be 100644
--- a/math/bihar/Makefile
+++ b/math/bihar/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 October 1996
 # Whom:			Pedro Giffuni S.
 #
-# $Id: Makefile,v 1.7 1998/10/09 03:36:39 asami Exp $
+# $Id: Makefile,v 1.8 1998/11/14 09:43:22 asami Exp $
 #
 
 DISTNAME=	bihar
@@ -16,7 +16,9 @@ MAINTAINER=	giffunip@asme.org
 
 # ${DISTFILES} is automatically created from the directory contents
 IGNOREFILES=	${DISTFILES}
+EXTRACT_CMD=		${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
+EXTRACT_AFTER_ARGS=	# empty
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/calc/Makefile b/math/calc/Makefile
index 5d21eb261932..fbf7daff99e5 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -3,7 +3,7 @@
 # Date created:         3 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.10 1997/08/25 00:09:35 asami Exp $
+# $Id: Makefile,v 1.11 1998/06/04 17:13:49 smace Exp $
 #
 
 DISTNAME=	calc-2.9.3t6
@@ -14,7 +14,9 @@ EXTRACT_SUFX=	.tar
 
 MAINTAINER=	jmz@FreeBSD.org
 
+EXTRACT_CMD=		${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
+EXTRACT_AFTER_ARGS=	# empty
 
 MAN1=		calc.1
 IGNOREFILES=	${DISTFILES}	# "on-the-fly" creation of tarball
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index 420fc1b513d6..52d86c9562ff 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 October 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.18 1998/11/14 09:43:20 asami Exp $
+# $Id: Makefile,v 1.19 1998/12/01 09:30:25 asami Exp $
 #
 
 DISTNAME=	eispack
@@ -19,7 +19,8 @@ LIB_DEPENDS=	blas.1:${PORTSDIR}/math/blas
 
 EXTRACT_CMD=	${SH} ${SCRIPTDIR}/uncomp
 EXTRACT_SUFX=	.gz
-EXTRACT_ARGS=	${WRKDIR}
+EXTRACT_BEFORE_ARGS=	${WRKDIR}
+EXTRACT_AFTER_ARGS=	# empty
 
 NO_WRKSUBDIR=	yes
 
diff --git a/math/eval/Makefile b/math/eval/Makefile
index c7aae0c6f8eb..1dea64f03495 100644
--- a/math/eval/Makefile
+++ b/math/eval/Makefile
@@ -3,7 +3,7 @@
 # Date created:         24 Sep 1997
 # Whom:                 eserte
 #
-# $Id: Makefile,v 1.1.1.1 1998/04/26 03:25:09 mph Exp $
+# $Id: Makefile,v 1.2 1998/07/07 18:55:41 scrappy Exp $
 #
 
 DISTNAME=	Eval113
@@ -17,7 +17,9 @@ MAINTAINER=	eserte@cs.tu-berlin.de
 
 BUILD_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
-EXTRACT_CMD=	lha
+EXTRACT_CMD=		${CAT}
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	| lha x -
 
 WRKSRC=		${WRKDIR}/Eval/source
 
diff --git a/math/fftpack/Makefile b/math/fftpack/Makefile
index 6fa72e4a63bf..72965c0ab6be 100644
--- a/math/fftpack/Makefile
+++ b/math/fftpack/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 October 1996
 # Whom:			Pedro Giffuni S.
 #
-# $Id: Makefile,v 1.7 1998/10/09 03:36:39 asami Exp $
+# $Id: Makefile,v 1.8 1998/11/14 09:43:22 asami Exp $
 #
 
 DISTNAME=	bihar
@@ -16,7 +16,9 @@ MAINTAINER=	giffunip@asme.org
 
 # ${DISTFILES} is automatically created from the directory contents
 IGNOREFILES=	${DISTFILES}
+EXTRACT_CMD=		${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
+EXTRACT_AFTER_ARGS=	# empty
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/math/linpack/Makefile b/math/linpack/Makefile
index 3c2f3c48afeb..dba6f8fd1a6d 100644
--- a/math/linpack/Makefile
+++ b/math/linpack/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 October 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.17 1998/11/14 09:43:24 asami Exp $
+# $Id: Makefile,v 1.18 1998/12/01 09:55:09 asami Exp $
 #
 
 DISTNAME=	linpack
@@ -19,7 +19,8 @@ LIB_DEPENDS=    blas.1:${PORTSDIR}/math/blas
 
 EXTRACT_CMD=	${SH} ${SCRIPTDIR}/uncomp
 EXTRACT_SUFX=	.gz
-EXTRACT_ARGS=	${WRKDIR}
+EXTRACT_BEFORE_ARGS=	${WRKDIR}
+EXTRACT_AFTER_ARGS=	# empty
 
 NO_WRKSUBDIR=	yes
 
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index a16832bfd7fc..f0300cee2332 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -7,7 +7,7 @@
 # Date created:         31 July 1995
 # Whom:                 faulkner@cactus.org
 #
-# $Id: Makefile,v 1.12 1997/08/10 22:31:15 fenner Exp $
+# $Id: Makefile,v 1.13 1998/11/28 05:39:00 asami Exp $
 #
 
 DISTNAME=       ast53unx
@@ -24,7 +24,8 @@ MAINTAINER=     ache@FreeBSD.ORG
 
 USE_XLIB=	yes
 EXTRACT_CMD=    ${SH}
-EXTRACT_ARGS=
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	# empty
 DIST_SUBDIR=    astrolog
 ALL_TARGET=     astrolog
 NO_WRKSUBDIR=   Yes
diff --git a/misc/estic/Makefile b/misc/estic/Makefile
index b86e1278ed5e..57c251cb4388 100644
--- a/misc/estic/Makefile
+++ b/misc/estic/Makefile
@@ -3,7 +3,7 @@
 # Date created:					21 Sep 1996
 # Whom:						Julian Stacey <jhs@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1997/07/21 19:28:43 max Exp $
+# $Id: Makefile,v 1.3 1998/11/29 12:43:11 asami Exp $
 #
 
 DISTNAME=		estic-1.40-sources
@@ -20,7 +20,8 @@ BUILD_DEPENDS=		unzip:${PORTSDIR}/archivers/unzip
 
 USE_XLIB=		yes
 EXTRACT_CMD=		unzip
-EXTRACT_BEFORE_ARGS=#	-q
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=		yes
 
 #			maybe one of them depends on the vga font from pcemu ?
diff --git a/misc/kdeutils11/Makefile b/misc/kdeutils11/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/misc/kdeutils11/Makefile
+++ b/misc/kdeutils11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/misc/man.el/Makefile b/misc/man.el/Makefile
index c85ec10ae6e6..5f3ef8f8ac2c 100644
--- a/misc/man.el/Makefile
+++ b/misc/man.el/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 September 1998
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.2 1998/12/02 05:54:52 asami Exp $
+# $Id: Makefile,v 1.3 1998/12/16 11:33:28 flathill Exp $
 #
 
 DISTNAME=	i18n-man-1.1
@@ -23,6 +23,6 @@ ELISPDIR=	${PREFIX}/share/emacs/site-lisp
 do-install:
 	@${MKDIR} ${ELISPDIR}
 	@cd ${WRKSRC}; \
-	${INSTALL_DATA} `${EXTRACT_CMD} tzf ${DISTDIR}/${DISTFILES}` ${ELISPDIR}
+	${INSTALL_DATA} `${TAR} tzf ${DISTDIR}/${DISTFILES}` ${ELISPDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 99b4012b0b77..f7b06dadad65 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:17 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/11 02:13:20 asami Exp $
 #
 
 DISTNAME=	kdemultimedia
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 99b4012b0b77..f7b06dadad65 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:17 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/11 02:13:20 asami Exp $
 #
 
 DISTNAME=	kdemultimedia
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/net/binkd/Makefile b/net/binkd/Makefile
index fd7e74a4dfd9..705a1d9b07f6 100644
--- a/net/binkd/Makefile
+++ b/net/binkd/Makefile
@@ -3,7 +3,7 @@
 # Date created:				19 August 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/12/24 06:55:54 steve Exp $
 #
 
 DISTNAME=		binkd092
@@ -19,7 +19,8 @@ BUILD_DEPENDS=		unzip:${PORTSDIR}/archivers/unzip
 
 WRKSRC=			${WRKDIR}/${PKGNAME}
 EXTRACT_CMD=		unzip
-EXTRACT_BEFORE_ARGS=
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	# empty
 GNU_CONFIGURE=		yes
 MAN8=			binkd.8
 
diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile
index 1dfeaed3c28e..9af97da9c645 100644
--- a/net/kdenetwork11/Makefile
+++ b/net/kdenetwork11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.24 1999/01/07 00:51:55 se Exp $
+# $Id: Makefile,v 1.25 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdenetwork
@@ -15,8 +15,7 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
-		${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		uu.1:${PORTSDIR}/converters/uulib \
@@ -25,10 +24,8 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		js.2:${PORTSDIR}/converters/kdesupport11 \
 		mimelib.1:${PORTSDIR}/converters/kdesupport11 \
 		rdb.55:${PORTSDIR}/converters/kdesupport11
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
 
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index 1dfeaed3c28e..9af97da9c645 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.24 1999/01/07 00:51:55 se Exp $
+# $Id: Makefile,v 1.25 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdenetwork
@@ -15,8 +15,7 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
-		${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		uu.1:${PORTSDIR}/converters/uulib \
@@ -25,10 +24,8 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		js.2:${PORTSDIR}/converters/kdesupport11 \
 		mimelib.1:${PORTSDIR}/converters/kdesupport11 \
 		rdb.55:${PORTSDIR}/converters/kdesupport11
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
 
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 1dfeaed3c28e..9af97da9c645 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.24 1999/01/07 00:51:55 se Exp $
+# $Id: Makefile,v 1.25 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdenetwork
@@ -15,8 +15,7 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
-		${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		uu.1:${PORTSDIR}/converters/uulib \
@@ -25,10 +24,8 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		js.2:${PORTSDIR}/converters/kdesupport11 \
 		mimelib.1:${PORTSDIR}/converters/kdesupport11 \
 		rdb.55:${PORTSDIR}/converters/kdesupport11
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
 
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 1dfeaed3c28e..9af97da9c645 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.24 1999/01/07 00:51:55 se Exp $
+# $Id: Makefile,v 1.25 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdenetwork
@@ -15,8 +15,7 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
-		${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		uu.1:${PORTSDIR}/converters/uulib \
@@ -25,10 +24,8 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		js.2:${PORTSDIR}/converters/kdesupport11 \
 		mimelib.1:${PORTSDIR}/converters/kdesupport11 \
 		rdb.55:${PORTSDIR}/converters/kdesupport11
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
 
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile
index a29dfcc88e32..8a602a60e43c 100644
--- a/net/tac_plus4/Makefile
+++ b/net/tac_plus4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		4 Mar 1997
 # Whom:			Igor Vinokurov <igor@zynaps.ru>
 #
-# $Id: Makefile,v 1.2 1997/09/17 04:51:30 max Exp $
+# $Id: Makefile,v 1.3 1998/01/16 04:06:17 jseger Exp $
 #
 
 DISTNAME=	tac_plus.2.1
@@ -14,7 +14,9 @@ EXTRACT_SUFX=	.tar
 
 MAINTAINER=	igor@zynaps.ru
 
-EXTRACT_BEFORE_ARGS=	-C ${WRKDIR} -xf
+EXTRACT_CMD=		${TAR}
+EXTRACT_BEFORE_ARGS=	-xf
+EXTRACT_AFTER_ARGS=	# empty
 ALL_TARGET=	tac_plus
 MAN8=		tac_plus.8
 EXTRA_PATCH=	patch-ba
diff --git a/print/detex/Makefile b/print/detex/Makefile
index 12649f7c2f85..911c3f04dfbb 100644
--- a/print/detex/Makefile
+++ b/print/detex/Makefile
@@ -4,7 +4,7 @@
 # Date created:			  Mon Feb 17, 1997
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.2 1997/01/25 18:08:40 obrien Exp $
+# $Id: Makefile,v 1.1.1.1 1997/03/25 10:53:08 obrien Exp $
 #
 
 DISTNAME=	detex-2.6
@@ -14,7 +14,9 @@ EXTRACT_SUFX=	.tar
 
 MAINTAINER=     obrien@FreeBSD.org
 
-EXTRACT_BEFORE_ARGS=	-C ${WRKDIR} -xf
+EXTRACT_CMD=		${TAR}
+EXTRACT_BEFORE_ARGS=	-xf
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
 MAN1=		detex.1
 
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index bb73205dd2ac..8337c2c29540 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 December 1998
 # Whom:			giffunip
 #
-# $Id: Makefile,v 1.30 1999/01/23 07:05:21 vanilla Exp $
+# $Id: Makefile,v 1.31 1999/01/27 07:41:25 fenner Exp $
 #
 
 DISTNAME=	ghostscript-5.10
@@ -42,7 +42,7 @@ post-extract:
 	${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
 	${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/png/work/libpng-1.0.3 ${WRKSRC}/libpng
 	# additional PCL3  driver
-	$(EXTRACT_CMD) -xvf ${WRKDIR}/hpdj-2.5/hpdj.tar -C $(WRKSRC)
+	$(TAR) -xvf ${WRKDIR}/hpdj-2.5/hpdj.tar -C $(WRKSRC)
 	${PATCH} --directory=${WRKSRC} <${WRKSRC}/devs.mak-5.10.diff
 	${PATCH} --directory=${WRKSRC} <${WRKSRC}/zmedia2.c-5.10.diff
 
diff --git a/russian/pgp.language/Makefile b/russian/pgp.language/Makefile
index d36f9a1315e1..c51e3560bd52 100644
--- a/russian/pgp.language/Makefile
+++ b/russian/pgp.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:         4 May 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.19 1998/10/16 02:54:07 jseger Exp $
+# $Id: Makefile,v 1.20 1998/10/19 20:00:35 ache Exp $
 #
 
 DISTNAME=       pgp26ru
@@ -20,7 +20,8 @@ BUILD_DEPENDS += unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS += ${PREFIX}/lib/pgp/config.txt:${PORTSDIR}/security/pgp
 
 EXTRACT_CMD=    unzip
-EXTRACT_ARGS=   -q
+EXTRACT_BEFORE_ARGS=	-q
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=   YES
 NO_BUILD=       YES
 
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index 3390e2c9c289..70a49a884442 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -5,7 +5,7 @@
 # Date created:         8 Jul 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp $
+# $Id: Makefile,v 1.21 1998/09/25 10:20:21 asami Exp $
 #
 
 # Pick an initial default, else it doesn't get set in the INDEX.
@@ -56,12 +56,14 @@ BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
 BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS+=   rsaref.2:${PORTSDIR}/security/rsaref
 EXTRACT_CMD=    unzip
-EXTRACT_ARGS=   -q
+EXTRACT_BEFORE_ARGS=	-q
+EXTRACT_AFTER_ARGS=	# empty
 FILESDIR=       ${.CURDIR}/files.usa
 PATCHDIR=       ${.CURDIR}/patches.usa
 
 post-extract:
-	cd ${WRKDIR}; $(EXTRACT_CMD) $(EXTRACT_ARGS) -aa $(DISTNAME)i
+	cd ${WRKDIR}; $(EXTRACT_CMD) $(EXTRACT_BEFORE_ARGS) -aa $(DISTNAME)i \
+		$(EXTRACT_AFTER_ARGS)
 	cd ${WRKDIR}; rm -f *.zip
 
 .else
diff --git a/sysutils/asrpages/Makefile b/sysutils/asrpages/Makefile
index 17e1eeade73a..8b8c57ae2f9d 100644
--- a/sysutils/asrpages/Makefile
+++ b/sysutils/asrpages/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Nov 1997
 # Whom:			Sheldon Hearn <axl@iafrica.com>
 #
-# $Id: Makefile,v 1.4 1998/08/17 20:54:47 asami Exp $
+# $Id: Makefile,v 1.5 1998/09/19 05:48:06 steve Exp $
 #
 
 DISTNAME=	asrpages
@@ -14,7 +14,9 @@ DISTFILES=	asr.pages.tar
 
 MAINTAINER=	axl@iafrica.com
 
-EXTRACT_ARGS=	-xf
+EXTRACT_CMD=	${TAR}
+EXTRACT_BEFORE_ARGS=	-xf
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $
+# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $
 #
 
 DISTNAME=	kdeutils
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index 51d07146a87f..160d605236b9 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.35 1998/12/02 07:57:11 asami Exp $
+# $Id: Makefile,v 1.36 1999/01/23 14:28:27 simokawa Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -84,10 +84,10 @@ ELC_DIR=	../lisp
 #   MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org)
 #   MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches
 post-extract:
-	${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src
 .if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH)
-	${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
 	${MKDIR} ${WRKSRC}/lisp/its
 	${CP} ${WRKDIR}/lisp/its/* ${WRKSRC}/lisp/its/
 .endif
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index 76a577c06a1a..a126ddd02243 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 March 1998
 # Whom:			Jun Kuriyama <kuriyama@opt.phys.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.13 1998/12/23 14:21:43 kuriyama Exp $
+# $Id: Makefile,v 1.14 1999/01/16 07:44:13 kuriyama Exp $
 #
 
 DISTNAME=	db133
@@ -24,6 +24,7 @@ RUN_DEPENDS=	${PREFIX}/share/sgml/docbook/3.0/catalog:${PORTSDIR}/textproc/docbo
 
 EXTRACT_CMD=	unzip
 EXTRACT_BEFORE_ARGS=	-a -q -L
+EXTRACT_AFTER_ARGS=	# empty
 NO_MTREE=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/docbook
diff --git a/textproc/nfbtrans/Makefile b/textproc/nfbtrans/Makefile
index 741bee4f3365..831f15916a7f 100644
--- a/textproc/nfbtrans/Makefile
+++ b/textproc/nfbtrans/Makefile
@@ -3,7 +3,7 @@
 # Date created:			30 Aug 1998
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/30 02:32:23 max Exp $
+# $Id: Makefile,v 1.2 1998/12/01 09:32:32 obrien Exp $
 #
 
 DISTNAME=	nfbtr750
@@ -21,7 +21,8 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 RESTRICTED=	"Unclear copyright status"
 EXTRACT_CMD=	unzip
-EXTRACT_ARGS=	-q -a -L -o
+EXTRACT_BEFORE_ARGS=	-q -a -L -o
+EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
 ALL_TARGET=	freebsd
 MAKEFILE=	makefile
diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index 3642dcbf976f..4ad13398d1a4 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sat Oct 31 16:30:00 CDT 1997
 # Whom:                 hetzels@westbend.net
 #
-# $Id: Makefile,v 1.6 1998/12/02 00:32:38 obrien Exp $
+# $Id: Makefile,v 1.7 1999/01/26 02:27:26 steve Exp $
 #
 
 DISTNAME=       apache_${AP_VERS}
@@ -108,7 +108,7 @@ pre-extract:
 post-extract:
 	@${ECHO} "===>  Extracting FrontPage install scripts"
 	@cd ${WRKSRC} && \
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} ${FPINSTALL} ${CHANGESERVER}
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${FRONTPAGE} ${EXTRACT_AFTER_ARGS} ${FPINSTALL} ${CHANGESERVER}
 
 post-install:
 	@${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh file."
diff --git a/www/htmlpp/Makefile b/www/htmlpp/Makefile
index 27336d843c96..38521400c8c9 100644
--- a/www/htmlpp/Makefile
+++ b/www/htmlpp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         9 Nov 1997
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1998/09/15 21:31:55 asami Exp $
+# $Id: Makefile,v 1.3 1998/11/29 08:20:30 asami Exp $
 #
 
 DISTNAME=	htmlpp
@@ -17,7 +17,8 @@ MAINTAINER=	dburr@FreeBSD.ORG
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 EXTRACT_CMD=	unzip
-EXTRACT_ARGS=	-qa
+EXTRACT_BEFORE_ARGS=	-qa
+EXTRACT_AFTER_ARGS=	# empty
 
 USE_PERL5=	YES
 
diff --git a/www/netscape4-navigator/Makefile b/www/netscape4-navigator/Makefile
index fc4c78fdd983..bf339a5c6674 100644
--- a/www/netscape4-navigator/Makefile
+++ b/www/netscape4-navigator/Makefile
@@ -3,7 +3,7 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.35 1999/01/06 04:18:14 simokawa Exp $
+# $Id: Makefile,v 1.36 1999/01/13 04:00:09 scrappy Exp $
 #
 
 DISTNAME=       netscape-navigator-4.08
@@ -49,7 +49,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${NDIR}/java/classes
 	${INSTALL_PROGRAM} ${WRKSRC}/vreg ${NDIR}
 	for i in ${WRKSRC}/*.nif; do \
-		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $${i} -C ${NDIR}; \
+		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $${i} ${EXTRACT_AFTER_ARGS} -C ${NDIR}; \
 	done
 	${WRKSRC}/vreg ${NDIR}/registry ${WRKSRC}/infile
 	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.08.bin
diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile
index 40bf13f798c8..8f5e31f8b108 100644
--- a/x11-fonts/etlfonts/Makefile
+++ b/x11-fonts/etlfonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:		3 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.4 1998/08/05 09:31:42 asami Exp $
+# $Id: Makefile,v 1.5 1998/08/07 22:43:08 asami Exp $
 #
 
 DISTNAME=	non-cjk
@@ -14,7 +14,9 @@ EXTRACT_SUFX=	.tar
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-EXTRACT_ARGS=	-xf
+EXTRACT_CMD=		${TAR}
+EXTRACT_BEFORE_ARGS=	-xf
+EXTRACT_AFTER_ARGS=	# empty
 USE_X_PREFIX=	yes
 
 post-extract:
diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index b1620d541670..42d15de1b858 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -3,7 +3,7 @@
 # Date created:        19 Januruary 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.12 1998/12/23 01:33:52 steve Exp $
+# $Id: Makefile,v 1.13 1999/01/12 16:51:02 vanilla Exp $
 #
 
 DISTNAME=	mlvwm089
@@ -30,6 +30,7 @@ post-install:
 	${RM} -f ${PREFIX}/lib/X11/mlvwm/*.orig
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/mini-icons.tar.gz \
+		${EXTRACT_AFTER_ARGS} \
 		-C ${PREFIX}/lib/X11/mlvwm/pixmap
 .if !defined(NOPORTDOCS)
 	${INSTALL_MAN} ${WRKSRC}/man/mlvwm.1 ${PREFIX}/man/man1
diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile
index ff9dfa75221c..707dea1bdc15 100644
--- a/x11/fbsd-icons/Makefile
+++ b/x11/fbsd-icons/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sat Jun 14 09:43:24 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.3 1998/06/27 05:19:51 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/05 09:31:42 asami Exp $
 #
 
 DISTNAME=	fbsd-icons
@@ -19,6 +19,6 @@ NO_WRKSUBDIR=	yes
 
 do-install:
 		${MKDIR} ${X11BASE}/icons
-		( cd ${X11BASE}/icons; ${EXTRACT_CMD} xzf ${DISTDIR}/fbsd-icons.tar.gz )
+		( cd ${X11BASE}/icons; ${TAR} -xzf ${DISTDIR}/fbsd-icons.tar.gz )
 
 .include <bsd.port.mk>
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
 #
 
 DISTNAME=	kdebase
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
 #
 
 DISTNAME=	kdebase
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
 #
 
 DISTNAME=	kdebase
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
 #
 
 DISTNAME=	kdebase
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
 #
 
 DISTNAME=	kdebase
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
 #
 
 DISTNAME=	kdebase
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
 #
 
 DISTNAME=	kdebase
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
 #
 
 DISTNAME=	kdebase
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
 #
 
 DISTNAME=	kdebase
@@ -15,16 +15,12 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 28ccce5e3da6..284289e073d8 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.22 1998/11/14 09:43:39 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/07 00:52:03 se Exp $
 #
 
 DISTNAME=	kdelibs
@@ -15,14 +15,10 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 28ccce5e3da6..284289e073d8 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.22 1998/11/14 09:43:39 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/07 00:52:03 se Exp $
 #
 
 DISTNAME=	kdelibs
@@ -15,14 +15,10 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 28ccce5e3da6..284289e073d8 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.22 1998/11/14 09:43:39 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/07 00:52:03 se Exp $
 #
 
 DISTNAME=	kdelibs
@@ -15,14 +15,10 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 28ccce5e3da6..284289e073d8 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.22 1998/11/14 09:43:39 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/07 00:52:03 se Exp $
 #
 
 DISTNAME=	kdelibs
@@ -15,14 +15,10 @@ EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar xf -
-
+USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \