Don't require exact nb revision for mbrola or the mbrolavox packages.

Take any nb revision. Bump revisions of all affected packages.

8 files changed, 28 insertions, 28 deletions

diff --git a/audio/festvox-en1/Makefile b/audio/festvox-en1/Makefile
index 7236f1df0d3..62e9905fefe 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2007/06/08 18:33:09 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/08/23 21:08:20 joerg Exp $
 
 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
@@ -13,8 +13,8 @@ COMMENT=	MBROLA based British English male voice for festival
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
 DEPENDS+=	festlex-oald>=1.4.0:../../audio/festlex-oald
-DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
-DEPENDS+=	mbrolavox-en1-980910nb1:../../audio/mbrolavox-en1
+DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
+DEPENDS+=	mbrolavox-en1-980910{,nb[0-9]*}:../../audio/mbrolavox-en1
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-us1/Makefile b/audio/festvox-us1/Makefile
index 434f19e897a..a12dcfaa1fb 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/06/08 18:33:09 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/08/23 21:08:20 joerg Exp $
 
 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
@@ -13,8 +13,8 @@ COMMENT=	MBROLA based American English female voice for festival
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
 DEPENDS+=	festlex-cmu>=1.4.0:../../audio/festlex-cmu
-DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
-DEPENDS+=	mbrolavox-us1-980512nb1:../../audio/mbrolavox-us1
+DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
+DEPENDS+=	mbrolavox-us1-980512{,nb[0-9]*}:../../audio/mbrolavox-us1
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index 136b14b05a9..b15fbe253f4 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/06/08 18:33:10 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/08/23 21:08:20 joerg Exp $
 
 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
@@ -13,8 +13,8 @@ COMMENT=	MBROLA based Americal English male voice for festival
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
 DEPENDS+=	festlex-cmu>=1.4.0:../../audio/festlex-cmu
-DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
-DEPENDS+=	mbrolavox-us2-980812nb1:../../audio/mbrolavox-us2
+DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
+DEPENDS+=	mbrolavox-us2-980812{,nb[0-9]*}:../../audio/mbrolavox-us2
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index 8d226586669..0656666324a 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/06/08 18:33:10 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/08/23 21:08:20 joerg Exp $
 
 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
@@ -13,8 +13,8 @@ COMMENT=	MBROLA based American English male voice for festival
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
 DEPENDS+=	festlex-cmu>=1.4.0:../../audio/festlex-cmu
-DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
-DEPENDS+=	mbrolavox-us3-990208nb1:../../audio/mbrolavox-us3
+DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
+DEPENDS+=	mbrolavox-us3-990208{,nb[0-9]*}:../../audio/mbrolavox-us3
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/mbrolavox-en1/Makefile b/audio/mbrolavox-en1/Makefile
index 544ecf12eb9..7e804f11bff 100644
--- a/audio/mbrolavox-en1/Makefile
+++ b/audio/mbrolavox-en1/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/12/28 11:47:52 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/08/23 21:08:20 joerg Exp $
 
 DISTNAME=	en1-980910
 PKGNAME=	mbrolavox-en1-980910
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/en1/ \
 		http://www.festvox.org/mbrola/dba/en1/
@@ -12,7 +12,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola/
 COMMENT=	British English male voice for MBROLA
 
-DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
+DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/mbrolavox-us1/Makefile b/audio/mbrolavox-us1/Makefile
index 00a89bf064e..f4e7ad302bb 100644
--- a/audio/mbrolavox-us1/Makefile
+++ b/audio/mbrolavox-us1/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/12/28 11:47:52 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/08/23 21:08:20 joerg Exp $
 
 DISTNAME=	us1-980512
 PKGNAME=	mbrolavox-us1-980512
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us1/ \
 		http://www.festvox.org/mbrola/dba/us1/
@@ -12,7 +12,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola/
 COMMENT=	American English female voice for MBROLA
 
-DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
+DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/mbrolavox-us2/Makefile b/audio/mbrolavox-us2/Makefile
index 565870b78eb..ab581f65eac 100644
--- a/audio/mbrolavox-us2/Makefile
+++ b/audio/mbrolavox-us2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/12/28 11:47:52 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/08/23 21:08:20 joerg Exp $
 
 DISTNAME=	us2-980812
 PKGNAME=	mbrolavox-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us2/ \
 		http://www.festvox.org/mbrola/dba/us2/
@@ -12,7 +12,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola/
 COMMENT=	American English male voice for MBROLA
 
-DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
+DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/mbrolavox-us3/Makefile b/audio/mbrolavox-us3/Makefile
index 49ebcdcb9d4..5688923a721 100644
--- a/audio/mbrolavox-us3/Makefile
+++ b/audio/mbrolavox-us3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/12/28 11:47:52 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/08/23 21:08:20 joerg Exp $
 
 DISTNAME=	us3-990208
 PKGNAME=	mbrolavox-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us3/ \
 		http://www.festvox.org/mbrola/dba/us3/
@@ -12,7 +12,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola/
 COMMENT=	American English male voice for MBROLA
 
-DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
+DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
 
 LICENSE=	no-commercial-use