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, 58 insertions, 58 deletions

diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index cdf18643823..e6adf9d770a 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/06/19 09:20:11 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:37 jlam Exp $
 #
 
 DISTNAME=	Linux-${PKGNAME}
@@ -10,7 +10,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.kernel.org/pub/linux/libs/pam/
 COMMENT=	Pluggable Authentication Modules
 
-BUILD_DEPENDS+=	bison-*:../../devel/bison
+BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
 USE_GMAKE=		YES
 USE_BUILDLINK_ONLY=	YES
diff --git a/security/aide/Makefile b/security/aide/Makefile
index 0cf56d66237..df161486981 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/03/27 03:20:14 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:37 jlam Exp $
 #
 
 DISTNAME=       aide-0.6
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cs.tut.fi/~rammer/aide.html
 COMMENT=	free intrusion detection system for checking file integrity
 
-BUILD_DEPENDS+=	bison-*:../../devel/bison
+BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
 GNU_CONFIGURE=	yes
 #don't set YACC so configure can correctly find bison
diff --git a/security/amavis/Makefile b/security/amavis/Makefile
index d41d1f02e96..318e50c4a52 100644
--- a/security/amavis/Makefile
+++ b/security/amavis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/09/14 21:56:49 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:37 jlam Exp $
 #
 
 DISTNAME=	amavis-0.2.1
@@ -12,16 +12,16 @@ HOMEPAGE=	http://www.amavis.org/
 COMMENT=	mail virus scanner
 
 DEPENDS+=	uvscan-[0-9]*:../../security/uvscan
-DEPENDS+=	maildrop-*:../../mail/maildrop
-DEPENDS+=	tnef-*:../../mail/tnef
-DEPENDS+=	unzip-*:../../archivers/unzip
-DEPENDS+=	unarj-*:../../archivers/unarj
-DEPENDS+=	unrar-*:../../archivers/unrar
-DEPENDS+=	xbin-*:../../archivers/xbin
-DEPENDS+=	lha-*:../../archivers/lha
-DEPENDS+=	zoo-*:../../archivers/zoo
-DEPENDS+=	freeze-*:../../archivers/freeze
-DEPENDS+=	arc-*:../../archivers/arc
+DEPENDS+=	maildrop-[0-9]*:../../mail/maildrop
+DEPENDS+=	tnef-[0-9]*:../../mail/tnef
+DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
+DEPENDS+=	unarj-[0-9]*:../../archivers/unarj
+DEPENDS+=	unrar-[0-9]*:../../archivers/unrar
+DEPENDS+=	xbin-[0-9]*:../../archivers/xbin
+DEPENDS+=	lha-[0-9]*:../../archivers/lha
+DEPENDS+=	zoo-[0-9]*:../../archivers/zoo
+DEPENDS+=	freeze-[0-9]*:../../archivers/freeze
+DEPENDS+=	arc-[0-9]*:../../archivers/arc
 
 VIRUSDIR?=	/var/log/virusmails	# where to put contaminated mails
 VIRUSMAILTO?=	security		# whom to notify about viruses
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index f883edb810a..f3913416072 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/08/26 10:32:23 skrll Exp $
+# $NetBSD: Makefile,v 1.17 2001/09/27 23:18:37 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.24
 PKGNAME=		${DISTNAME}nb3
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=	--with-rc4=${SSLBASE}
 
 .if defined(USE_PAM)
 CONFIGURE_ARGS+=	--with-pam=${PREFIX}
-DEPENDS+=		PAM-*:../../security/PAM
+DEPENDS+=		PAM-[0-9]*:../../security/PAM
 .endif
 
 # Authentication mechanisms
@@ -55,7 +55,7 @@ CONFIGURE_ARGS+=	--disable-x509		# --- no X.509
 .if defined(KERBEROS)
 USE_KERBEROS=		# defined
 CONFIGURE_ARGS+=	--enable-krb4=${PREFIX} --enable-gssapi=/usr # KERBEROS_V4
