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.

21 files changed, 48 insertions, 48 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index d2d9290cefe..d12489094c3 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/08/11 18:26:56 rh Exp $
+# $NetBSD: Makefile,v 1.17 2001/09/27 23:17:54 jlam Exp $
 #
 
 DISTNAME=		bonobo-1.0.7
@@ -9,7 +9,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Architecture for creating reusable software components
 
-BUILD_DEPENDS+=		bison-*:../../devel/bison
+BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 DEPENDS+=		ORBit>=0.5.8:../../net/ORBit
 DEPENDS+=		gdk-pixbuf-gnome>=0.10.0:../../graphics/gdk-pixbuf-gnome
 DEPENDS+=		oaf>=0.6.5:../../devel/oaf
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index da0de1602c4..db23f3d8e67 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/01 15:25:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:17:54 jlam Exp $
 
 DISTNAME=	cook-2.17
 CATEGORIES=	devel
@@ -8,7 +8,7 @@ MAINTAINER=	groo@netbsd.org
 HOMEPAGE=	http://www.canb.auug.org.au/~millerp/cook/cook.html
 COMMENT=	More powerful replacement for the traditional make(1) tool
 
-DEPENDS+=	rx-*:../../devel/rx
+DEPENDS+=	rx-[0-9]*:../../devel/rx
 BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=	# defined
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 6bdc668a7fe..93bdf8f780c 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2001/06/25 20:38:43 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2001/09/27 23:17:55 jlam Exp $
 #
 
 DISTNAME=	cvs-1.11
@@ -24,7 +24,7 @@ PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
 PATCHFILES=		cvs-1.11-v6-20010413.diff.gz
 PATCH_DIST_STRIP=	-p1
 
-BUILD_DEPENDS+=		autoconf-*:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-[0-9]*:../../devel/autoconf
 
 .if ${USE_INET6} == "YES"
 CONFIGURE_ARGS+=	--enable-ipv6
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index fde459769f4..ce065a621de 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/06/08 21:29:13 cjones Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:17:55 jlam Exp $
 #
 
 DISTNAME=	elib-1.0
@@ -11,11 +11,11 @@ COMMENT=	Library of utility functions for Emacs
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_XEMACS)
-DEPENDS+=	 	xemacs-*:../../editors/xemacs
+DEPENDS+=	 	xemacs-[0-9]*:../../editors/xemacs
 EMACS=			xemacs
 LISPDIR=		lib/xemacs/xemacs-packages/lisp/elib
 .else
-DEPENDS+=	 	emacs-*:../../editors/emacs
+DEPENDS+=	 	emacs-[0-9]*:../../editors/emacs
 EMACS=			emacs
 LISPDIR=		share/emacs/site-lisp/elib
 .endif
diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index 3655c7fa2a8..5a739fa11c1 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/09/24 20:45:22 tron Exp $
+# $NetBSD: Makefile,v 1.16 2001/09/27 23:17:55 jlam Exp $
 
 DISTNAME=	gal-0.12
 CATEGORIES=	gnome devel
@@ -9,7 +9,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Gnome Application Libraries
 
-DEPENDS+=	libiconv-*:../../converters/libiconv
+DEPENDS+=	libiconv-[0-9]*:../../converters/libiconv
 DEPENDS+=	gnome-libs>=1.2.13:../../x11/gnome-libs
 DEPENDS+=	gnome-print>=0.28:../../print/gnome-print
 DEPENDS+=	gnome-vfs>=1.0:../../sysutils/gnome-vfs
diff --git a/devel/gtkdiff/Makefile b/devel/gtkdiff/Makefile
index 461dbfc32cd..285cc355088 100644
--- a/devel/gtkdiff/Makefile
+++ b/devel/gtkdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 14:38:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:55 jlam Exp $
 #
 
 DISTNAME=	gtkdiff-1.6.0
@@ -9,7 +9,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.ainet.or.jp/~inoue/software/gtkdiff/index-e.html
 COMMENT=	diff front-end program using GNOME
 
