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.

22 files changed, 48 insertions, 48 deletions

diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index dfab0b32a4a..1bbd5688435 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/08/23 04:19:58 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/09/27 23:18:58 jlam Exp $
 #
 
 DISTNAME=		Xaw-XPM-1.1
@@ -11,7 +11,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.zip.com.au/~bb/XawXpm/
 COMMENT=		Enhanced 3-D widgets based on the Athena Widget set and Xaw3d
 
-CONFLICTS=		Xaw3d-*
+CONFLICTS=		Xaw3d-[0-9]*
 
 USE_IMAKE=		YES
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 625af26a2e9..dbb99c685bb 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/06/13 15:47:28 tron Exp $
+# $NetBSD: Makefile,v 1.29 2001/09/27 23:18:58 jlam Exp $
 #
 
 DISTNAME=	Xaw3d-1.5
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB:=widgets/Xaw3d/R6.3/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	3-D widgets based on the Athena Widget set
 
-CONFLICTS=	Xaw-Xpm-*
+CONFLICTS=	Xaw-Xpm-[0-9]*
 
 USE_IMAKE=	YES
 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index f9a39002e1c..a66f704eb19 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/06/11 06:34:56 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2001/09/27 23:18:59 jlam Exp $
 
 DISTNAME=		control-center-1.4.0.1
 CATEGORIES=		x11 gnome
@@ -11,7 +11,7 @@ COMMENT=		GNOME control-center development library
 DEPENDS+=		gnome-libs>=1.2.13:../../x11/gnome-libs
 DEPENDS+=		gdk-pixbuf>=0.10.1:../../graphics/gdk-pixbuf
 DEPENDS+=		gnome-vfs>=1.0:../../sysutils/gnome-vfs
-DEPENDS+=		scrollkeeper-*:../../textproc/scrollkeeper
+DEPENDS+=		scrollkeeper-[0-9]*:../../textproc/scrollkeeper
 
 USE_X11BASE=		YES
 USE_GMAKE=		YES
diff --git a/x11/egtk/Makefile b/x11/egtk/Makefile
index adaf8e0aec1..783e48998ba 100644
--- a/x11/egtk/Makefile
+++ b/x11/egtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/07/14 12:37:55 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:59 jlam Exp $
 #
 
 DISTNAME=	eGTK_0.3.4
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.netlabs.net/hp/richieb/gtk_eiffel.html
 COMMENT=	Eiffel/GTK+ interface for SmallEiffel
 
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-DEPENDS+=	smalleiffel-*:../../lang/smalleiffel
+DEPENDS+=	smalleiffel-[0-9]*:../../lang/smalleiffel
 
 USE_X11=	yes
 
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 79f691b36c0..20c5c40811d 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/07/23 00:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2001/09/27 23:18:59 jlam Exp $
 
 DISTNAME=	gdm-2.2.0
 CATEGORIES=	x11 gnome
@@ -10,7 +10,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Gnome Display Manager - a re-implementation of the xdm program
 
-DEPENDS+=	gnome-libs-*:../../x11/gnome-libs
+DEPENDS+=	gnome-libs-[0-9]*:../../x11/gnome-libs
 DEPENDS+=	libglade>=0.16:../../devel/libglade
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -50,7 +50,7 @@ GDMCFGFILES=	Default:Init.default/Default \
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_PAM)
-DEPENDS+=	PAM-*:../../security/PAM
+DEPENDS+=	PAM-[0-9]*:../../security/PAM
 .else
 
 post-patch:
diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index 6d87e87ceb4..2bcb1223575 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/07/11 16:39:17 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:59 jlam Exp $
 #
 
 DISTNAME=	gnomemm-1.1.19
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://gtkmm.sourceforge.net/
 COMMENT=	C++ binding for the GNOME libraries
 
