From 1922c6ef150a18a4101c99b06cbc075f2d09356d Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 27 Sep 2001 23:17:41 +0000
Subject: 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.

---
 mail/balsa/Makefile            | 10 +++++-----
 mail/elm-me/Makefile           |  4 ++--
 mail/elm/Makefile              |  6 +++---
 mail/evolution/Makefile        |  4 ++--
 mail/fetchmailconf/Makefile    |  4 ++--
 mail/mdfrm/Makefile            |  4 ++--
 mail/nmh/Makefile              |  6 +++---
 mail/p5-MIME-tools/Makefile    |  8 ++++----
 mail/p5-Mail-Sendmail/Makefile |  4 ++--
 mail/pine/Makefile             |  4 ++--
 mail/qmail-conf/Makefile       |  4 ++--
 mail/qmail/Makefile            |  4 ++--
 mail/queue_repair/Makefile     |  4 ++--
 mail/wmbiff/Makefile           |  4 ++--
 mail/wmmail/Makefile           |  4 ++--
 15 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'mail')

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 60b606b155a..bea5668d234 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:40 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:20 jlam Exp $
 #
 
 DISTNAME=	balsa-1.0.0
@@ -10,10 +10,10 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.balsa.net/
 COMMENT=	GNOME EMail client
 
-DEPENDS+=	libpspell-*:../../textproc/libpspell
-DEPENDS+=	pth-*:../../devel/pth
-DEPENDS+=	libproplist-*:../../devel/libproplist
-DEPENDS+=	gnome-core-*:../../x11/gnome-core
+DEPENDS+=	libpspell-[0-9]*:../../textproc/libpspell
+DEPENDS+=	pth-[0-9]*:../../devel/pth
+DEPENDS+=	libproplist-[0-9]*:../../devel/libproplist
+DEPENDS+=	gnome-core-[0-9]*:../../x11/gnome-core
 
 GNU_CONFIGURE=	yes
 USE_X11BASE=	yes
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index aa50a2875b1..fdd66c8ac17 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/26 20:27:05 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:20 jlam Exp $
 # FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp
 #
 
@@ -13,7 +13,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.instinct.org/elm/
 COMMENT=		ELM Mail User Agent with ME extensions
 
-CONFLICTS=		elm-*
+CONFLICTS=		elm-[0-9]*
 
 USE_BUILDLINK_ONLY=	YES
 HAS_CONFIGURE=		YES
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index a83b6d7c775..37d0ba47840 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/08/01 15:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/09/27 23:18:20 jlam Exp $
 
 DISTNAME=		elm2.5.5
 PKGNAME=		elm-2.5.5
@@ -9,8 +9,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.instinct.org/elm/
 COMMENT=		ELM Mail User Agent (without ME extensions)
 
-CONFLICTS+=		mm-*
-CONFLICTS+=		elm-me-*
+CONFLICTS+=		mm-[0-9]*
+CONFLICTS+=		elm-me-[0-9]*
 
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./Configure
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 2ecee952608..3000ba67107 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/09/25 13:31:17 tron Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:21 jlam Exp $
 
 DISTNAME=		evolution-0.13
 CATEGORIES=		mail time gnome
@@ -11,7 +11,7 @@ COMMENT=		GNOME mailer, calendar, contact manager, and communications tool
 
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
-DEPENDS+=		bison-*:../../devel/bison
+DEPENDS+=		bison-[0-9]*:../../devel/bison
 DEPENDS+=		db3-2.9:../../databases/db3
 DEPENDS+=		gal>=0.12:../../devel/gal
 DEPENDS+=		bonobo>=1.0.7:../../devel/bonobo
diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile
index 7a1a5a0ff31..be8a047f59c 100644
--- a/mail/fetchmailconf/Makefile
+++ b/mail/fetchmailconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/09/23 10:53:38 frueauf Exp $
+# $NetBSD: Makefile,v 1.28 2001/09/27 23:18:21 jlam Exp $
 
 DISTNAME=	fetchmail-5.9.0
 PKGNAME=	${DISTNAME:S/fetchmail/fetchmailconf/}
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.tuxedo.org/~esr/fetchmail/
 COMMENT=	Configuration tool for fetchmail
 
 DEPENDS+=	${DISTNAME}:../../mail/fetchmail
