pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix CONFLICTS of php/pear packages, the asterix was mi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/76f3c6a7f057
branches: trunk
changeset: 513848:76f3c6a7f057
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Jun 04 16:26:52 2006 +0000
description:
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:
archivers/php-bz2/Makefile | 4 ++--
archivers/php-zip/Makefile | 4 ++--
archivers/php-zlib/Makefile | 4 ++--
comms/pilot-link-libs/Makefile | 4 ++--
converters/php-iconv/Makefile | 4 ++--
converters/uulib/Makefile | 5 +----
databases/pear-DB/Makefile | 4 ++--
databases/php-dba/Makefile | 4 ++--
databases/php-dbase/Makefile | 4 ++--
databases/php-dbx/Makefile | 4 ++--
databases/php-filepro/Makefile | 4 ++--
databases/php-ldap/Makefile | 4 ++--
databases/php-mssql/Makefile | 4 ++--
databases/php-mysql/Makefile | 4 ++--
databases/php-odbc/Makefile | 4 ++--
databases/php-pgsql/Makefile | 4 ++--
databases/php5-mysqli/Makefile | 4 ++--
devel/php-gettext/Makefile | 4 ++--
devel/php-gmp/Makefile | 4 ++--
devel/php-memcache/Makefile | 4 ++--
devel/php-pcntl/Makefile | 4 ++--
devel/php-posix/Makefile | 4 ++--
devel/php-shmop/Makefile | 4 ++--
devel/php-sysvsem/Makefile | 4 ++--
devel/php-sysvshm/Makefile | 4 ++--
graphics/pear-Image_Canvas/Makefile | 4 ++--
graphics/pear-Image_Color/Makefile | 4 ++--
graphics/pear-Image_Graph/Makefile | 4 ++--
graphics/php-gd/Makefile | 4 ++--
graphics/php-jpgraph/Makefile | 4 ++--
30 files changed, 59 insertions(+), 62 deletions(-)
diffs (truncated from 502 to 300 lines):
diff -r 6c54012ae878 -r 76f3c6a7f057 archivers/php-bz2/Makefile
--- a/archivers/php-bz2/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/archivers/php-bz2/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 archivers/php-zip/Makefile
--- a/archivers/php-zip/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/archivers/php-zip/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 archivers/php-zlib/Makefile
--- a/archivers/php-zlib/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/archivers/php-zlib/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 comms/pilot-link-libs/Makefile
--- a/comms/pilot-link-libs/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/comms/pilot-link-libs/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 @@
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 -r 6c54012ae878 -r 76f3c6a7f057 converters/php-iconv/Makefile
--- a/converters/php-iconv/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/converters/php-iconv/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 converters/uulib/Makefile
--- a/converters/uulib/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/converters/uulib/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 @@
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 -r 6c54012ae878 -r 76f3c6a7f057 databases/pear-DB/Makefile
--- a/databases/pear-DB/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/databases/pear-DB/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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@localhost
HOMEPAGE= http://pear.php.net/package/DB
diff -r 6c54012ae878 -r 76f3c6a7f057 databases/php-dba/Makefile
--- a/databases/php-dba/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/databases/php-dba/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 databases/php-dbase/Makefile
--- a/databases/php-dbase/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/databases/php-dbase/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 databases/php-dbx/Makefile
--- a/databases/php-dbx/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/databases/php-dbx/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 @@
MAINTAINER= jdolecek%NetBSD.org@localhost
-CONFLICTS= php-dbx-[0-9]
+CONFLICTS= php-dbx-[0-9]*
.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6c54012ae878 -r 76f3c6a7f057 databases/php-filepro/Makefile
--- a/databases/php-filepro/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/databases/php-filepro/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 databases/php-ldap/Makefile
--- a/databases/php-ldap/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/databases/php-ldap/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 databases/php-mssql/Makefile
--- a/databases/php-mssql/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/databases/php-mssql/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 databases/php-mysql/Makefile
--- a/databases/php-mysql/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/databases/php-mysql/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-CONFLICTS= php-mysql-[0-9]
+CONFLICTS= php-mysql-[0-9]*
USE_PHP_EXT_PATCHES= yes
diff -r 6c54012ae878 -r 76f3c6a7f057 databases/php-odbc/Makefile
--- a/databases/php-odbc/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/databases/php-odbc/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 databases/php-pgsql/Makefile
--- a/databases/php-pgsql/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/databases/php-pgsql/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 databases/php5-mysqli/Makefile
--- a/databases/php5-mysqli/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/databases/php5-mysqli/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 @@
MAINTAINER= jdolecek%NetBSD.org@localhost
-CONFLICTS= php-mysqli-[0-9]
+CONFLICTS= php-mysqli-[0-9]*
PHP_VERSIONS_ACCEPTED= 5
diff -r 6c54012ae878 -r 76f3c6a7f057 devel/php-gettext/Makefile
--- a/devel/php-gettext/Makefile Sun Jun 04 15:23:56 2006 +0000
+++ b/devel/php-gettext/Makefile Sun Jun 04 16:26:52 2006 +0000
@@ -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 -r 6c54012ae878 -r 76f3c6a7f057 devel/php-gmp/Makefile
Home |
Main Index |
Thread Index |
Old Index