-DEPENDS+=	gnome-libs-*:../../x11/gnome-libs
+DEPENDS+=	gnome-libs-[0-9]*:../../x11/gnome-libs
 DEPENDS+=	libsigc++>=1.0.1:../../devel/libsigc++
 DEPENDS+=	gtk-->=1.2.5:../../x11/gtk--
 
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index a0c7d8aeeba..0ea09f7caa6 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/08/12 20:32:01 rh Exp $
+# $NetBSD: Makefile,v 1.16 2001/09/27 23:18:59 jlam Exp $
 #
 
 DISTNAME=		gnome-applets-1.4.0.3
@@ -10,7 +10,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Applets for GNOME
 
-BUILD_DEPENDS+=		xml-i18n-tools-*:../../textproc/xml-i18n-tools
+BUILD_DEPENDS+=		xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools
 DEPENDS+=		gnome-core>=1.4.0.4:../../x11/gnome-core
 DEPENDS+=		libgtop>=1.0.12:../../devel/libgtop
 
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 30a4ff93b51..b2c526a3a8b 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2001/08/27 06:31:36 tron Exp $
+# $NetBSD: Makefile,v 1.68 2001/09/27 23:19:00 jlam Exp $
 
 DISTNAME=		gnome-core-1.4.0.4
 CATEGORIES=		x11 gnome
@@ -11,7 +11,7 @@ COMMENT=		Base component of GNU Network Object Management Environment
 
 DEPENDS+=		gdk-pixbuf-gnome>=0.9.0nb1:../../graphics/gdk-pixbuf-gnome
 DEPENDS+=		libghttp>=1.0.9:../../www/libghttp
-DEPENDS+=		libxml-*:../../textproc/libxml
+DEPENDS+=		libxml-[0-9]*:../../textproc/libxml
 DEPENDS+=		xscreensaver-gnome>=3.25nb1:../xscreensaver-gnome
 DEPENDS+=		libglade>=0.14:../../devel/libglade
 DEPENDS+=		gtkhtml>=0.8.3:../../www/gtkhtml
diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index 36d83f08c99..9125c3fea06 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/05/19 14:49:48 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2001/09/27 23:19:00 jlam Exp $
 
 DISTNAME=		gnome-python-1.4.0
 CATEGORIES=		x11 gnome
@@ -9,11 +9,11 @@ HOMEPAGE=		http://www.daa.com.au/~james/gnome/
 COMMENT=		Python Bindings for the GNU Network Object Model Environment
 
 DEPENDS+=		gnome-core>1.4.0:../gnome-core
-DEPENDS+=		gtkglarea-*:../../x11/gtkglarea
-DEPENDS+=		libglade-*:../../devel/libglade
+DEPENDS+=		gtkglarea-[0-9]*:../../x11/gtkglarea
+DEPENDS+=		libglade-[0-9]*:../../devel/libglade
 DEPENDS+=		python>=2.0:../../lang/python
 
-CONFLICTS+=		py-gtk-*
+CONFLICTS+=		py-gtk-[0-9]*
 
 GNU_CONFIGURE=		yes
 USE_X11=		yes
diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile
index 43bb44c8552..512087e2b4f 100644
--- a/x11/gnome/Makefile
+++ b/x11/gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/04/26 07:32:03 rh Exp $
+# $NetBSD: Makefile,v 1.22 2001/09/27 23:19:00 jlam Exp $
 
 DISTNAME=	gnome-1.4.0.1
 CATEGORIES=	x11 gnome
@@ -25,7 +25,7 @@ DEPENDS+=	gnome-python>=1.4.0:../gnome-python
 DEPENDS+=	gnome-users-guide>=1.2:../gnome-users-guide
 DEPENDS+=	gnome-utils>=1.4.0:../../misc/gnome-utils
 DEPENDS+=	gnumeric>=0.64:../../math/gnumeric
-DEPENDS+=	evolution-*:../../mail/evolution
+DEPENDS+=	evolution-[0-9]*:../../mail/evolution
 DEPENDS+=	gtk-->=1.2.5:../gtk--
 DEPENDS+=	gtk-engines>=0.10:../gtk-engines
 DEPENDS+=	gtop>=1.0.13:../../sysutils/gtop
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 8896db4fefa..72acecb030e 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2001/08/29 18:27:59 hubertf Exp $
+# $NetBSD: Makefile,v 1.83 2001/09/27 23:19:00 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
@@ -18,7 +18,7 @@ DEPENDS+=	kdelibs-1.1.2:../../x11/kdelibs
 # kdebase doesn't manipulate GIFs, but KDE packages depending on kdebase
 # often do, so put the dependency here.
 #
-DEPENDS+=	libungif-*:../../graphics/libungif
+DEPENDS+=	libungif-[0-9]*:../../graphics/libungif
 
 USE_X11BASE=		YES
 USE_MESA=		YES
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index 557417918dd..d0eb253c264 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2001/05/22 09:32:28 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2001/09/27 23:19:01 jlam Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
@@ -15,7 +15,7 @@ COMMENT=	Support libraries for the KDE integrated X11 desktop
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	png>=1.0.11:../../graphics/png
 DEPENDS+=	qt1-1.44:../../x11/qt1
-DEPENDS+=	tiff-*:../../graphics/tiff
+DEPENDS+=	tiff-[0-9]*:../../graphics/tiff
 
 USE_X11BASE=	yes
 USE_GMAKE=	yes
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index 80031528ac7..e002190fd8c 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/04/02 20:06:15 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/09/27 23:19:01 jlam Exp $
 #
 
 DISTNAME=	khostchooser-0.3
@@ -11,7 +11,7 @@ COMMENT=	KDE Chooser replacement for X
 
 BUILD_USES_MSGFMT=	yes
 DEPENDS+=	kdelibs-1.1.2:../../x11/kdelibs
-DEPENDS+=	libungif-*:../../graphics/libungif
+DEPENDS+=	libungif-[0-9]*:../../graphics/libungif
 
 WRKSRC=		${WRKDIR}/khostchooser
 
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 2846cd69493..9498262e5f1 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/09/08 20:03:43 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/27 23:19:01 jlam Exp $
 # FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp 
 # OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp 
 
@@ -19,7 +19,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.opengroup.org/openmotif/
 COMMENT=		Open Motif
 
-CONFLICTS+=		lesstif-*
+CONFLICTS+=		lesstif-[0-9]*
 
 DIST_SUBDIR=		openmotif
 WRKSRC=			${WRKDIR}/motif
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index 612c34fa986..cd64040b616 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/05/22 09:32:28 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/09/27 23:19:02 jlam Exp $
 #
 
 DISTNAME=	qtarch-2.1-1
@@ -11,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://qtarch.sourceforge.net/
 COMMENT=	Graphical dialog editor for the Qt widget set
 
-DEPENDS+=	qt2-libs-*:../../x11/qt2-libs
+DEPENDS+=	qt2-libs-[0-9]*:../../x11/qt2-libs
 DEPENDS+=	png>=1.0.11:../../graphics/png
 
 USE_X11=	yes
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index a37c5456329..157dffca0a9 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:30 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/27 23:19:02 jlam Exp $
 
 DISTNAME=	qwt-0.3.0
 CATEGORIES=	x11
@@ -18,7 +18,7 @@ USE_LIBTOOL=	yes
 MAKE_ENV+=	CXX="${CXX}"
 MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 
-CONFLICTS=	qwtlib-*
+CONFLICTS=	qwtlib-[0-9]*
 
 post-patch:
 	${LN} -s ${WRKSRC}/makefiles/netbsd-g++ ${WRKSRC}/Makefile
diff --git a/x11/rep-gtk/Makefile b/x11/rep-gtk/Makefile
index e01fd618497..54b38b82cda 100644
--- a/x11/rep-gtk/Makefile
+++ b/x11/rep-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:06:45 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/27 23:19:02 jlam Exp $
 #
 
 DISTNAME=		rep-gtk-0.14
