Remove duplicate BUILD_DEPENDS for unzip (bsd.pkg.mk has an automatic one

if EXTRACT_SUFX is .zip); also remove EXTRACT_CMDs that are the same as
the implicit one.

6 files changed, 6 insertions, 23 deletions

diff --git a/audio/guspatches/Makefile b/audio/guspatches/Makefile
index bac3e2d9c1e..c5602062964 100644
--- a/audio/guspatches/Makefile
+++ b/audio/guspatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 13:30:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/20 11:40:07 wiz Exp $
 #
 
 DISTNAME=	dgguspat
@@ -10,8 +10,6 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=     packages@netbsd.org
 COMMENT=	GUS (Gravis Ultrasound) patches (audio samples) for TiMidity
 
-BUILD_DEPENDS+=	unzip:../../archivers/unzip
-
 CONFLICTS=	eawpatches-*
 
 RESTRICTED=		"Uses copyrighted patches"
diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile
index 95d132e669b..bd6b643ff64 100644
--- a/audio/mbrola/Makefile
+++ b/audio/mbrola/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 13:30:46 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/20 11:40:08 wiz Exp $
 
 DISTNAME=		mbr301h
 PKGNAME=		mbrola-301h
@@ -10,11 +10,8 @@ MAINTAINER=		proff@iq.org
 HOMEPAGE=		http://tcts.fpms.ac.be/synthesis/
 COMMENT=		MBROLA diphone synthesizer executable (only for i386)
 
-BUILD_DEPENDS=		unzip:../../archivers/unzip
-
 LICENSE=		no-commercial-use
 
-EXTRACT_CMD=		unzip -Loq ${DOWNLOADED_DISTFILE}
 NO_WRKSUBDIR=
 NO_BUILD=
 
diff --git a/audio/mbrolavox-en1/Makefile b/audio/mbrolavox-en1/Makefile
index bc6c42735b1..9ea7a35e0e6 100644
--- a/audio/mbrolavox-en1/Makefile
+++ b/audio/mbrolavox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 13:30:46 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/20 11:40:08 wiz Exp $
 
 DISTNAME=	en1-980910
 PKGNAME=	mbrolavox-en1-980910
@@ -11,13 +11,10 @@ MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 COMMENT=	British English male voice for MBROLA
 
-BUILD_DEPENDS=	unzip:../../archivers/unzip
 DEPENDS+=	mbrola-301h:../mbrola
 
 LICENSE=	no-commercial-use
 
-EXTRACT_CMD=	unzip -Loq ${DOWNLOADED_DISTFILE}
-
 NO_BUILD=	yes
 
 MHOME=		${PREFIX}/share/mbrola/voices
diff --git a/audio/mbrolavox-us1/Makefile b/audio/mbrolavox-us1/Makefile
index b8a9f01d16e..ca44d39f846 100644
--- a/audio/mbrolavox-us1/Makefile
+++ b/audio/mbrolavox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 13:30:46 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/20 11:40:08 wiz Exp $
 
 DISTNAME=	us1-980512
 PKGNAME=	mbrolavox-us1-980512
@@ -12,12 +12,9 @@ HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/
 COMMENT=	American English female voice for MBROLA
 
 DEPENDS+=	mbrola-301h:../mbrola
-BUILD_DEPENDS=	unzip:../../archivers/unzip
 
 LICENSE=	no-commercial-use
 
-EXTRACT_CMD=	unzip -Loq ${DOWNLOADED_DISTFILE}
-
 NO_BUILD=	yes
 
 MHOME=		${PREFIX}/share/mbrola/voices
diff --git a/audio/mbrolavox-us2/Makefile b/audio/mbrolavox-us2/Makefile
index a893936d718..fc86ba1df02 100644
--- a/audio/mbrolavox-us2/Makefile
+++ b/audio/mbrolavox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 13:30:46 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/20 11:40:08 wiz Exp $
 
 DISTNAME=	us2-980812
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -12,12 +12,9 @@ HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola.html
 COMMENT=	American English male voice for MBROLA
 
 DEPENDS+=	mbrola-301h:../mbrola
-BUILD_DEPENDS=	unzip:../../archivers/unzip
 
 LICENSE=	no-commercial-use
 
-EXTRACT_CMD=	unzip -Loq ${DOWNLOADED_DISTFILE}
-
 NO_BUILD=	yes
 
 MHOME=		${PREFIX}/share/mbrola/voices
diff --git a/audio/mbrolavox-us3/Makefile b/audio/mbrolavox-us3/Makefile
index 4386e8843a3..dc7693ed894 100644
--- a/audio/mbrolavox-us3/Makefile
+++ b/audio/mbrolavox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 13:30:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/20 11:40:08 wiz Exp $
 
 DISTNAME=	us3-990208
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -12,12 +12,9 @@ HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola.html
 COMMENT=	American English male voice for MBROLA
 
 DEPENDS+=	mbrola-301h:../mbrola
-BUILD_DEPENDS=	unzip:../../archivers/unzip
 
 LICENSE=	no-commercial-use
 
-EXTRACT_CMD=	unzip -Loq ${DOWNLOADED_DISTFILE}
-
 NO_BUILD=	yes
 
 MHOME=		${PREFIX}/share/mbrola/voices