14 files changed, 34 insertions, 48 deletions

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