Module Name:	pkgsrc
Committed By:	joerg
Date:		Fri Jun  2 18:28:01 UTC 2006

Modified Files:
	pkgsrc/archivers/php-bz2: Makefile
	pkgsrc/archivers/php-zip: Makefile
	pkgsrc/archivers/php-zlib: Makefile
	pkgsrc/converters/php-iconv: Makefile
	pkgsrc/databases/pear-DB: Makefile
	pkgsrc/databases/php-dba: Makefile
	pkgsrc/databases/php-dbase: Makefile
	pkgsrc/databases/php-dbx: Makefile
	pkgsrc/databases/php-filepro: Makefile
	pkgsrc/databases/php-ldap: Makefile
	pkgsrc/databases/php-mssql: Makefile
	pkgsrc/databases/php-mysql: Makefile
	pkgsrc/databases/php-odbc: Makefile
	pkgsrc/databases/php-pdo: Makefile buildlink3.mk module.mk
	pkgsrc/databases/php-pdo_dblib: Makefile
	pkgsrc/databases/php-pdo_mysql: Makefile
	pkgsrc/databases/php-pdo_odbc: Makefile
	pkgsrc/databases/php-pdo_pgsql: Makefile
	pkgsrc/databases/php-pdo_sqlite: Makefile
	pkgsrc/databases/php-pgsql: Makefile
	pkgsrc/databases/php-sqlite: Makefile
	pkgsrc/databases/php5-mysqli: Makefile
	pkgsrc/databases/phpldapadmin: Makefile
	pkgsrc/databases/phpmyadmin: Makefile
	pkgsrc/databases/phppgadmin: Makefile
	pkgsrc/devel/mantis: Makefile
	pkgsrc/devel/php-gettext: Makefile
	pkgsrc/devel/php-gmp: Makefile
	pkgsrc/devel/php-memcache: Makefile
	pkgsrc/devel/php-pcntl: Makefile
	pkgsrc/devel/php-posix: Makefile
	pkgsrc/devel/php-shmop: Makefile
	pkgsrc/devel/php-sysvsem: Makefile
	pkgsrc/devel/php-sysvshm: Makefile
	pkgsrc/graphics/pear-Image_Canvas: Makefile
	pkgsrc/graphics/pear-Image_Color: Makefile
	pkgsrc/graphics/pear-Image_Graph: Makefile
	pkgsrc/graphics/php-gd: Makefile
	pkgsrc/graphics/php-jpgraph: Makefile
	pkgsrc/lang/php: ext.mk pear.mk phpversion.mk
	pkgsrc/mail/imp: Makefile
	pkgsrc/mail/imp4: Makefile
	pkgsrc/mail/ingo: Makefile options.mk
	pkgsrc/mail/ja-squirrelmail: Makefile
	pkgsrc/mail/pear-Mail: Makefile
	pkgsrc/mail/pear-Mail_Mime: Makefile
	pkgsrc/mail/php-imap: Makefile
	pkgsrc/mail/squirrelmail: Makefile
	pkgsrc/mail/squirrelmail-decode: Makefile
	pkgsrc/mail/turba: Makefile options.mk
	pkgsrc/math/pear-Numbers_Roman: Makefile
	pkgsrc/math/pear-Numbers_Words: Makefile
	pkgsrc/math/php-bcmath: Makefile
	pkgsrc/meta-pkgs/php4-extensions: Makefile
	pkgsrc/meta-pkgs/php5-extensions: Makefile
	pkgsrc/misc/php-calendar: Makefile
	pkgsrc/misc/php-mbstring: Makefile
	pkgsrc/mk: apache.mk
	pkgsrc/multimedia/php-ming: Makefile
	pkgsrc/net/pear-Net_DIME: Makefile
	pkgsrc/net/pear-Net_SMTP: Makefile
	pkgsrc/net/pear-Net_Sieve: Makefile
	pkgsrc/net/pear-Net_Socket: Makefile
	pkgsrc/net/pear-Net_URL: Makefile
	pkgsrc/net/pear-SOAP: Makefile
	pkgsrc/net/php-ftp: Makefile
	pkgsrc/net/php-snmp: Makefile
	pkgsrc/net/php-sockets: Makefile
	pkgsrc/net/php-xmlrpc: Makefile
	pkgsrc/net/php-yp: Makefile
	pkgsrc/net/php5-soap: Makefile
	pkgsrc/print/php-pdflib: Makefile
	pkgsrc/security/base: Makefile
	pkgsrc/security/php-mcrypt: Makefile
	pkgsrc/security/php-mhash: Makefile
	pkgsrc/sysutils/pear-Log: Makefile
	pkgsrc/textproc/php-pspell: Makefile
	pkgsrc/textproc/php-wddx: Makefile
	pkgsrc/textproc/php4-domxml: Makefile
	pkgsrc/textproc/php4-xslt: Makefile
	pkgsrc/textproc/php5-dom: Makefile
	pkgsrc/textproc/php5-xsl: Makefile
	pkgsrc/time/kronolith: Makefile
	pkgsrc/time/pear-Date: Makefile
	pkgsrc/www/ap-Embperl: Makefile
	pkgsrc/www/ap-access-referer: Makefile
	pkgsrc/www/ap-auth-cookie: Makefile
	pkgsrc/www/ap-auth-kerb: Makefile
	pkgsrc/www/ap-auth-ldap: Makefile
	pkgsrc/www/ap-auth-mysql: Makefile
	pkgsrc/www/ap-auth-pam: Makefile
	pkgsrc/www/ap-auth-pgsql: Makefile
	pkgsrc/www/ap-auth-postgresql: Makefile
	pkgsrc/www/ap-auth-radius: Makefile
	pkgsrc/www/ap-auth-script: Makefile
	pkgsrc/www/ap-bandwidth: Makefile
	pkgsrc/www/ap-dav: Makefile
	pkgsrc/www/ap-dtcl: Makefile
	pkgsrc/www/ap-fastcgi: Makefile
	pkgsrc/www/ap-gzip: Makefile
	pkgsrc/www/ap-iasp: Makefile
	pkgsrc/www/ap-jk: Makefile
	pkgsrc/www/ap-layout: Makefile
	pkgsrc/www/ap-mp3: Makefile
	pkgsrc/www/ap-perl: Makefile buildlink3.mk
	pkgsrc/www/ap-php: Makefile
	pkgsrc/www/ap-python: Makefile
	pkgsrc/www/ap-rivet: Makefile
	pkgsrc/www/ap-rpaf: Makefile
	pkgsrc/www/ap-ruby: Makefile
	pkgsrc/www/ap-ssl: Makefile
	pkgsrc/www/ap-throttle: Makefile
	pkgsrc/www/ap-xslt: Makefile
	pkgsrc/www/apc-gui: Makefile
	pkgsrc/www/blur6ex: Makefile
	pkgsrc/www/drupal: Makefile options.mk
	pkgsrc/www/ganglia-webfrontend: Makefile
	pkgsrc/www/horde: Makefile
	pkgsrc/www/horde3: Makefile
	pkgsrc/www/p5-Apache-ASP: Makefile
	pkgsrc/www/p5-Apache-AuthCookie: Makefile
	pkgsrc/www/p5-Apache-Filter: Makefile
	pkgsrc/www/p5-Apache-SSI: Makefile
	pkgsrc/www/p5-HTML-Mason: Makefile
	pkgsrc/www/p5-libapreq: Makefile
	pkgsrc/www/pear-HTML_Common: Makefile
	pkgsrc/www/pear-HTML_Select: Makefile
	pkgsrc/www/pear-HTTP_Request: Makefile
	pkgsrc/www/php-FastTemplate: Makefile
	pkgsrc/www/php-apc: Makefile
	pkgsrc/www/php-curl: Makefile
	pkgsrc/www/php-eaccelerator: Makefile
	pkgsrc/www/php4-apc: Makefile
	pkgsrc/www/websvn: Makefile
