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, 45 insertions, 44 deletions

diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index 15a5253ee73..03aed484917 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/09/09 20:36:48 agc Exp $
+# $NetBSD: Makefile,v 1.15 2001/09/27 23:18:44 jlam Exp $
 # FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp
 #
 
@@ -16,7 +16,7 @@ MAINTAINER=	rh@NetBSD.ORG
 HOMEPAGE=	http://www.ora.com/davenport/
 COMMENT=	SGML DTD designed for computer documentation
 
-BUILD_DEPENDS=	unzip-*:../../archivers/unzip
+BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
 DEPENDS+=	iso8879-1986:../../textproc/iso8879
 
 NO_MTREE=       yes
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index 7952330a804..c21e1865f7d 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/03/27 03:20:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/27 23:18:45 jlam Exp $
 # FreeBSD Id: Makefile,v 1.17 1999/04/24 09:25:32 kuriyama Exp
 
 DISTNAME=	db157
@@ -11,7 +11,7 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://nwalsh.com/docbook/dsssl/
 COMMENT=	DSSSL stylesheets for the DocBook DTD by Norman Walsh
 
-BUILD_DEPENDS=	unzip-*:../../archivers/unzip
+BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
 DEPENDS+=	docbook>=4.0:../../textproc/docbook
 
 EXTRACT_CMD=	unzip ${DOWNLOADED_DISTFILE}
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index b712429ad44..e538d7913ea 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/09/02 17:07:01 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 2001/09/27 23:18:45 jlam Exp $
 # FreeBSD Id: Makefile,v 1.15 1999/01/31 11:15:57 dirk Exp
 #
 
@@ -14,7 +14,7 @@ MAINTAINER=	rh@NetBSD.ORG
 HOMEPAGE=	http://www.jclark.com/jade/
 COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
 
-CONFLICTS+=	sp-*
+CONFLICTS+=	sp-[0-9]*
 
 USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=		yes
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 75656b8d503..7d25f7067da 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/27 10:52:27 agc Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:45 jlam Exp $
 # FreeBSD Id: ports/textproc/openjade/Makefile,v 1.30 2001/03/04 21:39:19 lioux Exp
 
 DISTNAME=	openjade-1.3
@@ -11,7 +11,7 @@ COMMENT=	SGML/XML parser toolkit and DSSSL engine, successor to "jade"
 
 BUILD_DEPENDS+=	perl>=5.6.0:../../lang/perl5:build
 
-CONFLICTS+=	opensp-*
+CONFLICTS+=	opensp-[0-9]*
 
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 2f3932f871f..e2fae11a593 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/03/31 12:13:37 zuntum Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:45 jlam Exp $
 #
 
 DISTNAME=	OpenSP-1.4
@@ -12,7 +12,7 @@ COMMENT=	SGML parser, successor to "sp"
 
 DEPENDS+=	unproven-pthreads-[0-9]*:../../devel/unproven-pthreads
 
-CONFLICTS+=     sp-*
+CONFLICTS+=     sp-[0-9]*
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--enable-http \
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index 12ba400578f..2fe868c5766 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/10 15:38:09 mjl Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:45 jlam Exp $
 #
 
 DISTNAME=	XML-DOM-1.31
@@ -9,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Extend XML::Parser to build DOM Level 1 compliant data structure
 
-DEPENDS+=	p5-Parse-Yapp-*:../../devel/p5-Parse-Yapp
-DEPENDS+=	p5-libxml-*:../../textproc/p5-libxml
-DEPENDS+=	p5-XML-RegExp-*:../../textproc/p5-XML-RegExp
+DEPENDS+=	p5-Parse-Yapp-[0-9]*:../../devel/p5-Parse-Yapp
+DEPENDS+=	p5-libxml-[0-9]*:../../textproc/p5-libxml
+DEPENDS+=	p5-XML-RegExp-[0-9]*:../../textproc/p5-XML-RegExp
 
-CONFLICTS+=	p5-libxml-enno-*
+CONFLICTS+=	p5-libxml-enno-[0-9]*
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML-DOM/.packlist
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index e9e23fc51b1..6cd04c5abaf 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/06/10 17:17:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:45 jlam Exp $
 #
 
 DISTNAME=	XML-Parser.2.30
