Switch to using USE_ZIP along with minor cleanups to some ports.

8 files changed, 24 insertions, 60 deletions

diff --git a/games/crafty-open-large/Makefile b/games/crafty-open-large/Makefile
index 69d93341fff2..736814e08663 100644
--- a/games/crafty-open-large/Makefile
+++ b/games/crafty-open-large/Makefile
@@ -3,7 +3,7 @@
 # Date created:				1 June 1998
 # Whom:					Stefan Eggers <seggers@semyam.dinoco.de>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/04 02:37:37 mph Exp $
 #
 
 DISTNAME=	crafty-open-large-19960910
@@ -13,14 +13,11 @@ DISTFILES=	large1.zip large2.zip large3.zip large4.zip
 
 MAINTAINER=	seggers@semyam.dinoco.de
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
-		crafty:${PORTSDIR}/games/crafty
+BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 
 DIST_SUBDIR=		crafty
-EXTRACT_AFTER_ARGS=
-EXTRACT_BEFORE_ARGS=
-EXTRACT_CMD=		unzip
+USE_ZIP=		yes
 NO_WRKSUBDIR=		yes
 
 post-extract:
diff --git a/games/crafty-open-medium/Makefile b/games/crafty-open-medium/Makefile
index d9d6de7d2e15..cdb8c621c48e 100644
--- a/games/crafty-open-medium/Makefile
+++ b/games/crafty-open-medium/Makefile
@@ -3,25 +3,21 @@
 # Date created:				1 June 1998
 # Whom:					Stefan Eggers <seggers@semyam.dinoco.de>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/04 02:33:59 mph Exp $
 #
 
 DISTNAME=	medium
 PKGNAME=	crafty-open-medium-19960910
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/common/
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	seggers@semyam.dinoco.de
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
-		crafty:${PORTSDIR}/games/crafty
+BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 
 DIST_SUBDIR=		crafty
-EXTRACT_AFTER_ARGS=
-EXTRACT_BEFORE_ARGS=
-EXTRACT_CMD=		unzip
+USE_ZIP=		yes
 NO_WRKSUBDIR=		yes
 
 do-build:
diff --git a/games/crafty-open-small/Makefile b/games/crafty-open-small/Makefile
index 8fa24333670d..b3cdc9903135 100644
--- a/games/crafty-open-small/Makefile
+++ b/games/crafty-open-small/Makefile
@@ -3,25 +3,21 @@
 # Date created:				1 June 1998
 # Whom:					Stefan Eggers <seggers@semyam.dinoco.de>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/04 02:31:58 mph Exp $
 #
 
 DISTNAME=	small
 PKGNAME=	crafty-open-small-19970301
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/common/
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	seggers@semyam.dinoco.de
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
-		crafty:${PORTSDIR}/games/crafty
+BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 
 DIST_SUBDIR=		crafty
-EXTRACT_AFTER_ARGS=
-EXTRACT_BEFORE_ARGS=
-EXTRACT_CMD=		unzip
+USE_ZIP=		yes
 NO_WRKSUBDIR=		yes
 
 do-build:
diff --git a/games/doom/Makefile b/games/doom/Makefile
index f8c15f6474f5..3e5f2a02cecd 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -3,22 +3,19 @@
 # Date created:         Mon Dec 14 21:03:01 MET 1998
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.11 1999/02/10 03:52:47 jmz Exp $
+# $Id: Makefile,v 1.12 1999/02/10 05:07:58 jmz Exp $
 #
 
-DISTNAME=	doomsrc-1.8
+DISTNAME=	doomsrc
 PKGNAME=	doom-1.8
 CATEGORIES=	games
 MASTER_SITES?=	ftp://ftp.idsoftware.com/idstuff/source/ \
 		ftp://ftp.stomped.com/pub/idmirror/idstuff/source/ \
 		ftp://ftp.cdrom.com/pub/idgames/idstuff/source/ \
 		ftp://ftp.gamesnet.net/idsoftware/source/
-DISTFILES?=	doomsrc.zip
 
 MAINTAINER=	jmz@FreeBSD.org
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-
 NO_CDROM=	requested by IDsoftware
 
 MASTER_SITES2=	ftp://sunsite.unc.edu/pub/Linux/games/doom/ \
@@ -27,9 +24,7 @@ MASTER_SITES2=	ftp://sunsite.unc.edu/pub/Linux/games/doom/ \
 DISTFILES2=	doom1v18.wad.gz
 
 USE_XLIB=	yes
-EXTRACT_CMD=	unzip
-EXTRACT_BEFORE_ARGS=	-q
-EXTRACT_AFTER_ARGS=	# empty
+USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
 
diff --git a/games/inform/Makefile b/games/inform/Makefile
index fc38045fef24..93b5d85b02f3 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.2 1999/01/08 00:15:21 mph Exp $
+# $Id: Makefile,v 1.3 1999/02/03 11:11:44 asami Exp $
 #
 
 DISTNAME=	inform-6.15