-DEPENDS+=	gnome-core-*:../../x11/gnome-core
+DEPENDS+=	gnome-core-[0-9]*:../../x11/gnome-core
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index 037aad73f04..78a62ba2fe8 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/08/04 09:52:26 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2001/09/27 23:17:55 jlam Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
@@ -24,11 +24,11 @@ USE_GMAKE=	yes
 
 .ifdef USE_XEMACS
 EMACS=			${LOCALBASE}/bin/xemacs
-BUILD_DEPENDS+=		xemacs-*:../editors/xemacs
-BUILD_DEPENDS+=		xemacs-packages-*:../editors/xemacs-packages
+BUILD_DEPENDS+=		xemacs-[0-9]*:../editors/xemacs
+BUILD_DEPENDS+=		xemacs-packages-[0-9]*:../editors/xemacs-packages
 .elifdef USE_EMACS
 EMACS=			${LOCALBASE}/bin/emacs
-BUILD_DEPENDS+=		emacs-*:../../editors/emacs
+BUILD_DEPENDS+=		emacs-[0-9]*:../../editors/emacs
 .endif
 
 # we end-up installing .el file there whenever we use emacs or xemacs
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 2bc41b12f51..a3af952e7a4 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/08/26 10:32:20 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/27 23:17:56 jlam Exp $
 
 DISTNAME=	kdevelop-1.3
 PKGNAME=	${DISTNAME:S/-/-base-/}
@@ -11,7 +11,7 @@ HOMEPAGE=       http://www.kdevelop.org/
 COMMENT=	Base modules for IDE for Unix/X11/KDE
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=       autoconf-*:../../devel/autoconf
+DEPENDS+=       autoconf-[0-9]*:../../devel/autoconf
 DEPENDS+=       automake>=1.4:../../devel/automake
 DEPENDS+=       kdebase-1.*:../../x11/kdebase
 DEPENDS+=       kdoc-2*:../../textproc/kdoc
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 96d23cdb733..2947eedab7b 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2001/06/11 06:34:28 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2001/09/27 23:17:56 jlam Exp $
 
 DISTNAME=		libgtop-1.0.12
 CATEGORIES=		devel gnome
@@ -10,7 +10,7 @@ COMMENT=		library to retrieve system information, used in GNOME
 
 BUILD_DEPENDS=		perl>=${PERL5_REQD}:../../lang/perl5
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		gnome-libs-*:../../x11/gnome-libs
+DEPENDS+=		gnome-libs-[0-9]*:../../x11/gnome-libs
 DEPENDS+=		guile-[0-9]*:../../lang/guile
 
 NOT_FOR_PLATFORM=	SunOS-*-*
diff --git a/devel/libmpeg3/Makefile b/devel/libmpeg3/Makefile
index bfaa4de840a..e36880f2b8d 100644
--- a/devel/libmpeg3/Makefile
+++ b/devel/libmpeg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/05 14:38:45 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:17:56 jlam Exp $
 #
 
 DISTNAME=	libmpeg3-1.3
@@ -9,7 +9,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://heroines.sourceforge.net/libmpeg3.php3
 COMMENT=	MPEG decoding library
 
-BUILD_DEPENDS+=	nasm-*:../../devel/nasm
+BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 
 USE_BUILDLINK_ONLY=	yes
 HAS_CONFIGURE=	yes
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 59732f31b97..52d016bcffb 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2001/06/20 08:10:49 skrll Exp $
+# $NetBSD: Makefile.common,v 1.13 2001/09/27 23:17:56 jlam Exp $
 #
 
 DISTNAME=	libtool-ml-20010614
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/libtool/libtool.html
 
-CONFLICTS=	glibtool-*
+CONFLICTS=	glibtool-[0-9]*
 GNU_CONFIGURE=	yes
 
 DISTINFO_FILE=	${.CURDIR}/../libtool/distinfo