-DEPENDS+=		kth-krb4-*:../../security/kth-krb4
+DEPENDS+=		kth-krb4-[0-9]*:../../security/kth-krb4
 PLIST_SRC+=		${PKGDIR}/PLIST.krb4 ${PKGDIR}/PLIST.krb5
 .elif ${OPSYS} == "SunOS"
 USE_KERBEROS=		# defined
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 5e6daa1ec60..5c8ccf38a30 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/27 23:18:38 jlam Exp $
 # $OpenBSD: Makefile,v 1.13 2000/06/19 18:38:55 dugsong Exp $
 
 DISTNAME=	dsniff-2.3
@@ -9,7 +9,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.monkey.org/~dugsong/dsniff/
 COMMENT=	password sniffer
 
-DEPENDS+=	libnet-*:../../devel/libnet
+DEPENDS+=	libnet-[0-9]*:../../devel/libnet
 # libnids provides static library only, thus it isn't necessary at run-time,
 # only at compile-time.
 #
diff --git a/security/egd/Makefile b/security/egd/Makefile
index eaa994c7740..0d9a36548d3 100644
--- a/security/egd/Makefile
+++ b/security/egd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:49:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:38 jlam Exp $
 #
 
 DISTNAME=	egd-0.8
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.lothar.com/tech/crypto/
 COMMENT=	EGD: Entropy Gathering Daemon
 
-DEPENDS+=	p5-SHA-*:../../security/p5-SHA
+DEPENDS+=	p5-SHA-[0-9]*:../../security/p5-SHA
 
 USE_PERL5=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/egd/.packlist
diff --git a/security/fsh/Makefile b/security/fsh/Makefile
index 47199b3111c..092da33db45 100644
--- a/security/fsh/Makefile
+++ b/security/fsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/13 14:41:20 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:38 jlam Exp $
 #
 
 DISTNAME=	fsh-1.1
@@ -10,7 +10,7 @@ MAINTAINER=	fredb@netbsd.org
 HOMEPAGE=	http://www.lysator.liu.se/fsh/
 COMMENT=	fast remote command execution
 
-DEPENDS+=	python-*:../../lang/python
+DEPENDS+=	python-[0-9]*:../../lang/python
 
 GNU_CONFIGURE=	YES
 USE_GTEXINFO=	YES
diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index 3b8b0b96eeb..68bb63fb16a 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/09/19 13:48:00 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:38 jlam Exp $
 
 DISTNAME=	keychain-1.2
 PKGNAME=	${DISTNAME}nb1
@@ -10,10 +10,10 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gentoo.org/projects/keychain/
 COMMENT=	Nice ssh-agent front-end
 
-DEPENDS=	psmisc-*:../../sysutils/psmisc
+DEPENDS=	psmisc-[0-9]*:../../sysutils/psmisc
 
 .if !exists(/usr/bin/ssh-agent)
-DEPENDS+=	openssh-*:../../security/openssh
+DEPENDS+=	openssh-[0-9]*:../../security/openssh
 .endif
 
 NO_BUILD=	# defined
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 5c94bec80a2..5d815b31555 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/08/02 12:46:48 wennmach Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/27 23:18:38 jlam Exp $
 #
 
 DISTNAME=		krb4-1.0.9
@@ -10,10 +10,10 @@ MAINTAINER=		wennmach@netbsd.org
 HOMEPAGE=		http://www.pdc.kth.se/kth-krb/
 COMMENT=		Kerberos IV distribution from KTH
 
-CONFLICTS+=		wu-ftpd-*
-CONFLICTS+=		lukemftp-*
-CONFLICTS+=		zephyr-*
-CONFLICTS+=		libdes-*
+CONFLICTS+=		wu-ftpd-[0-9]*
+CONFLICTS+=		lukemftp-[0-9]*
+CONFLICTS+=		zephyr-[0-9]*
+CONFLICTS+=		libdes-[0-9]*
 
 CRYPTO=			yes
 GNU_CONFIGURE=		yes
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 2d457126c05..f045f275e11 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:48 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:39 jlam Exp $
 
 DISTNAME=	mcrypt-2.5.5
 CATEGORIES=	security devel
