diff options
| author | joerg <joerg> | 2006-06-02 18:27:54 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-06-02 18:27:54 +0000 |
| commit | 29a4a9b873025f72c731c1522c3c786af4889c5a (patch) | |
| tree | b7f585bd5e2d200a0004ced04920ab0be7a7445a | |
| parent | 816b9641c9a345f2442481d3050397d1a046703f (diff) | |
| download | pkgsrc-29a4a9b873025f72c731c1522c3c786af4889c5a.tar.gz | |
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@.
143 files changed, 719 insertions, 584 deletions
diff --git a/archivers/php-bz2/Makefile b/archivers/php-bz2/Makefile index 86ef479fc2c..928395831c7 100644 --- a/archivers/php-bz2/Makefile +++ b/archivers/php-bz2/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:04 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:54 joerg Exp $ MODNAME= bz2 -PKGREVISION= 1 CATEGORIES= archivers COMMENT= PHP extension for bzip2 compression +CONFLICTS= php-bz2-[0-9] + USE_PHP_EXT_PATCHES= yes CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.bzip2} diff --git a/archivers/php-zip/Makefile b/archivers/php-zip/Makefile index 2bbfeb174ce..c5f06d6a705 100644 --- a/archivers/php-zip/Makefile +++ b/archivers/php-zip/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:04 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:54 joerg Exp $ MODNAME= zip PECL_VERSION= 1.0 -PKGREVISION= 2 CATEGORIES+= archivers COMMENT= PHP extension for ZIP archive handling +CONFLICTS= php-zip-[0-9] CONFIGURE_ARGS+= --with-zip=shared,${BUILDLINK_DIR} diff --git a/archivers/php-zlib/Makefile b/archivers/php-zlib/Makefile index e965be5d250..6a4cdc1189f 100644 --- a/archivers/php-zlib/Makefile +++ b/archivers/php-zlib/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:04 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/06/02 18:27:54 joerg Exp $ MODNAME= zlib -PKGREVISION= 1 CATEGORIES+= archivers COMMENT= PHP extension for zlib compression +CONFLICTS= php-zlib-[0-9] + CONFIGURE_ARGS+= --with-${MODNAME}-dir=${BUILDLINK_DIR} post-extract: diff --git a/converters/php-iconv/Makefile b/converters/php-iconv/Makefile index 27f406f4ccf..92e3c5eeff9 100644 --- a/converters/php-iconv/Makefile +++ b/converters/php-iconv/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:29 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/06/02 18:27:54 joerg Exp $ MODNAME= iconv -PKGREVISION= 1 CATEGORIES+= converters COMMENT= PHP extension for character set conversion +CONFLICTS= php-iconv-[0-9] .include "../../converters/libiconv/buildlink3.mk" diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile index 33897584a42..1d89be5d0b3 100644 --- a/databases/pear-DB/Makefile +++ b/databases/pear-DB/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:54 joerg Exp $ DISTNAME= DB-1.7.6 -PKGREVISION= 1 CATEGORIES= databases +CONFLICTS= php-pear-DB-[0-9] + MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://pear.php.net/package/DB COMMENT= PHP Database Abstraction Layer diff --git a/databases/php-dba/Makefile b/databases/php-dba/Makefile index 1b1e13458e7..ad11feef670 100644 --- a/databases/php-dba/Makefile +++ b/databases/php-dba/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:54 joerg Exp $ MODNAME= dba -PKGREVISION= 1 CATEGORIES+= databases COMMENT= PHP extension for DBM database access +CONFLICTS= php-dba-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared diff --git a/databases/php-dbase/Makefile b/databases/php-dbase/Makefile index 2c855d2c400..0c4b3e1304b 100644 --- a/databases/php-dbase/Makefile +++ b/databases/php-dbase/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:54 joerg Exp $ MODNAME= dbase -PKGREVISION= 1 CATEGORIES+= databases COMMENT= PHP extension for dBase database access +CONFLICTS= php-dbase-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=shared diff --git a/databases/php-dbx/Makefile b/databases/php-dbx/Makefile index a99bb2bc846..89a5fc8c6b4 100644 --- a/databases/php-dbx/Makefile +++ b/databases/php-dbx/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:54 joerg Exp $ MODNAME= dbx PECL_VERSION= 1.1.0 -PKGREVISION= 1 CATEGORIES+= databases COMMENT= PHP database abstraction layer extension MAINTAINER= jdolecek@NetBSD.org +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 055edc20ec5..aeb67e0d56c 100644 --- a/databases/php-filepro/Makefile +++ b/databases/php-filepro/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:54 joerg Exp $ MODNAME= filepro -PKGREVISION= 1 CATEGORIES+= databases COMMENT= PHP extension for read-only filePro database access +CONFLICTS= php-filepro-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=shared diff --git a/databases/php-ldap/Makefile b/databases/php-ldap/Makefile index d9a8cdaf778..cb8ab68feab 100644 --- a/databases/php-ldap/Makefile +++ b/databases/php-ldap/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.8 2006/05/31 18:22:23 ghen Exp $ +# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:54 joerg Exp $ MODNAME= ldap -PKGREVISION= 4 CATEGORIES+= databases COMMENT= PHP extension for LDAP database access +CONFLICTS= php-ldap-[0-9] + USE_PHP_EXT_PATCHES= yes CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.openldap-client} diff --git a/databases/php-mssql/Makefile b/databases/php-mssql/Makefile index 0b98b666b99..6465db28059 100644 --- a/databases/php-mssql/Makefile +++ b/databases/php-mssql/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:54 joerg Exp $ MODNAME= mssql CATEGORIES+= databases COMMENT= PHP extension for MS SQL databases -PKGREVISION= 2 + +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 32ad4e6ad47..b604e870e80 100644 --- a/databases/php-mysql/Makefile +++ b/databases/php-mysql/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.9 2006/05/13 00:47:36 minskim Exp $ +# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:55 joerg Exp $ MODNAME= mysql -PKGREVISION= 2 CATEGORIES+= databases COMMENT= PHP extension for MySQL databases MAINTAINER= pkgsrc-users@NetBSD.org +CONFLICTS= php-mysql-[0-9] + USE_PHP_EXT_PATCHES= yes EVAL_PREFIX+= MYSQLDIR=mysql-client diff --git a/databases/php-odbc/Makefile b/databases/php-odbc/Makefile index 7188215a535..329cf1bf1a0 100644 --- a/databases/php-odbc/Makefile +++ b/databases/php-odbc/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= odbc -PKGREVISION= 1 CATEGORIES+= databases COMMENT= PHP extension for ODBC access +CONFLICTS= php-odbc-[0-9] CONFIGURE_ARGS+= --with-unixODBC=shared,${BUILDLINK_PREFIX.unixodbc} diff --git a/databases/php-pdo/Makefile b/databases/php-pdo/Makefile index 928324331f4..e4877f22122 100644 --- a/databases/php-pdo/Makefile +++ b/databases/php-pdo/Makefile @@ -1,17 +1,16 @@ -# $NetBSD: Makefile,v 1.5 2006/05/03 06:37:36 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:55 joerg Exp $ PDO_DRIVER= # empty PDO_VERSION= 1.0.2 +PHP_VERSIONS_ACCEPTED= 5 + .include "../../databases/php-pdo/module.mk" COMMENT= PHP extension for PHP Data Objects (base) -PKGREVISION= 1 CONFIGURE_ARGS+= --with-${PKGMODNAME} -PHP_VERSION_REQD= 5 - PLIST_SRC+= ${.CURDIR}/../../databases/php-pdo/PLIST.pdo PDO_INCLUDES= php_pdo_driver.h php_pdo.h diff --git a/databases/php-pdo/buildlink3.mk b/databases/php-pdo/buildlink3.mk index 516d3fc7548..83beba72752 100644 --- a/databases/php-pdo/buildlink3.mk +++ b/databases/php-pdo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/05/01 13:52:55 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2006/06/02 18:27:55 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PHP_PDO_BUILDLINK3_MK:= ${PHP_PDO_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphp-pdo} BUILDLINK_PACKAGES+= php-pdo .if !empty(PHP_PDO_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.php-pdo+= php-pdo-5.* -BUILDLINK_ABI_DEPENDS.php-pdo?= php-pdo>=5.1.1.1.0.2nb1 +BUILDLINK_API_DEPENDS.php-pdo+= ${PHP_PKG_PREFIX}-pdo-5.* +BUILDLINK_ABI_DEPENDS.php-pdo?= ${PHP_PKG_PREFIX}-pdo>=5.1.1.1.0.2nb1 BUILDLINK_PKGSRCDIR.php-pdo?= ../../databases/php-pdo BUILDLINK_INCDIRS.php-pdo?= include/php/ext/pdo .endif # PHP_PDO_BUILDLINK3_MK diff --git a/databases/php-pdo/module.mk b/databases/php-pdo/module.mk index e1eb996c38a..aec56a6e844 100644 --- a/databases/php-pdo/module.mk +++ b/databases/php-pdo/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.6 2006/02/07 17:59:56 jdolecek Exp $ +# $NetBSD: module.mk,v 1.7 2006/06/02 18:27:55 joerg Exp $ # Items common for all PDO drivers @@ -12,7 +12,9 @@ PDO_DRIVER_TR= ${ECHO} ${PDO_DRIVER:Q} | ${TR} a-z A-Z MODNAME= PDO${_PDO_SEP}${PDO_DRIVER_TR:sh} PKGMODNAME= pdo${_PDO_SEP}${PDO_DRIVER} PECL_VERSION?= ${PDO_VERSION} -PKGNAME= php-${PKGMODNAME}-${PHP_BASE_VERS}.${PECL_VERSION} +PKGNAME= ${PHP_PKG_PREFIX}-${PKGMODNAME}-${PHP_BASE_VERS}.${PECL_VERSION} + +CONFLICTS= php-pdo${_PDO_SEP}${PDO_DRIVER}-[0-9]* CATEGORIES+= databases MAINTAINER= jdolecek@NetBSD.org @@ -20,3 +22,7 @@ COMMENT= PHP PDO extension for ${PDO_COMMENT} databases # needed due to (broken?) PDO_* configure checks CONFIGURE_ENV+= PHP_PDO_SHARED="1" + +PHP_VERSIONS_ACCEPTED= 5 + +.include "../../lang/php/phpversion.mk" diff --git a/databases/php-pdo_dblib/Makefile b/databases/php-pdo_dblib/Makefile index 6f6e6004c54..7ae3327000a 100644 --- a/databases/php-pdo_dblib/Makefile +++ b/databases/php-pdo_dblib/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2006/04/06 06:21:42 reed Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ PDO_DRIVER= dblib PDO_COMMENT= FreeTDS/Sybase/MS SQL PDO_VERSION= 1.0 -PKGREVISION= 2 .include "../../databases/php-pdo/module.mk" diff --git a/databases/php-pdo_mysql/Makefile b/databases/php-pdo_mysql/Makefile index 7943885f7be..b286f620fe5 100644 --- a/databases/php-pdo_mysql/Makefile +++ b/databases/php-pdo_mysql/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:55 joerg Exp $ PDO_DRIVER= mysql PDO_COMMENT= MySQL PDO_VERSION= 1.0.1 -PKGREVISION= 2 - .include "../../databases/php-pdo/module.mk" CONFIGURE_ARGS+= --with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.mysql-client} diff --git a/databases/php-pdo_odbc/Makefile b/databases/php-pdo_odbc/Makefile index 134f16e0a2b..84788286075 100644 --- a/databases/php-pdo_odbc/Makefile +++ b/databases/php-pdo_odbc/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:55 joerg Exp $ PDO_DRIVER= odbc PDO_COMMENT= ODBC PDO_VERSION= 1.0 -PKGREVISION= 1 .include "../../databases/php-pdo/module.mk" diff --git a/databases/php-pdo_pgsql/Makefile b/databases/php-pdo_pgsql/Makefile index adb0413e4af..e742eaaab1e 100644 --- a/databases/php-pdo_pgsql/Makefile +++ b/databases/php-pdo_pgsql/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:55 joerg Exp $ PDO_DRIVER= pgsql PDO_COMMENT= PostgreSQL PDO_VERSION= 1.0.1 -PKGREVISION= 1 .include "../../databases/php-pdo/module.mk" diff --git a/databases/php-pdo_sqlite/Makefile b/databases/php-pdo_sqlite/Makefile index db3a944b636..85dd037f850 100644 --- a/databases/php-pdo_sqlite/Makefile +++ b/databases/php-pdo_sqlite/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:55 joerg Exp $ PDO_DRIVER= sqlite PDO_COMMENT= SQLite v3 PDO_VERSION= 1.0 -PKGREVISION= 1 .include "../../databases/php-pdo/module.mk" diff --git a/databases/php-pgsql/Makefile b/databases/php-pgsql/Makefile index 8f3adbbbb6f..d12cc231149 100644 --- a/databases/php-pgsql/Makefile +++ b/databases/php-pgsql/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:34 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= pgsql -PKGREVISION= 1 CATEGORIES+= databases COMMENT= PHP extension for PostgreSQL databases +CONFLICTS= php-pgsql-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=shared,${PGSQL_PREFIX} diff --git a/databases/php-sqlite/Makefile b/databases/php-sqlite/Makefile index a12c7f8e0b7..f2fc39f3f52 100644 --- a/databases/php-sqlite/Makefile +++ b/databases/php-sqlite/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:10 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= SQLite PKGMODNAME= sqlite -PKGNAME= php-${PKGMODNAME}-${PHP_BASE_VERS}.${PECL_VERSION} -PKGREVISION= 4 +PKGNAME= ${PHP_PKG_PREFIX}-${PKGMODNAME}-${PHP_BASE_VERS}.${PECL_VERSION} PECL_VERSION= 1.0.3 CATEGORIES+= databases MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= PHP extension for SQLite 2.x databases +CONFLICTS= php-sqlite-[0-9]* + CONFIGURE_ARGS+= --with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.sqlite} .include "../../lang/php/ext.mk" diff --git a/databases/php5-mysqli/Makefile b/databases/php5-mysqli/Makefile index 7c92567c207..e5219db1e7f 100644 --- a/databases/php5-mysqli/Makefile +++ b/databases/php5-mysqli/Makefile @@ -1,17 +1,18 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:34 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:55 joerg Exp $ MODNAME= mysqli -PKGREVISION= 2 CATEGORIES+= databases COMMENT= PHP5 extension for MySQL 4.1 and later databases MAINTAINER= jdolecek@NetBSD.org +CONFLICTS= php-mysqli-[0-9] + +PHP_VERSIONS_ACCEPTED= 5 EVAL_PREFIX+= MYSQLDIR=mysql-client CONFIGURE_ARGS+= --with-${MODNAME}=${PREFIX}/bin/mysql_config -PHP_VERSION_REQD= 5 .include "../../lang/php/ext.mk" .include "../../mk/mysql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile index 993b15579c5..b0b178bbadb 100644 --- a/databases/phpldapadmin/Makefile +++ b/databases/phpldapadmin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2006/05/28 18:18:44 adrianp Exp $ +# $NetBSD: Makefile,v 1.23 2006/06/02 18:27:55 joerg Exp $ DISTNAME= phpldapadmin-${VERSION} CATEGORIES= databases www -PKGREVISION= 2 +PKGREVISION= 3 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpldapadmin/} MAINTAINER= rasputnik@hellooperator.net @@ -12,12 +12,12 @@ COMMENT= Set of PHP-scripts to administer an LDAP directory over the WWW .include "../../mk/bsd.prefs.mk" .include "../../lang/php/phpversion.mk" -DEPENDS+= php-ldap>=4.1.2:../../databases/php-ldap -DEPENDS+= php-gettext>=4.1.2:../../devel/php-gettext +DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=4.1.2:../../databases/php-ldap +DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=4.1.2:../../devel/php-gettext .if ${PKG_PHP_VERSION} == "4" -DEPENDS+= php-domxml>=4.1.2:../../textproc/php4-domxml +DEPENDS+= ${PHP_PKG_PREFIX}-domxml>=4.1.2:../../textproc/php4-domxml .elif ${PKG_PHP_VERSION} == "5" -DEPENDS+= php-dom-[0-9]*:../../textproc/php5-dom +DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom .endif VERSION= 0.9.8.3 diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index dede9e61823..e00a15fbd1f 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.49 2006/05/13 09:56:36 tron Exp $ +# $NetBSD: Makefile,v 1.50 2006/06/02 18:27:55 joerg Exp $ DISTNAME= phpMyAdmin-${DIST_VERSION} PKGNAME= phpmyadmin-${DIST_VERSION:S/-//} +PKGREVISION= 1 CATEGORIES= databases www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/} EXTRACT_SUFX= .tar.bz2 @@ -10,8 +11,8 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.phpmyadmin.net/ COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW -DEPENDS+= php-mbstring>=4.3.3:../../misc/php-mbstring -DEPENDS+= php-mysql{,i}>=4.3.3:../../databases/php-mysql +DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring +DEPENDS+= ${PHP_PKG_PREFIX}-mysql{,i}>=4.3.3:../../databases/php-mysql PLIST_SUBST+= CP=${CP:Q} DIST_VERSION=${DIST_VERSION:Q} \ PMCONFFILE=${PMCONFFILE:Q} TEST=${TEST:Q} @@ -83,4 +84,5 @@ do-install: ${RM} -f ${PREFIX}/share/phpmyadmin/libraries/footer.inc.php.orig +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile index d1795963610..a8e916f6b7f 100644 --- a/databases/phppgadmin/Makefile +++ b/databases/phppgadmin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:34 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/06/02 18:27:55 joerg Exp $ DISTNAME= phpPgAdmin-3.5.5 PKGNAME= ${DISTNAME:S/PgAdmin/pgadmin/} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= databases www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phppgadmin/} EXTRACT_SUFX= .tar.bz2 @@ -11,7 +11,7 @@ MAINTAINER= jdolecek@NetBSD.org HOMEPAGE= http://phppgadmin.sourceforge.net/ COMMENT= Set of PHP-scripts to administer PostgreSQL over the WWW -DEPENDS+= php-pgsql>=4.2.0:../../databases/php-pgsql +DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=4.2.0:../../databases/php-pgsql MESSAGE_SUBST+= EGDIR=${EGDIR} @@ -80,4 +80,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCDIR}; \ done +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/mantis/Makefile b/devel/mantis/Makefile index 3778fe21537..b3f21e0ba23 100644 --- a/devel/mantis/Makefile +++ b/devel/mantis/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2006/05/28 15:17:47 adrianp Exp $ +# $NetBSD: Makefile,v 1.22 2006/06/02 18:27:55 joerg Exp $ DISTNAME= mantis-1.0.3 +PKGREVISION= 1 CATEGORIES= devel www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mantisbt/} @@ -8,8 +9,8 @@ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://www.mantisdb.org/ COMMENT= PHP/MySQL/web based bugtracking system -DEPENDS+= ap-php>=4.0.6:../../www/ap-php -DEPENDS+= php-mysql>=4.0.6:../../databases/php-mysql +DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.6:../../www/ap-php +DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.0.6:../../databases/php-mysql NO_BUILD= YES @@ -21,7 +22,7 @@ PKG_SUPPORTED_OPTIONS= charts .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mcharts) -DEPENDS+= php-jpgraph-[0-9]*:../../graphics/php-jpgraph +DEPENDS+= ${PHP_PKG_PREFIX}-jpgraph-[0-9]*:../../graphics/php-jpgraph .endif APACHE_USER?= www diff --git a/devel/php-gettext/Makefile b/devel/php-gettext/Makefile index e1753bbd747..000d748071e 100644 --- a/devel/php-gettext/Makefile +++ b/devel/php-gettext/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= gettext -PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for gettext support +CONFLICTS= php-gettext-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.gettext} diff --git a/devel/php-gmp/Makefile b/devel/php-gmp/Makefile index 1c2aa1493db..549d5cf3a7b 100644 --- a/devel/php-gmp/Makefile +++ b/devel/php-gmp/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= gmp -PKGREVISION= 1 CATEGORIES+= devel math COMMENT= PHP extension for arbitrary precision math +CONFLICTS= php-gmp-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.gmp} diff --git a/devel/php-memcache/Makefile b/devel/php-memcache/Makefile index 3b33a4cd099..6333d487527 100644 --- a/devel/php-memcache/Makefile +++ b/devel/php-memcache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/04/20 11:30:47 grant Exp $ +# $NetBSD: Makefile,v 1.2 2006/06/02 18:27:55 joerg Exp $ # MODNAME= memcache @@ -6,6 +6,8 @@ PECL_VERSION= 2.0.1 CATEGORIES+= devel COMMENT= PHP extension for memcached +CONFLICTS= php-memcache-[0-9] + CONFIGURE_ARGS+= --enable-${MODNAME} WRKSRC= ${WRKDIR}/${MODNAME}-${PECL_VERSION} diff --git a/devel/php-pcntl/Makefile b/devel/php-pcntl/Makefile index 6d6c7ec8ef2..7edd0bb4107 100644 --- a/devel/php-pcntl/Makefile +++ b/devel/php-pcntl/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:55 joerg Exp $ MODNAME= pcntl PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for Process Control functions +CONFLICTS= php-pcntl-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared diff --git a/devel/php-posix/Makefile b/devel/php-posix/Makefile index 7630264bfb7..05c6bcfadf4 100644 --- a/devel/php-posix/Makefile +++ b/devel/php-posix/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= posix -PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for POSIX-like functions +CONFLICTS= php-posix-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared diff --git a/devel/php-shmop/Makefile b/devel/php-shmop/Makefile index 44ec706ab53..869c7da6f6b 100644 --- a/devel/php-shmop/Makefile +++ b/devel/php-shmop/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= shmop -PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for simple SysV shared memory operations +CONFLICTS= php-shmop-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} diff --git a/devel/php-sysvsem/Makefile b/devel/php-sysvsem/Makefile index 2fd1e56d596..6742877edf5 100644 --- a/devel/php-sysvsem/Makefile +++ b/devel/php-sysvsem/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= sysvsem -PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for SysV semaphore support +CONFLICTS= php-sysvsem-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} diff --git a/devel/php-sysvshm/Makefile b/devel/php-sysvshm/Makefile index b0fe256b32b..0470d4af3da 100644 --- a/devel/php-sysvshm/Makefile +++ b/devel/php-sysvshm/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:56 joerg Exp $ MODNAME= sysvshm -PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for SysV shared memory support +CONFLICTS= php-sysvshm-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile index 47aa5af8e6b..b509454cab6 100644 --- a/graphics/pear-Image_Canvas/Makefile +++ b/graphics/pear-Image_Canvas/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:37 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $ DISTNAME= Image_Canvas-0.2.4 -PKGREVISION= 1 CATEGORIES= graphics MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://pear.php.net/package/Image_Color/ COMMENT= Common interface to image drawing, making image source code -DEPENDS+= pear-Image_Color>=1.0.0:../../graphics/pear-Image_Color +CONFLICTS= php-pear-Image_Canvas-[0-9] + +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Image_Color>=1.0.0:../../graphics/pear-Image_Color .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/pear-Image_Color/Makefile b/graphics/pear-Image_Color/Makefile index fcc00d83b4c..3fdb56beb1b 100644 --- a/graphics/pear-Image_Color/Makefile +++ b/graphics/pear-Image_Color/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:37 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $ DISTNAME= Image_Color-1.0.2 -PKGREVISION= 1 CATEGORIES= graphics MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://pear.php.net/package/Image_Color/ COMMENT= Manage and handles color data and conversions -DEPENDS+= php-gd-[0-9]*:../../graphics/php-gd +CONFLICTS= php-pear-Image_Color-[0-9] + +DEPENDS+= ${PHP_PKG_PREFIX}-gd-[0-9]*:../../graphics/php-gd .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/pear-Image_Graph/Makefile b/graphics/pear-Image_Graph/Makefile index b78bca29a24..6fd89ef8816 100644 --- a/graphics/pear-Image_Graph/Makefile +++ b/graphics/pear-Image_Graph/Makefile @@ -1,16 +1,17 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:37 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $ DISTNAME= Image_Graph-0.3.0dev4 -PKGREVISION= 1 CATEGORIES= graphics MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://pear.php.net/package/Image_Graph/ COMMENT= Package for displaying (numerical) data as a graph/chart/plot -DEPENDS+= pear-Image_Canvas>=0.2.1:../../graphics/pear-Image_Canvas -DEPENDS+= pear-Numbers_Roman-[0-9]*:../../math/pear-Numbers_Roman -DEPENDS+= pear-Numbers_Words-[0-9]*:../../math/pear-Numbers_Words +CONFLICTS= php-pear-Image_Graph-[0-9] + +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Image_Canvas>=0.2.1:../../graphics/pear-Image_Canvas +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Numbers_Roman-[0-9]*:../../math/pear-Numbers_Roman +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Numbers_Words-[0-9]*:../../math/pear-Numbers_Words .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile index 0966938a356..1558c111bbe 100644 --- a/graphics/php-gd/Makefile +++ b/graphics/php-gd/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:34 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/06/02 18:27:56 joerg Exp $ MODNAME= gd -PKGREVISION= 2 CATEGORIES+= graphics COMMENT= PHP extension for GD graphics library +CONFLICTS= php-gd-[0-9] # XXX we use bundled GD so that extension is usable also by non-threaded # PHP, such as CLI/CGI version or ap-php on Apache 1.x. diff --git a/graphics/php-jpgraph/Makefile b/graphics/php-jpgraph/Makefile index 7c5ef9852e6..220ff1e9b72 100644 --- a/graphics/php-jpgraph/Makefile +++ b/graphics/php-jpgraph/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2006/04/13 01:30:43 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2006/06/02 18:27:56 joerg Exp $ DISTNAME= jpgraph-1.18 -PKGNAME= php-${DISTNAME} -PKGREVISION= 2 +PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME} CATEGORIES= graphics www MASTER_SITES= http://members.chello.se/jpgraph/jpgdownloads/ @@ -10,7 +9,9 @@ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://www.aditus.nu/jpgraph/index.php COMMENT= Object Oriented class library for PHP -DEPENDS+= php-gd>=4.3.1:../../graphics/php-gd +CONFLICTS= php-jgraph-[0-9] + +DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.1:../../graphics/php-gd NO_CONFIGURE= YES NO_BUILD= YES @@ -52,4 +53,5 @@ do-install: ${FIND} ${PREFIX}/share/doc/php-jpgraph/html -type d | ${XARGS} \ ${CHMOD} ${PKGDIRMODE} +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/php/ext.mk b/lang/php/ext.mk index 835ba4868b1..eb2555df87f 100644 --- a/lang/php/ext.mk +++ b/lang/php/ext.mk @@ -1,4 +1,4 @@ -# $NetBSD: ext.mk,v 1.14 2006/06/01 17:44:21 jlam Exp $ +# $NetBSD: ext.mk,v 1.15 2006/06/02 18:27:56 joerg Exp $ # # PHP extension package framework, for both PECL and bundled PHP extensions. # @@ -23,13 +23,13 @@ PLIST_SUBST+= MODNAME=${PKGMODNAME} .if !defined(PECL_VERSION) # bundled extension -PKGNAME?= php-${MODNAME}-${PHP_BASE_VERS} +PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PHP_BASE_VERS} EXTRACT_ELEMENTS?= ${DISTNAME}/ext/${PKGMODNAME} WRKSRC?= ${WRKDIR}/${EXTRACT_ELEMENTS} DISTINFO_FILE= ${.CURDIR}/${PHPPKGSRCDIR}/distinfo .else # PECL extension -PKGNAME?= php-${MODNAME}-${PHP_BASE_VERS}.${PECL_VERSION} +PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PHP_BASE_VERS}.${PECL_VERSION} MASTER_SITES?= http://pecl.php.net/get/ PECL_DISTNAME?= ${MODNAME}-${PECL_VERSION} DISTNAME= ${PECL_DISTNAME} diff --git a/lang/php/pear.mk b/lang/php/pear.mk index a9dc9d5532e..1a6c36ef9c0 100644 --- a/lang/php/pear.mk +++ b/lang/php/pear.mk @@ -1,4 +1,4 @@ -# $NetBSD: pear.mk,v 1.8 2005/09/28 21:46:24 rillig Exp $ +# $NetBSD: pear.mk,v 1.9 2006/06/02 18:27:56 joerg Exp $ # # This Makefile fragment is intended to be included by packages that build # and install pear packages. @@ -18,7 +18,7 @@ _PEAR_PACKAGE_MK= # defined EXTRACT_SUFX= .tgz -PKGNAME= pear-${DISTNAME} +PKGNAME= ${PHP_PKG_PREFIX}-pear-${DISTNAME} CATEGORIES+= www MASTER_SITE_PEAR_PACKAGE+= \ diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index 101a148d738..596eef551df 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.4 2006/05/09 10:06:34 tron Exp $ +# $NetBSD: phpversion.mk,v 1.5 2006/06/02 18:27:56 joerg Exp $ # PHP wrapper, for module builds .if !defined(PHPVERSION_MK) @@ -71,9 +71,11 @@ PHP_VERSION_REQD:= ${PKG_PHP_VERSION} # set variables for the version we decided to use: # .if ${_PHP_VERSION} == "4" -PHPPKGSRCDIR= ../../www/php4 +PHPPKGSRCDIR= ../../www/php4 +PHP_PKG_PREFIX= php4 .elif ${_PHP_VERSION} == "5" -PHPPKGSRCDIR= ../../lang/php5 +PHPPKGSRCDIR= ../../lang/php5 +PHP_PKG_PREFIX= php5 .else # force an error PKG_SKIP_REASON+= "${PKG_PHP} is not a valid package" diff --git a/mail/imp/Makefile b/mail/imp/Makefile index 510e1451109..2abfc35403e 100644 --- a/mail/imp/Makefile +++ b/mail/imp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2006/02/05 23:09:55 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2006/06/02 18:27:56 joerg Exp $ DISTNAME= imp-3.2.8 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= mail www MASTER_SITES= ftp://ftp.horde.org/pub/imp/tarballs/ @@ -12,8 +12,8 @@ COMMENT= Internet Messaging Program CONFLICTS+= imp-4.* DEPENDS+= horde>=2.2.4:../../www/horde -DEPENDS+= php-imap>4.0.0:../../mail/php-imap -DEPENDS+= pear-Mail-[0-9]*:../../mail/pear-Mail +DEPENDS+= ${PHP_PKG_PREFIX}-imap>4.0.0:../../mail/php-imap +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail-[0-9]*:../../mail/pear-Mail DOCDIR= ${PREFIX}/share/doc/imp EGDIR= ${PREFIX}/share/examples/imp @@ -71,4 +71,5 @@ do-install: ${FIND} ${IMPDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} ${FIND} ${IMPDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/imp4/Makefile b/mail/imp4/Makefile index 9eb7925f9f4..4662e23e141 100644 --- a/mail/imp4/Makefile +++ b/mail/imp4/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.20 2006/04/29 09:23:19 adrianp Exp $ +# $NetBSD: Makefile,v 1.21 2006/06/02 18:27:56 joerg Exp $ DISTNAME= imp-h3-${IMPVER} PKGNAME= imp-${IMPVER} +PKGREVISION= 1 CATEGORIES= mail www MASTER_SITES= http://ftp.horde.org/pub/imp/ \ - ftp://ftp.horde.org/pub/imp/ + ftp://ftp.horde.org/pub/imp/ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://www.horde.org/imp/ @@ -13,8 +14,8 @@ COMMENT= Internet Messaging Program CONFLICTS+= imp-3.* DEPENDS+= horde>=3.0.2:../../www/horde3 -DEPENDS+= php-imap>4.3.3:../../mail/php-imap -DEPENDS+= pear-Mail-[0-9]*:../../mail/pear-Mail +DEPENDS+= ${PHP_PKG_PREFIX}-imap>4.3.3:../../mail/php-imap +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail-[0-9]*:../../mail/pear-Mail .include "../../mk/bsd.prefs.mk" @@ -97,4 +98,5 @@ do-install: @${CHOWN} ${APACHE_USER}:${ROOT_GROUP} ${IMPDIR}/config @${CHMOD} 0750 ${IMPDIR}/config +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile index 5d0a00a6fe0..def6bb1ed9f 100644 --- a/mail/ingo/Makefile +++ b/mail/ingo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/05/12 20:52:03 adrianp Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:56 joerg Exp $ DISTNAME= ingo-h3-${INGOVER} PKGNAME= ingo-${INGOVER} @@ -81,4 +81,5 @@ do-install: @${CHOWN} ${APACHE_USER}:${SHAREGRP} ${INGODIR}/config @${CHMOD} 0750 ${INGODIR}/config +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/ingo/options.mk b/mail/ingo/options.mk index f96981bc76b..4e2d4c893d7 100644 --- a/mail/ingo/options.mk +++ b/mail/ingo/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1.1.1 2006/03/31 22:06:34 adrianp Exp $ +# $NetBSD: options.mk,v 1.2 2006/06/02 18:27:56 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ingo PKG_SUPPORTED_OPTIONS= sieve imap @@ -9,12 +9,12 @@ PKG_SUPPORTED_OPTIONS= sieve imap ### Bring in support for the sieve filtering language ### .if !empty(PKG_OPTIONS:Msieve) -DEPENDS+= pear-Net_Sieve>=1.0.0:../../net/pear-Net_Sieve +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_Sieve>=1.0.0:../../net/pear-Net_Sieve .endif ### ### Bring in support for an IMAP server ### .if !empty(PKG_OPTIONS:Mimap) -DEPENDS+= php-imap>4.3.3:../../mail/php-imap +DEPENDS+= ${PHP_PKG_PREFIX}-imap>4.3.3:../../mail/php-imap .endif diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile index c85453d5b72..1edd25d23a7 100644 --- a/mail/ja-squirrelmail/Makefile +++ b/mail/ja-squirrelmail/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2006/05/05 05:32:36 martti Exp $ +# $NetBSD: Makefile,v 1.29 2006/06/02 18:27:56 joerg Exp $ DISTNAME= squirrelmail-1.4.6 PKGNAME= ja-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/} EXTRACT_SUFX= .tar.bz2 @@ -19,8 +19,8 @@ CONFLICTS= sq-attachment-handlers-[0-9]* CONFLICTS+= sq-squirrelspell-[0-9]* CONFLICTS+= squirrelmail-[0-9]* -DEPENDS+= php-gettext>=4.3.3:../../devel/php-gettext -DEPENDS+= php-mbstring>=4.3.3:../../misc/php-mbstring +DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext +DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring USE_LANGUAGES= # empty NO_BUILD= yes @@ -82,4 +82,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/ ${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/ +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile index 4953adac303..4a687480223 100644 --- a/mail/pear-Mail/Makefile +++ b/mail/pear-Mail/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:57 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $ DISTNAME= Mail-1.1.4 -PKGREVISION= 1 CATEGORIES= mail -DEPENDS+= pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP +CONFLICTS= php-pear-Mail-[0-9] + +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://pear.php.net/package/Mail diff --git a/mail/pear-Mail_Mime/Makefile b/mail/pear-Mail_Mime/Makefile index 592f950685d..48a7c887dbf 100644 --- a/mail/pear-Mail_Mime/Makefile +++ b/mail/pear-Mail_Mime/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:09:57 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:56 joerg Exp $ DISTNAME= Mail_Mime-1.2.1 -PKGREVISION= 1 CATEGORIES+= mail MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP classes to create and decode mime messages +CONFLICTS= php-pear-Mail_Mime-[0-9] + .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/php-imap/Makefile b/mail/php-imap/Makefile index e343a83258e..1bc49364a03 100644 --- a/mail/php-imap/Makefile +++ b/mail/php-imap/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:57 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:56 joerg Exp $ MODNAME= imap -PKGREVISION= 1 CATEGORIES+= mail COMMENT= PHP extension for IMAP (Internet Mailbox Access Protocol) +CONFLICTS= php-imap-[0-9] + USE_PHP_EXT_PATCHES= yes CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.imap-uw} diff --git a/mail/squirrelmail-decode/Makefile b/mail/squirrelmail-decode/Makefile index 65c46a9940b..dfde29f5e6f 100644 --- a/mail/squirrelmail-decode/Makefile +++ b/mail/squirrelmail-decode/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2006/03/02 07:41:44 martti Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:56 joerg Exp $ DISTNAME= squirrelmail-decode-1.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/} EXTRACT_SUFX= .tar.bz2 @@ -12,11 +12,12 @@ COMMENT= Extra decoding library for SquirrelMail NO_BUILD= yes -DEPENDS+= php-iconv>=4.3.3:../../converters/php-iconv +DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=4.3.3:../../converters/php-iconv do-install: ${INSTALL_DATA} ${WRKSRC:Q}/eastasia/*.php ${WRKSRC:Q}/x-mac/*.php \ ${PREFIX:Q}/share/squirrelmail/functions/decode +.include "../../lang/php/phpversion.mk" .include "../../mail/squirrelmail/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index c16849df16f..49836355e42 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.71 2006/04/11 05:24:20 martti Exp $ +# $NetBSD: Makefile,v 1.72 2006/06/02 18:27:56 joerg Exp $ DISTNAME= squirrelmail-1.4.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/} EXTRACT_SUFX= .tar.bz2 @@ -15,7 +15,7 @@ CONFLICTS+= sq-squirrelspell-[0-9]* CONFLICTS+= ja-squirrelspell-[0-9]* CONFLICTS+= ja-squirrelmail-[0-9]* -DEPENDS+= php-gettext>=4.3.3:../../devel/php-gettext +DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext USE_LANGUAGES= # empty NO_BUILD= yes @@ -77,4 +77,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/ ${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/ +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/turba/Makefile b/mail/turba/Makefile index 98728d95cfc..030ed8a01d1 100644 --- a/mail/turba/Makefile +++ b/mail/turba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/05/12 21:12:28 adrianp Exp $ +# $NetBSD: Makefile,v 1.17 2006/06/02 18:27:56 joerg Exp $ DISTNAME= turba-h3-${TURBAVER} PKGNAME= turba-${TURBAVER} @@ -86,4 +86,5 @@ do-install: @${CHOWN} ${APACHE_USER}:${SHAREGRP} ${TURBADIR}/config @${CHMOD} 0750 ${TURBADIR}/config +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/turba/options.mk b/mail/turba/options.mk index d618651cc1d..27f39d1266c 100644 --- a/mail/turba/options.mk +++ b/mail/turba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $ +# $NetBSD: options.mk,v 1.3 2006/06/02 18:27:56 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.turba PKG_SUPPORTED_OPTIONS= ldap mysql @@ -10,12 +10,12 @@ PKG_SUGGESTED_OPTIONS= ldap ### Use OpenLDAP for storing data ### .if !empty(PKG_OPTIONS:Mldap) -DEPENDS+= php-ldap>=4.3.3:../../databases/php-ldap +DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=4.3.3:../../databases/php-ldap .endif ### ### Use MySQL for storing data ### .if !empty(PKG_OPTIONS:Mmysql) -DEPENDS+= php-mysql>=4.3.3:../../databases/php-mysql +DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql .endif diff --git a/math/pear-Numbers_Roman/Makefile b/math/pear-Numbers_Roman/Makefile index 41d69c8f223..1c936f53474 100644 --- a/math/pear-Numbers_Roman/Makefile +++ b/math/pear-Numbers_Roman/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:03 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $ DISTNAME= Numbers_Roman-0.2.0 -PKGREVISION= 1 CATEGORIES= math MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://pear.php.net/package/Numbers_Roman/ COMMENT= Provides methods for converting to and from Roman Numerals +CONFLICTS= php-pear-Numbers_Roman-[0-9] + .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/pear-Numbers_Words/Makefile b/math/pear-Numbers_Words/Makefile index 9c0f9255df5..e86db668632 100644 --- a/math/pear-Numbers_Words/Makefile +++ b/math/pear-Numbers_Words/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:03 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:56 joerg Exp $ DISTNAME= Numbers_Words-0.14.0 -PKGREVISION= 1 CATEGORIES= math MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://pear.php.net/package/Numbers_Words/ COMMENT= Provides methods for spelling numerals in words +CONFLICTS= php-pear-Numbers_Words-[0-9] + .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/php-bcmath/Makefile b/math/php-bcmath/Makefile index c15624ab2d8..3dfb757bfcf 100644 --- a/math/php-bcmath/Makefile +++ b/math/php-bcmath/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.4 2006/02/05 23:10:03 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:56 joerg Exp $ MODNAME= bcmath -PKGREVISION= 1 CATEGORIES+= math COMMENT= PHP extension for bc-style arbitrary precision math +CONFLICTS= php-bcmath-[0-9] + CONFIGURE_ARGS+= --enable-${MODNAME} .include "../../lang/php/ext.mk" diff --git a/meta-pkgs/php4-extensions/Makefile b/meta-pkgs/php4-extensions/Makefile index f912a910e77..8332b96ce1c 100644 --- a/meta-pkgs/php4-extensions/Makefile +++ b/meta-pkgs/php4-extensions/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2006/02/05 23:10:06 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/06/02 18:27:57 joerg Exp $ DISTNAME= php-extensions-4.4 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= meta-pkgs www php4 MASTER_SITES= # empty DISTFILES= # empty @@ -12,52 +12,52 @@ COMMENT= "meta-package" for the PHP4 HTML-embedded scripting language # base PHP 4.x package DEPENDS+= php-4.4.*:../../www/php4 -DEPENDS+= ap-php-4.4.*:../../www/ap-php +DEPENDS+= ${APACHE_PKG_PREFIX}-php4-4.4.*:../../www/ap-php # extensions buildable with both PHP 4.x and PHP 5.x -DEPENDS+= php-bcmath-4.4.*:../../math/php-bcmath -DEPENDS+= php-bz2-4.4.*:../../archivers/php-bz2 -DEPENDS+= php-calendar-4.4.*:../../misc/php-calendar -DEPENDS+= php-curl-4.4.*:../../www/php-curl -DEPENDS+= php-dba-4.4.*:../../databases/php-dba -DEPENDS+= php-dbase-4.4.*:../../databases/php-dbase -DEPENDS+= php-dbx-4.4.*:../../databases/php-dbx -DEPENDS+= php-eaccelerator-4.4.*:../../www/php-eaccelerator -DEPENDS+= php-exif-4.4.*:../../graphics/php-exif -DEPENDS+= php-filepro-4.4.*:../../databases/php-filepro -DEPENDS+= php-ftp-4.4.*:../../net/php-ftp -DEPENDS+= php-gd-4.4.*:../../graphics/php-gd -DEPENDS+= php-gettext-4.4.*:../../devel/php-gettext -DEPENDS+= php-gmp-4.4.*:../../devel/php-gmp -DEPENDS+= php-iconv-4.4.*:../../converters/php-iconv -DEPENDS+= php-imap-4.4.*:../../mail/php-imap -DEPENDS+= php-ldap-4.4.*:../../databases/php-ldap -DEPENDS+= php-mbstring-4.4.*:../../misc/php-mbstring -DEPENDS+= php-mcrypt-4.4.*:../../security/php-mcrypt -DEPENDS+= php-mhash-4.4.*:../../security/php-mhash -DEPENDS+= php-mssql-4.4.*:../../databases/php-mssql -DEPENDS+= php-mysql-4.4.*:../../databases/php-mysql -DEPENDS+= php-odbc-4.4.*:../../databases/php-odbc -DEPENDS+= php-pcntl-4.4.*:../../devel/php-pcntl -DEPENDS+= php-pdflib-4.4.*:../../print/php-pdflib -DEPENDS+= php-pgsql-4.4.*:../../databases/php-pgsql -DEPENDS+= php-posix-4.4.*:../../devel/php-posix -DEPENDS+= php-shmop-4.4.*:../../devel/php-shmop -DEPENDS+= php-snmp-4.4.*:../../net/php-snmp -DEPENDS+= php-sockets-4.4.*:../../net/php-sockets -DEPENDS+= php-sqlite-4.4.*:../../databases/php-sqlite -DEPENDS+= php-sysvsem-4.4.*:../../devel/php-sysvsem -DEPENDS+= php-sysvshm-4.4.*:../../devel/php-sysvshm -DEPENDS+= php-wddx-4.4.*:../../textproc/php-wddx -DEPENDS+= php-xmlrpc-4.4.*:../../net/php-xmlrpc -DEPENDS+= php-yp-4.4.*:../../net/php-yp -DEPENDS+= php-zip-4.4.*:../../archivers/php-zip -DEPENDS+= php-zlib-4.4.*:../../archivers/php-zlib +DEPENDS+= php4-bcmath-4.4.*:../../math/php-bcmath +DEPENDS+= php4-bz2-4.4.*:../../archivers/php-bz2 +DEPENDS+= php4-calendar-4.4.*:../../misc/php-calendar +DEPENDS+= php4-curl-4.4.*:../../www/php-curl +DEPENDS+= php4-dba-4.4.*:../../databases/php-dba +DEPENDS+= php4-dbase-4.4.*:../../databases/php-dbase +DEPENDS+= php4-dbx-4.4.*:../../databases/php-dbx +DEPENDS+= php4-eaccelerator-4.4.*:../../www/php-eaccelerator +DEPENDS+= php4-exif-4.4.*:../../graphics/php-exif +DEPENDS+= php4-filepro-4.4.*:../../databases/php-filepro +DEPENDS+= php4-ftp-4.4.*:../../net/php-ftp +DEPENDS+= php4-gd-4.4.*:../../graphics/php-gd +DEPENDS+= php4-gettext-4.4.*:../../devel/php-gettext +DEPENDS+= php4-gmp-4.4.*:../../devel/php-gmp +DEPENDS+= php4-iconv-4.4.*:../../converters/php-iconv +DEPENDS+= php4-imap-4.4.*:../../mail/php-imap +DEPENDS+= php4-ldap-4.4.*:../../databases/php-ldap +DEPENDS+= php4-mbstring-4.4.*:../../misc/php-mbstring +DEPENDS+= php4-mcrypt-4.4.*:../../security/php-mcrypt +DEPENDS+= php4-mhash-4.4.*:../../security/php-mhash +DEPENDS+= php4-mssql-4.4.*:../../databases/php-mssql +DEPENDS+= php4-mysql-4.4.*:../../databases/php-mysql +DEPENDS+= php4-odbc-4.4.*:../../databases/php-odbc +DEPENDS+= php4-pcntl-4.4.*:../../devel/php-pcntl +DEPENDS+= php4-pdflib-4.4.*:../../print/php-pdflib +DEPENDS+= php4-pgsql-4.4.*:../../databases/php-pgsql +DEPENDS+= php4-posix-4.4.*:../../devel/php-posix +DEPENDS+= php4-shmop-4.4.*:../../devel/php-shmop +DEPENDS+= php4-snmp-4.4.*:../../net/php-snmp +DEPENDS+= php4-sockets-4.4.*:../../net/php-sockets +DEPENDS+= php4-sqlite-4.4.*:../../databases/php-sqlite +DEPENDS+= php4-sysvsem-4.4.*:../../devel/php-sysvsem +DEPENDS+= php4-sysvshm-4.4.*:../../devel/php-sysvshm +DEPENDS+= php4-wddx-4.4.*:../../textproc/php-wddx +DEPENDS+= php4-xmlrpc-4.4.*:../../net/php-xmlrpc +DEPENDS+= php4-yp-4.4.*:../../net/php-yp +DEPENDS+= php4-zip-4.4.*:../../archivers/php-zip +DEPENDS+= php4-zlib-4.4.*:../../archivers/php-zlib # PHP 4.x-only extensions -DEPENDS+= php-apc-4.4.*:../../www/php4-apc -DEPENDS+= php-domxml-4.4.*:../../textproc/php4-domxml -DEPENDS+= php-xslt-4.4.*:../../textproc/php4-xslt +DEPENDS+= php4-apc-4.4.*:../../www/php4-apc +DEPENDS+= php4-domxml-4.4.*:../../textproc/php4-domxml +DEPENDS+= php4-xslt-4.4.*:../../textproc/php4-xslt EXTRACT_ONLY= # empty NO_CHECKSUM= yes @@ -67,4 +67,6 @@ NO_MTREE= yes do-install: # empty +.include "../../mk/apachever.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/meta-pkgs/php5-extensions/Makefile b/meta-pkgs/php5-extensions/Makefile index f18921df341..8a54fdb16b5 100644 --- a/meta-pkgs/php5-extensions/Makefile +++ b/meta-pkgs/php5-extensions/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2006/02/05 23:10:06 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/06/02 18:27:57 joerg Exp $ DISTNAME= php-extensions-5.1 -PKGREVISION= # empty -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= meta-pkgs www php5 MASTER_SITES= # empty DISTFILES= # empty @@ -13,59 +12,59 @@ COMMENT= "meta-package" for the PHP5 HTML-embedded scripting language # base PHP 5.x package DEPENDS+= php-5.1.*:../../lang/php5 -DEPENDS+= ap-php-5.1.*:../../www/ap-php +DEPENDS+= ${APACHE_PKG_PREFIX}-php5-5.1.*:../../www/ap-php # extensions buildable with both PHP 4.x and PHP 5.x -DEPENDS+= php-bcmath-5.1.*:../../math/php-bcmath -DEPENDS+= php-bz2-5.1.*:../../archivers/php-bz2 -DEPENDS+= php-calendar-5.1.*:../../misc/php-calendar -DEPENDS+= php-curl-5.1.*:../../www/php-curl -DEPENDS+= php-dba-5.1.*:../../databases/php-dba -DEPENDS+= php-dbase-5.1.*:../../databases/php-dbase -DEPENDS+= php-dbx-5.1.*:../../databases/php-dbx +DEPENDS+= php5-bcmath-5.1.*:../../math/php-bcmath +DEPENDS+= php5-bz2-5.1.*:../../archivers/php-bz2 +DEPENDS+= php5-calendar-5.1.*:../../misc/php-calendar +DEPENDS+= php5-curl-5.1.*:../../www/php-curl +DEPENDS+= php5-dba-5.1.*:../../databases/php-dba +DEPENDS+= php5-dbase-5.1.*:../../databases/php-dbase +DEPENDS+= php5-dbx-5.1.*:../../databases/php-dbx # eaccelerator doesn't compile/work with 5.1 # DEPENDS+= php-eaccelerator-5.1.*:../../www/php-eaccelerator -DEPENDS+= php-exif-5.1.*:../../graphics/php-exif -DEPENDS+= php-filepro-5.1.*:../../databases/php-filepro -DEPENDS+= php-ftp-5.1.*:../../net/php-ftp -DEPENDS+= php-gd-5.1.*:../../graphics/php-gd -DEPENDS+= php-gettext-5.1.*:../../devel/php-gettext -DEPENDS+= php-gmp-5.1.*:../../devel/php-gmp -DEPENDS+= php-iconv-5.1.*:../../converters/php-iconv -DEPENDS+= php-imap-5.1.*:../../mail/php-imap -DEPENDS+= php-ldap-5.1.*:../../databases/php-ldap -DEPENDS+= php-mbstring-5.1.*:../../misc/php-mbstring -DEPENDS+= php-mcrypt-5.1.*:../../security/php-mcrypt -DEPENDS+= php-mhash-5.1.*:../../security/php-mhash -DEPENDS+= php-mssql-5.1.*:../../databases/php-mssql -DEPENDS+= php-mysql-5.1.*:../../databases/php-mysql -DEPENDS+= php-odbc-5.1.*:../../databases/php-odbc -DEPENDS+= php-pcntl-5.1.*:../../devel/php-pcntl -DEPENDS+= php-pdflib-5.1.*:../../print/php-pdflib -DEPENDS+= php-pgsql-5.1.*:../../databases/php-pgsql -DEPENDS+= php-posix-5.1.*:../../devel/php-posix -DEPENDS+= php-shmop-5.1.*:../../devel/php-shmop -DEPENDS+= php-snmp-5.1.*:../../net/php-snmp -DEPENDS+= php-sockets-5.1.*:../../net/php-sockets -DEPENDS+= php-sqlite-5.1.*:../../databases/php-sqlite -DEPENDS+= php-sysvsem-5.1.*:../../devel/php-sysvsem -DEPENDS+= php-sysvshm-5.1.*:../../devel/php-sysvshm -DEPENDS+= php-wddx-5.1.*:../../textproc/php-wddx -DEPENDS+= php-xmlrpc-5.1.*:../../net/php-xmlrpc -DEPENDS+= php-zip-5.1.*:../../archivers/php-zip -DEPENDS+= php-zlib-5.1.*:../../archivers/php-zlib +DEPENDS+= php5-exif-5.1.*:../../graphics/php-exif +DEPENDS+= php5-filepro-5.1.*:../../databases/php-filepro +DEPENDS+= php5-ftp-5.1.*:../../net/php-ftp +DEPENDS+= php5-gd-5.1.*:../../graphics/php-gd +DEPENDS+= php5-gettext-5.1.*:../../devel/php-gettext +DEPENDS+= php5-gmp-5.1.*:../../devel/php-gmp +DEPENDS+= php5-iconv-5.1.*:../../converters/php-iconv +DEPENDS+= php5-imap-5.1.*:../../mail/php-imap +DEPENDS+= php5-ldap-5.1.*:../../databases/php-ldap +DEPENDS+= php5-mbstring-5.1.*:../../misc/php-mbstring +DEPENDS+= php5-mcrypt-5.1.*:../../security/php-mcrypt +DEPENDS+= php5-mhash-5.1.*:../../security/php-mhash +DEPENDS+= php5-mssql-5.1.*:../../databases/php-mssql +DEPENDS+= php5-mysql-5.1.*:../../databases/php-mysql +DEPENDS+= php5-odbc-5.1.*:../../databases/php-odbc +DEPENDS+= php5-pcntl-5.1.*:../../devel/php-pcntl +DEPENDS+= php5-pdflib-5.1.*:../../print/php-pdflib +DEPENDS+= php5-pgsql-5.1.*:../../databases/php-pgsql +DEPENDS+= php5-posix-5.1.*:../../devel/php-posix +DEPENDS+= php5-shmop-5.1.*:../../devel/php-shmop +DEPENDS+= php5-snmp-5.1.*:../../net/php-snmp +DEPENDS+= php5-sockets-5.1.*:../../net/php-sockets +DEPENDS+= php5-sqlite-5.1.*:../../databases/php-sqlite +DEPENDS+= php5-sysvsem-5.1.*:../../devel/php-sysvsem +DEPENDS+= php5-sysvshm-5.1.*:../../devel/php-sysvshm +DEPENDS+= php5-wddx-5.1.*:../../textproc/php-wddx +DEPENDS+= php5-xmlrpc-5.1.*:../../net/php-xmlrpc +DEPENDS+= php5-zip-5.1.*:../../archivers/php-zip +DEPENDS+= php5-zlib-5.1.*:../../archivers/php-zlib # PHP 5.x-only extensions -DEPENDS+= php-dom-5.1.*:../../textproc/php5-dom -DEPENDS+= php-mysqli-5.1.*:../../databases/php5-mysqli -DEPENDS+= php-soap-5.1.*:../../net/php5-soap -DEPENDS+= php-xsl-5.1.*:../../textproc/php5-xsl -DEPENDS+= php-pdo-5.1.*:../../databases/php-pdo -DEPENDS+= php-pdo_dblib-5.1.*:../../databases/php-pdo_dblib -DEPENDS+= php-pdo_mysql-5.1.*:../../databases/php-pdo_mysql -DEPENDS+= php-pdo_odbc-5.1.*:../../databases/php-pdo_odbc -DEPENDS+= php-pdo_pgsql-5.1.*:../../databases/php-pdo_pgsql -DEPENDS+= php-pdo_sqlite-5.1.*:../../databases/php-pdo_sqlite +DEPENDS+= php5-dom-5.1.*:../../textproc/php5-dom +DEPENDS+= php5-mysqli-5.1.*:../../databases/php5-mysqli +DEPENDS+= php5-soap-5.1.*:../../net/php5-soap +DEPENDS+= php5-xsl-5.1.*:../../textproc/php5-xsl +DEPENDS+= php5-pdo-5.1.*:../../databases/php-pdo +DEPENDS+= php5-pdo_dblib-5.1.*:../../databases/php-pdo_dblib +DEPENDS+= php5-pdo_mysql-5.1.*:../../databases/php-pdo_mysql +DEPENDS+= php5-pdo_odbc-5.1.*:../../databases/php-pdo_odbc +DEPENDS+= php5-pdo_pgsql-5.1.*:../../databases/php-pdo_pgsql +DEPENDS+= php5-pdo_sqlite-5.1.*:../../databases/php-pdo_sqlite EXTRACT_ONLY= # empty NO_CHECKSUM= yes @@ -75,4 +74,6 @@ NO_MTREE= yes do-install: # empty + +.include "../../mk/apachever.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/php-calendar/Makefile b/misc/php-calendar/Makefile index bc631a8069f..1a54a5858c1 100644 --- a/misc/php-calendar/Makefile +++ b/misc/php-calendar/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:13 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $ MODNAME= calendar -PKGREVISION= 1 CATEGORIES+= misc COMMENT= PHP extension for calendar conversion support +CONFLICTS= php-calendar-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME} diff --git a/misc/php-mbstring/Makefile b/misc/php-mbstring/Makefile index 8f6e81d7713..c526dbd027e 100644 --- a/misc/php-mbstring/Makefile +++ b/misc/php-mbstring/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:13 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:57 joerg Exp $ MODNAME= mbstring CATEGORIES+= misc -PKGREVISION= 2 COMMENT= PHP extension for multibyte characters support (currently, Japanese only) +CONFLICTS= php-mbstring-[0-9] + USE_PHP_EXT_PATCHES= yes CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} diff --git a/mk/apache.mk b/mk/apache.mk index 983beccd288..5d2c059742f 100644 --- a/mk/apache.mk +++ b/mk/apache.mk @@ -1,4 +1,4 @@ -# $NetBSD: apache.mk,v 1.11 2006/05/09 10:05:04 tron Exp $ +# $NetBSD: apache.mk,v 1.12 2006/06/02 18:27:57 joerg Exp $ # # This Makefile fragment handles Apache dependencies and make variables, # and is meant to be included by packages that require Apache either at @@ -32,93 +32,7 @@ .if !defined(APACHE_MK) APACHE_MK= # defined -.include "../../mk/bsd.prefs.mk" - -PKG_APACHE_DEFAULT?= # empty - -_PKG_APACHES?= apache13 apache2 - -.if defined(PKG_APACHE_ACCEPTED) -. for _ap_ in ${PKG_APACHE_ACCEPTED} -. if !empty(_PKG_APACHES:M${_ap_}) -_PKG_APACHE_ACCEPTED+= ${PKG_APACHE_ACCEPTED:M${_ap_}} -. endif -. endfor -.endif - -_PKG_APACHE_ACCEPTED?= ${_PKG_APACHES} - -# Set the default apache for this platform. -# -.if !empty(PKG_APACHE_DEFAULT) -_PKG_APACHE_DEFAULT= ${PKG_APACHE_DEFAULT} -.endif -.if !defined(_PKG_APACHE_DEFAULT) -_PKG_APACHE_DEFAULT?= apache2 -.endif - -_APACHE_PKGBASE.apache13= apache-1\* -_APACHE_PKGBASE.apache2= apache-2\* - -# Mark the acceptable apaches and check which apache packages are installed. -.for _ap_ in ${_PKG_APACHE_ACCEPTED} -_PKG_APACHE_OK.${_ap_}= yes -_PKG_APACHE_INSTALLED.${_ap_}!= \ - if ${PKG_INFO} -qe ${_APACHE_PKGBASE.${_ap_}}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -.endfor - -# Use one of the installed apaches,... -# -.if !defined(_PKG_APACHE) -. for _ap_ in ${_PKG_APACHE_ACCEPTED} -. if !empty(_PKG_APACHE_INSTALLED.${_ap_}:M[yY][eE][sS]) -_PKG_APACHE?= ${_ap_} -. else -_PKG_APACHE_FIRSTACCEPTED?= ${_ap_} -. endif -. endfor -.endif -# -# ...otherwise, prefer the default one if it's accepted,... -# -.if !defined(_PKG_APACHE) -. if defined(_PKG_APACHE_OK.${_PKG_APACHE_DEFAULT}) && \ - !empty(_PKG_APACHE_OK.${_PKG_APACHE_DEFAULT}:M[yY][eE][sS]) -_PKG_APACHE= ${_PKG_APACHE_DEFAULT} -. endif -.endif -# -# ...otherwise, just use the first accepted apache. -# -.if !defined(_PKG_APACHE) -. if defined(_PKG_APACHE_FIRSTACCEPTED) -_PKG_APACHE= ${_PKG_APACHE_FIRSTACCEPTED} -. endif -.endif -# -# If there are no acceptable apaches, then generate an error. -# -.if !defined(_PKG_APACHE) -# force an error -PKG_FAIL_REASON= "no acceptable apache found" -_PKG_APACHE= "none" -.endif - -BUILDLINK_API_DEPENDS.apache13?= apache-1.3* -BUILDLINK_API_DEPENDS.apache2?= apache-2* - -.if ${_PKG_APACHE} == "apache13" -_APACHE_PKGSRCDIR= ../../www/apache -.elif ${_PKG_APACHE} == "apache2" -_APACHE_PKGSRCDIR= ../../www/apache2 -_APACHE_BL_SRCDIR= ${_APACHE_PKGSRCDIR} -.endif - -_APACHE_BL_SRCDIR?= ../../www/apache +.include "../../mk/apachever.mk" # Add a runtime dependency on the apache server. # This may or may not create an actual dependency depending on @@ -137,10 +51,4 @@ _APACHE_BL_SRCDIR?= ../../www/apache . endif .endif -# PKG_APACHE is a publicly readable variable containing the name of the server -# we will be using. -# -PKG_APACHE:= ${_PKG_APACHE} -BUILD_DEFS+= PKG_APACHE - .endif # APACHE_MK diff --git a/mk/apachever.mk b/mk/apachever.mk new file mode 100644 index 00000000000..68b2b39261e --- /dev/null +++ b/mk/apachever.mk @@ -0,0 +1,129 @@ +# $NetBSD: apachever.mk,v 1.1 2006/06/02 18:27:57 joerg Exp $ +# +# This Makefile fragment handles Apache dependencies and make variables, +# and is meant to be included by packages that require Apache either at +# build-time or at run-time. apache.mk will: +# +# * set PKG_APACHE to the name of the apache web server used +# +# * add a full dependency on the apache server +# +# * optionally add a full dependency on apr +# +# The available user variables are: +# +# PKG_APACHE_DEFAULT is a user-settable variable whose value is the default +# apache server to use. Possible values are apache13 and apache2. +# If there is already a version of apache installed this will have no +# effect. +# +# The available makefile variables are: +# +# PKG_APACHE_ACCEPTED is a package-settable list of servers that may be used as +# possible dependencies for the package. Possible values are the same as +# for PKG_APACHE_DEFAULT. +# +# USE_APR is used to note that the package requires the Apache Portable +# runtime to build and execute. This is only takes effect if apache2 +# is chosen (by this file) as the web server to use. This adds a full +# dependency on apr. +# + +.if !defined(APACHEVER_MK) +APACHEVER_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +PKG_APACHE_DEFAULT?= # empty + +_PKG_APACHES?= apache13 apache2 + +.if defined(PKG_APACHE_ACCEPTED) +. for _ap_ in ${PKG_APACHE_ACCEPTED} +. if !empty(_PKG_APACHES:M${_ap_}) +_PKG_APACHE_ACCEPTED+= ${PKG_APACHE_ACCEPTED:M${_ap_}} +. endif +. endfor +.endif + +_PKG_APACHE_ACCEPTED?= ${_PKG_APACHES} + +# Set the default apache for this platform. +# +.if !empty(PKG_APACHE_DEFAULT) +_PKG_APACHE_DEFAULT= ${PKG_APACHE_DEFAULT} +.endif +.if !defined(_PKG_APACHE_DEFAULT) +_PKG_APACHE_DEFAULT?= apache2 +.endif + +_APACHE_PKGBASE.apache13= apache-1\* +_APACHE_PKGBASE.apache2= apache-2\* + +# Mark the acceptable apaches and check which apache packages are installed. +.for _ap_ in ${_PKG_APACHE_ACCEPTED} +_PKG_APACHE_OK.${_ap_}= yes +_PKG_APACHE_INSTALLED.${_ap_}!= \ + if ${PKG_INFO} -qe ${_APACHE_PKGBASE.${_ap_}}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +.endfor + +# Use one of the installed apaches,... +# +.if !defined(_PKG_APACHE) +. for _ap_ in ${_PKG_APACHE_ACCEPTED} +. if !empty(_PKG_APACHE_INSTALLED.${_ap_}:M[yY][eE][sS]) +_PKG_APACHE?= ${_ap_} +. else +_PKG_APACHE_FIRSTACCEPTED?= ${_ap_} +. endif +. endfor +.endif +# +# ...otherwise, prefer the default one if it's accepted,... +# +.if !defined(_PKG_APACHE) +. if defined(_PKG_APACHE_OK.${_PKG_APACHE_DEFAULT}) && \ + !empty(_PKG_APACHE_OK.${_PKG_APACHE_DEFAULT}:M[yY][eE][sS]) +_PKG_APACHE= ${_PKG_APACHE_DEFAULT} +. endif +.endif +# +# ...otherwise, just use the first accepted apache. +# +.if !defined(_PKG_APACHE) +. if defined(_PKG_APACHE_FIRSTACCEPTED) +_PKG_APACHE= ${_PKG_APACHE_FIRSTACCEPTED} +. endif +.endif +# +# If there are no acceptable apaches, then generate an error. +# +.if !defined(_PKG_APACHE) +# force an error +PKG_FAIL_REASON= "no acceptable apache found" +_PKG_APACHE= "none" +.endif + +.if ${_PKG_APACHE} == "apache13" +_APACHE_PKGSRCDIR= ../../www/apache +_APACHE_PKG_PREFIX= ap13 +.elif ${_PKG_APACHE} == "apache2" +_APACHE_PKGSRCDIR= ../../www/apache2 +_APACHE_BL_SRCDIR= ${_APACHE_PKGSRCDIR} +_APACHE_PKG_PREFIX= ap2 +.endif + +_APACHE_BL_SRCDIR?= ../../www/apache + +# PKG_APACHE is a publicly readable variable containing the name of the server +# we will be using. +# +PKG_APACHE:= ${_PKG_APACHE} +APACHE_PKG_PREFIX:= ${_APACHE_PKG_PREFIX} +BUILD_DEFS+= PKG_APACHE + +.endif # APACHEVER_MK diff --git a/multimedia/php-ming/Makefile b/multimedia/php-ming/Makefile index ee4fc7d8f87..15efaed3157 100644 --- a/multimedia/php-ming/Makefile +++ b/multimedia/php-ming/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:18 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/06/02 18:27:57 joerg Exp $ MODNAME= ming -PKGREVISION= 1 CATEGORIES+= multimedia MAINTAINER= obata@lins.jp COMMENT= PHP extension for Ming library +CONFLICTS= php-ming-[0-9] + CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_PREFIX.ming} .include "../../lang/php/ext.mk" 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" diff --git a/print/php-pdflib/Makefile b/print/php-pdflib/Makefile index 2d2085ebd7a..e70c9ba2a23 100644 --- a/print/php-pdflib/Makefile +++ b/print/php-pdflib/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.7 2006/04/17 13:46:46 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2006/06/02 18:27:57 joerg Exp $ MODNAME= pdflib PKGMODNAME= pdf PECL_VERSION= 2.0.3 -PKGREVISION= 3 CATEGORIES+= print COMMENT= PHP extension for PDFlib on-the-fly PDF generation +CONFLICTS= php-pdf-[0-9] CONFIGURE_ARGS+= --with-pdflib=shared,${BUILDLINK_PREFIX.pdflib} diff --git a/security/base/Makefile b/security/base/Makefile index dea69ecd41f..5c07bff6508 100644 --- a/security/base/Makefile +++ b/security/base/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2006/05/12 22:31:38 adrianp Exp $ +# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:57 joerg Exp $ # DISTNAME= base-1.2.4 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=secureideas/} @@ -10,15 +11,15 @@ HOMEPAGE= http://secureideas.sourceforge.net/ COMMENT= Analysis engine to process a database of security events DEPENDS+= adodb>=1.2:../../databases/adodb -DEPENDS+= ap-php>=4.0.4:../../www/ap-php -DEPENDS+= php-gd>=4.0.4:../../graphics/php-gd -DEPENDS+= php-sockets>=4.0.4:../../net/php-sockets -DEPENDS+= php-mysql>=4.0.4:../../databases/php-mysql -DEPENDS+= pear-Log-[0-9]*:../../sysutils/pear-Log -DEPENDS+= pear-Numbers_Words-[0-9]*:../../math/pear-Numbers_Words -DEPENDS+= pear-Numbers_Roman-[0-9]*:../../math/pear-Numbers_Roman -DEPENDS+= pear-Image_Color-[0-9]*:../../graphics/pear-Image_Color -DEPENDS+= pear-Image_Graph-[0-9]*:../../graphics/pear-Image_Graph +DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.4:../../www/ap-php +DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.0.4:../../graphics/php-gd +DEPENDS+= ${PHP_PKG_PREFIX}-sockets>=4.0.4:../../net/php-sockets +DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.0.4:../../databases/php-mysql +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Numbers_Words-[0-9]*:../../math/pear-Numbers_Words +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Numbers_Roman-[0-9]*:../../math/pear-Numbers_Roman +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Image_Color-[0-9]*:../../graphics/pear-Image_Color +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Image_Graph-[0-9]*:../../graphics/pear-Image_Graph NO_BUILD= YES @@ -72,4 +73,6 @@ do-install: @${CHOWN} ${WWW_USER} ${BASE_DIR} +.include "../../mk/apachever.mk" +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/php-mcrypt/Makefile b/security/php-mcrypt/Makefile index 00ea366e61c..6b100bd6df6 100644 --- a/security/php-mcrypt/Makefile +++ b/security/php-mcrypt/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:46 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:58 joerg Exp $ MODNAME= mcrypt -PKGREVISION= 1 CATEGORIES+= security COMMENT= PHP extension for the mcrypt crypto algorithms library +CONFLICTS= php-mcrypt-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.libmcrypt} diff --git a/security/php-mhash/Makefile b/security/php-mhash/Makefile index 70822b6ce9e..4e8781ae8ba 100644 --- a/security/php-mhash/Makefile +++ b/security/php-mhash/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:46 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:58 joerg Exp $ MODNAME= mhash -PKGREVISION= 1 CATEGORIES+= security COMMENT= PHP extension for the mhash hash algorithms library +CONFLICTS= php-mhash-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.mhash} diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile index 96de177578d..83f6920834f 100644 --- a/sysutils/pear-Log/Makefile +++ b/sysutils/pear-Log/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:10:56 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:58 joerg Exp $ DISTNAME= Log-1.8.4 -PKGREVISION= 1 CATEGORIES= sysutils MAINTAINER= jdolecek@NetBSD.org HOMEPAGE= http://www.csh.rit.edu/~jon/projects/pear_log/ COMMENT= PHP Log framework provides an abstracted logging system +CONFLICTS= php-pear-Log-[0-9] + .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/php-pspell/Makefile b/textproc/php-pspell/Makefile index 28e1b0b69f8..0eaae1f0743 100644 --- a/textproc/php-pspell/Makefile +++ b/textproc/php-pspell/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:11:06 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:58 joerg Exp $ MODNAME= pspell -PKGREVISION= 1 CATEGORIES+= textproc COMMENT= PHP extension for pspell support +CONFLICTS= php-pspell-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.aspell} diff --git a/textproc/php-wddx/Makefile b/textproc/php-wddx/Makefile index 3a11d4f57d6..30b9070db81 100644 --- a/textproc/php-wddx/Makefile +++ b/textproc/php-wddx/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.9 2006/05/23 22:55:56 jdolecek Exp $ +# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:58 joerg Exp $ MODNAME= wddx -PKGREVISION= 4 CATEGORIES+= textproc COMMENT= PHP extension for WDDX support +CONFLICTS= php-wddx-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile index 12aa36853c8..c7fadc387e9 100644 --- a/textproc/php4-domxml/Makefile +++ b/textproc/php4-domxml/Makefile @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.23 2006/02/05 23:11:06 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2006/06/02 18:27:58 joerg Exp $ MODNAME= domxml -PKGREVISION= 1 CATEGORIES+= textproc COMMENT= PHP4 extension for DOM support +PHP_VERSIONS_ACCEPTED= 4 + +CONFLICTS= php-domxml-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-dom=shared,${BUILDLINK_PREFIX.libxml2} @@ -12,7 +14,6 @@ CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib} CONFIGURE_ARGS+= --with-dom-xslt=${BUILDLINK_PREFIX.libxslt} CONFIGURE_ARGS+= --with-dom-exslt=${BUILDLINK_PREFIX.libxslt} -PHP_VERSION_REQD= 4 .include "../../lang/php/ext.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile index 393532c2bad..a32d2235ea1 100644 --- a/textproc/php4-xslt/Makefile +++ b/textproc/php4-xslt/Makefile @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.20 2006/02/05 23:11:06 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2006/06/02 18:27:58 joerg Exp $ MODNAME= xslt -PKGREVISION= 2 CATEGORIES+= textproc COMMENT= PHP4 extension for XSLT functions (Sablotron backend) +PHP_VERSIONS_ACCEPTED= 4 + +CONFLICTS= php-xslt-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME} CONFIGURE_ARGS+= --with-${MODNAME}-sablot=${BUILDLINK_PREFIX.sablotron} @@ -34,7 +36,6 @@ post-install: ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKSRC}; ${INSTALL_DATA} README.XSLT-BACKENDS ${DOCDIR} -PHP_VERSION_REQD= 4 .include "../../lang/php/ext.mk" .include "../../textproc/sablotron/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/php5-dom/Makefile b/textproc/php5-dom/Makefile index 2e6185e21a0..e19d650f1ce 100644 --- a/textproc/php5-dom/Makefile +++ b/textproc/php5-dom/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:06 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:58 joerg Exp $ MODNAME= dom -PKGREVISION= 1 CATEGORIES+= textproc COMMENT= PHP5 extension for DOM support +CONFLICTS= php-dom-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME} CONFIGURE_ARGS+= --with-libxml-dir=${BUILDLINK_PREFIX.libxml2} -PHP_VERSION_REQD= 5 +PHP_VERSIONS_ACCEPTED= 5 .include "../../lang/php/ext.mk" #.include "../../devel/zlib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/textproc/php5-xsl/Makefile b/textproc/php5-xsl/Makefile index 718780bfebf..10fc742c122 100644 --- a/textproc/php5-xsl/Makefile +++ b/textproc/php5-xsl/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:06 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:58 joerg Exp $ MODNAME= xsl -PKGREVISION= 1 CATEGORIES+= textproc COMMENT= PHP5 extension for XSLT functions +CONFLICTS= php-xsl-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.libxslt} @@ -12,7 +12,7 @@ CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.libxslt} EXTRACT_ELEMENTS= ${DISTNAME}/ext/${MODNAME} ${DISTNAME}/ext/dom WRKSRC= ${WRKDIR}/${DISTNAME}/ext/${MODNAME} -PHP_VERSION_REQD= 5 +PHP_VERSIONS_ACCEPTED= 5 .include "../../lang/php/ext.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/kronolith/Makefile b/time/kronolith/Makefile index ad2b1343c8b..6075fe0af2d 100644 --- a/time/kronolith/Makefile +++ b/time/kronolith/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2006/04/29 09:23:19 adrianp Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:58 joerg Exp $ DISTNAME= kronolith-h3-${KRONOLITHVER} PKGNAME= kronolith-${KRONOLITHVER} +PKGREVISION= 1 CATEGORIES= www time MASTER_SITES= http://ftp.horde.org/pub/kronolith/ \ ftp://ftp.horde.org/pub/kronolith/ @@ -11,8 +12,8 @@ HOMEPAGE= http://www.horde.org/kronolith/ COMMENT= Horde calendar application DEPENDS+= horde>=3.0.0:../../www/horde3 -DEPENDS+= php-mysql>=4.3.3:../../databases/php-mysql -DEPENDS+= pear-Date-[0-9]*:../../time/pear-Date +DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Date-[0-9]*:../../time/pear-Date .include "../../mk/bsd.prefs.mk" @@ -81,4 +82,5 @@ do-install: @${CHOWN} ${APACHE_USER}:${SHAREGRP} ${KRONOLITHDIR}/config @${CHMOD} 0750 ${KRONOLITHDIR}/config +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/pear-Date/Makefile b/time/pear-Date/Makefile index 52ec37da129..27b51020f0a 100644 --- a/time/pear-Date/Makefile +++ b/time/pear-Date/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:11:10 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:58 joerg Exp $ DISTNAME= Date-1.4.3 -PKGREVISION= 1 CATEGORIES= time MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP Date and Time Zone Classes +CONFLICTS= php-pear-Date-[0-9] + .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-Embperl/Makefile b/www/ap-Embperl/Makefile index f18761650e7..549af564c9a 100644 --- a/www/ap-Embperl/Makefile +++ b/www/ap-Embperl/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:56 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/06/02 18:27:58 joerg Exp $ # DISTNAME= HTML-Embperl-1.2.0 -PKGNAME= ap-Embperl-1.2.0 -PKGREVISION= 3 +PKGNAME= ap13-Embperl-1.2.0 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} \ ftp://ftp.dev.ecos.de/pub/perl/embperl/ @@ -12,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://perl.apache.org/embperl/ COMMENT= Perl5 library for embedding perl in HTML documents +CONFLICTS= ap-Embperl-[0-9]* + DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser PERL5_PACKLIST= auto/HTML/Embperl/.packlist diff --git a/www/ap-access-referer/Makefile b/www/ap-access-referer/Makefile index af7d0424305..8a01db56318 100644 --- a/www/ap-access-referer/Makefile +++ b/www/ap-access-referer/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:56 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:58 joerg Exp $ # DISTNAME= mod_access_referer-1.0.2 -PKGNAME= ap-access-referer-1.0.2 -PKGREVISION= 2 +PKGNAME= ap13-access-referer-1.0.2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=accessreferer/} @@ -11,6 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://accessreferer.sourceforge.net/ COMMENT= Apache module for referer-based access control +CONFLICTS= ap-access-referer-[0-9]* APACHE_MODULE_NAME= mod_access_referer.so diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile index f79971769e4..c665aa0cde0 100644 --- a/www/ap-auth-cookie/Makefile +++ b/www/ap-auth-cookie/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.38 2006/03/04 21:30:56 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2006/06/02 18:27:58 joerg Exp $ # # There are a few more mod_auth_cookie's out there doing slightly # different things. This one pkg would be a good place to dump them all in # one. DISTNAME= mod_auth_cookie.c -PKGNAME= ap-auth-cookie-1.9 -PKGREVISION= 2 +PKGNAME= ap13-auth-cookie-1.9 CATEGORIES= www MASTER_SITES= ftp://ftp.kciLink.com/pub/ EXTRACT_SUFX= .gz @@ -15,6 +14,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= ftp://ftp.kciLink.com/pub/mod_auth_cookie.txt COMMENT= Cookie-based authentication for Apache +CONFLICTS= ap-auth-cookie-[0-9]* + WRKSRC= ${WRKDIR} EXTRACT_CMD= ${DO_NADA} diff --git a/www/ap-auth-kerb/Makefile b/www/ap-auth-kerb/Makefile index f1bec09ea06..850fa388ef3 100644 --- a/www/ap-auth-kerb/Makefile +++ b/www/ap-auth-kerb/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/05/15 12:05:43 markd Exp $ +# $NetBSD: Makefile,v 1.2 2006/06/02 18:27:58 joerg Exp $ DISTNAME= mod_auth_kerb-5.0rc7 -PKGNAME= ap-auth-kerb-5.0rc7 +PKGNAME= ${APACHE_PKG_PREFIX}-auth-kerb-5.0rc7 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=modauthkerb/} @@ -9,6 +9,8 @@ MAINTAINER= markd@NetBSD.org HOMEPAGE= http://modauthkerb.sourceforge.net/ COMMENT= Module to allow Apache authentication using Kerberos +CONFLICTS= ap-auth-kerb-[0-9]* + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-krb4 USE_TOOLS+= gmake diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile index 120302a592d..0196d237e92 100644 --- a/www/ap-auth-ldap/Makefile +++ b/www/ap-auth-ldap/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2006/05/31 18:22:26 ghen Exp $ +# $NetBSD: Makefile,v 1.30 2006/06/02 18:27:58 joerg Exp $ DISTNAME= auth_ldap-1.6.1 -PKGNAME= ap-auth-ldap-1.6.1 -PKGREVISION= 3 +PKGNAME= ap13-auth-ldap-1.6.1 SVR4_PKGNAME= apldap CATEGORIES= www databases MASTER_SITES= http://www.rudedog.org/auth_ldap/ @@ -11,6 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.rudedog.org/auth_ldap/ COMMENT= Module to allow apache authentication against an LDAP directory +CONFLICTS= ap-auth-ldap-[0-9]* APACHE_MODULE_NAME= auth_ldap.so CPPFLAGS+= -DWITH_OPENLDAP diff --git a/www/ap-auth-mysql/Makefile b/www/ap-auth-mysql/Makefile index bca7340be64..9ec1a2f7c2d 100644 --- a/www/ap-auth-mysql/Makefile +++ b/www/ap-auth-mysql/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2006/05/16 02:35:37 ben Exp $ +# $NetBSD: Makefile,v 1.17 2006/06/02 18:27:58 joerg Exp $ # DISTNAME= libapache-mod-auth-mysql_4.3.1 -PKGNAME= ${DISTNAME:S/libapache-mod/ap/:S/_/-/} -PKGREVISION= 5 +PKGNAME= ${APACHE_PKG_PREFIX}-auth-mysql-4.3.1 WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} CATEGORIES= www databases security MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/liba/libapache-mod-auth-mysql/} @@ -12,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://packages.debian.org/unstable/web/libapache-mod-auth-mysql.html COMMENT= Module to allow apache authentication against a MySQL database +CONFLICTS= ap-auth-mysql-[0-9]* + GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/www/ap-auth-pam/Makefile b/www/ap-auth-pam/Makefile index d0abf2e2288..89712c21c79 100644 --- a/www/ap-auth-pam/Makefile +++ b/www/ap-auth-pam/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:56 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/06/02 18:27:58 joerg Exp $ DISTNAME= mod_auth_pam-1.0a -PKGNAME= ap-auth-pam-1.0a -PKGREVISION= 2 +PKGNAME= ap13-auth-pam-1.0a CATEGORIES= www MASTER_SITES= http://pam.sourceforge.net/mod_auth_pam/dist/ @@ -10,6 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://pam.sourceforge.net/mod_auth_pam/ COMMENT= Module to allow Apache authentication using PAM +CONFLICTS= ap-auth-pam-[0-9]* APACHE_MODULE_NAME= mod_auth_pam.so LDFLAGS+= -lpam diff --git a/www/ap-auth-pgsql/Makefile b/www/ap-auth-pgsql/Makefile index e5cea03c5da..daaaf1071be 100644 --- a/www/ap-auth-pgsql/Makefile +++ b/www/ap-auth-pgsql/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:11:16 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:58 joerg Exp $ DISTNAME= mod_auth_pgsql-0.9.12 -PKGNAME= ap-auth-pgsql-0.9.12 -PKGREVISION= 3 +PKGNAME= ap13-auth-pgsql-0.9.12 CATEGORIES= www databases MASTER_SITES= http://www.giuseppetanzilli.it/mod_auth_pgsql/dist/ @@ -10,7 +9,9 @@ MAINTAINER= waddell@caravan.com HOMEPAGE= http://www.giuseppetanzilli.it/mod_auth_pgsql/ COMMENT= Apache module for user authentication/logging against a PostgreSQL DB -CONFLICTS= ap-auth-postgresql-[0-9]* +CONFLICTS= ap-auth-pgsql-[0-9]* +CONFLICTS+= ap-auth-postgresql-[0-9]* +CONFLICTS+= ap13-auth-postgresql-[0-9]* APACHE_MODULE_NAME= mod_auth_pgsql.so diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile index d6c9abcf992..b5e93a6b435 100644 --- a/www/ap-auth-postgresql/Makefile +++ b/www/ap-auth-postgresql/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2006/03/20 19:59:21 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2006/06/02 18:27:58 joerg Exp $ DISTNAME= AuthPG-1.4 -PKGNAME= ap-auth-postgresql-1.4 -PKGREVISION= 3 +PKGNAME= ap13-auth-postgresql-1.4 CATEGORIES= www databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=authpg/} @@ -10,8 +9,9 @@ MAINTAINER= jwise@NetBSD.org HOMEPAGE= http://authpg.sourceforge.net/ COMMENT= Module to allow apache authentication against a Postgresql database -CONFLICTS= ap-auth-pgsql-[0-9]* - +CONFLICTS= ap-auth-postgresql-[0-9]* +CONFLICTS+= ap-auth-pgsql-[0-9]* +CONFLICTS+= ap13-auth-pgsql-[0-9]* APACHE_MODULE_NAME= mod_auth_pg.so diff --git a/www/ap-auth-radius/Makefile b/www/ap-auth-radius/Makefile index 491905c0dac..e4c8d74d547 100644 --- a/www/ap-auth-radius/Makefile +++ b/www/ap-auth-radius/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:17 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:58 joerg Exp $ # DISTNAME= mod_auth_radius-1.5.7 -PKGREVISION= 2 +PKGNAME= ap13-auth-radius-1.5.7 CATEGORIES= www MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ EXTRACT_SUFX= .tar @@ -11,6 +11,7 @@ MAINTAINER= manu@NetBSD.org HOMEPAGE= http://www.freeradius.org/mod_auth_radius/ COMMENT= Radius authentication module for Apache +CONFLICTS= ap-auth-radius-[0-9]* APACHE_MODULE_NAME= mod_auth_radius.so diff --git a/www/ap-auth-script/Makefile b/www/ap-auth-script/Makefile index e73e213f507..223b3b1ffd1 100644 --- a/www/ap-auth-script/Makefile +++ b/www/ap-auth-script/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:56 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2006/06/02 18:27:59 joerg Exp $ # DISTNAME= mod_auth_script-alpha1.3 -PKGNAME= ap-auth-script-1.3 -PKGREVISION= 2 +PKGNAME= ap13-auth-script-1.3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mod-auth-script/} @@ -11,6 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://mod-auth-script.sourceforge.net/ COMMENT= Apache module for script-based authentication +CONFLICTS= ap-auth-script-[0-9]* APACHE_MODULE_NAME= mod_auth_script.so diff --git a/www/ap-bandwidth/Makefile b/www/ap-bandwidth/Makefile index 84f2257d9b3..d7f4445e266 100644 --- a/www/ap-bandwidth/Makefile +++ b/www/ap-bandwidth/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:56 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/06/02 18:27:59 joerg Exp $ # DISTNAME= mod_bandwidth.c -PKGNAME= ap-bandwidth-2.0.6 -PKGREVISION= 2 +PKGNAME= ap13-bandwidth-2.0.6 CATEGORIES= www MASTER_SITES= ftp://ftp.cohprog.com/pub/apache/module/ EXTRACT_SUFX= # empty @@ -12,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.cohprog.com/mod_bandwidth.html COMMENT= Apache module for bandwidth management +CONFLICTS= ap-bandwidth-[0-9]* + WRKSRC= ${WRKDIR} APACHE_MODULE_NAME= mod_bandwidth.so diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile index 38d48377ea2..e65a6bcb663 100644 --- a/www/ap-dav/Makefile +++ b/www/ap-dav/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:52 reed Exp $ +# $NetBSD: Makefile,v 1.20 2006/06/02 18:27:59 joerg Exp $ DISTNAME= mod_dav-1.0.3-1.3.6 -PKGNAME= ap-dav-1.0.3 -PKGREVISION= 4 +PKGNAME= ap13-dav-1.0.3 CATEGORIES= www MASTER_SITES= http://www.webdav.org/mod_dav/ @@ -10,8 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.webdav.org/mod_dav/ COMMENT= Apache WebDAV module -# Ugly mess that says apache>=1.3.9 and apache<2.0. -BUILDLINK_API_DEPENDS.apache+= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*} +CONFLICTS= ap-dav-[0-9]* APACHE_MODULE= YES GNU_CONFIGURE= YES diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile index 93e69fcfc56..300747163d9 100644 --- a/www/ap-dtcl/Makefile +++ b/www/ap-dtcl/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2006/02/05 23:11:17 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2006/06/02 18:27:59 joerg Exp $ DISTNAME= mod_dtcl-0.11.6 -PKGNAME= ap-dtcl-0.11.2 -PKGREVISION= 3 +PKGNAME= ap13-dtcl-0.11.2 CATEGORIES= www MASTER_SITES= http://tcl.apache.org/mod_dtcl/download/ @@ -10,6 +9,8 @@ MAINTAINER= jwise@NetBSD.org HOMEPAGE= http://tcl.apache.org/ COMMENT= Simple, fast Tcl server side scripting for apache +CONFLICTS= ap-dtcl-[0-9]* + WRKSRC= ${WRKDIR}/mod_dtcl TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile index 32c5ebbc7f4..55fbbdd28ae 100644 --- a/www/ap-fastcgi/Makefile +++ b/www/ap-fastcgi/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.29 2006/02/05 23:11:17 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2006/06/02 18:27:59 joerg Exp $ # .include "Makefile.common" -PKGNAME= ${DISTNAME:S/mod_/ap-/} -PKGREVISION= 2 +PKGNAME= ${DISTNAME:S/mod_/ap13-/} + +CONFLICTS= ap-fastcgi-[0-9]* APACHE_MODULE= yes APACHE_MODULE_NAME= mod_fastcgi.so diff --git a/www/ap-gzip/Makefile b/www/ap-gzip/Makefile index 6bfc8d8b6af..4eb96b69606 100644 --- a/www/ap-gzip/Makefile +++ b/www/ap-gzip/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:56 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/06/02 18:27:59 joerg Exp $ # DISTNAME= mod_gzip-1.3.26.1a -PKGNAME= ${DISTNAME:C|mod_|ap-|} -PKGREVISION= 2 +PKGNAME= ${DISTNAME:C|mod_|ap13-|} CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mod-gzip/} EXTRACT_SUFX= .tgz @@ -12,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.sourceforge.net/projects/mod-gzip/ COMMENT= On-the-fly GZIP compression for Apache 1.3.x +CONFLICTS= ap-gzip-[0-9]* APACHE_MODULE_NAME= mod_gzip.so diff --git a/www/ap-iasp/Makefile b/www/ap-iasp/Makefile index be383428a7f..b75dd12b3b5 100644 --- a/www/ap-iasp/Makefile +++ b/www/ap-iasp/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:17 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/06/02 18:27:59 joerg Exp $ .include "../../www/iasp/Makefile.common" -PKGNAME= ap-iasp-${IASP_VERSION} -PKGREVISION= 2 +PKGNAME= ap13-iasp-${IASP_VERSION} COMMENT= Apache connector for accessing a iASP proxy server +CONFLICTS= ap-iasp-[0-9]* + DEPENDS+= {iasp-${IASP_VERSION},iasp-${IASP_VERSION}nb*}:../../www/iasp IASP_SRCDIR= ${IASP_DIR}/bin/apache/source/1.3 diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile index 6fbf491ceaf..0ecdba6305d 100644 --- a/www/ap-jk/Makefile +++ b/www/ap-jk/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2006/04/22 09:22:16 rillig Exp $ +# $NetBSD: Makefile,v 1.36 2006/06/02 18:27:59 joerg Exp $ DISTNAME= jakarta-tomcat-connectors-${JK_VERSION}-src -PKGNAME= ap-jk-${JK_VERSION} +PKGNAME= ap13-jk-${JK_VERSION} JK_VERSION= 1.2.15 -PKGREVISION= 1 CATEGORIES= www java MASTER_SITES= http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-${JK_VERSION}/ @@ -11,6 +10,8 @@ MAINTAINER= erh@NetBSD.org HOMEPAGE= http://jakarta.apache.org/tomcat/connectors-doc/ COMMENT= Apache connector for accessing Jakarta Tomcat +CONFLICTS= ap-jk-[0-9]* + WRKSRC= ${WRKDIR}/${DISTNAME}/jk/native APACHE_MODULE= YES BUILD_DEFS+= JK_ENABLE_JNI diff --git a/www/ap-layout/Makefile b/www/ap-layout/Makefile index 9a72e463049..97708d914ba 100644 --- a/www/ap-layout/Makefile +++ b/www/ap-layout/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:11:17 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/06/02 18:27:59 joerg Exp $ # DISTNAME= mod_layout-3.2 -PKGNAME= ${DISTNAME:C|mod_|ap-|} -PKGREVISION= 2 +PKGNAME= ${DISTNAME:C|mod_|ap13-|} CATEGORIES= www MASTER_SITES= ftp://ftp.tangent.org/pub/apache/ \ http://software.tangent.org/download/ @@ -12,6 +11,7 @@ MAINTAINER= grant@NetBSD.org HOMEPAGE= http://software.tangent.org/ COMMENT= Apache module to wrap static or dynamic content +CONFLICTS= ap-layout-[0-9]* APACHE_MODULE_NAME= mod_layout.so diff --git a/www/ap-mp3/Makefile b/www/ap-mp3/Makefile index 17aabc0b220..0b26878595c 100644 --- a/www/ap-mp3/Makefile +++ b/www/ap-mp3/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:11:17 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/06/02 18:27:59 joerg Exp $ # DISTNAME= mod_mp3-0.35 -PKGNAME= ${DISTNAME:C|mod_|ap-|} -PKGREVISION= 2 +PKGNAME= ${DISTNAME:C|mod_|ap13-|} CATEGORIES= www MASTER_SITES= ftp://ftp.tangent.org/pub/apache/ \ http://software.tangent.org/download/ @@ -12,6 +11,7 @@ MAINTAINER= grant@NetBSD.org HOMEPAGE= http://software.tangent.org/media/ COMMENT= Apache module for streaming mp3 files +CONFLICTS= ap-mp3-[0-9]* APACHE_MODULE_NAME= ${DISTNAME:C|-.*||}.so APACHE_MODULE_SRCDIR= ${WRKSRC}/src diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile index 1171d677728..a67fec04354 100644 --- a/www/ap-perl/Makefile +++ b/www/ap-perl/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.42 2006/04/06 06:22:53 reed Exp $ +# $NetBSD: Makefile,v 1.43 2006/06/02 18:27:59 joerg Exp $ # DISTNAME= mod_perl-1.29 -PKGNAME= ap-perl-1.29 -PKGREVISION= 5 +PKGNAME= ap13-perl-1.29 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} \ http://perl.apache.org/dist/ @@ -12,7 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://perl.apache.org/ COMMENT= Module that embeds a Perl interpreter into Apache -CONFLICTS= ap2-perl-[0-9]* +CONFLICTS= ap-perl-[0-9]* +CONFLICTS+= ap2-perl-[0-9]* DEPENDS+= ${BUILDLINK_API_DEPENDS.apache}:../../www/apache DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk index 58554677528..3742ab297b8 100644 --- a/www/ap-perl/buildlink3.mk +++ b/www/ap-perl/buildlink3.mk @@ -1,18 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:38 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2006/06/02 18:27:59 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AP_PERL_BUILDLINK3_MK:= ${AP_PERL_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ap-perl +BUILDLINK_DEPENDS+= ap13-perl .endif BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nap-perl} -BUILDLINK_PACKAGES+= ap-perl +BUILDLINK_PACKAGES+= ap13-perl .if !empty(AP_PERL_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.ap-perl+= ap-perl>=1.29nb3 -BUILDLINK_ABI_DEPENDS.ap-perl?= ap-perl>=1.29nb5 +BUILDLINK_API_DEPENDS.ap-perl+= ap13-perl>=1.29nb3 +BUILDLINK_ABI_DEPENDS.ap-perl?= ap13-perl>=1.29nb5 BUILDLINK_PKGSRCDIR.ap-perl?= ../../www/ap-perl BUILDLINK_FILES.ap-perl+= lib/httpd/mod_perl.* diff --git a/www/ap-php/Makefile b/www/ap-php/Makefile index 35e2e03291c..92cfe3ce2a5 100644 --- a/www/ap-php/Makefile +++ b/www/ap-php/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.9 2006/04/14 13:47:30 cube Exp $ +# $NetBSD: Makefile,v 1.10 2006/06/02 18:27:59 joerg Exp $ # -PKGNAME= ap-php-${PHP_BASE_VERS} -PKGREVISION= 6 +PKGNAME= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-${PHP_BASE_VERS} COMMENT= Apache (${PKG_APACHE}) module for ${PKG_PHP} +CONFLICTS= ap-php-[0-9]* + APACHE_MODULE= YES SHLIBTOOL_OVERRIDE= libtool diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile index 875ff60b212..d74224fe488 100644 --- a/www/ap-python/Makefile +++ b/www/ap-python/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:56 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/06/02 18:27:59 joerg Exp $ # DISTNAME= mod_python-2.7.10 -PKGNAME= ap-python-2.7.10 -PKGREVISION= 2 +PKGNAME= ap13-python-2.7.10 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/modpython/} EXTRACT_SUFX= .tgz @@ -12,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.modpython.org/ COMMENT= Python interpreter embedded into Apache +CONFLICTS= ap-python-[0-9]* + PLIST_SRC= ${WRKDIR}/.PLIST_SRC GNU_CONFIGURE= yes diff --git a/www/ap-rivet/Makefile b/www/ap-rivet/Makefile index 2c0d4ee6933..eee28afb38f 100644 --- a/www/ap-rivet/Makefile +++ b/www/ap-rivet/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:11:17 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:59 joerg Exp $ DISTNAME= rivet_0.4.0-1 -PKGNAME= ap-rivet-0.4.0.1 -PKGREVISION= 3 +PKGNAME= ap13-rivet-0.4.0.1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=tcl/rivet/} @@ -10,6 +9,8 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://tcl.apache.org/rivet/ COMMENT= System for creating dynamic web content via Tcl +CONFLICTS= ap-rivet-[0-9]* + WRKSRC= ${WRKDIR}/tcl-rivet HAS_CONFIGURE= yes CONFIGURE_DIRS= src diff --git a/www/ap-rpaf/Makefile b/www/ap-rpaf/Makefile index 5f1fbd8cacf..27a021f7616 100644 --- a/www/ap-rpaf/Makefile +++ b/www/ap-rpaf/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2006/03/22 22:50:33 tv Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:59 joerg Exp $ # DISTNAME= mod_rpaf-0.5 -PKGNAME= ${DISTNAME:S/mod_/ap-/} +PKGNAME= ${APACHE_PKG_PREFIX}-rpaf-0.5 CATEGORIES= www MASTER_SITES= http://stderr.net/apache/rpaf/download/ @@ -10,6 +10,8 @@ MAINTAINER= tv@NetBSD.org HOMEPAGE= http://stderr.net/apache/rpaf/ COMMENT= Remaps reverse-proxied connections to "real" requesting IPs +CONFLICTS= ap-rpaf-[0-9]* + APACHE_MODULE= # defined INSTALLATION_DIRS= share/doc diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile index f80d4d68218..2d944bcb2c2 100644 --- a/www/ap-ruby/Makefile +++ b/www/ap-ruby/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2006/02/05 23:11:17 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2006/06/02 18:27:59 joerg Exp $ # DISTNAME= mod_ruby-${VERSION} -PKGNAME= ap-${RUBY_PKGPREFIX}-${VERSION} -PKGREVISION= 5 +PKGNAME= ap13-${RUBY_PKGPREFIX}-${VERSION} CATEGORIES= www ruby MASTER_SITES= http://www.modruby.net/archive/ @@ -11,7 +10,7 @@ MAINTAINER= taca@NetBSD.org HOMEPAGE= http://www.modruby.net/ COMMENT= Apache module that embeds Ruby interpreter within -CONFLICTS+= ap2-ruby* +CONFLICTS= ap-ruby* ap2-ruby* RUBY_HAS_ARCHLIB= yes APACHE_MODULE= yes diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index fe5d27c7939..649ea787dcb 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.100 2006/04/06 06:22:53 reed Exp $ +# $NetBSD: Makefile,v 1.101 2006/06/02 18:27:59 joerg Exp $ DISTNAME= mod_ssl-2.8.25-1.3.34 -PKGNAME= ap-ssl-2.8.25 -PKGREVISION= 2 +PKGNAME= ap13-ssl-2.8.25 CATEGORIES= www security MASTER_SITES= http://www.modssl.org/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \ @@ -13,6 +12,7 @@ HOMEPAGE= http://www.modssl.org/ COMMENT= SSL/TLS protocols module for Apache CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]* +CONFLICTS+= ap-ssl-[0-9]* BUILDLINK_API_DEPENDS.apache+= apache>=1.3.33 diff --git a/www/ap-throttle/Makefile b/www/ap-throttle/Makefile index a19ee067f77..e465da291dd 100644 --- a/www/ap-throttle/Makefile +++ b/www/ap-throttle/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:18 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2006/06/02 18:27:59 joerg Exp $ DISTNAME= mod_throttle312 -PKGNAME= ap-throttle-3.1.2 -PKGREVISION= 3 +PKGNAME= ap13-throttle-3.1.2 CATEGORIES= www MASTER_SITES= http://www.snert.com/Software/mod_throttle/ EXTRACT_SUFX= .tgz @@ -11,6 +10,8 @@ MAINTAINER= eric@cirr.com HOMEPAGE= ${MASTER_SITES} COMMENT= Apache module for limiting bandwidth usage +CONFLICTS= ap-throttle-[0-9]* + WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/ap-/mod_/} APACHE_MODULE_NAME= mod_throttle.so diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile index 38bd8a66cbf..ed9caf071b2 100644 --- a/www/ap-xslt/Makefile +++ b/www/ap-xslt/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2006/02/05 23:11:18 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2006/06/02 18:27:59 joerg Exp $ DISTNAME= modxslt-1.1 -PKGNAME= ap-xslt-1.1 -PKGREVISION= 11 +PKGNAME= ap13-xslt-1.1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=modxslt/} @@ -10,6 +9,8 @@ MAINTAINER= jwise@NetBSD.org HOMEPAGE= http://modxslt.sourceforge.net/ COMMENT= Simple, fast XSLT transformations for apache +CONFLICTS= ap-xslt-[0-9]* + WRKSRC= ${WRKDIR}/modxslt APACHE_MODULE_NAME= mod_xslt.so diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile index 990f2a4e26f..24fdc0ef24f 100644 --- a/www/apc-gui/Makefile +++ b/www/apc-gui/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:57 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/06/02 18:28:00 joerg Exp $ DISTNAME= apc_gui-1.0.3 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= www MASTER_SITES= http://apc.neuropeans.com/download/ @@ -10,10 +10,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://apc.neuropeans.com/ COMMENT= Web interface for managing APC (php-apc) -PHP_VERSION_REQD= 4 +PHP_VERSIONS_ACCEPTED= 4 -DEPENDS+= php-apc>=1.1.0.1:../../www/php4-apc -DEPENDS+= php-gd-4.[0-9]*:../../graphics/php-gd +.include "../../lang/php/phpversion.mk" + +DEPENDS+= ${PHP_PKG_PREFIX}-apc>=1.1.0.1:../../www/php4-apc +DEPENDS+= ${PHP_PKG_PREFIX}-gd-4.[0-9]*:../../graphics/php-gd NO_BUILD= YES diff --git a/www/blur6ex/Makefile b/www/blur6ex/Makefile index 350c58a7a7c..d079479b6cf 100644 --- a/www/blur6ex/Makefile +++ b/www/blur6ex/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:57 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2006/06/02 18:28:00 joerg Exp $ # DISTNAME= blur6ex-0.1.198 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= www MASTER_SITES= http://www.blursoft.com/releases/ @@ -10,8 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.blursoft.com/ COMMENT= Weblog and content framework -DEPENDS+= ap{,2}-php>=4.0.0:../../www/ap-php -DEPENDS+= php-mysql-[0-9]*:../../databases/php-mysql +DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.0:../../www/ap-php +DEPENDS+= ${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql DEPENDS+= mysql-server>=4.1:../../databases/mysql5-server NO_CONFIGURE= yes @@ -51,4 +51,6 @@ do-install: '-s|./engine/core/db.php$$||' . \ ${PREFIX}/${HTTPD_ROOT}/blog +.include "../../mk/apachever.mk" +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/drupal/Makefile b/www/drupal/Makefile index 2209072a595..e7a948fb2b7 100644 --- a/www/drupal/Makefile +++ b/www/drupal/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2006/05/28 14:46:47 adrianp Exp $ +# $NetBSD: Makefile,v 1.12 2006/06/02 18:28:00 joerg Exp $ DISTNAME= drupal-4.7.1 +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://drupal.org/files/projects/ @@ -8,10 +9,8 @@ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://drupal.org/ COMMENT= Open source content management system -.include "../../lang/php/phpversion.mk" - -DEPENDS+= ap-php>=4.3.3:../../www/ap-php -DEPENDS+= php-gd>=4.3.3:../../graphics/php-gd +DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php +DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd NO_BUILD= YES DRUPAL= ${PREFIX}/share/drupal @@ -30,6 +29,9 @@ SUBST_FILES.conf= drupal.conf SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g" SUBST_MESSAGE.conf= Fixing configuration files. +.include "../../mk/apachever.mk" +.include "../../lang/php/phpversion.mk" + .include "options.mk" post-extract: diff --git a/www/drupal/options.mk b/www/drupal/options.mk index c057fdea091..5e229b8e533 100644 --- a/www/drupal/options.mk +++ b/www/drupal/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2006/05/28 14:46:47 adrianp Exp $ +# $NetBSD: options.mk,v 1.3 2006/06/02 18:28:00 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.drupal @@ -15,13 +15,13 @@ PKG_SUGGESTED_OPTIONS= mysql drupal-xmlservices ### .if !empty(PKG_OPTIONS:Mpgsql) . include "../../mk/pgsql.buildlink3.mk" -DEPENDS+= php-pgsql-[0-9]*:../../databases/php-pgsql +DEPENDS+= ${PHP_PKG_PREFIX}-pgsql-[0-9]*:../../databases/php-pgsql .elif !empty(PKG_OPTIONS:Mmysql) ### ### Use MySQL for storing Drupal data ### . include "../../mk/mysql.buildlink3.mk" -DEPENDS+= php-mysql>=4.3.3:../../databases/php-mysql +DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql .endif ### @@ -30,8 +30,8 @@ DEPENDS+= php-mysql>=4.3.3:../../databases/php-mysql ### .if !empty(PKG_OPTIONS:Mdrupal-xmlservices) . if ${PKG_PHP_VERSION} == "4" -DEPENDS+= php-domxml>=4.3.3:../../textproc/php4-domxml +DEPENDS+= ${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml . elif ${PKG_PHP_VERSION} == "5" -DEPENDS+= php-dom-[0-9]*:../../textproc/php5-dom +DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom . endif .endif diff --git a/www/ganglia-webfrontend/Makefile b/www/ganglia-webfrontend/Makefile index 6ef68f22899..ec6ff0bce67 100644 --- a/www/ganglia-webfrontend/Makefile +++ b/www/ganglia-webfrontend/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:11:23 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/02 18:28:00 joerg Exp $ # DISTNAME= ganglia-3.0.1 PKGNAME= ganglia-webfrontend-3.0.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www parallel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ganglia/} EXTRACT_SUFX= .tar.bz2 @@ -12,7 +12,7 @@ MAINTAINER= jschauma@NetBSD.org HOMEPAGE= http://ganglia.sourceforge.net/ COMMENT= PHP based frontend for the Ganglia Cluster Monitor -DEPENDS+= ap-php>=4.1:../../www/ap-php +DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.1:../../www/ap-php DEPENDS+= ganglia-monitor-core>=3.0.1:../../parallel/ganglia-monitor-core NO_BUILD= YES @@ -31,4 +31,6 @@ do-install: ${INSTALL_DATA_DIR} ${DOCROOT} cd ${WRKSRC} && ${PAX} -rw . ${DOCROOT}/ +.include "../../mk/apachever.mk" +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/horde/Makefile b/www/horde/Makefile index f1ce64fe516..9e6ba1f8bde 100644 --- a/www/horde/Makefile +++ b/www/horde/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2006/05/28 15:48:32 adrianp Exp $ +# $NetBSD: Makefile,v 1.44 2006/06/02 18:28:00 joerg Exp $ DISTNAME= horde-2.2.9 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= ftp://ftp.horde.org/pub/horde/tarballs/ @@ -9,9 +9,11 @@ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://www.horde.org/ COMMENT= PHP application framework -DEPENDS+= php-gettext>=4.3.3:../../devel/php-gettext -DEPENDS+= pear-Log-[0-9]*:../../sysutils/pear-Log -DEPENDS+= pear-DB-[0-9]*:../../databases/pear-DB +.include "../../lang/php/phpversion.mk" + +DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log +DEPENDS+= ${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB CONFLICTS+= horde-3.* diff --git a/www/horde3/Makefile b/www/horde3/Makefile index 8e2cf4726b7..ffb9f3162c5 100644 --- a/www/horde3/Makefile +++ b/www/horde3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2006/04/29 09:23:19 adrianp Exp $ +# $NetBSD: Makefile,v 1.25 2006/06/02 18:28:00 joerg Exp $ DISTNAME= horde-3.1.1 +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://ftp.horde.org/pub/horde/ \ ftp://ftp.horde.org/pub/horde/ @@ -13,20 +14,20 @@ CONFLICTS+= horde-2.* .include "../../lang/php/phpversion.mk" -DEPENDS+= php-gettext>=4.3.3:../../devel/php-gettext -DEPENDS+= php-mcrypt>=4.3.3:../../security/php-mcrypt -DEPENDS+= php-iconv>=4.3.3:../../converters/php-iconv -DEPENDS+= php-gd>=4.3.3:../../graphics/php-gd -DEPENDS+= pear-Log-[0-9]*:../../sysutils/pear-Log -DEPENDS+= pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime -DEPENDS+= pear-DB-[0-9]*:../../databases/pear-DB -DEPENDS+= ap-php>=4.3.3:../../www/ap-php +DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext +DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=4.3.3:../../security/php-mcrypt +DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=4.3.3:../../converters/php-iconv +DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log +DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime +DEPENDS+= ${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB +DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php .if ${PKG_PHP_VERSION} == "4" -DEPENDS+= php-domxml>=4.3.3:../../textproc/php4-domxml +DEPENDS+= ${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml .elif ${PKG_PHP_VERSION} == "5" -DEPENDS+= php-dom-[0-9]*:../../textproc/php5-dom +DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom .endif -DEPENDS+= php-zlib>=4.3.3:../../archivers/php-zlib +DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib .include "../../mk/bsd.prefs.mk" @@ -127,4 +128,5 @@ do-install: @${CHOWN} ${APACHE_USER}:${SHAREGRP} ${HORDEDIR}/config @${CHMOD} 0750 ${HORDEDIR}/config +.include "../../mk/apachever.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile index 49fac12b53c..d668c9eeb49 100644 --- a/www/p5-Apache-ASP/Makefile +++ b/www/p5-Apache-ASP/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.27 2006/03/04 21:30:59 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2006/06/02 18:28:00 joerg Exp $ # DISTNAME= Apache-ASP-2.21 PKGNAME= p5-${DISTNAME} -PKGREVISION= 5 +PKGREVISION= 6 SVR4_PKGNAME= p5aas CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile index d76d8214fec..1903296ddb1 100644 --- a/www/p5-Apache-AuthCookie/Makefile +++ b/www/p5-Apache-AuthCookie/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:59 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/06/02 18:28:00 joerg Exp $ # DISTNAME= Apache-AuthCookie-3.06 PKGNAME= p5-${DISTNAME} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} @@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://search.cpan.org/dist/Apache-AuthCookie/ COMMENT= Perl5 module for Authentication and Authorization via cookies -DEPENDS+= ap-perl>=1.29:../../www/ap-perl +DEPENDS+= ap13-perl>=1.29:../../www/ap-perl DEPENDS+= p5-Apache-Test-[0-9]*:../../www/p5-Apache-Test PERL5_PACKLIST= auto/Apache/AuthCookie/.packlist diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile index 0f3ff7ed3f9..c713412c37f 100644 --- a/www/p5-Apache-Filter/Makefile +++ b/www/p5-Apache-Filter/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:59 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/06/02 18:28:00 joerg Exp $ DISTNAME= Apache-Filter-1.022 PKGNAME= p5-${DISTNAME} -PKGREVISION= 4 +PKGREVISION= 5 SVR4_PKGNAME= p5afi CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile index fc0649a395a..4cc74dda5b6 100644 --- a/www/p5-Apache-SSI/Makefile +++ b/www/p5-Apache-SSI/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:59 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/06/02 18:28:00 joerg Exp $ DISTNAME= Apache-SSI-2.16 PKGNAME= p5-${DISTNAME} -PKGREVISION= 4 +PKGREVISION= 5 SVR4_PKGNAME= p5ass CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile index c5fae6c7404..fed51ba1c4f 100644 --- a/www/p5-HTML-Mason/Makefile +++ b/www/p5-HTML-Mason/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2006/03/04 21:31:01 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2006/06/02 18:28:00 joerg Exp $ DISTNAME= HTML-Mason-1.3101 PKGNAME= p5-HTML-Mason-1.31.1 -PKGREVISION= 1 +PKGREVISION= 2 SVR4_PKGNAME= p5hma CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile index ec1895dafcd..baf4f322d27 100644 --- a/www/p5-libapreq/Makefile +++ b/www/p5-libapreq/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2006/03/04 21:31:03 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/06/02 18:28:00 joerg Exp $ DISTNAME= libapreq-1.33 PKGNAME= p5-${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 SVR4_PKGNAME= p5lap CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} diff --git a/www/pear-HTML_Common/Makefile b/www/pear-HTML_Common/Makefile index dbd2d4d145e..66069cc6f1c 100644 --- a/www/pear-HTML_Common/Makefile +++ b/www/pear-HTML_Common/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:27 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/06/02 18:28:00 joerg Exp $ DISTNAME= HTML_Common-1.2.1 -PKGREVISION= 3 CATEGORIES= www MAINTAINER= jdolecek@NetBSD.org COMMENT= Base PHP class for other HTML classes +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 88fd3b8f739..9411e76dedd 100644 --- a/www/pear-HTML_Select/Makefile +++ b/www/pear-HTML_Select/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:11:27 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/06/02 18:28:00 joerg Exp $ DISTNAME= HTML_Select-1.2.1 -PKGREVISION= 1 CATEGORIES= www MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP class for generating HTML form select elements -DEPENDS+= pear-HTML_Common>=1.1:../../www/pear-HTML_Common +CONFLICTS= php-pear-HTML_Select-[0-9] + +DEPENDS+= ${PHP_PKG_PREFIX}-pear-HTML_Common>=1.1:../../www/pear-HTML_Common .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/pear-HTTP_Request/Makefile b/www/pear-HTTP_Request/Makefile index 7b38ca7a712..f7f56560e15 100644 --- a/www/pear-HTTP_Request/Makefile +++ b/www/pear-HTTP_Request/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:11:27 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/06/02 18:28:00 joerg Exp $ DISTNAME= HTTP_Request-1.2.3 -PKGREVISION= 1 #CATEGORIES+= www MAINTAINER= jdolecek@NetBSD.org COMMENT= PHP classes to provides an easy way to perform HTTP requests -DEPENDS+= pear-Net_URL>=1.0.12:../../net/pear-Net_URL -DEPENDS+= pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket +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 .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/php-FastTemplate/Makefile b/www/php-FastTemplate/Makefile index c43754066b1..6e612512e60 100644 --- a/www/php-FastTemplate/Makefile +++ b/www/php-FastTemplate/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:31:03 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2006/06/02 18:28:00 joerg Exp $ DISTNAME= FastTemplate-1_1_0 -PKGNAME= php-FastTemplate-1.1.0 -PKGREVISION= 1 +PKGNAME= ${PHP_PKG_PREFIX}-FastTemplate-1.1.0 CATEGORIES= www php4 MASTER_SITES= http://www.thewebmasters.net/php/ @@ -13,7 +12,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.thewebmasters.net/php/FastTemplate.phtml COMMENT= PHP extension for managing templates and variable interpolation -DEPENDS+= php>=3.0.18:../../www/php4 +CONFLICTS= php-FastTemplate-[0-9] + +PHP_VERSIONS_ACCEPTED= 4 WRKSRC= ${WRKDIR}/FastTemplate DIST_SUBDIR= ${PKGBASE} @@ -40,4 +41,5 @@ do-install: done ${INSTALL_DATA} ${WRKSRC}/templates/*.tpl ${EGDIR}/templates +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/php-apc/Makefile b/www/php-apc/Makefile index 4304b7ad94a..6ddcc99b979 100644 --- a/www/php-apc/Makefile +++ b/www/php-apc/Makefile @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.1 2006/05/03 14:02:30 tv Exp $ +# $NetBSD: Makefile,v 1.2 2006/06/02 18:28:00 joerg Exp $ MODNAME= apc PECL_VERSION= 3.0.10 CATEGORIES+= sysutils COMMENT= Alternative PHP Cache +CONFLICTS= php-apc-[0-9] + MAINTAINER= pkgsrc-users@NetBSD.org CONFIGURE_ARGS+= --enable-${MODNAME} diff --git a/www/php-curl/Makefile b/www/php-curl/Makefile index aed61a1d506..0b3c1a562b9 100644 --- a/www/php-curl/Makefile +++ b/www/php-curl/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:11:28 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/06/02 18:28:00 joerg Exp $ MODNAME= curl -PKGREVISION= 1 CATEGORIES+= www COMMENT= PHP extension for curl functions +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 66e4ca98c0c..aa0d935e97f 100644 --- a/www/php-eaccelerator/Makefile +++ b/www/php-eaccelerator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/06/01 18:00:59 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/02 18:28:01 joerg Exp $ MODNAME= eaccelerator PECL_VERSION= 0.9.5beta2 @@ -6,6 +6,8 @@ PECL_DISTNAME= ${MODNAME}-0.9.5-beta2 CATEGORIES+= sysutils COMMENT= PHP accelerator, optimizer, encoder and dynamic content cache +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 f363874bef0..7336a4272a9 100644 --- a/www/php4-apc/Makefile +++ b/www/php4-apc/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.23 2006/03/04 21:31:03 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2006/06/02 18:28:01 joerg Exp $ MODNAME= apc PECL_VERSION= 2.0.4 -PKGREVISION= 2 CATEGORIES+= sysutils COMMENT= Alternative PHP Cache for PHP4 MAINTAINER= pkgsrc-users@NetBSD.org +CONFLICTS= php-apc-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME} WRKSRC= ${WRKDIR}/APC-${PECL_VERSION} @@ -20,7 +20,7 @@ post-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR} -PHP_VERSION_REQD= 4 # PHP 4.x only +PHP_VERSIONS_ACCEPTED= 4 .include "../../lang/php/ext.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/websvn/Makefile b/www/websvn/Makefile index 66c5a34de10..50ee4eba1ba 100644 --- a/www/websvn/Makefile +++ b/www/websvn/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:31:04 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/06/02 18:28:01 joerg Exp $ # DISTNAME= WebSVN_161 PKGNAME= websvn-1.61 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= www MASTER_SITES= http://websvn.tigris.org/files/documents/1380/14334/ @@ -11,8 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://websvn.tigris.org/ COMMENT= Subversion repository web frontend -DEPENDS+= ap{,2}-php>=4.0.0:../../www/ap-php -DEPENDS+= php-zlib-[0-9]*:../../archivers/php-zlib +DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.0:../../www/ap-php +DEPENDS+= ${PHP_PKG_PREFIX}-zlib-[0-9]*:../../archivers/php-zlib WRKSRC= ${WRKDIR}/WebSVN NO_BUILD= yes @@ -40,4 +40,6 @@ do-install: post-install: ${RM} ${PREFIX}/${HTTPD_ROOT}/websvn/include/distconfig.inc +.include "../../mk/apachever.mk" +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" |