diff --git a/devel/mit-pthreads/Makefile b/devel/mit-pthreads/Makefile
index 6d8f3ca708d..0c0e213c86e 100644
--- a/devel/mit-pthreads/Makefile
+++ b/devel/mit-pthreads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/05/19 03:56:33 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2001/09/27 23:17:56 jlam Exp $
 #
 
 DISTNAME=		pthreads-1_60_beta6
@@ -12,7 +12,7 @@ COMMENT=		Chris Provenzano's (MIT) POSIX threads library
 
 ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
 			NetBSD-*-sparc NetBSD-*-m68k NetBSD-*-powerpc
-CONFLICTS+=             unproven-pthreads-*
+CONFLICTS+=             unproven-pthreads-[0-9]*
 
 HAS_CONFIGURE=		yes
 MAKE_ENV+=		NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT}
diff --git a/devel/p5-Expect/Makefile b/devel/p5-Expect/Makefile
index 2f5dd49251e..1b088e99b51 100644
--- a/devel/p5-Expect/Makefile
+++ b/devel/p5-Expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/28 12:44:30 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/27 23:17:57 jlam Exp $
 
 DISTNAME=	Expect-1.11
 PKGNAME=	p5-expect-1.11
@@ -8,8 +8,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Expect/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl version of the TCL "expect" tool
 
-DEPENDS+=	p5-IO-stty-*:../../devel/p5-IO-Stty
-DEPENDS+=	p5-IO-tty-*:../../devel/p5-IO-Tty
+DEPENDS+=	p5-IO-stty-[0-9]*:../../devel/p5-IO-Stty
+DEPENDS+=	p5-IO-tty-[0-9]*:../../devel/p5-IO-Tty
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Expect/.packlist
diff --git a/devel/palmos-includes/Makefile b/devel/palmos-includes/Makefile
index eab48fbd3d2..0dbf1618340 100644
--- a/devel/palmos-includes/Makefile
+++ b/devel/palmos-includes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/25 17:39:16 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:17:57 jlam Exp $
 #
 
 DISTNAME=       sdk35
@@ -11,7 +11,7 @@ MAINTAINER=	dillo@giga.or.at
 HOMEPAGE=	http://www.palmos.com/dev/tech/tools/gcc/
 COMMENT=	Palm OS include files
 
-BUILD_DEPENDS+=	wget-*:../../net/wget
+BUILD_DEPENDS+=	wget-[0-9]*:../../net/wget
 
 DISTSPECIAL=	${DISTNAME}${EXTRACT_SUFX} sdk35-update1${EXTRACT_SUFX}
 
diff --git a/devel/prc-tools-gcc/Makefile b/devel/prc-tools-gcc/Makefile
index 123f0cab862..0cffc17ca6c 100644
--- a/devel/prc-tools-gcc/Makefile
+++ b/devel/prc-tools-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/28 05:48:19 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:17:57 jlam Exp $
 #
 
 PKGNAME=	prc-tools-gcc-${PRC_TOOLS_VERS}
@@ -9,7 +9,7 @@ BASE_VERS=	2.95.2
 
 .include "../../devel/prc-tools/Makefile.common"
 
-BUILD_DEPENDS+=	autoconf-*:../../devel/autoconf
+BUILD_DEPENDS+=	autoconf-[0-9]*:../../devel/autoconf
 DEPENDS+=	prc-tools-binutils>=2.0:../../devel/prc-tools-binutils
 
 ALL_TARGET=	all-gcc
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 46aea89f896..bdfce9d5cc3 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2001/06/19 21:27:57 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2001/09/27 23:17:57 jlam Exp $
 #
 
 DISTNAME=		pth-1.4.0
@@ -9,7 +9,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/pth/pth.html
 COMMENT=		GNU Portable Thread library
 
