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.

26 files changed, 52 insertions, 52 deletions

diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile
index 1c88c96a41b..7459ab6bdd3 100644
--- a/games/angband-tty/Makefile
+++ b/games/angband-tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/16 15:10:42 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:04 jlam Exp $
 #
 
 DISTNAME=		angband-283
@@ -12,7 +12,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.phial.com/angband/
 COMMENT=		Tolkien based variant of Moria for tty/console displays
 
-CONFLICTS=		angband-x11-*
+CONFLICTS=		angband-x11-[0-9]*
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index 4b3da7899ab..5f73fb335af 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/16 15:10:42 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:04 jlam Exp $
 #
 
 DISTNAME=		angband-283
@@ -12,7 +12,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.phial.com/angband/
 COMMENT=		Tolkien based variant of Moria for X11 displays
 
-CONFLICTS=		angband-tty-*
+CONFLICTS=		angband-tty-[0-9]*
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
diff --git a/games/colchess-book-colchess/Makefile b/games/colchess-book-colchess/Makefile
index 1dfa1ad32bf..44ec13b5336 100644
--- a/games/colchess-book-colchess/Makefile
+++ b/games/colchess-book-colchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:10:44 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:04 jlam Exp $
 
 DISTNAME=		colchess
 PKGNAME=		${CHESS_ENGINE}-book-${DIST_SUBDIR}
@@ -13,7 +13,7 @@ COMMENT=		chess opening book for ColChess (default)
 
 DEPENDS+=		colchess>=7.0:../../games/colchess
 
-CONFLICTS+=		colchess-book-*
+CONFLICTS+=		colchess-book-[0-9]*
 
 CHESS_ENGINE=		colchess
 DIST_SUBDIR=		colchess-7.0
diff --git a/games/colchess-book-large/Makefile b/games/colchess-book-large/Makefile
index 9841fed6bf5..f7043ea3b51 100644
--- a/games/colchess-book-large/Makefile
+++ b/games/colchess-book-large/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:24 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:04 jlam Exp $
 
 DISTNAME=		book_large
 PKGNAME=		${CHESS_ENGINE}-book-large-20000512
@@ -11,7 +11,7 @@ COMMENT=		chess opening book for ColChess (large)
 
 DEPENDS+=		colchess>=7.0:../../games/colchess
 
-CONFLICTS=		${CHESS_ENGINE}-book-*
+CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		colchess
 DIST_SUBDIR=		chessbooks
diff --git a/games/crafty-book-enormous/Makefile b/games/crafty-book-enormous/Makefile
index fb7c1f46479..5eb38776cbd 100644
--- a/games/crafty-book-enormous/Makefile
+++ b/games/crafty-book-enormous/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:24 agc Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:04 jlam Exp $
 
 DISTNAME=		enormous
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -16,7 +16,7 @@ COMMENT=		chess opening book for Crafty (enormous)
 
 DEPENDS+=		crafty>=17.0:../../games/crafty
 
-CONFLICTS=		${CHESS_ENGINE}-book-*
+CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 REASON=			"Files too large"
 NO_SRC_ON_CDROM=	${REASON}
diff --git a/games/crafty-book-large/Makefile b/games/crafty-book-large/Makefile
index c0433412ab5..e9184ba2f4c 100644
--- a/games/crafty-book-large/Makefile
+++ b/games/crafty-book-large/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:24 agc Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:05 jlam Exp $
 
 DISTNAME=		large
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -15,7 +15,7 @@ COMMENT=		chess opening book for Crafty (large)
 
 DEPENDS+=		crafty>=17.0:../../games/crafty
 
-CONFLICTS=		${CHESS_ENGINE}-book-*
+CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 REASON=			"Files too large"
 NO_SRC_ON_CDROM=	${REASON}
diff --git a/games/crafty-book-medium/Makefile b/games/crafty-book-medium/Makefile
index 029bf978577..cf8715b3ba1 100644
--- a/games/crafty-book-medium/Makefile
+++ b/games/crafty-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:24 agc Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:05 jlam Exp $
 
 DISTNAME=		medium
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -11,7 +11,7 @@ COMMENT=		chess opening book for Crafty (medium)
 
 DEPENDS+=		crafty>=17.0:../../games/crafty
 
-CONFLICTS=		${CHESS_ENGINE}-book-*
+CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
diff --git a/games/crafty-book-small/Makefile b/games/crafty-book-small/Makefile
index 3a0393afd9c..b8a582cd4d8 100644
--- a/games/crafty-book-small/Makefile
+++ b/games/crafty-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:25 agc Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:05 jlam Exp $
 
 DISTNAME=		small
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -11,7 +11,7 @@ COMMENT=		chess opening book for Crafty (small)
 
 DEPENDS+=		crafty>=17.0:../../games/crafty
 
-CONFLICTS=		${CHESS_ENGINE}-book-*
+CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		crafty
 DIST_SUBDIR=		chessbooks
diff --git a/games/exchess-book-medium/Makefile b/games/exchess-book-medium/Makefile
index 4cfd6ac5f6a..2c600349cbb 100644
--- a/games/exchess-book-medium/Makefile
+++ b/games/exchess-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:25 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:05 jlam Exp $
 
 DISTNAME=		medium
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -11,7 +11,7 @@ COMMENT=		chess opening book for EXchess (medium)
 
 DEPENDS+=		exchess-[0-9]*:../../games/exchess
 
-CONFLICTS=		${CHESS_ENGINE}-book-*
+CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		exchess
 DIST_SUBDIR=		chessbooks
diff --git a/games/exchess-book-small/Makefile b/games/exchess-book-small/Makefile
index a5de3ff6f74..67b916e46f7 100644
--- a/games/exchess-book-small/Makefile
+++ b/games/exchess-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:25 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:05 jlam Exp $
 
 DISTNAME=		small
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -11,7 +11,7 @@ COMMENT=		chess opening book for EXchess (small)
 
 DEPENDS+=		exchess-[0-9]*:../../games/exchess
 
-CONFLICTS=		${CHESS_ENGINE}-book-*
+CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		exchess
 DIST_SUBDIR=		chessbooks
diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile
index ecc0db6055e..5b0c5e86271 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:49 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:06 jlam Exp $
 #
 
 DISTNAME=	gnocatan-0.6.1
@@ -9,7 +9,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://gnocatan.sourceforge.net/
 COMMENT=	gnome version of the Settlers of Catan board game
 
-DEPENDS+=	gnome-core-*:../../x11/gnome-core
+DEPENDS+=	gnome-core-[0-9]*:../../x11/gnome-core
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
diff --git a/games/gnome-breakout/Makefile b/games/gnome-breakout/Makefile
index fae5bf7da2a..0db45173683 100644
--- a/games/gnome-breakout/Makefile
+++ b/games/gnome-breakout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/01 18:19:11 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:06 jlam Exp $
 #
 
 DISTNAME=	gnome-breakout-0.5.2
@@ -9,7 +9,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.senet.com.au/~alcaron/software.html
 COMMENT=	gnome version of the classic breakout game
 
-DEPENDS+=	gnome-core-*:../../x11/gnome-core
+DEPENDS+=	gnome-core-[0-9]*:../../x11/gnome-core
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index c7efda45885..356dadb4b0e 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:10:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:06 jlam Exp $
 
 DISTNAME=	gnome-chess-0.2.4
 CATEGORIES=	games gnome
@@ -8,7 +8,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://arcavia.com/rd/gnome-chess/
 COMMENT=	GNOME's graphical interface for playing chess
 
-DEPENDS+=	gnome-core-*:../../x11/gnome-core
+DEPENDS+=	gnome-core-[0-9]*:../../x11/gnome-core
 
 GNU_CONFIGURE=	yes
 USE_X11BASE=	yes
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index ebacc73ccee..1210ab7f83b 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/09/09 23:47:25 mycroft Exp $
+# $NetBSD: Makefile,v 1.30 2001/09/27 23:18:06 jlam Exp $
 
 DISTNAME=		gnome-games-1.4.0.2
 CATEGORIES=		games gnome
@@ -15,7 +15,7 @@ DEPENDS+=		gnome-core>1.4.0:../../x11/gnome-core
 DEPENDS+=		guile-[0-9]*:../../lang/guile
 BUILD_USES_MSGFMT=	YES
 
-CONFLICTS=		xbill-*
+CONFLICTS=		xbill-[0-9]*
 
 USE_GMAKE=		YES
 USE_X11BASE=		YES
diff --git a/games/gnuchess-book-chess/Makefile b/games/gnuchess-book-chess/Makefile
index 7b155447e19..77fe1bce3fb 100644
--- a/games/gnuchess-book-chess/Makefile
+++ b/games/gnuchess-book-chess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:10:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:06 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/27 07:41:12 fenner Exp
 #
 
@@ -13,7 +13,7 @@ COMMENT=		chess opening book for GNU Chess (default)
 
 DEPENDS+=		gnuchess>=5.00nb1:../../games/gnuchess
 
-CONFLICTS+=		gnuchess-book-*
+CONFLICTS+=		gnuchess-book-[0-9]*
 
 CHESS_ENGINE=		gnuchess
 NO_CONFIGURE=		# defined
diff --git a/games/gnuchess-book-medium/Makefile b/games/gnuchess-book-medium/Makefile
index ce01ccd8bf1..93512ccc95c 100644
--- a/games/gnuchess-book-medium/Makefile
+++ b/games/gnuchess-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:26 agc Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:07 jlam Exp $
 
 DISTNAME=		medium
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -11,7 +11,7 @@ COMMENT=		chess opening book for GNU Chess (medium)
 
 DEPENDS+=		gnuchess>=5.00nb1:../../games/gnuchess
 
-CONFLICTS=		${CHESS_ENGINE}-book-*
+CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		gnuchess
 DIST_SUBDIR=		chessbooks
diff --git a/games/gnuchess-book-small/Makefile b/games/gnuchess-book-small/Makefile
index d938ddd2b78..2be7214227d 100644
--- a/games/gnuchess-book-small/Makefile
+++ b/games/gnuchess-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:26 agc Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:07 jlam Exp $
 
 DISTNAME=		small
 PKGNAME=		${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -11,7 +11,7 @@ COMMENT=		chess opening book for GNU Chess (small)
 
 DEPENDS+=		gnuchess>=5.00nb1:../../games/gnuchess
 
-CONFLICTS=		${CHESS_ENGINE}-book-*
+CONFLICTS=		${CHESS_ENGINE}-book-[0-9]*
 
 CHESS_ENGINE=		gnuchess
 DIST_SUBDIR=		chessbooks
diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile
index c6031ad70bc..9e6a46126be 100644
--- a/games/kdetoys/Makefile
+++ b/games/kdetoys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 15:10:52 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:07 jlam Exp $
 
 DISTNAME=	kdetoys-1.1.2
 CATEGORIES=	games kde
@@ -12,7 +12,7 @@ COMMENT=	Toys for the KDE integrated X11 desktop
 
 DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
 
-CONFLICTS=	kworldwatch-*
+CONFLICTS=	kworldwatch-[0-9]*
 
 USE_X11BASE=	yes
 USE_GMAKE=	yes
diff --git a/games/knightcap/Makefile b/games/knightcap/Makefile
index bdf8afc3b23..a559a456819 100644
--- a/games/knightcap/Makefile
+++ b/games/knightcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 15:10:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:07 jlam Exp $
 
 DISTNAME=		KnightCap-3.6
 PKGNAME=		knightcap-3.6nb1
@@ -9,7 +9,7 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://anu.samba.org/KnightCap/
 COMMENT=		chess engine with 3D OpenGL-rendered chessboard
 
-DEPENDS+=		Mesa-*:../../graphics/Mesa
+DEPENDS+=		Mesa-[0-9]*:../../graphics/Mesa
 
 USE_X11=		# defined
 NO_CONFIGURE=		# defined
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index 46a15d814da..ef18dc06c5d 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/09 10:54:21 sakamoto Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/27 23:18:07 jlam Exp $
 # FreeBSD Id: ports/games/pysol/Makefile,v 1.20 1999/12/08 11:01:01 tg Exp
 
 DISTNAME=       pysol-4.72
@@ -11,7 +11,7 @@ MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html
 COMMENT=	Solitaire game, written in Python
 
-DEPENDS+=	py-Tk-*:../../x11/py-Tk
+DEPENDS+=	py-Tk-[0-9]*:../../x11/py-Tk
 
 NO_BUILD=	yes
 PLIST_SRC=	${WRKDIR}/PLIST.src
diff --git a/games/quake/Makefile b/games/quake/Makefile
index b1cb93792c2..a0fb5db0c2f 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/09/09 20:36:27 agc Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/27 23:18:08 jlam Exp $
 
 DISTNAME=	q1source
 PKGNAME=	quake-2.30
@@ -12,7 +12,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.idsoftware.com/
 COMMENT=	legendary first person shoot'em up game
 
-DEPENDS+=	quakedata-*:../../games/quakedata
+DEPENDS+=	quakedata-[0-9]*:../../games/quakedata
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile
index 6e7acc7b8a0..f18637f3d96 100644
--- a/games/quake3arena-demo/Makefile
+++ b/games/quake3arena-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:27 agc Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:08 jlam Exp $
 #
 
 DISTNAME=	linuxq3ademo-1_11-6_x86_gz
@@ -15,7 +15,7 @@ COMMENT=	Quake 3 Arena -- first person shooter (linux demo)
 DEPENDS+=	suse_linux>=6.3:../../emulators/suse_linux
 DEPENDS+=	suse_glx-6.4:../../emulators/suse_glx
 
-CONFLICTS=	quake3arena-*
+CONFLICTS=	quake3arena-[0-9]*
 
 NO_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index ac4fbb49849..f68a75770eb 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:28 agc Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:08 jlam Exp $
 #
 
 DISTNAME=	linuxq3apoint-1.17.x86
@@ -15,7 +15,7 @@ DEPENDS+=	suse_base>=6.3:../../emulators/suse_base
 DEPENDS+=	suse_x11>=6.3:../../emulators/suse_x11
 DEPENDS+=	suse_glx-6.4:../../emulators/suse_glx
 
-CONFLICTS=	quake3arena-demo-*
+CONFLICTS=	quake3arena-demo-[0-9]*
 
 NO_SRC_ON_FTP=	no
 NO_BIN_ON_FTP=	no
diff --git a/games/quake6/Makefile b/games/quake6/Makefile
index 0d3f22da638..64a97fd6383 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/08/27 14:35:08 tron Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/27 23:18:08 jlam Exp $
 
 DISTNAME=	quake-v6-bsd-kame
 PKGNAME=	quake6-0.0
@@ -13,7 +13,7 @@ MAINTAINER=	itojun@kame.net
 HOMEPAGE=	http://www.viagenie.qc.ca/en/ipv6-quake.shtml
 COMMENT=	Quake over IPv6
 
-DEPENDS=	quakedata-*:../../games/quakedata
+DEPENDS=	quakedata-[0-9]*:../../games/quakedata
 BUILD_DEPENDS=	autoconf>=2.13:../../devel/autoconf
 
 WRKSRC=		${WRKDIR}/quakeforge
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index be653a6ef17..eb2712c4bf0 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 15:11:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/27 23:18:08 jlam Exp $
 #
 
 DISTNAME=		xbill-2.0
@@ -10,7 +10,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.xbill.org/
 COMMENT=		stop the dreaded Windows virus from infecting computers
 
-CONFLICT=		gnome-games-*
+CONFLICT=		gnome-games-[0-9]*
 
 USE_IMAKE=		YES
 USE_XPM=		YES
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 48af3dc0cdf..da949187e70 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/07/27 11:05:58 abs Exp $
+# $NetBSD: Makefile,v 1.16 2001/09/27 23:18:09 jlam Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10nb1
@@ -12,7 +12,7 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.idsoftware.com/archives/doomarc.html
 COMMENT=	3D shoot-em-up for 8-bit X11 displays
 
-BUILD_DEPENDS=	unzip-*:../../archivers/unzip
+BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
 
 LICENSE=	shareware