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.

38 files changed, 96 insertions, 95 deletions

diff --git a/www/ap-DBI/Makefile b/www/ap-DBI/Makefile
index 437477500c0..ae7cf6553f3 100644
--- a/www/ap-DBI/Makefile
+++ b/www/ap-DBI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/20 05:23:26 jonb Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:49 jlam Exp $
 #
 
 DISTNAME=       ApacheDBI-0.87
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/MERGL/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 Apache modules for DBI connections
 
-DEPENDS+=	ap-perl-*:../../www/ap-perl
+DEPENDS+=	ap-perl-[0-9]*:../../www/ap-perl
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 
 USE_PERL5=	# defined
diff --git a/www/ap-Embperl/Makefile b/www/ap-Embperl/Makefile
index c912bc861be..32ba6b3756c 100644
--- a/www/ap-Embperl/Makefile
+++ b/www/ap-Embperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:21:43 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:50 jlam Exp $
 #
 
 DISTNAME=       HTML-Embperl-1.2.0
@@ -10,8 +10,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://perl.apache.org/embperl/
 COMMENT=	perl5 library for embedding perl in HTML documents
 
-DEPENDS+=	ap-perl-*:../../www/ap-perl
-DEPENDS+=	p5-HTML-Parser-*:../../www/p5-HTML-Parser
+DEPENDS+=	ap-perl-[0-9]*:../../www/ap-perl
+DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/HTML/Embperl/.packlist
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index f5ed11f4982..b6e705bd87d 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/05/20 05:23:27 jonb Exp $
+# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:50 jlam Exp $
 
 DISTNAME=	AuthPG-1.2b2
 PKGNAME=	ap-auth-postgresql-1.2b2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://home.bawi.org/~minskim/authpg/
 COMMENT=	Module to allow apache authentication against a Postgresql database
 
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-DEPENDS+=	postgresql-{6.5.3*,7.0*,lib-*}:../../databases/postgresql-lib
+DEPENDS+=	postgresql-{6.5.3*,7.0*,lib-[0-9]*}:../../databases/postgresql-lib
 # For "apxs":
 BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
 
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 24fb50a9599..307c364a6e8 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/20 05:23:28 jonb Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:50 jlam Exp $
 
 DISTNAME=	jakarta-tomcat-3.2.1-src
 PKGNAME=	ap-jk-3.2.1
@@ -9,7 +9,7 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
 COMMENT=	improved connector for accessing Jakarta Tomcat or JServ from Apache
 
-DEPENDS+=	apache{,6}-*:../../www/apache
+DEPENDS+=	apache{,6}-[0-9]*:../../www/apache
 
 USE_JAVA=	yes
 # For "apxs":
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 14534607681..08fe4882a73 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2001/07/13 07:09:24 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2001/09/27 23:18:51 jlam Exp $
 
 DISTNAME=		mod_ssl-2.8.4-1.3.20
 PKGNAME=		ap-ssl-2.8.4
@@ -13,7 +13,7 @@ DEPENDS+=		apache>=1.3.20:../../www/apache
 # For "apxs":
 BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
 
-CONFLICTS=		apache-1.3.[0-9] apache-*modssl-* apache6-*
+CONFLICTS=		apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]*
 
 HAS_CONFIGURE=		# defined
 USE_SSL=		# defined
diff --git a/www/apache-current/Makefile b/www/apache-current/Makefile
index d072b7beb39..327c6fa96b4 100644
--- a/www/apache-current/Makefile
+++ b/www/apache-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/09/14 15:38:08 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:51 jlam Exp $
 
 DISTNAME=		httpd-2_0_16-beta
 PKGNAME=		apache-2.0.16
@@ -11,7 +11,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.apache.org/
 COMMENT=		HTTP (Web) server, version 2
 
-CONFLICTS=		apache-*modssl-* apache-* apache6-* ap-*
+CONFLICTS=		apache-*modssl-[0-9]* apache-[0-9]*
+CONFLICTS+=		apache6-[0-9]* ap-[0-9]*
 
 # autodetect
 BUILD_DEFS+=		USE_INET6
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 8c6a1f5cd8a..9b072640e54 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2001/07/13 07:09:24 jlam Exp $
+# $NetBSD: Makefile,v 1.76 2001/09/27 23:18:51 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -22,7 +22,7 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://httpd.apache.org/
 COMMENT=		HTTP (Web) server
 