@@ -11,8 +11,8 @@ COMMENT=		librep bindings for gtk (used by sawmill)
 
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		librep>=0.13.1:../../lang/librep
-DEPENDS+=		libglade-*:../../devel/libglade
-DEPENDS+=		gnome-libs-*:../../x11/gnome-libs
+DEPENDS+=		libglade-[0-9]*:../../devel/libglade
+DEPENDS+=		gnome-libs-[0-9]*:../../x11/gnome-libs
 DEPENDS+=		gdk-pixbuf-gnome>=0.9.0:../../graphics/gdk-pixbuf-gnome
 
 USE_X11=		# defined
diff --git a/x11/ruby-fox/Makefile b/x11/ruby-fox/Makefile
index 24fe2a6f177..52c5766c3dd 100644
--- a/x11/ruby-fox/Makefile
+++ b/x11/ruby-fox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/05 17:24:31 sakamoto Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:19:02 jlam Exp $
 
 DISTNAME=	FXRuby-0.99.174
 PKGNAME=	${RUBY_PKGNAMEPREFIX}fox-0.99.174
@@ -9,7 +9,7 @@ MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://fxruby.sourceforge.net/
 COMMENT=	Ruby interface to FOX GUI library
 
-DEPENDS+=	ruby-opengl-*:../../graphics/ruby-opengl
+DEPENDS+=	ruby-opengl-[0-9]*:../../graphics/ruby-opengl
 BUILDLINK_DEPENDS.fox=${DISTNAME:C/FXRuby/fox/}
 
 WRKDIST=	${WRKDIR}/${DISTNAME}
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index 4110b82faad..d889be30019 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/30 15:30:20 taca Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/27 23:19:02 jlam Exp $
 # FreeBSD: ports/x11-toolkits/ruby-gtk/Makefile,v 1.16 2000/10/15 15:45:59 knu Exp
 
 DISTNAME=	ruby-gtk-0.25
@@ -18,7 +18,7 @@ USE_X11=	yes
 
 INSTALL_TARGET=	site-install
 
-DEPENDS+=	imlib-*:../../graphics/imlib
+DEPENDS+=	imlib-[0-9]*:../../graphics/imlib
 
 DOCS_EN=	README README.EXT doc/rbbr.rb
 DOCS_JA=	README.ja README.EXT.ja
diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile
index 80cd2c8bcaf..1c13693bee0 100644
--- a/x11/ssystem/Makefile
+++ b/x11/ssystem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/03/28 03:10:53 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:19:03 jlam Exp $
 #
 
 DISTNAME=	ssystem-1.6
@@ -9,7 +9,7 @@ MAINTAINER=	fredb@netbsd.org
 HOMEPAGE=	http://www1.las.es/~amil/ssystem/
 COMMENT=	Solar System Flyby Simulator
 
-BUILD_DEPENDS+=	bison-*:../../devel/bison
+BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 
 USE_MESA=	yes
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index ef3b1492053..2cbcb088244 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/03/12 10:43:19 tron Exp $
+# $NetBSD: Makefile,v 1.12 2001/09/27 23:19:03 jlam Exp $
 #
 
 DISTNAME=	wterm-6.2.6
@@ -10,7 +10,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://wm.current.nu/files.php\#wterm
 COMMENT=	NeXTStep(tm) style X11 terminal emulator for WindowMaker
 
-DEPENDS+=	windowmaker-*:../../wm/windowmaker
+DEPENDS+=	windowmaker-[0-9]*:../../wm/windowmaker
 
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 5e7ba7dcc76..cf024ca9e77 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2001/06/18 15:41:49 fredb Exp $
+# $NetBSD: Makefile.common,v 1.18 2001/09/27 23:19:03 jlam Exp $
 #
 
 DISTNAME=		xscreensaver-3.33
@@ -10,7 +10,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.jwz.org/xscreensaver/
 
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
-DEPENDS+=		gle-*:../../graphics/gle
+DEPENDS+=		gle-[0-9]*:../../graphics/gle
 
 USE_MESA=		yes
 USE_X11BASE=		yes