From 758d912e338f2060213377f59a7f58ced9eeab24 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 21 Jan 2006 18:57:40 +0000
Subject: Update package Makefile now that bsd.pkg.extract.mk is using the
 "extract" script for extraction.  Many cases where a custom EXTRACT_CMD
 simply copied the distfile into the work directory are no longer needed.  The
 extract script also hides differences between pax and tar behind a common
 command-line interface, so we no longer need code that's conditional on
 whether EXTRACT_USING is tar or pax.

---
 games/falcons-eye/Makefile | 4 ++--
 games/quakedata/Makefile   | 6 ++++--
 games/xdoom/Makefile       | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'games')

diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index 7ac2ddd2976..7c8847b0b3b 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/12/11 09:40:41 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/21 18:57:41 jlam Exp $
 #
 
 DISTNAME=		nethack_source_331_jtp_193
@@ -12,7 +12,7 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		http://falconseye.sourceforge.net/
 COMMENT=		Falcon's Eye NetHack
 
-EXTRACT_CMD=		unzip -aq ${DOWNLOADED_DISTFILE}
+EXTRACT_OPTS_ZIP=	-aq
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 DIST_SUBDIR=		${PKGNAME_NOREV}-20050216-2
diff --git a/games/quakedata/Makefile b/games/quakedata/Makefile
index a85fd05e36a..dd573333fe8 100644
--- a/games/quakedata/Makefile
+++ b/games/quakedata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/19 15:30:15 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/21 18:57:41 jlam Exp $
 
 DISTNAME=	quake106
 PKGNAME=	quakedata-1.0
@@ -19,8 +19,10 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+EXTRACT_ELEMENTS=	resource.*
+EXTRACT_OPTS_ZIP=	-qo
+
 WRKSRC=		${WRKDIR}
-EXTRACT_CMD=	unzip -q -o ${DOWNLOADED_DISTFILE} -d ${WRKDIR} resource.*
 NO_BUILD=	YES
 
 post-extract:
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index f06b7f7c1c1..5c1a7f16701 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/12/05 20:50:18 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2006/01/21 18:57:41 jlam Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
@@ -16,9 +16,10 @@ BUILD_DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 
 LICENSE=	xdoom-license
 
+EXTRACT_ONLY=		doomsrc.zip
+EXTRACT_OPTX_ZIP=	-qo
+
 WRKSRC=		${WRKDIR}
-EXTRACT_ONLY=	doomsrc.zip
-EXTRACT_CMD=	unzip -qo ${DISTDIR}/${EXTRACT_ONLY}
 USE_X11BASE=	yes
 USE_TOOLS+=	gmake gunzip
 MAKE_ENV+=	X11BASE=${X11BASE:Q} INSTALL_PREFIX=${PREFIX:Q}
-- 
cgit v1.2.3