summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2006-06-04 16:26:52 +0000
committerjoerg <joerg>2006-06-04 16:26:52 +0000
commitdc9ed1eae49824498c84348d2a303ffac3043006 (patch)
tree2289aa9644e3677c23bdb5b3beb8c83893ff887a
parent679fcff02a4b0120f6701fe265d6709796dde611 (diff)
downloadpkgsrc-dc9ed1eae49824498c84348d2a303ffac3043006.tar.gz
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.
-rw-r--r--archivers/php-bz2/Makefile4
-rw-r--r--archivers/php-zip/Makefile4
-rw-r--r--archivers/php-zlib/Makefile4
-rw-r--r--comms/pilot-link-libs/Makefile4
-rw-r--r--converters/php-iconv/Makefile4
-rw-r--r--converters/uulib/Makefile5
-rw-r--r--databases/pear-DB/Makefile4
-rw-r--r--databases/php-dba/Makefile4
-rw-r--r--databases/php-dbase/Makefile4
-rw-r--r--databases/php-dbx/Makefile4
-rw-r--r--databases/php-filepro/Makefile4
-rw-r--r--databases/php-ldap/Makefile4
-rw-r--r--databases/php-mssql/Makefile4
-rw-r--r--databases/php-mysql/Makefile4
-rw-r--r--databases/php-odbc/Makefile4
-rw-r--r--databases/php-pgsql/Makefile4
-rw-r--r--databases/php5-mysqli/Makefile4
-rw-r--r--devel/php-gettext/Makefile4
-rw-r--r--devel/php-gmp/Makefile4
-rw-r--r--devel/php-memcache/Makefile4
-rw-r--r--devel/php-pcntl/Makefile4
-rw-r--r--devel/php-posix/Makefile4
-rw-r--r--devel/php-shmop/Makefile4
-rw-r--r--devel/php-sysvsem/Makefile4
-rw-r--r--devel/php-sysvshm/Makefile4
-rw-r--r--graphics/pear-Image_Canvas/Makefile4
-rw-r--r--graphics/pear-Image_Color/Makefile4
-rw-r--r--graphics/pear-Image_Graph/Makefile4
-rw-r--r--graphics/php-gd/Makefile4
-rw-r--r--graphics/php-jpgraph/Makefile4
30 files changed, 59 insertions, 62 deletions
diff --git a/archivers/php-bz2/Makefile b/archivers/php-bz2/Makefile
index 928395831c7..21766ffc12b 100644
--- a/archivers/php-bz2/Makefile
+++ b/archivers/php-bz2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/04 16:26:52 joerg Exp $
MODNAME= bz2
CATEGORIES= archivers
COMMENT= PHP extension for bzip2 compression
-CONFLICTS= php-bz2-[0-9]
+CONFLICTS= php-bz2-[0-9]*
USE_PHP_EXT_PATCHES= yes
diff --git a/archivers/php-zip/Makefile b/archivers/php-zip/Makefile
index c5f06d6a705..97b7505fdb3 100644
--- a/archivers/php-zip/Makefile
+++ b/archivers/php-zip/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:52 joerg Exp $
MODNAME= zip
PECL_VERSION= 1.0
CATEGORIES+= archivers
COMMENT= PHP extension for ZIP archive handling
-CONFLICTS= php-zip-[0-9]
+CONFLICTS= php-zip-[0-9]*
CONFIGURE_ARGS+= --with-zip=shared,${BUILDLINK_DIR}
diff --git a/archivers/php-zlib/Makefile b/archivers/php-zlib/Makefile
index 6a4cdc1189f..0befa3c11ce 100644
--- a/archivers/php-zlib/Makefile
+++ b/archivers/php-zlib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2006/06/02 18:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/06/04 16:26:52 joerg Exp $
MODNAME= zlib
CATEGORIES+= archivers
COMMENT= PHP extension for zlib compression
-CONFLICTS= php-zlib-[0-9]
+CONFLICTS= php-zlib-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}-dir=${BUILDLINK_DIR}
diff --git a/comms/pilot-link-libs/Makefile b/comms/pilot-link-libs/Makefile
index 5112fb9935f..9277ede4baa 100644
--- a/comms/pilot-link-libs/Makefile
+++ b/comms/pilot-link-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.16 2006/06/04 16:26:52 joerg Exp $
#
.include "../../comms/pilot-link/Makefile.common"
@@ -7,7 +7,7 @@ PKGNAME= pilot-link-libs-${PILOT_LINK_VERS}
PKGREVISION= 3
COMMENT= Libraries for talking to the 3Com Pilot PDA
-CONFLICTS+= pilot-link-0.8.* pilot-link-0.9.[0-3]
+CONFLICTS+= pilot-link<0.9.5
MAKE_ENV+= PILIB="libsock/libpisock.la"
diff --git a/converters/php-iconv/Makefile b/converters/php-iconv/Makefile
index 92e3c5eeff9..6693bb6d54d 100644
--- a/converters/php-iconv/Makefile
+++ b/converters/php-iconv/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2006/06/02 18:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/06/04 16:26:53 joerg Exp $
MODNAME= iconv
CATEGORIES+= converters
COMMENT= PHP extension for character set conversion
-CONFLICTS= php-iconv-[0-9]
+CONFLICTS= php-iconv-[0-9]*
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index cabdb6c7df3..a74317ee587 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/03/04 21:29:07 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2006/06/04 16:26:53 joerg Exp $
#
DISTNAME= uudeview-0.5.20
@@ -11,9 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.fpx.de/fp/Software/UUDeview/
COMMENT= Library for uu/xx/Base64/BinHex de-/encoding
-# "kdesupport-2.1b" included "uu" library.
-CONFLICTS+= kdesupport-2.1b
-
GNU_CONFIGURE= yes
CONFIGURE_DIRS= uulib
BUILD_DIRS= uulib
diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile
index 1d89be5d0b3..e7dd15e7046 100644
--- a/databases/pear-DB/Makefile
+++ b/databases/pear-DB/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:53 joerg Exp $
DISTNAME= DB-1.7.6
CATEGORIES= databases
-CONFLICTS= php-pear-DB-[0-9]
+CONFLICTS= php-pear-DB-[0-9]*
MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://pear.php.net/package/DB
diff --git a/databases/php-dba/Makefile b/databases/php-dba/Makefile
index ad11feef670..c4b879ebf1d 100644
--- a/databases/php-dba/Makefile
+++ b/databases/php-dba/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= dba
CATEGORIES+= databases
COMMENT= PHP extension for DBM database access
-CONFLICTS= php-dba-[0-9]
+CONFLICTS= php-dba-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}=shared
diff --git a/databases/php-dbase/Makefile b/databases/php-dbase/Makefile
index 0c4b3e1304b..818a3727825 100644
--- a/databases/php-dbase/Makefile
+++ b/databases/php-dbase/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= dbase
CATEGORIES+= databases
COMMENT= PHP extension for dBase database access
-CONFLICTS= php-dbase-[0-9]
+CONFLICTS= php-dbase-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=shared
diff --git a/databases/php-dbx/Makefile b/databases/php-dbx/Makefile
index 89a5fc8c6b4..507152eb47d 100644
--- a/databases/php-dbx/Makefile
+++ b/databases/php-dbx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:53 joerg Exp $
MODNAME= dbx
PECL_VERSION= 1.1.0
@@ -7,7 +7,7 @@ COMMENT= PHP database abstraction layer extension
MAINTAINER= jdolecek@NetBSD.org
-CONFLICTS= php-dbx-[0-9]
+CONFLICTS= php-dbx-[0-9]*
.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-filepro/Makefile b/databases/php-filepro/Makefile
index aeb67e0d56c..5ee25bfb56c 100644
--- a/databases/php-filepro/Makefile
+++ b/databases/php-filepro/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= filepro
CATEGORIES+= databases
COMMENT= PHP extension for read-only filePro database access
-CONFLICTS= php-filepro-[0-9]
+CONFLICTS= php-filepro-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=shared
diff --git a/databases/php-ldap/Makefile b/databases/php-ldap/Makefile
index cb8ab68feab..7d0ac1aed7c 100644
--- a/databases/php-ldap/Makefile
+++ b/databases/php-ldap/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/04 16:26:53 joerg Exp $
MODNAME= ldap
CATEGORIES+= databases
COMMENT= PHP extension for LDAP database access
-CONFLICTS= php-ldap-[0-9]
+CONFLICTS= php-ldap-[0-9]*
USE_PHP_EXT_PATCHES= yes
diff --git a/databases/php-mssql/Makefile b/databases/php-mssql/Makefile
index 6465db28059..92b1b431a25 100644
--- a/databases/php-mssql/Makefile
+++ b/databases/php-mssql/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:54 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= mssql
CATEGORIES+= databases
COMMENT= PHP extension for MS SQL databases
-CONFLICTS= php-mssql-[0-9]
+CONFLICTS= php-mssql-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_DIR}
diff --git a/databases/php-mysql/Makefile b/databases/php-mysql/Makefile
index b604e870e80..e268c11db33 100644
--- a/databases/php-mysql/Makefile
+++ b/databases/php-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/04 16:26:53 joerg Exp $
MODNAME= mysql
CATEGORIES+= databases
@@ -6,7 +6,7 @@ COMMENT= PHP extension for MySQL databases
MAINTAINER= pkgsrc-users@NetBSD.org
-CONFLICTS= php-mysql-[0-9]
+CONFLICTS= php-mysql-[0-9]*
USE_PHP_EXT_PATCHES= yes
diff --git a/databases/php-odbc/Makefile b/databases/php-odbc/Makefile
index 329cf1bf1a0..a05f0c0b3ef 100644
--- a/databases/php-odbc/Makefile
+++ b/databases/php-odbc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= odbc
CATEGORIES+= databases
COMMENT= PHP extension for ODBC access
-CONFLICTS= php-odbc-[0-9]
+CONFLICTS= php-odbc-[0-9]*
CONFIGURE_ARGS+= --with-unixODBC=shared,${BUILDLINK_PREFIX.unixodbc}
diff --git a/databases/php-pgsql/Makefile b/databases/php-pgsql/Makefile
index d12cc231149..f0568abc1f9 100644
--- a/databases/php-pgsql/Makefile
+++ b/databases/php-pgsql/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= pgsql
CATEGORIES+= databases
COMMENT= PHP extension for PostgreSQL databases
-CONFLICTS= php-pgsql-[0-9]
+CONFLICTS= php-pgsql-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${PGSQL_PREFIX}
diff --git a/databases/php5-mysqli/Makefile b/databases/php5-mysqli/Makefile
index e5219db1e7f..0cac1385c62 100644
--- a/databases/php5-mysqli/Makefile
+++ b/databases/php5-mysqli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:53 joerg Exp $
MODNAME= mysqli
CATEGORIES+= databases
@@ -6,7 +6,7 @@ COMMENT= PHP5 extension for MySQL 4.1 and later databases
MAINTAINER= jdolecek@NetBSD.org
-CONFLICTS= php-mysqli-[0-9]
+CONFLICTS= php-mysqli-[0-9]*
PHP_VERSIONS_ACCEPTED= 5
diff --git a/devel/php-gettext/Makefile b/devel/php-gettext/Makefile
index 000d748071e..081b0b90e13 100644
--- a/devel/php-gettext/Makefile
+++ b/devel/php-gettext/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= gettext
CATEGORIES+= devel
COMMENT= PHP extension for gettext support
-CONFLICTS= php-gettext-[0-9]
+CONFLICTS= php-gettext-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.gettext}
diff --git a/devel/php-gmp/Makefile b/devel/php-gmp/Makefile
index 549d5cf3a7b..0986b247638 100644
--- a/devel/php-gmp/Makefile
+++ b/devel/php-gmp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= gmp
CATEGORIES+= devel math
COMMENT= PHP extension for arbitrary precision math
-CONFLICTS= php-gmp-[0-9]
+CONFLICTS= php-gmp-[0-9]*
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.gmp}
diff --git a/devel/php-memcache/Makefile b/devel/php-memcache/Makefile
index 6333d487527..ab790951e6d 100644
--- a/devel/php-memcache/Makefile
+++ b/devel/php-memcache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/06/04 16:26:53 joerg Exp $
#
MODNAME= memcache
@@ -6,7 +6,7 @@ PECL_VERSION= 2.0.1
CATEGORIES+= devel
COMMENT= PHP extension for memcached
-CONFLICTS= php-memcache-[0-9]
+CONFLICTS= php-memcache-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}
WRKSRC= ${WRKDIR}/${MODNAME}-${PECL_VERSION}
diff --git a/devel/php-pcntl/Makefile b/devel/php-pcntl/Makefile
index 7edd0bb4107..a2e4eb53f7b 100644
--- a/devel/php-pcntl/Makefile
+++ b/devel/php-pcntl/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/04 16:26:53 joerg Exp $
MODNAME= pcntl
PKGREVISION= 1
CATEGORIES+= devel
COMMENT= PHP extension for Process Control functions
-CONFLICTS= php-pcntl-[0-9]
+CONFLICTS= php-pcntl-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}=shared
diff --git a/devel/php-posix/Makefile b/devel/php-posix/Makefile
index 05c6bcfadf4..d244ddab92d 100644
--- a/devel/php-posix/Makefile
+++ b/devel/php-posix/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= posix
CATEGORIES+= devel
COMMENT= PHP extension for POSIX-like functions
-CONFLICTS= php-posix-[0-9]
+CONFLICTS= php-posix-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}=shared
diff --git a/devel/php-shmop/Makefile b/devel/php-shmop/Makefile
index 869c7da6f6b..ea7e0fb9b0f 100644
--- a/devel/php-shmop/Makefile
+++ b/devel/php-shmop/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= shmop
CATEGORIES+= devel
COMMENT= PHP extension for simple SysV shared memory operations
-CONFLICTS= php-shmop-[0-9]
+CONFLICTS= php-shmop-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR}
diff --git a/devel/php-sysvsem/Makefile b/devel/php-sysvsem/Makefile
index 6742877edf5..bf665c577bd 100644
--- a/devel/php-sysvsem/Makefile
+++ b/devel/php-sysvsem/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= sysvsem
CATEGORIES+= devel
COMMENT= PHP extension for SysV semaphore support
-CONFLICTS= php-sysvsem-[0-9]
+CONFLICTS= php-sysvsem-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR}
diff --git a/devel/php-sysvshm/Makefile b/devel/php-sysvshm/Makefile
index 0470d4af3da..24c9d1d19dd 100644
--- a/devel/php-sysvshm/Makefile
+++ b/devel/php-sysvshm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:53 joerg Exp $
MODNAME= sysvshm
CATEGORIES+= devel
COMMENT= PHP extension for SysV shared memory support
-CONFLICTS= php-sysvshm-[0-9]
+CONFLICTS= php-sysvshm-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR}
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