From 337c6b1297ecf0ce92e4814030662b8352b54ab4 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 2 Jun 2006 18:27:54 +0000 Subject: Rename all PHP 4 packages to php4-*, all PHP 5 packages to php5-*, all PEAR packages to php?-pear-* and all Apache packages to ap13-* or ap2-* respectively. Add new variables to simplify the Makefile handling. Add CONFLICTS on the old names. Reset revisions of bumped packages. ap-php will now depend on the default Apache and PHP version. All programs using it have an implicit option of the Apache version as well. OK from jlam@ and adrianp@. --- net/pear-Net_DIME/Makefile | 5 +++-- net/pear-Net_SMTP/Makefile | 7 ++++--- net/pear-Net_Sieve/Makefile | 6 ++++-- net/pear-Net_Socket/Makefile | 5 +++-- net/pear-Net_URL/Makefile | 5 +++-- net/pear-SOAP/Makefile | 13 +++++++------ net/php-ftp/Makefile | 4 ++-- net/php-snmp/Makefile | 4 ++-- net/php-sockets/Makefile | 4 ++-- net/php-xmlrpc/Makefile | 5 +++-- net/php-yp/Makefile | 7 ++++--- net/php5-soap/Makefile | 7 ++++--- 12 files changed, 41 insertions(+), 31 deletions(-) (limited to 'net') diff --git a/net/pear-Net_DIME/Makefile b/net/pear-Net_DIME/Makefile index d6f5fa130a0..87d53d99bb3 100644 --- a/net/pear-Net_DIME/Makefile +++ b/net/pear-Net_DIME/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:10:29 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:57 joerg Exp $ DISTNAME= Net_DIME-0.3 -PKGREVISION= 1 CATEGORIES+= net MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP classes that implements DIME encoding +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 1139db2c9f8..ffdb2686b29 100644 --- a/net/pear-Net_SMTP/Makefile +++ b/net/pear-Net_SMTP/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2006/02/05 23:10:29 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:57 joerg Exp $ DISTNAME= Net_SMTP-1.2.6 -PKGREVISION= 2 CATEGORIES+= net mail MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP classes to provide SMTP Interface -DEPENDS+= pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket +CONFLICTS= php-pear-Net_SMTP-[0-9] + +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile index bb3ecd3e3be..6a12a4312e5 100644 --- a/net/pear-Net_Sieve/Makefile +++ b/net/pear-Net_Sieve/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/03/31 21:54:16 adrianp Exp $ +# $NetBSD: Makefile,v 1.2 2006/06/02 18:27:57 joerg Exp $ DISTNAME= Net_Sieve-1.1.1 CATEGORIES+= net @@ -7,7 +7,9 @@ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://pear.php.net/package/Net_Sieve/ COMMENT= PHP classes that handles talking to timsieved -DEPENDS+= pear-Net_Socket>=1.0.0:../../net/pear-Net_Socket +CONFLICTS= php-pear-Net_Sieve-[0-9] + +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Socket>=1.0.0:../../net/pear-Net_Socket .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pear-Net_Socket/Makefile b/net/pear-Net_Socket/Makefile index 09110f00a8c..847e4d749de 100644 --- a/net/pear-Net_Socket/Makefile +++ b/net/pear-Net_Socket/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:10:29 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $ DISTNAME= Net_Socket-1.0.2 -PKGREVISION= 2 CATEGORIES+= net MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP classes to provide Network Socket Interface +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 353735b773b..30acbe5da49 100644 --- a/net/pear-Net_URL/Makefile +++ b/net/pear-Net_URL/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:10:29 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $ DISTNAME= Net_URL-1.0.14 -PKGREVISION= 1 CATEGORIES+= net MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP classes to easy parsing of URLs +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 2a2f52ddcb1..5b133481f9a 100644 --- a/net/pear-SOAP/Makefile +++ b/net/pear-SOAP/Makefile @@ -1,16 +1,17 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:10:29 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $ DISTNAME= SOAP-0.8.1 -PKGREVISION= 1 CATEGORIES+= net MAINTAINER= jdolecek@NetBSD.org COMMENT= SOAP Client/Server for PHP -DEPENDS+= pear-Mail_Mime>=1.2:../../mail/pear-Mail_Mime -DEPENDS+= pear-HTTP_Request>=1.2:../../www/pear-HTTP_Request -DEPENDS+= pear-Net_URL>=1.0:../../net/pear-Net_URL -DEPENDS+= pear-Net_DIME>=0.3:../../net/pear-Net_DIME +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 +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_URL>=1.0:../../net/pear-Net_URL +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_DIME>=0.3:../../net/pear-Net_DIME PEAR_DIRRM_BASEDIR= yes diff --git a/net/php-ftp/Makefile b/net/php-ftp/Makefile index a43cecc7d4e..66320e99cc7 100644 --- a/net/php-ftp/Makefile +++ b/net/php-ftp/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:29 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $ MODNAME= ftp -PKGREVISION= 1 CATEGORIES+= net COMMENT= PHP extension for FTP access +CONFLICTS= php-ftp-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME} diff --git a/net/php-snmp/Makefile b/net/php-snmp/Makefile index 81aac8cc3b1..bef00964038 100644 --- a/net/php-snmp/Makefile +++ b/net/php-snmp/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:29 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $ MODNAME= snmp -PKGREVISION= 1 CATEGORIES+= net COMMENT= PHP extension for SNMP +CONFLICTS= php-snmp-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=${PREFIX} diff --git a/net/php-sockets/Makefile b/net/php-sockets/Makefile index 5c2d038abec..216d764d7da 100644 --- a/net/php-sockets/Makefile +++ b/net/php-sockets/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:29 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $ MODNAME= sockets -PKGREVISION= 1 CATEGORIES+= net COMMENT= PHP extension for sockets support +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 7c9863ebb34..4c2caf000b4 100644 --- a/net/php-xmlrpc/Makefile +++ b/net/php-xmlrpc/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:10:29 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:57 joerg Exp $ MODNAME= xmlrpc -PKGREVISION= 2 CATEGORIES+= net COMMENT= PHP extension for XML-RPC support +CONFLICTS= php-xmlrpc-[0-9] + HOMEPAGE= http://xmlrpc-epi.sourceforge.net/ CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} diff --git a/net/php-yp/Makefile b/net/php-yp/Makefile index ea72718dcbc..ad41ef5e198 100644 --- a/net/php-yp/Makefile +++ b/net/php-yp/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:29 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/06/02 18:27:57 joerg Exp $ MODNAME= yp -PKGREVISION= 1 CATEGORIES+= net COMMENT= PHP extension for YP domain support +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 # PHP4-only for now -PHP_VERSION_REQD= 4 +PHP_VERSIONS_ACCEPTED= 4 CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} diff --git a/net/php5-soap/Makefile b/net/php5-soap/Makefile index bb6d5a258fe..0d7bf3f1e73 100644 --- a/net/php5-soap/Makefile +++ b/net/php5-soap/Makefile @@ -1,17 +1,18 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:29 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:57 joerg Exp $ MODNAME= soap -PKGREVISION= 1 CATEGORIES+= net COMMENT= PHP5 extension for SOAP functions MAINTAINER= jdolecek@NetBSD.org +CONFLICTS= php-soap-[0-9] + +PHP_VERSIONS_ACCEPTED= 5 CONFIGURE_ARGS+= --enable-${MODNAME} CONFIGURE_ARGS+= --with-libxml-dir=${BUILDLINK_PREFIX.libxml2} -PHP_VERSION_REQD= 5 .include "../../lang/php/ext.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3