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.

20 files changed, 45 insertions, 45 deletions

diff --git a/lang/baci/Makefile b/lang/baci/Makefile
index 8d3e51f5e96..350aa0ac6ae 100644
--- a/lang/baci/Makefile
+++ b/lang/baci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/09 13:09:24 agc Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:15 jlam Exp $
 #
 
 DISTNAME=	bacisrc
@@ -12,7 +12,7 @@ MAINTAINER=	wulf@netbsd.org
 HOMEPAGE=	http://www.mines.edu/fs_home/tcamp/baci/
 COMMENT=	Ben-Ari Concurrent Interpreter
 
-DEPENDS+=	bison-*:../../devel/bison
+DEPENDS+=	bison-[0-9]*:../../devel/bison
 
 PLIST_SRC=      ${WRKDIR}/PLIST
 
diff --git a/lang/blackdown-jdk13/Makefile b/lang/blackdown-jdk13/Makefile
index fcc25bd238c..79cf6297adc 100644
--- a/lang/blackdown-jdk13/Makefile
+++ b/lang/blackdown-jdk13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/23 16:57:47 manu Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:16 jlam Exp $
 #
 
 DISTNAME=       blackdown-jdk-1.3.0.nb3
@@ -13,7 +13,7 @@ COMMENT=        Blackdown's Java(tm) Development Kit 1.3.0
 
 DEPENDS+=	linuxppc_lib>=2000.4.2:../../emulators/linuxppc_lib
 
-CONFLICTS=      jdk-* blackdown-j*
+CONFLICTS=      jdk-[0-9]* blackdown-j*
 
 WRKSRC=		${WRKDIR}/j2sdk1.3
 
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index 97abd5e1980..4c2385778ab 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/09/05 21:30:36 groo Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:16 jlam Exp $
 #
 
 DISTNAME=		plt.src.x
@@ -10,7 +10,7 @@ MAINTAINER=		groo@netbsd.org
 HOMEPAGE=		http://www.cs.rice.edu/CS/PLT/packages/drscheme/
 COMMENT=		R4RS-compilant and nearly R5RS-compliant scheme tailored for teaching
 
-CONFLICTS+=		mzscheme-*:../mzscheme
+CONFLICTS+=		mzscheme-[0-9]*:../mzscheme
 
 USE_GMAKE=		yes
 USE_PERL5=		yes
diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile
index eccc2f88fe9..d117894e148 100644
--- a/lang/eieio/Makefile
+++ b/lang/eieio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/06/08 20:22:00 cjones Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:16 jlam Exp $
 #
 
 DISTNAME=	eieio-0.16
@@ -12,11 +12,11 @@ COMMENT=	Enhanced Integration of Emacs Interpreted Objects
 .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/eieio
 .else
-DEPENDS+=	 	emacs-*:../../editors/emacs
+DEPENDS+=	 	emacs-[0-9]*:../../editors/emacs
 EMACS=			emacs
 LISPDIR=		share/emacs/site-lisp/eieio
 .endif
diff --git a/lang/fort77/Makefile b/lang/fort77/Makefile
index 923714584cb..2fe50cb0a10 100644
--- a/lang/fort77/Makefile
+++ b/lang/fort77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/19 03:56:36 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/27 23:18:16 jlam Exp $
 #
 
 DISTNAME=		fort77-1.14a
@@ -8,7 +8,7 @@ MASTER_SITES=		${MASTER_SITE_SUNSITE:=devel/lang/fortran/}
 MAINTAINER=		packages@netbsd.org
 COMMENT=		the driver for f2c, a fortran to C translator
 
-DEPENDS+=		f2c-*:../../lang/f2c
+DEPENDS+=		f2c-[0-9]*:../../lang/f2c
 
 # on 1.3.X systems there is not shared libf2c, thus use libf2c.a
 # from the f2c package.
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index f7febc0b28c..00b20d88a6c 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/07/15 13:52:28 minoura Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:16 jlam Exp $
 #
 
 DISTNAME=	Gauche-0.4.2
@@ -11,10 +11,10 @@ HOMEPAGE=	http://www.shiro.dreamhost.com/scheme/gauche/index.html
 COMMENT=	R5RS Scheme implementation developed to be a handy script interpreter
 
 # devel/boehm-gc cannot be used because Gauche requires PIC version
-#DEPENDS+=	boehm-gc-*:../../devel/boehm-gc
-DEPENDS+=	slib-*:../../devel/slib
+#DEPENDS+=	boehm-gc-[0-9]*:../../devel/boehm-gc
+DEPENDS+=	slib-[0-9]*:../../devel/slib
 # XXX: On newer SunOS/Linux we have to use their native iconv(3)...?