@@ -8,8 +8,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://mcrypt.hellug.gr/
 COMMENT=	replacement to crypt(1), supports bunch of algorithms
 
-DEPENDS+=	libmcrypt-*:../../security/libmcrypt
-DEPENDS+=	mhash-*:../../security/mhash
+DEPENDS+=	libmcrypt-[0-9]*:../../security/libmcrypt
+DEPENDS+=	mhash-[0-9]*:../../security/mhash
 
 USE_LIBTOOL=	yes
 USE_LIBINTL=	yes
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index a1e731cd66b..547eca4def7 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:49:54 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:39 jlam Exp $
 #
 
 DISTNAME=	nessus-libraries-${VERS}
@@ -14,7 +14,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig \
 # The detection of the gmp library from pkgsrc does unfortunatly not
 # work. Feel free to tweak the configure script of nessus-library to
 # make it find our gmp libs, I was just not able to make it work. -TF
-#DEPENDS+=	gmp-*:../../devel/gmp
+#DEPENDS+=	gmp-[0-9]*:../../devel/gmp
 
 WRKSRC=		${WRKDIR}/nessus-libraries
 
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 167ef365aa3..77a15abfb26 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2001/09/27 05:12:54 itojun Exp $
+# $NetBSD: Makefile,v 1.56 2001/09/27 23:18:39 jlam Exp $
 
 DISTNAME=		openssh-2.9.9p2
 CATEGORIES=		security
@@ -12,7 +12,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.openssh.com/
 COMMENT=		Open Source Secure shell client and server (remote login program)
 
-CONFLICTS=		sftp-*
+CONFLICTS=		sftp-[0-9]*
 CONFLICTS+=		ssh-[0-9]* ssh6-[0-9]*
 
 BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 75c98ab7e8b..21cfb5f4b75 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2001/09/14 14:17:10 skrll Exp $
+# $NetBSD: Makefile,v 1.46 2001/09/27 23:18:39 jlam Exp $
 
 DISTNAME=		openssl-0.9.6
 PKGNAME=		${DISTNAME}nb2
@@ -12,7 +12,7 @@ COMMENT=		Secure Socket Layer and cryptographic library
 
 BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
 
-CONFLICTS=		SSLeay-* ssleay-* base64-*
+CONFLICTS=		SSLeay-[0-9]* ssleay-[0-9]* base64-[0-9]*
 
 CRYPTO=			YES
 
diff --git a/security/pakemon/Makefile b/security/pakemon/Makefile
index 0656e83f60e..92393cef2dc 100644
--- a/security/pakemon/Makefile
+++ b/security/pakemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/27 14:35:14 tron Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:39 jlam Exp $
 
 DISTNAME=	pakemon-0.3.1
 CATEGORIES=	security
@@ -8,7 +8,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.inas.mag.keio.ac.jp/ids/pakemon/
 COMMENT=	packet monster, an Open Source Intrusion Detection System
 
-DEPENDS+=	libnet-*:../../devel/libnet
+DEPENDS+=	libnet-[0-9]*:../../devel/libnet
 # libnids provides static library only, thus it isn't necessary at run-time,
 # only at compile-time.
 #
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 8409a3154f0..3f851f02b71 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:48 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:40 jlam Exp $
 #
 
 DISTNAME=	pam_ldap
@@ -13,8 +13,8 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.padl.com/pam_ldap.html
 COMMENT=	pluggable authentication module for LDAP directories
 