Added Files:
	pkgsrc/mk: apachever.mk

Log Message:
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@.


To generate a diff of this commit:
cvs rdiff -r1.9 -r1.10 pkgsrc/archivers/php-bz2/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/archivers/php-zip/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/archivers/php-zlib/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/converters/php-iconv/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/databases/pear-DB/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/php-dba/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/php-dbase/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/databases/php-dbx/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/php-filepro/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/databases/php-ldap/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/php-mssql/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/databases/php-mysql/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/php-odbc/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/databases/php-pdo/Makefile \
    pkgsrc/databases/php-pdo/buildlink3.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/php-pdo/module.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/php-pdo_dblib/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/databases/php-pdo_mysql/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/databases/php-pdo_odbc/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/databases/php-pdo_pgsql/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/databases/php-pdo_sqlite/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/php-pgsql/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/php-sqlite/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/databases/php5-mysqli/Makefile
cvs rdiff -r1.22 -r1.23 pkgsrc/databases/phpldapadmin/Makefile
cvs rdiff -r1.49 -r1.50 pkgsrc/databases/phpmyadmin/Makefile
cvs rdiff -r1.19 -r1.20 pkgsrc/databases/phppgadmin/Makefile
cvs rdiff -r1.21 -r1.22 pkgsrc/devel/mantis/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/devel/php-gettext/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/devel/php-gmp/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/devel/php-memcache/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/devel/php-pcntl/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/devel/php-posix/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/devel/php-shmop/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/devel/php-sysvsem/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/devel/php-sysvshm/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/graphics/pear-Image_Canvas/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/graphics/pear-Image_Color/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/graphics/pear-Image_Graph/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/graphics/php-gd/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/graphics/php-jpgraph/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/lang/php/ext.mk
cvs rdiff -r1.8 -r1.9 pkgsrc/lang/php/pear.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/lang/php/phpversion.mk
cvs rdiff -r1.36 -r1.37 pkgsrc/mail/imp/Makefile
cvs rdiff -r1.20 -r1.21 pkgsrc/mail/imp4/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/mail/ingo/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/mail/ingo/options.mk
cvs rdiff -r1.28 -r1.29 pkgsrc/mail/ja-squirrelmail/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/mail/pear-Mail/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/mail/pear-Mail_Mime/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/mail/php-imap/Makefile
cvs rdiff -r1.71 -r1.72 pkgsrc/mail/squirrelmail/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/mail/squirrelmail-decode/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/mail/turba/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/mail/turba/options.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/math/pear-Numbers_Roman/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/math/pear-Numbers_Words/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/math/php-bcmath/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/meta-pkgs/php4-extensions/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/meta-pkgs/php5-extensions/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/misc/php-calendar/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/misc/php-mbstring/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/mk/apache.mk
cvs rdiff -r0 -r1.1 pkgsrc/mk/apachever.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/multimedia/php-ming/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/net/pear-Net_DIME/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/net/pear-Net_SMTP/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/net/pear-Net_Sieve/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/net/pear-Net_Socket/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/net/pear-Net_URL/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/net/pear-SOAP/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/net/php-ftp/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/net/php-snmp/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/net/php-sockets/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/net/php-xmlrpc/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/net/php-yp/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/net/php5-soap/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/print/php-pdflib/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/security/base/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/security/php-mcrypt/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/security/php-mhash/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/sysutils/pear-Log/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/textproc/php-pspell/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/textproc/php-wddx/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/textproc/php4-domxml/Makefile
cvs rdiff -r1.20 -r1.21 pkgsrc/textproc/php4-xslt/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/textproc/php5-dom/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/textproc/php5-xsl/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/time/kronolith/Makefile
cvs rdiff -r1.6 -r1.7 pkgsrc/time/pear-Date/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/www/ap-Embperl/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/www/ap-access-referer/Makefile
cvs rdiff -r1.38 -r1.39 pkgsrc/www/ap-auth-cookie/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/www/ap-auth-kerb/Makefile
cvs rdiff -r1.29 -r1.30 pkgsrc/www/ap-auth-ldap/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/www/ap-auth-mysql/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/www/ap-auth-pam/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/www/ap-auth-pgsql/Makefile
cvs rdiff -r1.27 -r1.28 pkgsrc/www/ap-auth-postgresql/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/www/ap-auth-radius/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/www/ap-auth-script/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/www/ap-bandwidth/Makefile
cvs rdiff -r1.19 -r1.20 pkgsrc/www/ap-dav/Makefile
cvs rdiff -r1.26 -r1.27 pkgsrc/www/ap-dtcl/Makefile
cvs rdiff -r1.29 -r1.30 pkgsrc/www/ap-fastcgi/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/www/ap-gzip/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/www/ap-iasp/Makefile
cvs rdiff -r1.35 -r1.36 pkgsrc/www/ap-jk/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/www/ap-layout/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/www/ap-mp3/Makefile
cvs rdiff -r1.42 -r1.43 pkgsrc/www/ap-perl/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/www/ap-perl/buildlink3.mk
cvs rdiff -r1.9 -r1.10 pkgsrc/www/ap-php/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/www/ap-python/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/www/ap-rivet/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/www/ap-rpaf/Makefile
cvs rdiff -r1.28 -r1.29 pkgsrc/www/ap-ruby/Makefile
cvs rdiff -r1.100 -r1.101 pkgsrc/www/ap-ssl/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/www/ap-throttle/Makefile
cvs rdiff -r1.30 -r1.31 pkgsrc/www/ap-xslt/Makefile
cvs rdiff -r1.18 -r1.19 pkgsrc/www/apc-gui/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/www/blur6ex/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/www/drupal/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/www/drupal/options.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/www/ganglia-webfrontend/Makefile
cvs rdiff -r1.43 -r1.44 pkgsrc/www/horde/Makefile
cvs rdiff -r1.24 -r1.25 pkgsrc/www/horde3/Makefile
cvs rdiff -r1.27 -r1.28 pkgsrc/www/p5-Apache-ASP/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/www/p5-Apache-AuthCookie/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/www/p5-Apache-Filter/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/www/p5-Apache-SSI/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/www/p5-HTML-Mason/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/www/p5-libapreq/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/www/pear-HTML_Common/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/www/pear-HTML_Select/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/www/pear-HTTP_Request/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/www/php-FastTemplate/Makefile
cvs rdiff -r1.1 -r1.2 pkgsrc/www/php-apc/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/www/php-curl/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/www/php-eaccelerator/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/www/php4-apc/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/www/websvn/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.