-DEPENDS+=	libiconv-*:../../converters/libiconv
+DEPENDS+=	libiconv-[0-9]*:../../converters/libiconv
 
 # Due to GC dynamic loading support, this package runs on limited platforms
 # Plus, it is not LP64-safe
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 7e1c064a5fd..bd5f5f681b5 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/07/04 02:31:44 kent Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:17 jlam Exp $
 
 DISTNAME=		gcc-2.95.2
 GCC_VERSION=		2.95.2
@@ -17,7 +17,7 @@ DISTFILES+=		${DISTNAME}.tar.gz ${SSP_PATCH}
 PATCHDIR=		../gcc/patches
 GCC_FILESDIR=		../gcc/files
 
-BUILD_DEPENDS+=		bison-*:../../devel/bison
+BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 # Please let me know what platforms this package works or doesn't work on.
 #ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-sparc
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 78c73350ab8..89de864a592 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/06/11 17:21:56 tron Exp $
+# $NetBSD: Makefile,v 1.28 2001/09/27 23:18:17 jlam Exp $
 
 DISTNAME=		gcc-2.95.2
 CATEGORIES=		lang
@@ -8,7 +8,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/gcc/gcc.html
 COMMENT=		GNU Compiler Collection
 
-BUILD_DEPENDS+=		bison-*:../../devel/bison
+BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 # The platforms listed below are the only tested platforms so far.
 # If you get gcc working on other platforms, then please add them.
diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile
index c78bbf8c1cf..cf83bebd418 100644
--- a/lang/jbuilder-jit/Makefile
+++ b/lang/jbuilder-jit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/10 14:36:49 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:17 jlam Exp $
 #
 
 DISTNAME=	unix_jb35foundation
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.inprise.com/jbuilder/foundation/linux.html
 COMMENT=	Just-In-Time compiler for Linux Java Virtual Machine
 
 # works with both 1.2.2 and 1.3 JVMs
-DEPENDS=	sun-jre-*:../../lang/sun-jre13
+DEPENDS=	sun-jre-[0-9]*:../../lang/sun-jre13
 
 BROKEN=		Old distfile not available anymore; needs to be updated to 4.0.
 
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index c263fedd4c1..fcc6126be47 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2001/06/11 06:34:39 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2001/09/27 23:18:17 jlam Exp $
 #
 
 DISTNAME=		kaffe-1.0.6
@@ -11,7 +11,7 @@ COMMENT=		Virtual machine capable of running Java(tm) code
 
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		png>=1.0.11:../../graphics/png
-DEPENDS+=		libungif-*:../../graphics/libungif
+DEPENDS+=		libungif-[0-9]*:../../graphics/libungif
 DEPENDS+=		gmp>=3.0.0:../../devel/gmp
 
 USE_X11=		yes
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 13c2b1b62b4..255d2002fb9 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/06/12 03:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/27 23:18:17 jlam Exp $
 
 DISTNAME=		gcc-2.95.2
 PKGNAME=		pgcc-2.95.2.1
@@ -13,7 +13,7 @@ MAINTAINER=		jmcneill@invisible.yi.org
 HOMEPAGE=		http://goof.com/pcg/
 COMMENT=		Pentium GNU Compiler Collection
 
-BUILD_DEPENDS+=		bison-*:../../devel/bison
+BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 # 'Pentium GCC' is optimized for the Intel Pentium processor, but should
 # work on all platforms on which GCC works.
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index cffe4a46681..96b58c4ba1c 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:03 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:18 jlam Exp $
 #
 
 DISTNAME=	snobol-0.99.4
@@ -12,7 +12,7 @@ MAINTAINER=	refling@comet.lbl.gov
 HOMEPAGE=	http://people.ne.mediaone.net/philbudne/snobol.html
 COMMENT=	Macro implementation of SNOBOL4 in C
 
-BUILD_DEPENDS=	unzip-*:../../archivers/unzip
+BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 0a0bcf9860e..865d5424538 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/08/27 14:35:09 tron Exp $
+# $NetBSD: Makefile,v 1.19 2001/09/27 23:18:18 jlam Exp $
 #
 
 DISTNAME=	Squeak-3.0
@@ -16,7 +16,7 @@ COMMENT=	Full Smalltalk 80 with portability to UN*X, Mac, and Windows
 
 BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
 BUILD_DEPENDS+=	automake>=1.4:../../devel/automake