-DEPENDS+=	openldap-*:../../databases/openldap
-DEPENDS+=	PAM-*:../../security/PAM
+DEPENDS+=	openldap-[0-9]*:../../databases/openldap
+DEPENDS+=	PAM-[0-9]*:../../security/PAM
 
 GNU_CONFIGURE=	YES
 CPPFLAGS+=	-I${WRKSRC}
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index c4d69e6c1fd..b8c50b58695 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/04/30 04:16:11 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/09/27 23:18:40 jlam Exp $
 #
 
 DISTNAME=	pgp50i-unix-src
@@ -20,7 +20,7 @@ COMMENT=	New, international, Public-Key encryption and digital signature utility
 
 BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
 
-CONFLICTS=	pgraf-*  	# Both have a `pgps' executable
+CONFLICTS=	pgraf-[0-9]*  	# Both have a `pgps' executable
 
 CRYPTO=		YES
 GNU_CONFIGURE=	YES
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 727007a03df..c3fd69e34ff 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:50:02 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:40 jlam Exp $
 
 DISTNAME=		pks-0.9.4
 CATEGORIES=		security www
@@ -15,7 +15,7 @@ MAINTAINER=		burgess@neonramp.com
 HOMEPAGE=		http://www.mit.edu/people/marc/pks/
 COMMENT=		PGP Public Key Server
 
-DEPENDS+=		db-*:../../databases/db
+DEPENDS+=		db-[0-9]*:../../databases/db
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/pks
diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index bd7a1c41f27..5dec8079e2f 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2001/08/31 09:43:09 itojun Exp $
+# $NetBSD: Makefile,v 1.41 2001/09/27 23:18:40 jlam Exp $
 #
 
 DISTNAME=	racoon-20010831a
@@ -27,7 +27,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 LIBPATH=	-L${LOCALBASE}/lib
 
-CONFLICTS+=	racoon-*
+CONFLICTS+=	racoon-[0-9]*
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/racoon
 
diff --git a/security/rats/Makefile b/security/rats/Makefile
index 9a7a00dad40..e859aa9cc0d 100644
--- a/security/rats/Makefile
+++ b/security/rats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/06 06:10:50 jun Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:40 jlam Exp $
 #
 
 DISTNAME=	rats-1.1
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://www.securesw.com/rats/
 COMMENT=	Rough Auditing Tool for Security
 
-DEPENDS+=	expat-*:../../textproc/expat
+DEPENDS+=	expat-[0-9]*:../../textproc/expat
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-expat-include=${LOCALBASE}/include
diff --git a/security/ssh-ip-tunnel/Makefile b/security/ssh-ip-tunnel/Makefile
index e995406f861..8095f9ead90 100644
--- a/security/ssh-ip-tunnel/Makefile
+++ b/security/ssh-ip-tunnel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/17 17:50:10 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/09/27 23:18:41 jlam Exp $
 
 DISTNAME=	vpn-1.0
 PKGNAME=	ssh-ip-tunnel-1.0
@@ -10,7 +10,7 @@ COMMENT=	Simple VPN system using pppd over ssh
 
 DEPENDS+=	pty-redir-0.1:../../misc/pty-redir
 .if !exists(/usr/bin/ssh)
-DEPENDS+=	{openssh-*,ssh{,6}-1.2.27*}:../../security/ssh
+DEPENDS+=	{openssh-[0-9]*,ssh{,6}-1.2.27*}:../../security/ssh
 .endif
 
 CONFLICTS=	vpn-1.0
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 8fd388b9668..65f2454ac7e 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2001/05/19 03:56:39 jlam Exp $
+# $NetBSD: Makefile,v 1.93 2001/09/27 23:18:41 jlam Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--with-libwrap
 .endif
 
 .if ${OPSYS} == "SunOS"
-DEPENDS+=		zlib-*:../../devel/zlib
+DEPENDS+=		zlib-[0-9]*:../../devel/zlib
 CONFIGURE_ENV+=		X_CFLAGS="-I${LOCALBASE}/include"
 .endif