diff options
author | joerg <joerg> | 2006-06-04 16:26:54 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-06-04 16:26:54 +0000 |
commit | a8e40ef4f9e34f0798b53fe2e6d4315e9deb9eee (patch) | |
tree | 1c794d0297d16ff2a589f73e4b2528ed5e788bd5 /www | |
parent | 62d00c8bfac877aa6e2976b37a3cfa3ae922fedf (diff) | |
download | pkgsrc-a8e40ef4f9e34f0798b53fe2e6d4315e9deb9eee.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 'www')
-rw-r--r-- | www/pear-HTML_Common/Makefile | 4 | ||||
-rw-r--r-- | www/pear-HTML_Select/Makefile | 4 | ||||
-rw-r--r-- | www/pear-HTTP_Request/Makefile | 4 | ||||
-rw-r--r-- | www/php-FastTemplate/Makefile | 4 | ||||
-rw-r--r-- | www/php-apc/Makefile | 4 | ||||
-rw-r--r-- | www/php-curl/Makefile | 4 | ||||
-rw-r--r-- | www/php-eaccelerator/Makefile | 4 | ||||
-rw-r--r-- | www/php4-apc/Makefile | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/www/pear-HTML_Common/Makefile b/www/pear-HTML_Common/Makefile index 66069cc6f1c..b8946fe7bf7 100644 --- a/www/pear-HTML_Common/Makefile +++ b/www/pear-HTML_Common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/06/02 18:28:00 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/06/04 16:26:55 joerg Exp $ DISTNAME= HTML_Common-1.2.1 CATEGORIES= www @@ -6,7 +6,7 @@ CATEGORIES= www MAINTAINER= jdolecek@NetBSD.org COMMENT= Base PHP class for other HTML classes -CONFLICTS= php-pear-HTML_Common-[0-9] +CONFLICTS= php-pear-HTML_Common-[0-9]* .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/pear-HTML_Select/Makefile b/www/pear-HTML_Select/Makefile index 9411e76dedd..6bcdadef650 100644 --- a/www/pear-HTML_Select/Makefile +++ b/www/pear-HTML_Select/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/06/02 18:28:00 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/06/04 16:26:56 joerg Exp $ DISTNAME= HTML_Select-1.2.1 CATEGORIES= www @@ -6,7 +6,7 @@ CATEGORIES= www MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP class for generating HTML form select elements -CONFLICTS= php-pear-HTML_Select-[0-9] +CONFLICTS= php-pear-HTML_Select-[0-9]* DEPENDS+= ${PHP_PKG_PREFIX}-pear-HTML_Common>=1.1:../../www/pear-HTML_Common diff --git a/www/pear-HTTP_Request/Makefile b/www/pear-HTTP_Request/Makefile index f7f56560e15..cad5cef2676 100644 --- a/www/pear-HTTP_Request/Makefile +++ b/www/pear-HTTP_Request/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/06/02 18:28:00 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/04 16:26:56 joerg Exp $ DISTNAME= HTTP_Request-1.2.3 #CATEGORIES+= www @@ -6,7 +6,7 @@ DISTNAME= HTTP_Request-1.2.3 MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP classes to provides an easy way to perform HTTP requests -CONFLICTS= php-pear-HTTP_Request-[0-9] +CONFLICTS= php-pear-HTTP_Request-[0-9]* DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_URL>=1.0.12:../../net/pear-Net_URL DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket diff --git a/www/php-FastTemplate/Makefile b/www/php-FastTemplate/Makefile index 6e612512e60..b474e6d7d76 100644 --- a/www/php-FastTemplate/Makefile +++ b/www/php-FastTemplate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/06/02 18:28:00 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/06/04 16:26:56 joerg Exp $ DISTNAME= FastTemplate-1_1_0 PKGNAME= ${PHP_PKG_PREFIX}-FastTemplate-1.1.0 @@ -12,7 +12,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.thewebmasters.net/php/FastTemplate.phtml COMMENT= PHP extension for managing templates and variable interpolation -CONFLICTS= php-FastTemplate-[0-9] +CONFLICTS= php-FastTemplate-[0-9]* PHP_VERSIONS_ACCEPTED= 4 diff --git a/www/php-apc/Makefile b/www/php-apc/Makefile index 6ddcc99b979..8328d86d5d5 100644 --- a/www/php-apc/Makefile +++ b/www/php-apc/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2006/06/02 18:28:00 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/06/04 16:26:56 joerg Exp $ MODNAME= apc PECL_VERSION= 3.0.10 CATEGORIES+= sysutils COMMENT= Alternative PHP Cache -CONFLICTS= php-apc-[0-9] +CONFLICTS= php-apc-[0-9]* MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/www/php-curl/Makefile b/www/php-curl/Makefile index 0b3c1a562b9..241d104e2fd 100644 --- a/www/php-curl/Makefile +++ b/www/php-curl/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.9 2006/06/02 18:28:00 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/06/04 16:26:56 joerg Exp $ MODNAME= curl CATEGORIES+= www COMMENT= PHP extension for curl functions -CONFLICTS= php-curl-[0-9] +CONFLICTS= php-curl-[0-9]* CONFIGURE_ARGS+= --with-curl=shared,${BUILDLINK_PREFIX.curl} diff --git a/www/php-eaccelerator/Makefile b/www/php-eaccelerator/Makefile index aa0d935e97f..d5314ff1b3a 100644 --- a/www/php-eaccelerator/Makefile +++ b/www/php-eaccelerator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/06/02 18:28:01 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/04 16:26:56 joerg Exp $ MODNAME= eaccelerator PECL_VERSION= 0.9.5beta2 @@ -6,7 +6,7 @@ PECL_DISTNAME= ${MODNAME}-0.9.5-beta2 CATEGORIES+= sysutils COMMENT= PHP accelerator, optimizer, encoder and dynamic content cache -CONFLICTS= php-eaccelator-[0-9] +CONFLICTS= php-eaccelator-[0-9]* MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eaccelerator/} EXTRACT_SUFX= .tar.bz2 diff --git a/www/php4-apc/Makefile b/www/php4-apc/Makefile index 7336a4272a9..cfcd8ff7ca0 100644 --- a/www/php4-apc/Makefile +++ b/www/php4-apc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/06/02 18:28:01 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2006/06/04 16:26:56 joerg Exp $ MODNAME= apc PECL_VERSION= 2.0.4 @@ -7,7 +7,7 @@ COMMENT= Alternative PHP Cache for PHP4 MAINTAINER= pkgsrc-users@NetBSD.org -CONFLICTS= php-apc-[0-9] +CONFLICTS= php-apc-[0-9]* CONFIGURE_ARGS+= --enable-${MODNAME} WRKSRC= ${WRKDIR}/APC-${PECL_VERSION} |