-CONFLICTS=		pth-current-*
+CONFLICTS=		pth-current-[0-9]*
 
 USE_BUILDLINK_ONLY=	YES
 USE_LIBTOOL=		YES
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 0a578f79092..fb947456d5e 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/03/27 03:19:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/27 23:17:57 jlam Exp $
 #
 
 DISTNAME=	pwlib_min_1.1pl17
@@ -19,7 +19,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.openh323.org/
 COMMENT=	Portable Windows Libary
 
-BUILD_DEPENDS=	bison-*:../../devel/bison
+BUILD_DEPENDS=	bison-[0-9]*:../../devel/bison
 DEPENDS+=	unproven-pthreads>=0.17:../../devel/unproven-pthreads
 
 WRKSRC=		${WRKDIR}/pwlib
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index 07bd39b09eb..e78569ff91d 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/11 06:34:29 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/27 23:17:58 jlam Exp $
 # FreeBSD: ports/devel/sdcc/Makefile,v 1.5 2000/04/15 15:13:38 knu Exp
 
 DISTNAME=	sdcc-2.2.1-src
@@ -18,10 +18,10 @@ WRKSRC=		${WRKDIR}/${PKGNAME}
 # yacc that breaks the building process of sdcc.
 # Use of bison fixes this problem for now.
 #
-BUILD_DEPENDS+=	bison-*:../../devel/bison
+BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 # we link to the static boehm-gc library so we only
 # need this at compile time
-BUILD_DEPENDS+=	boehm-gc-*:../../devel/boehm-gc
+BUILD_DEPENDS+=	boehm-gc-[0-9]*:../../devel/boehm-gc
 YACC=		bison
 
 GNU_CONFIGURE=	yes
diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index bb7a899de55..fc81894efe6 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/07/10 21:54:39 cjones Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:58 jlam Exp $
 #
 
 DISTNAME=	semantic-1.4beta5
@@ -15,11 +15,11 @@ DEPENDS+=	eieio-0.16:../../lang/eieio
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_XEMACS)
-DEPENDS+=	 	xemacs-*:../../editors/xemacs
+DEPENDS+=	 	xemacs-[0-9]*:../../editors/xemacs
 EMACS=			xemacs
 LISPDIR=		lib/xemacs/xemacs-packages/lisp/semantic
 .else
-DEPENDS+=	 	emacs-*:../../editors/emacs
+DEPENDS+=	 	emacs-[0-9]*:../../editors/emacs
 EMACS=			emacs
 LISPDIR=		share/emacs/site-lisp/semantic
 .endif
diff --git a/devel/tavrasm/Makefile b/devel/tavrasm/Makefile
index ae36aabd84c..e4adeac79f7 100644
--- a/devel/tavrasm/Makefile
+++ b/devel/tavrasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/03/27 03:19:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:17:58 jlam Exp $
 #
 
 DISTNAME=	tavrasm
@@ -10,7 +10,7 @@ MAINTAINER=	dillo@giga.or.at
 HOMEPAGE=	http://www.tavrasm.org/
 COMMENT=	assembler for the Atmel AVR series of microcontrollers
 
-BUILD_DEPENDS+=	bison-*:../../devel/bison
+BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
 WRKSRCTOP=	${WRKDIR}/tavrasm.115
 WRKSRC=		${WRKSRCTOP}/src
diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile
index cab4ee9ea9c..39a84be6855 100644
--- a/devel/unproven-pthreads/Makefile
+++ b/devel/unproven-pthreads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/05/19 03:56:34 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/09/27 23:17:58 jlam Exp $
 #
 
 DISTNAME=		unproven-pthreads-0.17
@@ -11,7 +11,7 @@ COMMENT=		(MIT) POSIX threads library, hacked by Michael Graff
 
 ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
 			NetBSD-*-m68k NetBSD-*-powerpc NetBSD-*-sparc
-CONFLICTS+=		mit-pthreads-*
+CONFLICTS+=		mit-pthreads-[0-9]*
 
 HAS_CONFIGURE=		yes
 MAKE_ENV+=		NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT}