Mechanical changes to 375 files to change dependency patterns of the form

foo-* to foo-[0-9]*.  This is to cause the dependencies to match only the
packages whose base package name is "foo", and not those named "foo-bar".
A concrete example is p5-Net-* matching p5-Net-DNS as well as p5-Net.  Also
change dependency examples in Packages.txt to reflect this.

18 files changed, 41 insertions, 41 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 0471b922a4d..28dd39eb708 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/02 17:45:32 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:17:42 jlam Exp $
 #
 
 DISTNAME=	audacity-src-0.96
@@ -11,12 +11,12 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://audacity.sourceforge.net/
 COMMENT=	audio editor
 
-DEPENDS+=	wxGTK-*:../../x11/wxGTK
-DEPENDS+=	pth-*:../../devel/pth
-DEPENDS+=	id3lib-*:../../audio/id3lib
-DEPENDS+=	libmpeg3-*:../../devel/libmpeg3
+DEPENDS+=	wxGTK-[0-9]*:../../x11/wxGTK
+DEPENDS+=	pth-[0-9]*:../../devel/pth
+DEPENDS+=	id3lib-[0-9]*:../../audio/id3lib
+DEPENDS+=	libmpeg3-[0-9]*:../../devel/libmpeg3
 DEPENDS+=	lame>=3.89:../../audio/lame
-BUILD_DEPENDS+=	zip-*:../../archivers/zip
+BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--without-xaudio --with-libmpeg3
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index beb3b7b7f76..d58a473919a 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:42 jlam Exp $
 # FreeBSD: ports/audio/cmp3/Makefile,v 1.13 2001/02/04 21:12:44 olgeni Exp
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=	rxg@ms25.url.com.tw
 HOMEPAGE=	http://www.personal.psu.edu/nkk104/cmp3/
 COMMENT=	ncurses based frontend to mpg123
 
-DEPENDS+=	mpg123-*:../../audio/mpg123
+DEPENDS+=	mpg123-[0-9]*:../../audio/mpg123
 
 WRKSRC=		${WRKDIR}/cmp3
 
diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile
index 117da6535f8..a8b0ea7c7cc 100644
--- a/audio/eawpatches/Makefile
+++ b/audio/eawpatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:17:42 jlam Exp $
 #
 
 DISTNAME=	eawpats-full-10
@@ -11,9 +11,9 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.stardate.bc.ca/eawpatches/
 COMMENT=	Eric A. Welsh' patches (audio samples) for TiMidity
 
-BUILD_DEPENDS=  unrar-*:../../archivers/unrar
+BUILD_DEPENDS=  unrar-[0-9]*:../../archivers/unrar
 
-CONFLICTS=	guspatches-*
+CONFLICTS=	guspatches-[0-9]*
 
 EXTRACT_ONLY=	# empty
 NO_PATCH=	yes
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index d1ec31677ea..5899fb2ed48 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/07/18 15:19:42 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/09/27 23:17:42 jlam Exp $
 
 DISTNAME=	festvox_kallpc16k
 PKGNAME=	festvox-kal16-1.4.0
@@ -15,7 +15,7 @@ DEPENDS+=	festival>=1.4.0:../festival
 DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
 DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu
 
-CONFLICTS=	festvox-kal8-*
+CONFLICTS=	festvox-kal8-[0-9]*
 
 NO_BUILD=	yes
 
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index 75d5f6288ef..aceed2ebaa8 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:42 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/09/27 23:17:43 jlam Exp $
 
 DISTNAME=	festvox_kallpc8k
 PKGNAME=	festvox-kal8-1.4.0
@@ -15,7 +15,7 @@ DEPENDS+=	festival>=1.4.0:../festival
 DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
 DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu
 
-CONFLICTS=	festvox-kal16-*
+CONFLICTS=	festvox-kal16-[0-9]*
 
 NO_BUILD=	yes
 
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index 7e41c4ca37c..2bd943bb6ce 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/07/18 15:19:43 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/09/27 23:17:43 jlam Exp $
 
 DISTNAME=	festvox_kedlpc16k
 PKGNAME=	festvox-ked16-1.4.0
