pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Rename all PHP 4 packages to php4-*, all PHP 5 package...
details: https://anonhg.NetBSD.org/pkgsrc/rev/77ea56a84375
branches: trunk
changeset: 513755:77ea56a84375
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Jun 02 18:27:54 2006 +0000
description:
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@.
diffstat:
archivers/php-bz2/Makefile | 5 +-
archivers/php-zip/Makefile | 4 +-
archivers/php-zlib/Makefile | 5 +-
converters/php-iconv/Makefile | 4 +-
databases/pear-DB/Makefile | 5 +-
databases/php-dba/Makefile | 4 +-
databases/php-dbase/Makefile | 4 +-
databases/php-dbx/Makefile | 4 +-
databases/php-filepro/Makefile | 4 +-
databases/php-ldap/Makefile | 5 +-
databases/php-mssql/Makefile | 5 +-
databases/php-mysql/Makefile | 5 +-
databases/php-odbc/Makefile | 4 +-
databases/php-pdo/Makefile | 7 +-
databases/php-pdo/buildlink3.mk | 6 +-
databases/php-pdo/module.mk | 10 ++-
databases/php-pdo_dblib/Makefile | 3 +-
databases/php-pdo_mysql/Makefile | 4 +-
databases/php-pdo_odbc/Makefile | 3 +-
databases/php-pdo_pgsql/Makefile | 3 +-
databases/php-pdo_sqlite/Makefile | 3 +-
databases/php-pgsql/Makefile | 4 +-
databases/php-sqlite/Makefile | 7 +-
databases/php5-mysqli/Makefile | 7 +-
databases/phpldapadmin/Makefile | 12 +-
databases/phpmyadmin/Makefile | 8 +-
databases/phppgadmin/Makefile | 7 +-
devel/mantis/Makefile | 9 +-
devel/php-gettext/Makefile | 4 +-
devel/php-gmp/Makefile | 4 +-
devel/php-memcache/Makefile | 4 +-
devel/php-pcntl/Makefile | 3 +-
devel/php-posix/Makefile | 4 +-
devel/php-shmop/Makefile | 4 +-
devel/php-sysvsem/Makefile | 4 +-
devel/php-sysvshm/Makefile | 4 +-
graphics/pear-Image_Canvas/Makefile | 7 +-
graphics/pear-Image_Color/Makefile | 7 +-
graphics/pear-Image_Graph/Makefile | 11 +-
graphics/php-gd/Makefile | 4 +-
graphics/php-jpgraph/Makefile | 10 +-
lang/php/ext.mk | 6 +-
lang/php/pear.mk | 4 +-
lang/php/phpversion.mk | 8 +-
mail/imp/Makefile | 9 +-
mail/imp4/Makefile | 10 +-
mail/ingo/Makefile | 3 +-
mail/ingo/options.mk | 6 +-
mail/ja-squirrelmail/Makefile | 9 +-
mail/pear-Mail/Makefile | 7 +-
mail/pear-Mail_Mime/Makefile | 5 +-
mail/php-imap/Makefile | 5 +-
mail/squirrelmail-decode/Makefile | 7 +-
mail/squirrelmail/Makefile | 7 +-
mail/turba/Makefile | 3 +-
mail/turba/options.mk | 6 +-
math/pear-Numbers_Roman/Makefile | 5 +-
math/pear-Numbers_Words/Makefile | 5 +-
math/php-bcmath/Makefile | 5 +-
meta-pkgs/php4-extensions/Makefile | 90 ++++++++++++------------
meta-pkgs/php5-extensions/Makefile | 101 ++++++++++++++-------------
misc/php-calendar/Makefile | 4 +-
misc/php-mbstring/Makefile | 5 +-
mk/apache.mk | 96 +--------------------------
mk/apachever.mk | 129 ++++++++++++++++++++++++++++++++++++
multimedia/php-ming/Makefile | 5 +-
net/pear-Net_DIME/Makefile | 5 +-
net/pear-Net_SMTP/Makefile | 7 +-
net/pear-Net_Sieve/Makefile | 6 +-
net/pear-Net_Socket/Makefile | 5 +-
net/pear-Net_URL/Makefile | 5 +-
net/pear-SOAP/Makefile | 13 +-
net/php-ftp/Makefile | 4 +-
net/php-snmp/Makefile | 4 +-
net/php-sockets/Makefile | 4 +-
net/php-xmlrpc/Makefile | 5 +-
net/php-yp/Makefile | 7 +-
net/php5-soap/Makefile | 7 +-
print/php-pdflib/Makefile | 4 +-
security/base/Makefile | 23 +++--
security/php-mcrypt/Makefile | 4 +-
security/php-mhash/Makefile | 4 +-
sysutils/pear-Log/Makefile | 5 +-
textproc/php-pspell/Makefile | 4 +-
textproc/php-wddx/Makefile | 4 +-
textproc/php4-domxml/Makefile | 7 +-
textproc/php4-xslt/Makefile | 7 +-
textproc/php5-dom/Makefile | 6 +-
textproc/php5-xsl/Makefile | 6 +-
time/kronolith/Makefile | 8 +-
time/pear-Date/Makefile | 5 +-
www/ap-Embperl/Makefile | 7 +-
www/ap-access-referer/Makefile | 6 +-
www/ap-auth-cookie/Makefile | 7 +-
www/ap-auth-kerb/Makefile | 6 +-
www/ap-auth-ldap/Makefile | 6 +-
www/ap-auth-mysql/Makefile | 7 +-
www/ap-auth-pam/Makefile | 6 +-
www/ap-auth-pgsql/Makefile | 9 +-
www/ap-auth-postgresql/Makefile | 10 +-
www/ap-auth-radius/Makefile | 5 +-
www/ap-auth-script/Makefile | 6 +-
www/ap-bandwidth/Makefile | 7 +-
www/ap-dav/Makefile | 8 +-
www/ap-dtcl/Makefile | 7 +-
www/ap-fastcgi/Makefile | 7 +-
www/ap-gzip/Makefile | 6 +-
www/ap-iasp/Makefile | 7 +-
www/ap-jk/Makefile | 7 +-
www/ap-layout/Makefile | 6 +-
www/ap-mp3/Makefile | 6 +-
www/ap-perl/Makefile | 8 +-
www/ap-perl/buildlink3.mk | 10 +-
www/ap-php/Makefile | 7 +-
www/ap-python/Makefile | 7 +-
www/ap-rivet/Makefile | 7 +-
www/ap-rpaf/Makefile | 6 +-
www/ap-ruby/Makefile | 7 +-
www/ap-ssl/Makefile | 6 +-
www/ap-throttle/Makefile | 7 +-
www/ap-xslt/Makefile | 7 +-
www/apc-gui/Makefile | 12 +-
www/blur6ex/Makefile | 10 +-
www/drupal/Makefile | 12 +-
www/drupal/options.mk | 10 +-
www/ganglia-webfrontend/Makefile | 8 +-
www/horde/Makefile | 12 +-
www/horde3/Makefile | 26 +++---
www/p5-Apache-ASP/Makefile | 4 +-
www/p5-Apache-AuthCookie/Makefile | 6 +-
www/p5-Apache-Filter/Makefile | 4 +-
www/p5-Apache-SSI/Makefile | 4 +-
www/p5-HTML-Mason/Makefile | 4 +-
www/p5-libapreq/Makefile | 4 +-
www/pear-HTML_Common/Makefile | 5 +-
www/pear-HTML_Select/Makefile | 7 +-
www/pear-HTTP_Request/Makefile | 9 +-
www/php-FastTemplate/Makefile | 10 +-
www/php-apc/Makefile | 4 +-
www/php-curl/Makefile | 4 +-
www/php-eaccelerator/Makefile | 4 +-
www/php4-apc/Makefile | 6 +-
www/websvn/Makefile | 10 +-
143 files changed, 719 insertions(+), 584 deletions(-)
diffs (truncated from 3501 to 300 lines):
diff -r 18c33c91c75b -r 77ea56a84375 archivers/php-bz2/Makefile
--- a/archivers/php-bz2/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/archivers/php-bz2/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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 -r 18c33c91c75b -r 77ea56a84375 archivers/php-zip/Makefile
--- a/archivers/php-zip/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/archivers/php-zip/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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 -r 18c33c91c75b -r 77ea56a84375 archivers/php-zlib/Makefile
--- a/archivers/php-zlib/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/archivers/php-zlib/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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 -r 18c33c91c75b -r 77ea56a84375 converters/php-iconv/Makefile
--- a/converters/php-iconv/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/converters/php-iconv/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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 -r 18c33c91c75b -r 77ea56a84375 databases/pear-DB/Makefile
--- a/databases/pear-DB/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/pear-DB/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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@localhost
HOMEPAGE= http://pear.php.net/package/DB
COMMENT= PHP Database Abstraction Layer
diff -r 18c33c91c75b -r 77ea56a84375 databases/php-dba/Makefile
--- a/databases/php-dba/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-dba/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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 -r 18c33c91c75b -r 77ea56a84375 databases/php-dbase/Makefile
--- a/databases/php-dbase/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-dbase/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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 -r 18c33c91c75b -r 77ea56a84375 databases/php-dbx/Makefile
--- a/databases/php-dbx/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-dbx/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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@localhost
+CONFLICTS= php-dbx-[0-9]
.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 18c33c91c75b -r 77ea56a84375 databases/php-filepro/Makefile
--- a/databases/php-filepro/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-filepro/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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 -r 18c33c91c75b -r 77ea56a84375 databases/php-ldap/Makefile
--- a/databases/php-ldap/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-ldap/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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 -r 18c33c91c75b -r 77ea56a84375 databases/php-mssql/Makefile
--- a/databases/php-mssql/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-mssql/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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 -r 18c33c91c75b -r 77ea56a84375 databases/php-mysql/Makefile
--- a/databases/php-mysql/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-mysql/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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@localhost
+CONFLICTS= php-mysql-[0-9]
+
USE_PHP_EXT_PATCHES= yes
EVAL_PREFIX+= MYSQLDIR=mysql-client
diff -r 18c33c91c75b -r 77ea56a84375 databases/php-odbc/Makefile
--- a/databases/php-odbc/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-odbc/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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 -r 18c33c91c75b -r 77ea56a84375 databases/php-pdo/Makefile
--- a/databases/php-pdo/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-pdo/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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 -r 18c33c91c75b -r 77ea56a84375 databases/php-pdo/buildlink3.mk
--- a/databases/php-pdo/buildlink3.mk Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-pdo/buildlink3.mk Fri Jun 02 18:27:54 2006 +0000
@@ -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+= 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 -r 18c33c91c75b -r 77ea56a84375 databases/php-pdo/module.mk
--- a/databases/php-pdo/module.mk Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-pdo/module.mk Fri Jun 02 18:27:54 2006 +0000
@@ -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 @@
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@localhost
@@ -20,3 +22,7 @@
# needed due to (broken?) PDO_* configure checks
CONFIGURE_ENV+= PHP_PDO_SHARED="1"
+
+PHP_VERSIONS_ACCEPTED= 5
+
+.include "../../lang/php/phpversion.mk"
diff -r 18c33c91c75b -r 77ea56a84375 databases/php-pdo_dblib/Makefile
--- a/databases/php-pdo_dblib/Makefile Fri Jun 02 18:23:23 2006 +0000
+++ b/databases/php-pdo_dblib/Makefile Fri Jun 02 18:27:54 2006 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index