-DEPENDS+=	py-Tk-*:../../x11/py-Tk
+DEPENDS+=	py-Tk-[0-9]*:../../x11/py-Tk
 
 DISTINFO_FILE=	${.CURDIR}/../fetchmail/distinfo
 NO_BUILD=	YES
diff --git a/mail/mdfrm/Makefile b/mail/mdfrm/Makefile
index a621f7081b5..7db4777d54d 100644
--- a/mail/mdfrm/Makefile
+++ b/mail/mdfrm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/04/27 16:53:14 zuntum Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:21 jlam Exp $
 #
 
 DISTNAME=	mdfrm.pl
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	#
 MAINTAINER=	zuntum@netbsd.org
 COMMENT=	print a summary of mail in a Maildir waiting to be read
 
-DEPENDS+=       p5-TimeDate-*:../../devel/p5-TimeDate
+DEPENDS+=       p5-TimeDate-[0-9]*:../../devel/p5-TimeDate
 
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 WRKSRC=		${WRKDIR}
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index fd428ed14f7..c84f2a10673 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2001/09/21 17:07:12 sommerfeld Exp $
+# $NetBSD: Makefile,v 1.43 2001/09/27 23:18:21 jlam Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
@@ -12,8 +12,8 @@ MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.mhost.com/nmh/
 COMMENT=		Cleaned up MH mailer suite
 
-CONFLICTS=		ja-mh-*
-CONFLICTS+=		ja-mh6-*
+CONFLICTS=		ja-mh-[0-9]*
+CONFLICTS+=		ja-mh6-[0-9]*
 
 # We choose DOT_LOCKING in our patches because ".lock" files are
 # the most common locking mechanism supported by mail software.
diff --git a/mail/p5-MIME-tools/Makefile b/mail/p5-MIME-tools/Makefile
index 1c7b5e67a3b..e4803d4bb5d 100644
--- a/mail/p5-MIME-tools/Makefile
+++ b/mail/p5-MIME-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/17 00:44:47 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:22 jlam Exp $
 #
 
 DISTNAME=       MIME-tools-5.410
@@ -10,9 +10,9 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.zeegee.com/code/perl/MIME-tools/
 COMMENT=	perl5 modules for encoding and decoding MIME messages
 
-DEPENDS+=	p5-IO-stringy-*:../../devel/p5-IO-stringy
-DEPENDS+=	p5-MIME-Base64-*:../../converters/p5-MIME-Base64
-DEPENDS+=	p5-MailTools-*:../../mail/p5-MailTools
+DEPENDS+=	p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
+DEPENDS+=	p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
+DEPENDS+=	p5-MailTools-[0-9]*:../../mail/p5-MailTools
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/MIME-tools/.packlist
diff --git a/mail/p5-Mail-Sendmail/Makefile b/mail/p5-Mail-Sendmail/Makefile
index e1bc3af436a..ac6b4de4cb7 100644
--- a/mail/p5-Mail-Sendmail/Makefile
+++ b/mail/p5-Mail-Sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/16 18:13:39 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:22 jlam Exp $
 
 DISTNAME=	Mail-Sendmail-0.78
 PKGNAME=	p5-${DISTNAME}
@@ -9,7 +9,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://alma.ch/perl/
 COMMENT=	perl5 module dedicated to Sendmail
 
-DEPENDS+=	p5-MIME-Base64-*:../../converters/p5-MIME-Base64
+DEPENDS+=	p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Mail/Sendmail/.packlist
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 979d7716543..84195e6cfd4 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2001/08/06 02:58:57 hubertf Exp $
+# $NetBSD: Makefile,v 1.48 2001/09/27 23:18:22 jlam Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -23,7 +23,7 @@ DEPENDS+=	imap-uw>=2000.0.3:../../mail/imap-uw
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(PINE_USE_LDAP) && ${PINE_USE_LDAP} == YES
-DEPENDS+=      openldap-*:../../databases/openldap
+DEPENDS+=      openldap-[0-9]*:../../databases/openldap
 LDAPCFLAGS=    LDAPCFLAGS="-DENABLE_LDAP -I${PREFIX}/include"
 LDAPLIBS=      LDAPLIBS="-lldap -llber"
 .endif
diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
index 47a7c5fdf60..27c3420d450 100644
--- a/mail/qmail-conf/Makefile
+++ b/mail/qmail-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/19 16:03:06 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:22 jlam Exp $
 #
 
 DISTNAME=	qmail-conf-0.55
@@ -17,7 +17,7 @@ COMMENT=	collection of tools for setting up qmail services
 IS_INTERACTIVE=	YES
 
 DEPENDS+=	qmail>=1.03:../../mail/qmail
-DEPENDS+=	checkpassword-*:../../sysutils/checkpassword
+DEPENDS+=	checkpassword-[0-9]*:../../sysutils/checkpassword
 
 ALL_TARGET=	#
 INSTALL_TARGET= setup check
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index b4b97bbdaa8..14c312fcf2e 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/13 14:17:11 zuntum Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:22 jlam Exp $
 #
 
 DISTNAME=	qmail-1.03
@@ -25,7 +25,7 @@ COMMENT=	SECURE, reliable, efficient, simple, and FAST MTA for UNIX systems
 USER_CMD=		/usr/sbin/user
 GROUP_CMD=		/usr/sbin/group
 .else
-DEPENDS+=		user-*:../../sysutils/user
+DEPENDS+=		user-[0-9]*:../../sysutils/user
 USER_CMD=		${LOCALBASE}/sbin/user
 GROUP_CMD=		${LOCALBASE}/sbin/group
 .endif
diff --git a/mail/queue_repair/Makefile b/mail/queue_repair/Makefile
index a7f47da9222..0782b67bb1c 100644
--- a/mail/queue_repair/Makefile
+++ b/mail/queue_repair/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/08/15 15:53:36 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:23 jlam Exp $
 #
 
 DISTNAME=	queue-repair-0.8.4
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.qcc.sk.ca/~charlesc/software/queue_repair/
 MAINTAINER=	zuntum@netbsd.org
 COMMENT=	check or correct most corruptions of the queue in qmail
 
-DEPENDS+=	python-*:../../lang/python
+DEPENDS+=	python-[0-9]*:../../lang/python
 
 NO_BUILD=	YES
 
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 20b6ca5e6e6..0c944fb01da 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/07/11 16:49:02 magick Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:23 jlam Exp $
 
 DISTNAME=	wmbiff-0.3.1
 CATEGORIES=	mail x11
@@ -8,7 +8,7 @@ MAINTAINER=	magick@zhadum.de
 HOMEPAGE=	http://sourceforge.net/projects/wmbiff/
 COMMENT=	xbuffy like "mail-checker" for WindowMaker
 
-DEPENDS+=	windowmaker-*:../../wm/windowmaker
+DEPENDS+=	windowmaker-[0-9]*:../../wm/windowmaker
 
 USE_X11=	YES
 USE_XPM=	YES
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index c8fa6ba8072..afa8f2d77f4 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/02/17 18:25:08 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/09/27 23:18:23 jlam Exp $
 
 DISTNAME=	WMMail.app-0.64
 PKGNAME=	wmmail-0.64
@@ -9,7 +9,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.eecg.toronto.edu/cgi-bin/cgiwrap/chanb/index.cgi?wmmail
 COMMENT=	xbiff like "mail-checker" for WindowMaker
 
-DEPENDS+=	windowmaker-*:../../wm/windowmaker
+DEPENDS+=	windowmaker-[0-9]*:../../wm/windowmaker
 
 USE_X11BASE=		yes
 USE_GMAKE=		yes
-- 
cgit v1.2.3