@@ -12,22 +12,18 @@ MASTER_SITES=  	ftp://ftp.gmd.de/if-archive/infocom/compilers/inform6/source/ \
 		ftp://ftp.gmd.de/if-archive/infocom/compilers/inform6/library/
 DISTFILES=	inform615_source.zip inform_library68.zip
 
+MAINTAINER=	mph@freebsd.org
+
 .if !defined(NOPORTDOCS)
 MASTER_SITES+=	ftp://ftp.gmd.de/if-archive/infocom/compilers/inform6/manuals/
 DISTFILES+=	designers_manual_html.zip
 .endif
 
-MAINTAINER=	mph@freebsd.org
-
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-
 DIST_SUBDIR=	inform
 NO_WRKSUBDIR=	yes
 
-EXTRACT_ONLY=		inform615_source.zip
-EXTRACT_CMD=		unzip
-EXTRACT_BEFORE_ARGS=	-qq
-EXTRACT_AFTER_ARGS=	# empty
+EXTRACT_ONLY=	inform615_source.zip
+USE_ZIP=	yes
 
 # I can hardly believe it, but the ".c" and ".h" extensions are
 # not present on the source files.
@@ -35,7 +31,7 @@ post-extract:
 	@${MV} ${WRKSRC}/header ${WRKSRC}/header.h
 .for file in arrays asm bpatch chars directs errors expressc expressp \
 	files inform lexer linker memory objects states symbols syntax \
-	tables text veneer verbs 
+	tables text veneer verbs
 	@${MV} ${WRKSRC}/${file} ${WRKSRC}/${file}.c
 .endfor
 	@${CP} ${FILESDIR}/Makefile.inform ${WRKSRC}/Makefile
diff --git a/games/jzip/Makefile b/games/jzip/Makefile
index 613a5bd92602..6d3302a6941e 100644
--- a/games/jzip/Makefile
+++ b/games/jzip/Makefile
@@ -3,22 +3,17 @@
 # Date created:				7 May 1998
 # Whom:					Matthew Hunt <mph@FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1998/07/05 04:15:04 mph Exp $
+# $Id: Makefile,v 1.4 1999/02/03 11:11:44 asami Exp $
 #
 
 DISTNAME=		jzip201g
 PKGNAME=		jzip-2.0.1g
 CATEGORIES=		games
 MASTER_SITES=   	http://www.freebsd.org/~mph/distfiles/
-EXTRACT_SUFX=		.zip
 
 MAINTAINER=		mph@freebsd.org
 
-BUILD_DEPENDS=		unzip:${PORTSDIR}/archivers/unzip
-
-EXTRACT_CMD=		unzip
-EXTRACT_BEFORE_ARGS=	-qq
-EXTRACT_AFTER_ARGS=	# empty
+USE_ZIP=		yes
 
 NO_WRKSUBDIR=		yes
 
diff --git a/games/uox3/Makefile b/games/uox3/Makefile
index 399caa04123a..9948d02bc21f 100644
--- a/games/uox3/Makefile
+++ b/games/uox3/Makefile
@@ -3,7 +3,7 @@
 # Date created:         24 Feb 1999
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/02/25 06:55:49 dburr Exp $
+# $Id: Makefile,v 1.2 1999/02/28 09:30:56 dburr Exp $
 #
 
 DISTNAME=	uox3v6902-linux
@@ -11,18 +11,12 @@ PKGNAME=	uox3-0.69.02
 CATEGORIES=	games
 MASTER_SITES=	ftp://provolone.dynip.com/pub/ \
 		http://users.1st.net/magda/
-EXTRACT_SUFX=	.zip
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} tqpsworld${EXTRACT_SUFX}
 
 MAINTAINER=	dburr@FreeBSD.ORG
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-
 DIST_SUBDIR=		uox3
-EXTRACT_CMD=		unzip
-EXTRACT_BEFORE_ARGS=	-qa
-EXTRACT_AFTER_ARGS=	# This space left intentionally blank.
-
+USE_ZIP=	YES
 NO_WRKSUBDIR=	YES
 
 USE_GMAKE=	YES
diff --git a/games/xpacman/Makefile b/games/xpacman/Makefile
index 2cc69c30f10e..62e313a47e76 100644
--- a/games/xpacman/Makefile
+++ b/games/xpacman/Makefile
@@ -3,23 +3,18 @@
 # Date created:         19 Aug 1995
 # Whom:                 joerg
 #
-# $Id: Makefile,v 1.5 1998/09/28 02:25:21 steve Exp $
+# $Id: Makefile,v 1.6 1999/02/03 11:11:45 asami Exp $
 #
 
 DISTNAME=       pacman10
 PKGNAME=	xpacman-1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nvg.unit.no/pub/pacman/
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	joerg@FreeBSD.org
 
-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_ZIP=	yes
 USE_IMAKE=      yes
 MAN1=		pacman.1