-CONFLICTS=		apache-*modssl-* apache6-*
+CONFLICTS=		apache-*modssl-[0-9]* apache6-[0-9]*
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
 HAS_CONFIGURE=		# defined
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 80e31a0be22..5c6120418cf 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/07/16 15:41:51 itojun Exp $
+# $NetBSD: Makefile,v 1.34 2001/09/27 23:18:51 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -25,7 +25,7 @@ MAINTAINER=		itojun@netbsd.org
 HOMEPAGE=		http://httpd.apache.org/
 COMMENT=		HTTP (Web) server with IPv6 support
 
-CONFLICTS=		apache-* apache-*modssl-* apache6-*
+CONFLICTS=		apache-[0-9]* apache-*modssl-[0-9]* apache6-[0-9]*
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif:N*.diff.gz}
 HAS_CONFIGURE=		# defined
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index d715c25b700..4f272004630 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/08/27 14:35:16 tron Exp $
+# $NetBSD: Makefile,v 1.18 2001/09/27 23:18:52 jlam Exp $
 
 DISTNAME=	bluefish-0.6
 CATEGORIES=	www
@@ -17,8 +17,8 @@ COMMENT=	GTK HTML editor for the experienced web designer
 BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
 BUILD_USES_MSGFMT=	YES
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-DEPENDS+=	imlib-*:../../graphics/imlib
-DEPENDS+=	weblint-*:../../www/weblint
+DEPENDS+=	imlib-[0-9]*:../../graphics/imlib
+DEPENDS+=	weblint-[0-9]*:../../www/weblint
 
 USE_X11BASE=	# defined
 USE_GMAKE=	# defined
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 72e2c77f137..ce1650ac2c1 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/03/29 21:16:13 jwise Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/27 23:18:52 jlam Exp $
 
 DISTNAME=	Cocoon-1.8.2
 PKGNAME=	cocoon-1.8.2
@@ -15,7 +15,7 @@ COMMENT=	the Apache Project's XML/XSL based web publishing system
 # imported as -current packages.
 DEPENDS+=	xalan-j-1.2:../../textproc/xalan-j
 DEPENDS+=	fop-0.15.0:../../textproc/fop
-DEPENDS+=	jakarta-servletapi-*:../../www/jakarta-servletapi
+DEPENDS+=	jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
 
 # In addition to the above requirements, cocoon will build in support for the
 # following if they are in ${CLASSPATH}
diff --git a/www/galway/Makefile b/www/galway/Makefile
index f9d501b729d..5b7be11f1c6 100644
--- a/www/galway/Makefile
+++ b/www/galway/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:03 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:52 jlam Exp $
 #
 
 DISTNAME=	galway-0.33
@@ -10,7 +10,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://erin.netpedia.net/galway.html
 COMMENT=	Web editor programmed in Scheme
 
-DEPENDS+=	guile-gtk-*:../../devel/guile-gtk
+DEPENDS+=	guile-gtk-[0-9]*:../../devel/guile-gtk
 
 NO_BUILD=	YES
 
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index e50358291a5..9b3cbb91c81 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/09/24 20:59:26 tron Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/27 23:18:52 jlam Exp $
 
 DISTNAME=		gtkhtml-0.12.0
 CATEGORIES=		www gnome
@@ -10,9 +10,9 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		lightweight HTML rendering/printing/editing engine
 
 DEPENDS+=		gal>=0.5nb1:../../devel/gal
-DEPENDS+=		glibwww-*:../../www/glibwww
+DEPENDS+=		glibwww-[0-9]*:../../www/glibwww
 DEPENDS+=		bonobo>=0.37:../../devel/bonobo
-DEPENDS+=		{control-center<1.5.0,libcapplet-*}:../../x11/controlcenter
+DEPENDS+=		{control-center<1.5.0,libcapplet-[0-9]*}:../../x11/controlcenter
 DEPENDS+=		gnome-print>=0.28:../../print/gnome-print
 DEPENDS+=		libghttp>=1.0:../../www/libghttp
 
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 892afbd1f02..02e62e18a27 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:52 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:52 jlam Exp $
 #
 
 DISTNAME=	hiawatha
@@ -13,7 +13,7 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.pault.com/pault/downloads/
 COMMENT=	Barebones HTTP server with XML and XSLT support (and more)
 
