diff options
author | joerg <joerg> | 2006-06-04 16:26:54 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-06-04 16:26:54 +0000 |
commit | 4a72c855a61391e2a3b8c3ac6378a595f8b63420 (patch) | |
tree | 1c794d0297d16ff2a589f73e4b2528ed5e788bd5 /net | |
parent | dd995e3971905d4428c352cafcea8f8f586df5d4 (diff) | |
download | pkgsrc-4a72c855a61391e2a3b8c3ac6378a595f8b63420.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 'net')
-rw-r--r-- | net/pear-Net_DIME/Makefile | 4 | ||||
-rw-r--r-- | net/pear-Net_SMTP/Makefile | 4 | ||||
-rw-r--r-- | net/pear-Net_Sieve/Makefile | 4 | ||||
-rw-r--r-- | net/pear-Net_Socket/Makefile | 4 | ||||
-rw-r--r-- | net/pear-Net_URL/Makefile | 4 | ||||
-rw-r--r-- | net/pear-SOAP/Makefile | 4 | ||||
-rw-r--r-- | net/php-ftp/Makefile | 4 | ||||
-rw-r--r-- | net/php-snmp/Makefile | 4 | ||||
-rw-r--r-- | net/php-sockets/Makefile | 4 | ||||
-rw-r--r-- | net/php-xmlrpc/Makefile | 4 | ||||
-rw-r--r-- | net/php-yp/Makefile | 4 | ||||
-rw-r--r-- | net/php5-soap/Makefile | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/net/pear-Net_DIME/Makefile b/net/pear-Net_DIME/Makefile index 87d53d99bb3..fb79e3d69b8 100644 --- a/net/pear-Net_DIME/Makefile +++ b/net/pear-Net_DIME/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/04 16:26:54 joerg Exp $ DISTNAME= Net_DIME-0.3 CATEGORIES+= net @@ -6,7 +6,7 @@ CATEGORIES+= net MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP classes that implements DIME encoding -CONFLICTS= php-pear-Net_DIME-[0-9] +CONFLICTS= php-pear-Net_DIME-[0-9]* .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pear-Net_SMTP/Makefile b/net/pear-Net_SMTP/Makefile index ffdb2686b29..af0e8f8bd8b 100644 --- a/net/pear-Net_SMTP/Makefile +++ b/net/pear-Net_SMTP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/04 16:26:54 joerg Exp $ DISTNAME= Net_SMTP-1.2.6 CATEGORIES+= net mail @@ -6,7 +6,7 @@ CATEGORIES+= net mail MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP classes to provide SMTP Interface -CONFLICTS= php-pear-Net_SMTP-[0-9] +CONFLICTS= php-pear-Net_SMTP-[0-9]* DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile index 6a12a4312e5..f127c457647 100644 --- a/net/pear-Net_Sieve/Makefile +++ b/net/pear-Net_Sieve/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/06/04 16:26:54 joerg Exp $ DISTNAME= Net_Sieve-1.1.1 CATEGORIES+= net @@ -7,7 +7,7 @@ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://pear.php.net/package/Net_Sieve/ COMMENT= PHP classes that handles talking to timsieved -CONFLICTS= php-pear-Net_Sieve-[0-9] +CONFLICTS= php-pear-Net_Sieve-[0-9]* DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Socket>=1.0.0:../../net/pear-Net_Socket diff --git a/net/pear-Net_Socket/Makefile b/net/pear-Net_Socket/Makefile index 847e4d749de..38c0b08956b 100644 --- a/net/pear-Net_Socket/Makefile +++ b/net/pear-Net_Socket/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:54 joerg Exp $ DISTNAME= Net_Socket-1.0.2 CATEGORIES+= net @@ -6,7 +6,7 @@ CATEGORIES+= net MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP classes to provide Network Socket Interface -CONFLICTS= php-pear-Net_Socket-[0-9] +CONFLICTS= php-pear-Net_Socket-[0-9]* .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pear-Net_URL/Makefile b/net/pear-Net_URL/Makefile index 30acbe5da49..be0218f1763 100644 --- a/net/pear-Net_URL/Makefile +++ b/net/pear-Net_URL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:55 joerg Exp $ DISTNAME= Net_URL-1.0.14 CATEGORIES+= net @@ -6,7 +6,7 @@ CATEGORIES+= net MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP classes to easy parsing of URLs -CONFLICTS= php-pear-Net_URL-[0-9] +CONFLICTS= php-pear-Net_URL-[0-9]* .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pear-SOAP/Makefile b/net/pear-SOAP/Makefile index 5b133481f9a..841e5c6eb8f 100644 --- a/net/pear-SOAP/Makefile +++ b/net/pear-SOAP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:55 joerg Exp $ DISTNAME= SOAP-0.8.1 CATEGORIES+= net @@ -6,7 +6,7 @@ CATEGORIES+= net MAINTAINER= jdolecek@NetBSD.org COMMENT= SOAP Client/Server for PHP -CONFLICTS= php-pear-SOAP-[0-9] +CONFLICTS= php-pear-SOAP-[0-9]* DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.2:../../mail/pear-Mail_Mime DEPENDS+= ${PHP_PKG_PREFIX}-pear-HTTP_Request>=1.2:../../www/pear-HTTP_Request diff --git a/net/php-ftp/Makefile b/net/php-ftp/Makefile index 66320e99cc7..35a8dcfa277 100644 --- a/net/php-ftp/Makefile +++ b/net/php-ftp/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:55 joerg Exp $ MODNAME= ftp CATEGORIES+= net COMMENT= PHP extension for FTP access -CONFLICTS= php-ftp-[0-9] +CONFLICTS= php-ftp-[0-9]* CONFIGURE_ARGS+= --enable-${MODNAME} diff --git a/net/php-snmp/Makefile b/net/php-snmp/Makefile index bef00964038..4f59d3804b7 100644 --- a/net/php-snmp/Makefile +++ b/net/php-snmp/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:55 joerg Exp $ MODNAME= snmp CATEGORIES+= net COMMENT= PHP extension for SNMP -CONFLICTS= php-snmp-[0-9] +CONFLICTS= php-snmp-[0-9]* CONFIGURE_ARGS+= --with-${MODNAME}=${PREFIX} diff --git a/net/php-sockets/Makefile b/net/php-sockets/Makefile index 216d764d7da..50145f46d96 100644 --- a/net/php-sockets/Makefile +++ b/net/php-sockets/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/06/04 16:26:55 joerg Exp $ MODNAME= sockets CATEGORIES+= net COMMENT= PHP extension for sockets support -CONFLICTS= php-sockets-[0-9] +CONFLICTS= php-sockets-[0-9]* CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} diff --git a/net/php-xmlrpc/Makefile b/net/php-xmlrpc/Makefile index 4c2caf000b4..f03ef1100ea 100644 --- a/net/php-xmlrpc/Makefile +++ b/net/php-xmlrpc/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:55 joerg Exp $ MODNAME= xmlrpc CATEGORIES+= net COMMENT= PHP extension for XML-RPC support -CONFLICTS= php-xmlrpc-[0-9] +CONFLICTS= php-xmlrpc-[0-9]* HOMEPAGE= http://xmlrpc-epi.sourceforge.net/ diff --git a/net/php-yp/Makefile b/net/php-yp/Makefile index ad41ef5e198..1c90f5ceb26 100644 --- a/net/php-yp/Makefile +++ b/net/php-yp/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/06/04 16:26:55 joerg Exp $ MODNAME= yp CATEGORIES+= net COMMENT= PHP extension for YP domain support -CONFLICTS= php-yp-[0-9] +CONFLICTS= php-yp-[0-9]* # yp extension has been unbundled in PHP 5.1.1, it's only available # in CVS and isn't available through have PECL; thus, mark this diff --git a/net/php5-soap/Makefile b/net/php5-soap/Makefile index 0d7bf3f1e73..e3dfd1d85a5 100644 --- a/net/php5-soap/Makefile +++ b/net/php5-soap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:57 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/04 16:26:55 joerg Exp $ MODNAME= soap CATEGORIES+= net @@ -6,7 +6,7 @@ COMMENT= PHP5 extension for SOAP functions MAINTAINER= jdolecek@NetBSD.org -CONFLICTS= php-soap-[0-9] +CONFLICTS= php-soap-[0-9]* PHP_VERSIONS_ACCEPTED= 5 |