Rename the following variables to reduce the number that we need to track:

	EXTRACT_CMD_OPTS.bin		->  EXTRACT_OPTS_BIN
	EXTRACT_CMD_OPTS.lha		->  EXTRACT_OPTS_LHA
	EXTRACT_CMD_OPTS.rar		->  EXTRACT_OPTS_RAR
	EXTRACT_CMD_OPTS.tar		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tar.Z		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tar.bz2	->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tar.gz		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tbz		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tbz2		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tgz		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.zip		->  EXTRACT_OPTS_ZIP
	EXTRACT_CMD_OPTS.zoo		->  EXTRACT_OPTS_ZOO
	EXTRACT_CMD_OPTS_tar.gz		->  EXTRACT_OPTS_TAR

8 files changed, 16 insertions, 16 deletions

diff --git a/emulators/DatLib/Makefile b/emulators/DatLib/Makefile
index 5a484757b65..17b0e5377b2 100644
--- a/emulators/DatLib/Makefile
+++ b/emulators/DatLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/01/19 21:42:46 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/20 23:41:29 jlam Exp $
 #
 
 DISTNAME=		datlib215
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		datlib
-EXTRACT_CMD_OPTS.zip=	-Laaqo
+EXTRACT_OPTS_ZIP=	-Laaqo
 
 MAKE_ENV+=		RANLIB=${RANLIB:Q}
 INSTALLATION_DIRS=	lib
diff --git a/emulators/DatUtil/Makefile b/emulators/DatUtil/Makefile
index 6841387b50b..8a2fb822887 100644
--- a/emulators/DatUtil/Makefile
+++ b/emulators/DatUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/01/19 21:43:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/20 23:41:29 jlam Exp $
 #
 
 DISTNAME=		dutil227
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		datutil
-EXTRACT_CMD_OPTS.zip=	-Laaqo
+EXTRACT_OPTS_ZIP=	-Laaqo
 
 INSTALLATION_DIRS=	bin
 
diff --git a/emulators/MAMEDiff/Makefile b/emulators/MAMEDiff/Makefile
index cfed7fb2965..c90bee46a0e 100644
--- a/emulators/MAMEDiff/Makefile
+++ b/emulators/MAMEDiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/01/11 18:55:16 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/20 23:41:29 jlam Exp $
 #
 
 DISTNAME=		mdiff224
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		mamediff
-EXTRACT_CMD_OPTS.zip=	-Laaqo
+EXTRACT_OPTS_ZIP=	-Laaqo
 INSTALLATION_DIRS=	bin
 
 BUILDLINK_DEPENDS.DatLib+=	DatLib>=2.13
diff --git a/emulators/ROMBuild/Makefile b/emulators/ROMBuild/Makefile
index ef9e3ebffea..c02722037df 100644
--- a/emulators/ROMBuild/Makefile
+++ b/emulators/ROMBuild/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/17 18:38:33 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/20 23:41:29 jlam Exp $
 #
 
 DISTNAME=		rbuild27
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		rombuild
-EXTRACT_CMD_OPTS.zip=	-Laaqo
+EXTRACT_OPTS_ZIP=	-Laaqo
 INSTALLATION_DIRS=	bin
 
 post-extract:
diff --git a/emulators/ROMInfo/Makefile b/emulators/ROMInfo/Makefile
index 2ca578ef204..429f5e9a9e9 100644
--- a/emulators/ROMInfo/Makefile
+++ b/emulators/ROMInfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/01/01 19:37:12 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/20 23:41:29 jlam Exp $
 #
 
 DISTNAME=		rinfo26
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		rominfo
-EXTRACT_CMD_OPTS.zip=	-Laaqo
+EXTRACT_OPTS_ZIP=	-Laaqo
 INSTALLATION_DIRS=	bin
 
 BUILDLINK_DEPENDS.DatLib+=	DatLib>=2.13
diff --git a/emulators/ZIPIdent/Makefile b/emulators/ZIPIdent/Makefile
index 3ff4afc241c..1027c2427b3 100644
--- a/emulators/ZIPIdent/Makefile
+++ b/emulators/ZIPIdent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/01/01 19:37:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/20 23:41:30 jlam Exp $
 #
 
 DISTNAME=		zident27
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		zipident
-EXTRACT_CMD_OPTS.zip=	-Laaqo
+EXTRACT_OPTS_ZIP=	-Laaqo
 INSTALLATION_DIRS=	bin
 
 BUILDLINK_DEPENDS.DatLib+=	DatLib>=2.13
diff --git a/emulators/arnold/Makefile b/emulators/arnold/Makefile
index bde1580b611..8068804cd30 100644
--- a/emulators/arnold/Makefile
+++ b/emulators/arnold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/11 09:40:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/20 23:41:30 jlam Exp $
 #
 
 DISTNAME=		arnsrc27012002
@@ -13,7 +13,7 @@ HOMEPAGE=		http://arnold.emuunlim.com/
 COMMENT=		Amstrad CPC, Amstrad CPC+ and KC Compact emulator
 
 # we want case sensitive file names.
-EXTRACT_CMD_OPTS.zip=	-aqo
+EXTRACT_OPTS_ZIP=	-aqo
 
 WRKSRC=			${WRKDIR}/arnold
 GNU_CONFIGURE=		yes
diff --git a/emulators/sms_sdl/Makefile b/emulators/sms_sdl/Makefile
index 3be23551c54..66bfefadc4c 100644
--- a/emulators/sms_sdl/Makefile
+++ b/emulators/sms_sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/11 09:40:39 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/20 23:41:30 jlam Exp $
 #
 
 DISTNAME=		sms_sdl-0.9.4a-r7.1-src
@@ -14,7 +14,7 @@ COMMENT=		SMS Plus emulator port to SDL
 
 WRKSRC=			${WRKDIR}/sms_sdl-0.9.4a-r7.1
 BUILD_DIRS=		sdl
-EXTRACT_CMD_OPTS.zip=	-aqo
+EXTRACT_OPTS_ZIP=	-aqo
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sdl/sms_sdl ${PREFIX}/bin