@@ -15,7 +15,7 @@ DEPENDS+=	festival>=1.4.0:../festival
 DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
 DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu
 
-CONFLICTS=	festvox-ked8-*
+CONFLICTS=	festvox-ked8-[0-9]*
 
 NO_BUILD=	yes
 
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index 6d30a9d6377..7d83c4e99c3 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/07/18 15:19:43 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/09/27 23:17:43 jlam Exp $
 
 DISTNAME=	festvox_kedlpc8k
 PKGNAME=	festvox-ked8-1.4.0
@@ -15,7 +15,7 @@ DEPENDS+=	festival>=1.4.0:../festival
 DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
 DEPENDS+=	festlex-cmu>=1.4.0:../festlex-cmu
 
-CONFLICTS=	festvox-ked16-*
+CONFLICTS=	festvox-ked16-[0-9]*
 
 NO_BUILD=	yes
 
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index 9a04501fe5e..f81edf489bf 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/07/18 15:19:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/09/27 23:17:43 jlam Exp $
 
 DISTNAME=	festvox_rablpc16k
 PKGNAME=	festvox-rab16-1.4.0
@@ -15,7 +15,7 @@ DEPENDS+=	festival>=1.4.0:../festival
 DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
 DEPENDS+=	festlex-oald>=1.4.0:../festlex-oald
 
-CONFLICTS=	festvox-rab8-*
+CONFLICTS=	festvox-rab8-[0-9]*
 
 NO_BUILD=	yes
 
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 76afe1e8382..53d63ac880b 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/07/18 15:19:44 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2001/09/27 23:17:43 jlam Exp $
 
 DISTNAME=	festvox_rablpc8k
 PKGNAME=	festvox-rab8-1.4.0
@@ -15,7 +15,7 @@ DEPENDS+=	festival>=1.4.0:../festival
 DEPENDS+=	festlex-poslex>=1.4.0:../festlex-poslex
 DEPENDS+=	festlex-oald>=1.4.0:../festlex-oald
 
-CONFLICTS=	festvox-rab16-*
+CONFLICTS=	festvox-rab16-[0-9]*
 
 NO_BUILD=	yes
 
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index c13370292c6..3b650cc8a0c 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/11 06:34:17 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/27 23:17:44 jlam Exp $
 #
 
 DISTNAME=	gdcd-0.2.1
@@ -10,7 +10,7 @@ HOMEPAGE=	http://cdcd.undergrid.net/
 COMMENT=	CD player for the X Window System using the GIMP Tool Kit (GTK)
 
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-DEPENDS+=	imlib-*:../../graphics/imlib
+DEPENDS+=	imlib-[0-9]*:../../graphics/imlib
 DEPENDS+=	libcdaudio>0.99.4:../../audio/libcdaudio
 
 USE_X11BASE=	YES
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index 743843ef093..21abf28b26e 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 13:30:41 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:17:44 jlam Exp $
 
 DISTNAME=	mp3info-0.8.2
 PKGNAME=	g${DISTNAME}
@@ -14,7 +14,7 @@ COMMENT=	Utility to read and modify the ID3 tags of MP3 files
 DEPENDS+=	gtk+>=1.2.0:../../x11/gtk
 DEPENDS+=	ncurses>=5.0:../../devel/ncurses
 
-CONFLICTS=	mp3info-*
+CONFLICTS=	mp3info-[0-9]*
 
 USE_X11=	YES
 
diff --git a/audio/guspatches/Makefile b/audio/guspatches/Makefile
index 7406bdfda08..e2d609a52cc 100644
--- a/audio/guspatches/Makefile
+++ b/audio/guspatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:17:44 jlam Exp $
 #
 
 DISTNAME=	dgguspat
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=     packages@netbsd.org
 COMMENT=	GUS (Gravis Ultrasound) patches (audio samples) for TiMidity
 