-DEPENDS+=	saxon-*:../../textproc/saxon
+DEPENDS+=	saxon-[0-9]*:../../textproc/saxon
 
 NO_PATCH=
 NO_CONFIGURE=
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 76843412884..1cedf03b688 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/08/23 18:06:16 abs Exp $
+# $NetBSD: Makefile,v 1.23 2001/09/27 23:18:52 jlam Exp $
 
 DISTNAME=	${PKGNAME}-src
 PKGNAME=	jakarta-tomcat-3.2.3
@@ -9,7 +9,7 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://jakarta.apache.org/
 COMMENT=	the Apache Project's Java Servlet 2.2 and JSP 1.1 server
 
-DEPENDS+=	jakarta-servletapi-*:../../www/jakarta-servletapi
+DEPENDS+=	jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
 
 USE_JAVA=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 61489763472..f13ce5970b5 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2001/06/11 06:34:55 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2001/09/27 23:18:53 jlam Exp $
 #
 
 DISTNAME=		lynx2.8.4dev.19
@@ -61,9 +61,9 @@ post-install:
 
 LYNX_SCREEN_LIB?=	slang
 .if (${LYNX_SCREEN_LIB} == slang)
-DEPENDS+=		libslang-*:../../devel/libslang
+DEPENDS+=		libslang-[0-9]*:../../devel/libslang
 .elif (${LYNX_SCREEN_LIB} == ncurses)
-DEPENDS+=		ncurses-*:../../devel/ncurses
+DEPENDS+=		ncurses-[0-9]*:../../devel/ncurses
 CONFIGURE_ARGS+=	--enable-color-style
 CPPFLAGS+=		-I/usr/include -I${LOCALBASE}/include
 .elif (${LYNX_SCREEN_LIB} == curses)
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 18056d7275a..726961bcbf2 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2001/07/13 14:41:19 fredb Exp $
+# $NetBSD: Makefile,v 1.42 2001/09/27 23:18:53 jlam Exp $
 #
 
 DISTNAME=		lynx2.8.3rel.1
@@ -117,10 +117,10 @@ post-install:
 # "color styles", and more. No library supports all features.
 LYNX_SCREEN_LIB?=	slang
 .if (${LYNX_SCREEN_LIB} == slang)
-DEPENDS+=		libslang-*:../../devel/libslang
+DEPENDS+=		libslang-[0-9]*:../../devel/libslang
 LIBS=			-lm -ltermcap
 .elif (${LYNX_SCREEN_LIB} == ncurses)
-DEPENDS+=		ncurses-*:../../devel/ncurses
+DEPENDS+=		ncurses-[0-9]*:../../devel/ncurses
 CONFIGURE_ARGS+=	--enable-color-style
 .elif (${LYNX_SCREEN_LIB} != curses)
 pre-configure:
diff --git a/www/netscape/Makefile b/www/netscape/Makefile
index 58cc0efe556..497118958fc 100644
--- a/www/netscape/Makefile
+++ b/www/netscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:53 agc Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:53 jlam Exp $
 #
 
 COMMENT=	Open new communicator, navigator, or mozilla window
@@ -9,12 +9,12 @@ BINNAME=	netscape
 
 DEPENDS+= ns-remote>=1.3:../../www/ns-remote
 .if defined(NS_PREFERRED) && ${NS_PREFERRED} == mozilla
-DEPENDS+= {mozilla,navigator,communicator}-*:../../www/mozilla
+DEPENDS+= {mozilla,navigator,communicator}-[0-9]*:../../www/mozilla
 .else
 .if defined(NS_PREFERRED) && ${NS_PREFERRED} == navigator
-DEPENDS+= {navigator,communicator,mozilla}-*:../../www/navigator
+DEPENDS+= {navigator,communicator,mozilla}-[0-9]*:../../www/navigator
 .else
-DEPENDS+= {communicator,navigator,mozilla}-*:../../www/communicator
+DEPENDS+= {communicator,navigator,mozilla}-[0-9]*:../../www/communicator
 .endif
 .endif
 
diff --git a/www/ns-plugger-common/Makefile b/www/ns-plugger-common/Makefile
index c1d2b7b7e74..18c08dd8ae5 100644
--- a/www/ns-plugger-common/Makefile
+++ b/www/ns-plugger-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/03/06 10:17:43 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:53 jlam Exp $
 #
 
 DISTNAME=		plugger-3.2-linux-x86-glibc