@@ -11,7 +11,7 @@ MAINTAINER=	bad@netbsd.org
 HOMEPAGE=	http://wwwx.netheaven.com/~coopercc/xmlparser/intro.html
 COMMENT=	Perl extension interface to James Clark's XML parser, expat
 
-DEPENDS+=	expat-*:../../textproc/expat
+DEPENDS+=	expat-[0-9]*:../../textproc/expat
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Parser/.packlist
diff --git a/textproc/p5-XML-RegExp/Makefile b/textproc/p5-XML-RegExp/Makefile
index 5d6d85fb629..5c583b2831b 100644
--- a/textproc/p5-XML-RegExp/Makefile
+++ b/textproc/p5-XML-RegExp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/10 15:38:11 mjl Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:46 jlam Exp $
 #
 
 DISTNAME=	XML-RegExp-0.03
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/TJMATHER/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Provide regular expressions for some XML tokens
 
-CONFLICTS+=	p5-libxml-enno-*
+CONFLICTS+=	p5-libxml-enno-[0-9]*
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/RegExp/.packlist
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index d9d0c2d8a2f..59347349c71 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/10 15:38:11 mjl Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:46 jlam Exp $
 #
 
 DISTNAME=	XML-XQL-0.66
@@ -9,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl module to perform XQL queries on XML object trees
 
-DEPENDS+=	p5-XML-DOM-*:../p5-XML-DOM
+DEPENDS+=	p5-XML-DOM-[0-9]*:../p5-XML-DOM
 DEPENDS+=	p5-XML-Parser-2.*:../p5-XML-Parser
-DEPENDS+=	p5-Date-Manip-*:../../devel/p5-Date-Manip
+DEPENDS+=	p5-Date-Manip-[0-9]*:../../devel/p5-Date-Manip
 
-CONFLICTS+=	p5-libxml-enno-*
+CONFLICTS+=	p5-libxml-enno-[0-9]*
 
 USE_PERL5=	yes
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/XQL/.packlist
diff --git a/textproc/p5-libxml-enno/Makefile b/textproc/p5-libxml-enno/Makefile
index b2603614d21..22067e9a3d6 100644
--- a/textproc/p5-libxml-enno/Makefile
+++ b/textproc/p5-libxml-enno/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/08/10 15:29:20 mjl Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:46 jlam Exp $
 
 DISTNAME=	libxml-enno-1.05a
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,8 @@ DEPENDS+=	p5-libwww>=5.50:../../www/p5-libwww
 DEPENDS+=	p5-libxml>=0.07:../../textproc/p5-libxml
 DEPENDS+=	p5-Parse-Yapp>=1.04:../../devel/p5-Parse-Yapp
 
-CONFLICTS+=	p5-XML-DOM-* p5-XML-XQL-* p5-XML-Checker-* p5-XML-RegExp-*
+CONFLICTS+=	p5-XML-DOM-[0-9]* p5-XML-XQL-[0-9]*
+CONFLICTS+=	p5-XML-Checker-[0-9]* p5-XML-RegExp-[0-9]*
 
 WRKSRC=		${WRKDIR}/libxml-enno-1.05
 
diff --git a/textproc/pyxml/Makefile b/textproc/pyxml/Makefile
index 80f772d19c4..d9a6ff2fd8c 100644
--- a/textproc/pyxml/Makefile
+++ b/textproc/pyxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/06 16:05:57 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:46 jlam Exp $
 #
 
 DISTNAME=	PyXML-0.6.6
@@ -10,7 +10,7 @@ HOMEPAGE=	http://pyxml.sourceforge.net/
 COMMENT=	collection of libraries to process XML with Python
 
 DEPENDS+=	python>=2.0:../../lang/python
-DEPENDS+=	expat-*:../../textproc/expat
+DEPENDS+=	expat-[0-9]*:../../textproc/expat
 
 USE_PYTHON=	yes
 PYDISTUTILSPKG=	yes
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 85c926fb847..dd4989149d4 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/06/25 17:27:34 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:46 jlam Exp $
 
 DISTNAME=		Sablot-0.60
 PKGNAME=		sablotron-0.60
@@ -9,7 +9,7 @@ MAINTAINER=		uithuis@dds.nl
 HOMEPAGE=		http://www.gingerall.com/charlie-bin/get/webGA/act/sablotron.act
 COMMENT=		XSL processor fully implemented in C++
 
-DEPENDS+=		expat-*:../../textproc/expat
+DEPENDS+=		expat-[0-9]*:../../textproc/expat
 
 GNU_CONFIGURE=  	YES
 USE_GMAKE=		YES
diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index 2ef64943b7c..cf31e9bba1b 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/25 04:18:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/27 23:18:47 jlam Exp $
 #
 
 DISTNAME=	sp-1.3.4
@@ -15,8 +15,8 @@ MAINTAINER=	mjl@emsi.priv.at
 HOMEPAGE=	http://www.jclark.com/sp/
 COMMENT=	SGML System Conforming to International Standard ISO 8879
 
-CONFLICTS+=	jade-*
-CONFLICTS+=	opensp-*
+CONFLICTS+=	jade-[0-9]*
+CONFLICTS+=	opensp-[0-9]*
 
 MAKE_ENV+=	INSTALL="${INSTALL}"
 
diff --git a/textproc/tcl-dom/Makefile b/textproc/tcl-dom/Makefile
index f4be8a95fc0..78581e01806 100644
--- a/textproc/tcl-dom/Makefile
+++ b/textproc/tcl-dom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:47 jlam Exp $
 #
 
 DISTNAME=	TclDOM-1.6
@@ -10,10 +10,10 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.zveno.com/zm.cgi/in-tclxml/in-tcldom/
 COMMENT=	DOM implementation for use with TclXML or TclExpat
 
-DEPENDS+=	tcl-xml-*:../../textproc/tcl-xml
+DEPENDS+=	tcl-xml-[0-9]*:../../textproc/tcl-xml
 
 # old name for this package...
-CONFLICTS+=	TclDom-*
+CONFLICTS+=	TclDom-[0-9]*
 
 NO_CONFIGURE=
 NO_BUILD=
diff --git a/textproc/tcl-xml/Makefile b/textproc/tcl-xml/Makefile
index e873f033041..791d59909f0 100644
--- a/textproc/tcl-xml/Makefile
+++ b/textproc/tcl-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:47 jlam Exp $
 #
 
 DISTNAME=	TclXML-1.2
@@ -13,7 +13,7 @@ COMMENT=	XML parser implemented entirely in Tcl
 DEPENDS+=       tcl>=8.3.2:../../lang/tcl
 
 # old name for this package...
-CONFLICTS+=	TclXML-*
+CONFLICTS+=	TclXML-[0-9]*
 
 NO_CONFIGURE=
 NO_BUILD=
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
index d877e699ea5..fce485b2ff2 100644
--- a/textproc/xp/Makefile
+++ b/textproc/xp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:47 jlam Exp $
 #
 
 DISTNAME=	xp
@@ -11,7 +11,7 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.jclark.com/xml/
 COMMENT=	James Clark's non-validating XML Parser for Java
 
-DEPENDS+=	unzip-*:../../archivers/unzip
+DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 
 EXTRACT_ONLY=
 USE_JAVA=	yes
diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile
index a2b21b8f8c3..c3dfce2bc1d 100644
--- a/textproc/xt/Makefile
+++ b/textproc/xt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:47 jlam Exp $
 #
 
 DISTNAME=	xt
@@ -11,8 +11,8 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.jclark.com/xml/
 COMMENT=	James Clark's Java implementation of XSLT
 
-DEPENDS+=	unzip-*:../../archivers/unzip
-DEPENDS+=	XP-*:../../textproc/xp
+DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
+DEPENDS+=	XP-[0-9]*:../../textproc/xp
 
 EXTRACT_ONLY=
 USE_JAVA=	yes
diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index f2b835b00b3..99a8e4f30f6 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/14 21:43:59 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:48 jlam Exp $
 
 DISTNAME=	yodl-1.31.18
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.xs4all.nl/~jantien/yodl/
 COMMENT=	high-level document preparation system
 
-BUILD_DEPENDS+=	bison-*:../../devel/bison
+BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES