From 81defa46ec81d041e5aeea3c7cfad181f1864d9d 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.

---
 converters/base64/Makefile           |  4 ++--
 converters/doc2html/Makefile         | 10 +++++-----
 converters/rpm2cpio/Makefile         |  4 ++--
 converters/wv/Makefile               |  4 ++--
 converters/xlHtml-mixedcase/Makefile |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'converters')

diff --git a/converters/base64/Makefile b/converters/base64/Makefile
index a0525bf3aeb..15715f8f532 100644
--- a/converters/base64/Makefile
+++ b/converters/base64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/20 04:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:17:50 jlam Exp $
 #
 
 DISTNAME=	base64-1.3
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.fourmilab.ch/webtools/base64/
 COMMENT=	encode and decode base64 files
 
-CONFLICTS=	openssl-*
+CONFLICTS=	openssl-[0-9]*
 GNU_CONFIGURE=	yes
 ALL_TARGET=	prog
 USE_BUILDLINK_ONLY=	yes
diff --git a/converters/doc2html/Makefile b/converters/doc2html/Makefile
index fa49d9d49e9..1924de2a33a 100644
--- a/converters/doc2html/Makefile
+++ b/converters/doc2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/14 14:03:20 agc Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/27 23:17:50 jlam Exp $
 #
 
 DISTNAME=	doc2html
@@ -10,11 +10,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.htdig.org
 COMMENT=	PERL external filter for htdig to convert numerous doc formats to HTML
 
-DEPENDS+=	xlHtml-*:../../converters/xlHtml
-DEPENDS+=	rtf2html-*:../../converters/rtf2html
+DEPENDS+=	xlHtml-[0-9]*:../../converters/xlHtml
+DEPENDS+=	rtf2html-[0-9]*:../../converters/rtf2html
 DEPENDS+=	ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
-DEPENDS+=	xpdf-*:../../graphics/xpdf
-DEPENDS+=	catdoc-*:../../textproc/catdoc
+DEPENDS+=	xpdf-[0-9]*:../../graphics/xpdf
+DEPENDS+=	catdoc-[0-9]*:../../textproc/catdoc
 
 USE_PERL5=	YES
 
diff --git a/converters/rpm2cpio/Makefile b/converters/rpm2cpio/Makefile
index 157c5ba9f5f..980f988b1c6 100644
--- a/converters/rpm2cpio/Makefile
+++ b/converters/rpm2cpio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:17 agc Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:17:51 jlam Exp $
 # FreeBSD Id: ports/misc/rpm2cpio/Makefile,v 1.2 1999/08/25 07:22:29 obrien Exp
 
 DISTNAME=	rpm2cpio
@@ -11,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.iagora.com/~espel/index.html
 COMMENT=	Convert .rpm files for extraction with cpio, needs just perl
 
-CONFLICTS+=	rpm-*
+CONFLICTS+=	rpm-[0-9]*
 
 USE_PERL5=	# defined
 REPLACE_PERL=	rpm2cpio
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 1bdf961a3ab..b533f4dbb05 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:08 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/09/27 23:17:51 jlam Exp $
 #
 
 DISTNAME=		wv-0.6.5
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.wvWare.com/
 COMMENT=		Microsoft Word 6, 7, 8, and 9 (95/97/2000) doc to HTML/LaTeX converter
 
 # not detected by configure, causes conflicts with the one coming with wv
-#CONFLICTS+=		libgetopt-*
+#CONFLICTS+=		libgetopt-[0-9]*
 
 USE_BUILDLINK_ONLY=	YES
 REPLACE_BUILDLINK=	wv-incconfig wv-libconfig
diff --git a/converters/xlHtml-mixedcase/Makefile b/converters/xlHtml-mixedcase/Makefile
index 6c317b2dab8..4289ffe2549 100644
--- a/converters/xlHtml-mixedcase/Makefile
+++ b/converters/xlHtml-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/26 10:32:19 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:51 jlam Exp $
 #
 
 DISTNAME=		xlHtml-0.2.8
@@ -9,7 +9,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.xlHtml.org/
 COMMENT=		Microsoft xls/ppt to HTML converter
 
-BUILD_DEPENDS+=		autoconf-*:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-[0-9]*:../../devel/autoconf
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
 USE_BUILDLINK_ONLY=	YES
-- 
cgit v1.2.3