-CONFLICTS=	eawpatches-*
+CONFLICTS=	eawpatches-[0-9]*
 
 RESTRICTED=		"Uses copyrighted patches"
 NO_BIN_ON_FTP=		${RESTRICTED}
diff --git a/audio/krio/Makefile b/audio/krio/Makefile
index a91ae044b8b..5ce979b1476 100644
--- a/audio/krio/Makefile
+++ b/audio/krio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/22 09:32:18 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:17:44 jlam Exp $
 
 DISTNAME=	Krio-19990721
 PKGNAME=	krio-19990721
@@ -19,7 +19,7 @@ DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	kdelibs-1.1.2:../../x11/kdelibs
 DEPENDS+=	png>=1.0.11:../../graphics/png
 DEPENDS+=	qt1-1.44:../../x11/qt1
-DEPENDS+=	tiff-*:../../graphics/tiff
+DEPENDS+=	tiff-[0-9]*:../../graphics/tiff
 
 WRKSRC=		${WRKDIR}/Krio
 
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 4e01f465e06..168b9171632 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/07/31 14:23:01 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2001/09/27 23:17:44 jlam Exp $
 #
 
 VERS=		3.89
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--enable-analyzer=no
 .endif
 
 .if (${MACHINE_ARCH} == "alpha")
-DEPENDS+=	libffm-*:../../math/libffm
+DEPENDS+=	libffm-[0-9]*:../../math/libffm
 # double is faster than float on Alpha
 CFLAGS+=	-O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \
 		-mfp-regs -fschedule-insns -fschedule-insns2 		  \
diff --git a/audio/mad/Makefile b/audio/mad/Makefile
index 3df3aa5dea6..0984f08537c 100644
--- a/audio/mad/Makefile
+++ b/audio/mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/19 10:26:20 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:17:45 jlam Exp $
 #
 
 DISTNAME=	mad-0.13.0b
@@ -15,7 +15,7 @@ COMMENT=	High-quality MPEG audio decoder
 
 BUILD_USES_MSGFMT=	yes
 
-CONFLICTS=	madplay-*
+CONFLICTS=	madplay-[0-9]*
 
 GNU_CONFIGURE=	YES
 USE_LIBINTL=	YES
diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
index e8dcb0bf306..d5184a09a6f 100644
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 13:30:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:45 jlam Exp $
 #
 
 DISTNAME=	mp3info-0.2.16
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://bimbo.hive.no/pub/mp3info/
 MAINTAINER=	simonb@netbsd.org
 COMMENT=	MP3 header and tag information tool
 
-CONFLICTS=	gmp3info-*
+CONFLICTS=	gmp3info-[0-9]*
 
 GNU_CONFIGURE=	YES
 
diff --git a/audio/mp3to/Makefile b/audio/mp3to/Makefile
index c246f27a36a..c0198d28e64 100644
--- a/audio/mp3to/Makefile
+++ b/audio/mp3to/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/19 16:10:24 tron Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:17:45 jlam Exp $
 
 DISTNAME=	mp3to
 PKGNAME=	${DISTNAME}-1.0.1
@@ -10,7 +10,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.cs.berkeley.edu/~amc/utils/
 COMMENT=	Convert MP3 files to various other audio formats
 
-DEPENDS+=	mpg123-*:../mpg123
+DEPENDS+=	mpg123-[0-9]*:../mpg123
 DEPENDS+=	gmp3info>=0.8.2:../gmp3info
 DEPENDS+=	sox>=12.17.1:../sox
 
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 113abdee473..d5f100bae15 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/23 16:54:37 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:17:45 jlam Exp $
 
 DISTNAME=	vorbis-tools-1.0rc2
 PKGNAME=	vorbis-tools-1.0.0.6
@@ -9,7 +9,7 @@ MAINTAINER=	lukem@netbsd.org
 HOMEPAGE=	http://www.vorbis.com/
 COMMENT=	Ogg Vorbis encoder and player
 
-CONFLICTS=	vorbis-*
+CONFLICTS=	vorbis-[0-9]*
 
 USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=		yes