-BUILD_DEPENDS+=	unzip-*:../../archivers/unzip
+BUILD_DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
diff --git a/lang/stalin/Makefile b/lang/stalin/Makefile
index 06252beeeaa..308f6ce90c1 100644
--- a/lang/stalin/Makefile
+++ b/lang/stalin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/25 17:48:34 jtb Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/27 23:18:18 jlam Exp $
 
 DISTNAME=		stalin-0.9
 CATEGORIES=		lang
@@ -9,7 +9,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.neci.nj.nec.com/homepages/qobi/software.html
 COMMENT=		Aggressively optimizing Scheme compiler
 
-DEPENDS+=		boehm-gc-*:../../devel/boehm-gc
+DEPENDS+=		boehm-gc-[0-9]*:../../devel/boehm-gc
 
 USE_MESA=		yes
 
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index 6f122464888..5974152ed70 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/09/22 04:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/27 23:18:18 jlam Exp $
 #
 
 # MASTER_SITES is very special, and must end in "=":
@@ -14,7 +14,7 @@ COMMENT=	Sun's Java(tm) Development Kit 1.3.1
 
 DEPENDS=	sun-jre-1.3.1.0.1:../../lang/sun-jre13
 
-CONFLICTS=	jdk-* blackdown-j*
+CONFLICTS=	jdk-[0-9]* blackdown-j*
 
 FETCH_BEFORE_ARGS=-o ${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_CMD=	${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index bff3b4d9078..905ae337d5d 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/09/22 04:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/09/27 23:18:18 jlam Exp $
 #
 
 # MASTER_SITES is very special, and must end in "=":
@@ -12,7 +12,7 @@ MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://java.sun.com/
 COMMENT=	Sun's Java(tm) Runtime Environment 1.3.1
 
-CONFLICTS=	jdk-* blackdown-j*
+CONFLICTS=	jdk-[0-9]* blackdown-j*
 
 FETCH_BEFORE_ARGS=-o ${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_CMD=	${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
@@ -29,8 +29,8 @@ NO_BIN_ON_FTP=	${RESTRICTED}
 
 # Needs to be after bsd.prefs.mk
 .if ${OPSYS} != "Linux"
-DEPENDS+=	suse_compat-*:../../emulators/suse_compat
-DEPENDS+=	suse_x11-*:../../emulators/suse_x11
+DEPENDS+=	suse_compat-[0-9]*:../../emulators/suse_compat
+DEPENDS+=	suse_x11-[0-9]*:../../emulators/suse_x11
 .endif
 
 .if !defined(JDK_HOME)
diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile
index 27eb7cf214b..1d31a31c6b2 100644
--- a/lang/tcl-expect/Makefile
+++ b/lang/tcl-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:34 agc Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:19 jlam Exp $
 #
 
 DISTNAME=	expect
@@ -12,7 +12,7 @@ COMMENT=	extensions to Tcl to support scripting of interactive programs
 
 DEPENDS+=	tcl>=8.3.2:../../lang/tcl
 
-CONFLICTS+=	expect-*
+CONFLICTS+=	expect-[0-9]*
 
 WRKSRC=		${WRKDIR}/expect-5.32
 DIST_SUBDIR=	expect-5.32.1
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index ab8d0079854..72f0529cf14 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/04/27 09:16:18 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:19 jlam Exp $
 #
 
 DISTNAME=	tclX8.2.0
@@ -12,7 +12,7 @@ COMMENT=	Extended Tcl (TclX), a set of Tcl extensions for system programming
 
 DEPENDS+=	tcl>=8.3.2:../../lang/tcl
 
-CONFLICTS+=	tclX-*
+CONFLICTS+=	tclX-[0-9]*
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 1417393aa4e..cd0722ed207 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/25 19:42:58 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:20 jlam Exp $
 #
 
 DISTNAME=		tcl8.3.2
@@ -13,7 +13,7 @@ MAINTAINER=		jwise@netbsd.org
 HOMEPAGE=		http://www.tcltk.com/
 COMMENT=		Ousterhout's Tool Command Language, a scripting language
 
-CONFLICTS+=		tclman80-*
+CONFLICTS+=		tclman80-[0-9]*
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=		yes
diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile
index 673a1c80240..230c9b0379a 100644
--- a/lang/tk-tclX/Makefile
+++ b/lang/tk-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/05 19:51:15 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:20 jlam Exp $
 #
 
 DISTNAME=	tclX8.2.0
@@ -13,7 +13,7 @@ COMMENT=	Extended Tcl (TclX), a set of Tcl extensions for system programming
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 DEPENDS+=	tcl-tclX-8.2.0:../../lang/tcl-tclX
 
-CONFLICTS+=	tclX-*
+CONFLICTS+=	tclX-[0-9]*
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes