summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorjoerg <joerg>2006-06-04 16:26:52 +0000
committerjoerg <joerg>2006-06-04 16:26:52 +0000
commit675552fe022c238d47cc721113a8de2b529b8bf6 (patch)
tree2289aa9644e3677c23bdb5b3beb8c83893ff887a /databases
parent27306f3d4dee81b231501a266b8e0acbc27320a2 (diff)
downloadpkgsrc-675552fe022c238d47cc721113a8de2b529b8bf6.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.
Diffstat (limited to 'databases')
-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
11 files changed, 22 insertions, 22 deletions
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