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@.

2 files changed, 97 insertions, 94 deletions

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"