@@ -14,14 +14,14 @@ COMMENT=		streaming multimedia plugin for Netscape
 BINNAME?=		common
 
 .if ${BINNAME} != common
-DEPENDS+=		${BINNAME}-*:../../www/${BINNAME}
+DEPENDS+=		${BINNAME}-[0-9]*:../../www/${BINNAME}
 MOZILLA_HOME=		${PREFIX}/lib/netscape/${NSNAME:C/nb[0-9]+$//}
 PLIST_SUBST+=		MOZILLA_HOME=${MOZILLA_HOME:S/${PREFIX}\///}
 .else
 DEPENDS+=		suse_base>=6.3:../../emulators/suse_base
 .endif
 
-CONFLICTS+=		plugger-*	# obsolete all-in-one plugger package
+CONFLICTS+=		plugger-[0-9]*	# obsolete all-in-one plugger package
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
diff --git a/www/ns-plugger-communicator/Makefile b/www/ns-plugger-communicator/Makefile
index ccdd8bc1949..c658efd589b 100644
--- a/www/ns-plugger-communicator/Makefile
+++ b/www/ns-plugger-communicator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:17 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:53 jlam Exp $
 #
 
 COMMENT=	streaming multimedia plugin for Netscape (communicator)
@@ -6,7 +6,7 @@ COMMENT=	streaming multimedia plugin for Netscape (communicator)
 BINNAME=	communicator
 COMMONDIR=	../ns-plugger-common
 
-DEPENDS+=	ns-plugger-common-*:${COMMONDIR}
+DEPENDS+=	ns-plugger-common-[0-9]*:${COMMONDIR}
 
 PLIST_SRC=	${.CURDIR}/pkg/PLIST
 PKGDIR=		${.CURDIR}/${COMMONDIR}/pkg
diff --git a/www/ns-plugger-navigator/Makefile b/www/ns-plugger-navigator/Makefile
index 263f0ca1ba1..e9960bb535d 100644
--- a/www/ns-plugger-navigator/Makefile
+++ b/www/ns-plugger-navigator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:17 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:54 jlam Exp $
 #
 
 COMMENT=	streaming multimedia plugin for Netscape (navigator)
@@ -6,7 +6,7 @@ COMMENT=	streaming multimedia plugin for Netscape (navigator)
 BINNAME=	navigator
 COMMONDIR=	../ns-plugger-common
 
-DEPENDS+=	ns-plugger-common-*:${COMMONDIR}
+DEPENDS+=	ns-plugger-common-[0-9]*:${COMMONDIR}
 
 PLIST_SRC=	${.CURDIR}/pkg/PLIST
 PKGDIR=		${.CURDIR}/${COMMONDIR}/pkg
diff --git a/www/openacs/Makefile b/www/openacs/Makefile
index e909d6510fd..90361822a37 100644
--- a/www/openacs/Makefile
+++ b/www/openacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/07/27 10:52:00 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:54 jlam Exp $
 #
 
 DISTNAME=		openacs-3.2.5
@@ -14,7 +14,7 @@ COMMENT=		TCL-based web programming environment
 DEPENDS+=		ap-aolserver-1.1:../../www/ap-aolserver
 DEPENDS+=		postgresql-lib>=7.0:../../databases/postgresql-lib
 DEPENDS+=		ImageMagick>=5.2.0:../../graphics/ImageMagick
-DEPENDS+=		unzip-*:../../archivers/unzip
+DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 BUILD_DEPENDS+=		postgresql-client>=7.0:../../databases/postgresql-client
 
 NO_CONFIGURE=	# set
diff --git a/www/p5-Apache-DBILogConfig/Makefile b/www/p5-Apache-DBILogConfig/Makefile
index d7e2a9540c9..348fb01f61f 100644
--- a/www/p5-Apache-DBILogConfig/Makefile
+++ b/www/p5-Apache-DBILogConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/27 20:38:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:54 jlam Exp $
 #
 
 DISTNAME=	Apache-DBILogConfig-0.01
@@ -9,8 +9,8 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 MAINTAINER=	packages@NetBSD.org
 COMMENT=	A database-independent Apache database logger
 
-DEPENDS+=	ap-DBI-*:../../www/ap-DBI
-DEPENDS+=	p5-TimeDate-*:../../devel/p5-TimeDate
+DEPENDS+=	ap-DBI-[0-9]*:../../www/ap-DBI
+DEPENDS+=	p5-TimeDate-[0-9]*:../../devel/p5-TimeDate
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Apache/DBILogConfig/.packlist
diff --git a/www/p5-Apache-DBILogger/Makefile b/www/p5-Apache-DBILogger/Makefile
index 5ff4705083a..7fe6c04190f 100644
--- a/www/p5-Apache-DBILogger/Makefile
+++ b/www/p5-Apache-DBILogger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/27 20:40:09 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:55 jlam Exp $
 #
 
 DISTNAME=	Apache-DBILogger-0.93
@@ -10,8 +10,8 @@ MAINTAINER=	packages@NetBSD.org
 HOMEPAGE=	http://ask.netcetera.dk/
 COMMENT=	Database-independent httpd database logging module
 
-DEPENDS+=	p5-Apache-DBILogConfig-*:../../www/p5-Apache-DBILogConfig
-DEPENDS+=	ap-DBI-*:../../www/ap-DBI
+DEPENDS+=	p5-Apache-DBILogConfig-[0-9]*:../../www/p5-Apache-DBILogConfig
+DEPENDS+=	ap-DBI-[0-9]*:../../www/ap-DBI
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Apache/DBILogger/.packlist
diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 189f76bdbf8..e3328093c95 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/05 17:18:21 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:55 jlam Exp $
 
 DISTNAME=		CGI-Application-1.2
 PKGNAME=		p5-${DISTNAME}
@@ -9,7 +9,7 @@ MAINTAINER=		jlam@netbsd.org
 COMMENT=		perl5 module to create sophisticated, reusable web-based applications
 
 DEPENDS+=		{p5-CGI>=2.66,perl>=5.6.1nb2}:../../www/p5-CGI
-DEPENDS+=		p5-HTML-Template-*:../../www/p5-HTML-Template
+DEPENDS+=		p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
 
 USE_PERL5=		# defined
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/CGI/Application/.packlist
diff --git a/www/p5-HTML-PrettyPrinter/Makefile b/www/p5-HTML-PrettyPrinter/Makefile
index ed88b0aca9a..6f8107068cc 100644
--- a/www/p5-HTML-PrettyPrinter/Makefile
+++ b/www/p5-HTML-PrettyPrinter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:23 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:55 jlam Exp $
 
 DISTNAME=		HTML-PrettyPrinter-0.03
 PKGNAME=		p5-${DISTNAME}
@@ -9,7 +9,7 @@ MAINTAINER=		jlam@netbsd.org
 COMMENT=		perl5 module for pretty-printing HTML
 
 DEPENDS+=		p5-HTML-Tree>=3.0:../../www/p5-HTML-Tree
-DEPENDS+=		p5-HTML-Tagset-*:../../www/p5-HTML-Tagset
+DEPENDS+=		p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
 
 USE_PERL5=		# defined
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/HTML/PrettyPrinter/.packlist
diff --git a/www/p5-HTTP-Request-Form/Makefile b/www/p5-HTTP-Request-Form/Makefile
index 65a627d6c5b..2075a994bab 100644
--- a/www/p5-HTTP-Request-Form/Makefile
+++ b/www/p5-HTTP-Request-Form/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/03 16:07:19 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:56 jlam Exp $
 #
 
 DISTNAME=	HTTP-Request-Form-0.7
@@ -9,10 +9,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTTP/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Construct HTTP::Request objects for form processing
 
-DEPENDS+=       p5-libwww-*:../../www/p5-libwww
-DEPENDS+=       p5-URI-*:../../www/p5-URI
-DEPENDS+=       p5-HTML-Tagset-*:../../www/p5-HTML-Tagset
-DEPENDS+=       p5-HTML-Tree-*:../../www/p5-HTML-Tree
+DEPENDS+=       p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+=       p5-URI-[0-9]*:../../www/p5-URI
+DEPENDS+=       p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
+DEPENDS+=       p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
 
 USE_PERL5=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/HTTP/Request/Form/.packlist
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index 68874edfa0d..3e96004ee75 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/02 18:08:25 nra Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:56 jlam Exp $
 #
 
 DISTNAME=	Template-Toolkit-2.04
@@ -18,8 +18,8 @@ DEPENDS+=	p5-GD>=1.32:../../graphics/p5-GD
 DEPENDS+=	p5-GDGraph>=1.33:../../graphics/p5-GDGraph
 DEPENDS+=	p5-GDGraph3d>=0.55:../../graphics/p5-GDGraph3d
 DEPENDS+=	p5-libxml-enno>=1.04:../../textproc/p5-libxml-enno
-DEPENDS+=	p5-Pod-POM-*:../../textproc/p5-Pod-POM
-DEPENDS+=	p5-Text-Autoformat-*:../../textproc/p5-Text-Autoformat
+DEPENDS+=	p5-Pod-POM-[0-9]*:../../textproc/p5-Pod-POM
+DEPENDS+=	p5-Text-Autoformat-[0-9]*:../../textproc/p5-Text-Autoformat
 DEPENDS+=	p5-XML-Parser>=2.30:../../textproc/p5-XML-Parser
 DEPENDS+=	p5-XML-RSS>=0.9:../../textproc/p5-XML-RSS
 DEPENDS+=	p5-XML-XPath>=1.08:../../textproc/p5-XML-XPath
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 3296fb87c3b..e691bd04f03 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/05/14 16:01:22 zuntum Exp $
+# $NetBSD: Makefile,v 1.20 2001/09/27 23:18:56 jlam Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/09/14 04:00:11 jfitz Exp
 #
 
@@ -10,11 +10,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=WWW/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 library for WWW access
 
-DEPENDS+= 	p5-Digest-MD5-*:../../security/p5-Digest-MD5
+DEPENDS+= 	p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=	p5-Net-[0-9]*:../../net/p5-Net
-DEPENDS+=	p5-MIME-Base64-*:../../converters/p5-MIME-Base64
-DEPENDS+=	p5-HTML-Parser-*:../../www/p5-HTML-Parser
-DEPENDS+=	p5-URI-*:../../www/p5-URI
+DEPENDS+=	p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
+DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
+DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/libwww-perl/.packlist
diff --git a/www/php3-gd/Makefile b/www/php3-gd/Makefile
index 9ad03ae69ad..a48e69d0bf6 100644
--- a/www/php3-gd/Makefile
+++ b/www/php3-gd/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:22:28 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:56 jlam Exp $
 #
 
 PKGNAME=	php-gd-${PHP_VERSION}
 
 COMMENT=	PHP3 extension for GD graphics library
 
-DEPENDS+=	gd-*:../../graphics/gd
+DEPENDS+=	gd-[0-9]*:../../graphics/gd
 
 USE_PERL5=	yes
 
diff --git a/www/php3-pgsql/Makefile b/www/php3-pgsql/Makefile
index a48dafa3c51..2b5ef8bf7ea 100644
--- a/www/php3-pgsql/Makefile
+++ b/www/php3-pgsql/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2001/05/14 15:04:51 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/27 23:18:56 jlam Exp $
 #
 
 PKGNAME=	php-pgsql-${PHP_VERSION}
 
 COMMENT=	PHP3 extension for PostgreSQL databases
 
-DEPENDS+=	postgresql-{6.5.3*,7.0*,lib-*}:../../databases/postgresql-lib
+DEPENDS+=	postgresql-{6.5.3*,7.0*,lib-[0-9]*}:../../databases/postgresql-lib
 
 CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}/pgsql
 
diff --git a/www/php3-snmp/Makefile b/www/php3-snmp/Makefile
index 57cacbbd85f..4a8586a8f0b 100644
--- a/www/php3-snmp/Makefile
+++ b/www/php3-snmp/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:22:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:57 jlam Exp $
 #
 
 PKGNAME=	php-snmp-${PHP_VERSION}
 
 COMMENT=	PHP3 extension for SNMP databases
 
-DEPENDS+=	ucd-snmp-*:../../net/ucd-snmp
+DEPENDS+=	ucd-snmp-[0-9]*:../../net/ucd-snmp
 
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
 
diff --git a/www/php3/Makefile b/www/php3/Makefile
index 8aa4034d623..19cd9eca724 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/06/11 06:34:56 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2001/09/27 23:18:57 jlam Exp $
 #
 
 DISTNAME=	php-${PHP_VERSION}
@@ -17,7 +17,7 @@ DEPENDS+=	gdbm>=1.7.3:../../databases/gdbm
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-DEPENDS+=	zlib-*:../../devel/zlib
+DEPENDS+=	zlib-[0-9]*:../../devel/zlib
 .endif
 
 PHP_VERSION=	3.0.18
diff --git a/www/php4-gd/Makefile b/www/php4-gd/Makefile
index 1de7460cd7b..e7c048c268a 100644
--- a/www/php4-gd/Makefile
+++ b/www/php4-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/14 14:12:31 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:57 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
@@ -8,7 +8,7 @@ PHP_PKG_VERS=		# empty
 
 COMMENT=		PHP4 extension for GD graphics library
 
-DEPENDS+=		gd-*:../../graphics/gd
+DEPENDS+=		gd-[0-9]*:../../graphics/gd
 
 EVAL_PREFIX+=		GDDIR=gd
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${GDDIR}
diff --git a/www/php4-pgsql/Makefile b/www/php4-pgsql/Makefile
index 5898a6c691b..372162d7f6f 100644
--- a/www/php4-pgsql/Makefile
+++ b/www/php4-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/14 15:10:25 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:57 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
@@ -8,7 +8,7 @@ PHP_PKG_VERS=		# empty
 
 COMMENT=		PHP4 extension for PostgreSQL databases
 
-DEPENDS+=		postgresql-{6.5.3*,7.0*,lib-*}:../../databases/postgresql-lib
+DEPENDS+=		postgresql-{6.5.3*,7.0*,lib-[0-9]*}:../../databases/postgresql-lib
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${LOCALBASE}
 
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index d3f4558bd3f..6b7d1e6dd32 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2001/06/13 06:20:28 explorer Exp $
+# $NetBSD: Makefile.common,v 1.16 2001/09/27 23:18:57 jlam Exp $
 
 DISTNAME=		php-${PHP_DIST_VERS}
 PHP_DIST_VERS=		4.0.5
@@ -34,7 +34,7 @@ PHP_CONFDIR?=		${LOCALBASE}/etc
 MESSAGE_SUBST+=		PHP_CONFDIR=${PHP_CONFDIR}
 
 .if ${OPSYS} == "SunOS"
-DEPENDS+=		zlib-*:../../devel/zlib
+DEPENDS+=		zlib-[0-9]*:../../devel/zlib
 .endif
 
 # Here we configure only for what NetBSD ships.  We add the rest via modules.
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index a1abcd4c5f5..684a580afd7 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/13 07:09:27 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:58 jlam Exp $
 #
 
 DISTNAME=	surfraw-1.0.3
@@ -9,7 +9,7 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://surfraw.sourceforge.net/
 COMMENT=	Shell Users' Revolutionary Front Rage Against the Web
 
-CONFLICTS+=	surfaw-*
+CONFLICTS+=	surfaw-[0-9]*
 
 GNU_CONFIGURE=	# defined
 
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 45392a16106..6b6e803e8bc 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/06/24 05:57:23 itojun Exp $
+# $NetBSD: Makefile,v 1.27 2001/09/27 23:18:58 jlam Exp $
 #
 
 DISTNAME=	w3m-0.2.1
@@ -16,7 +16,7 @@ COMMENT=	multilingualized version of a pager/text-based browser w3m
 
 DEPENDS=	boehm-gc>=5.3:../../devel/boehm-gc
 
-CONFLICTS+=	w3m-m17n-*
+CONFLICTS+=	w3m-m17n-[0-9]*
 
 HELPDIR=        share/doc/w3m
 HELPERDIR=      lib/w3m
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 871e063815b..a13e13550fa 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:56 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:58 jlam Exp $
 #
 
 DISTNAME=	wml-2.0.3
@@ -9,12 +9,12 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.engelschall.com/sw/wml/
 COMMENT=	Web Meta Language
 
-DEPENDS+=	ncurses-*:../../devel/ncurses
+DEPENDS+=	ncurses-[0-9]*:../../devel/ncurses
 DEPENDS+=	p5-Bit-Vector>=5.2:../../devel/p5-Bit-Vector
-DEPENDS+=	p5-File-PathConvert-*:../../devel/p5-File-PathConvert
+DEPENDS+=	p5-File-PathConvert-[0-9]*:../../devel/p5-File-PathConvert
 DEPENDS+=	p5-Image-Size>=2.6:../../graphics/p5-Image-Size
 DEPENDS+=	p5-Term-ReadKey>=2.11:../../devel/p5-Term-ReadKey
-#DEPENDS+=	tidy-*:../../www/tidy
+#DEPENDS+=	tidy-[0-9]*:../../www/tidy
 
 USE_PERL5=	yes