Fix CONFLICTS of php/pear packages, the asterix was missing (thanks tv).

While going through the tree, fix some more packages which had similiar
issues with too strict conflicts, bump the revisions of those.

5 files changed, 10 insertions, 10 deletions

diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile
index b509454cab6..54f7630cc1e 100644
--- a/graphics/pear-Image_Canvas/Makefile
+++ b/graphics/pear-Image_Canvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:53 joerg Exp $
 
 DISTNAME=	Image_Canvas-0.2.4
 CATEGORIES=	graphics
@@ -7,7 +7,7 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE= 	http://pear.php.net/package/Image_Color/
 COMMENT=	Common interface to image drawing, making image source code
 
-CONFLICTS=	php-pear-Image_Canvas-[0-9]
+CONFLICTS=	php-pear-Image_Canvas-[0-9]*
 
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Image_Color>=1.0.0:../../graphics/pear-Image_Color
 
diff --git a/graphics/pear-Image_Color/Makefile b/graphics/pear-Image_Color/Makefile
index 3fdb56beb1b..9d8423f9060 100644
--- a/graphics/pear-Image_Color/Makefile
+++ b/graphics/pear-Image_Color/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
 
 DISTNAME=	Image_Color-1.0.2
 CATEGORIES=	graphics
@@ -7,7 +7,7 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE= 	http://pear.php.net/package/Image_Color/
 COMMENT=	Manage and handles color data and conversions
 
-CONFLICTS=	php-pear-Image_Color-[0-9]
+CONFLICTS=	php-pear-Image_Color-[0-9]*
 
 DEPENDS+=	${PHP_PKG_PREFIX}-gd-[0-9]*:../../graphics/php-gd
 
diff --git a/graphics/pear-Image_Graph/Makefile b/graphics/pear-Image_Graph/Makefile
index 6fd89ef8816..740c30600c1 100644
--- a/graphics/pear-Image_Graph/Makefile
+++ b/graphics/pear-Image_Graph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:54 joerg Exp $
 
 DISTNAME=	Image_Graph-0.3.0dev4
 CATEGORIES=	graphics
@@ -7,7 +7,7 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE= 	http://pear.php.net/package/Image_Graph/
 COMMENT=	Package for displaying (numerical) data as a graph/chart/plot
 
-CONFLICTS=	php-pear-Image_Graph-[0-9]
+CONFLICTS=	php-pear-Image_Graph-[0-9]*
 
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Image_Canvas>=0.2.1:../../graphics/pear-Image_Canvas
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Numbers_Roman-[0-9]*:../../math/pear-Numbers_Roman
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile
index 1558c111bbe..113c76c42df 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/06/04 16:26:54 joerg Exp $
 
 MODNAME=		gd
 CATEGORIES+=		graphics
 COMMENT=		PHP extension for GD graphics library
 
-CONFLICTS=	php-gd-[0-9]
+CONFLICTS=	php-gd-[0-9]*
 
 # XXX we use bundled GD so that extension is usable also by non-threaded
 # PHP, such as CLI/CGI version or ap-php on Apache 1.x.
diff --git a/graphics/php-jpgraph/Makefile b/graphics/php-jpgraph/Makefile
index 220ff1e9b72..7fac2d26c20 100644
--- a/graphics/php-jpgraph/Makefile
+++ b/graphics/php-jpgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/06/04 16:26:54 joerg Exp $
 
 DISTNAME=	jpgraph-1.18
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
@@ -9,7 +9,7 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE= 	http://www.aditus.nu/jpgraph/index.php
 COMMENT=	Object Oriented class library for PHP
 
-CONFLICTS=	php-jgraph-[0-9]
+CONFLICTS=	php-jgraph-[0-9]*
 
 DEPENDS+=	${PHP_PKG_PREFIX}-gd>=4.3.1:../../graphics/php-gd