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

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

The fix here is one of the following.

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

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

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

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

7 files changed, 16 insertions, 30 deletions

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>