Instead of random PHP packages, just includes extensions bundled

with PHP 5.3.x's distribution.

Bump PKGREVISION.

2 files changed, 62 insertions, 61 deletions

diff --git a/meta-pkgs/php53-extensions/MESSAGE b/meta-pkgs/php53-extensions/MESSAGE
new file mode 100644
index 00000000000..c18b560a74e
--- /dev/null
+++ b/meta-pkgs/php53-extensions/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2012/06/16 05:42:20 taca Exp $
+
+This meta package dosen't contain packages which isn't distributed with
+PHP 5.3.x any more.
+
+===========================================================================
diff --git a/meta-pkgs/php53-extensions/Makefile b/meta-pkgs/php53-extensions/Makefile
index 0c4177b40c3..a58cc1331ea 100644
--- a/meta-pkgs/php53-extensions/Makefile
+++ b/meta-pkgs/php53-extensions/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2012/04/15 22:01:02 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/16 05:42:21 taca Exp $
 
 DISTNAME=	php-extensions-${PHP_BASE_VERS}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	meta-pkgs www
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,68 +10,62 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.php.net/
 COMMENT=	"meta-package" for the PHP 5.3 HTML-embedded scripting language
 
-# base PHP 5.3.x package
-DEPENDS+=	php>=${PHP_BASE_VERS}<5.4:../../lang/php53
-DEPENDS+=	${APACHE_PKG_PREFIX}-php53>=${PHP_BASE_VERS}<5.4:../../www/ap-php
+DEPENDS+=	php>=${PHP_BASE_VERS}<${NEXT_VERS}:${PHPPKGSRCDIR}
+DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/ap-php
+DEPENDS+=	${PHP_PKG_PREFIX}-fpm>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/php-fpm
 
-# extensions buildable with both PHP 5.2.x and PHP 5.3.x
-DEPENDS+=	php53-apc>=5.3.8:../../www/php-apc
-DEPENDS+=	php53-bcmath>=${PHP_BASE_VERS}:../../math/php-bcmath
-DEPENDS+=	php53-bz2>=${PHP_BASE_VERS}:../../archivers/php-bz2
-DEPENDS+=	php53-calendar>=${PHP_BASE_VERS}:../../time/php-calendar
-DEPENDS+=	php53-curl>=${PHP_BASE_VERS}:../../www/php-curl
-DEPENDS+=	php53-dba>=${PHP_BASE_VERS}:../../databases/php-dba
-DEPENDS+=	php53-dbx>=5.3.8:../../databases/php-dbx
-DEPENDS+=	php53-dom>=${PHP_BASE_VERS}:../../textproc/php-dom
-DEPENDS+=	php53-eaccelerator>=5.3.8:../../www/php-eaccelerator
-DEPENDS+=	php53-enchant>=5.3.8:../../textproc/php-enchant
-DEPENDS+=	php53-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
-DEPENDS+=	php53-ftp>=${PHP_BASE_VERS}:../../net/php-ftp
-DEPENDS+=	php53-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
-DEPENDS+=	php53-gettext>=${PHP_BASE_VERS}:../../devel/php-gettext
-DEPENDS+=	php53-gmp>=${PHP_BASE_VERS}:../../devel/php-gmp
-DEPENDS+=	php53-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
-DEPENDS+=	php53-imap>=${PHP_BASE_VERS}:../../mail/php-imap
-DEPENDS+=	php53-intl>=5.3.8:../../textproc/php-intl
-DEPENDS+=	php53-json>=${PHP_BASE_VERS}:../../textproc/php-json
-DEPENDS+=	php53-ldap>=${PHP_BASE_VERS}:../../databases/php-ldap
-DEPENDS+=	php53-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
-DEPENDS+=	php53-mcrypt>=${PHP_BASE_VERS}:../../security/php-mcrypt
-DEPENDS+=	php53-mssql>=${PHP_BASE_VERS}:../../databases/php-mssql
-DEPENDS+=	php53-mysql>=${PHP_BASE_VERS}:../../databases/php-mysql
-DEPENDS+=	php53-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
+DEPENDS+=	${PHP_PKG_PREFIX}-bcmath>=${PHP_BASE_VERS}<${NEXT_VERS}:../../math/php-bcmath
+DEPENDS+=	${PHP_PKG_PREFIX}-bz2>=${PHP_BASE_VERS}<${NEXT_VERS}:../../archivers/php-bz2
+DEPENDS+=	${PHP_PKG_PREFIX}-calendar>=${PHP_BASE_VERS}<${NEXT_VERS}:../../time/php-calendar
+DEPENDS+=	${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/php-curl
+DEPENDS+=	${PHP_PKG_PREFIX}-dba>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-dba
+DEPENDS+=	${PHP_PKG_PREFIX}-dom>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-dom
+DEPENDS+=	${PHP_PKG_PREFIX}-enchant>=${PHP_BASE_VERS}:../../textproc/php-enchant
+DEPENDS+=	${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}<${NEXT_VERS}:../../graphics/php-exif
+DEPENDS+=	${PHP_PKG_PREFIX}-ftp>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-ftp
+DEPENDS+=	${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}<${NEXT_VERS}:../../graphics/php-gd
+DEPENDS+=	${PHP_PKG_PREFIX}-gettext>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-gettext
+DEPENDS+=	${PHP_PKG_PREFIX}-gmp>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-gmp
+DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}<${NEXT_VERS}:../../converters/php-iconv
+DEPENDS+=	${PHP_PKG_PREFIX}-imap>=${PHP_BASE_VERS}<${NEXT_VERS}:../../mail/php-imap
+DEPENDS+=	${PHP_PKG_PREFIX}-intl>=5.3.8:../../textproc/php-intl
+DEPENDS+=	${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-json
+DEPENDS+=	${PHP_PKG_PREFIX}-ldap>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-ldap
+DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}<${NEXT_VERS}:../../converters/php-mbstring
+DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=${PHP_BASE_VERS}<${NEXT_VERS}:../../security/php-mcrypt
+DEPENDS+=	${PHP_PKG_PREFIX}-mssql>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-mssql
+DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-mysql
+DEPENDS+=	${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-mysqli
 # broken
-# DEPENDS+=	php53-odbc>=${PHP_BASE_VERS}:../../databases/php-odbc
-DEPENDS+=	php53-pcntl>=${PHP_BASE_VERS}:../../devel/php-pcntl
-DEPENDS+=	php53-pdflib>=5.3.8:../../print/php-pdflib
-DEPENDS+=	php53-pdo>=${PHP_BASE_VERS}:../../databases/php-pdo
-DEPENDS+=	php53-pdo_dblib>=${PHP_BASE_VERS}:../../databases/php-pdo_dblib
-DEPENDS+=	php53-pdo_mysql>=${PHP_BASE_VERS}:../../databases/php-pdo_mysql
-DEPENDS+=	php53-pdo_pgsql>=${PHP_BASE_VERS}:../../databases/php-pdo_pgsql
-DEPENDS+=	php53-pdo_sqlite>=${PHP_BASE_VERS}:../../databases/php-pdo_sqlite
-DEPENDS+=	php53-pgsql>=${PHP_BASE_VERS}:../../databases/php-pgsql
-DEPENDS+=	php53-posix>=${PHP_BASE_VERS}:../../devel/php-posix
-DEPENDS+=	php53-shmop>=${PHP_BASE_VERS}:../../devel/php-shmop
-DEPENDS+=	php53-snmp>=${PHP_BASE_VERS}:../../net/php-snmp
-DEPENDS+=	php53-soap>=${PHP_BASE_VERS}:../../net/php-soap
-DEPENDS+=	php53-sockets>=${PHP_BASE_VERS}:../../net/php-sockets
-DEPENDS+=	php53-sqlite>=${PHP_BASE_VERS}:../../databases/php-sqlite
-DEPENDS+=	php53-sysvmsg>=${PHP_BASE_VERS}:../../devel/php-sysvmsg
-DEPENDS+=	php53-sysvsem>=${PHP_BASE_VERS}:../../devel/php-sysvsem
-DEPENDS+=	php53-sysvshm>=${PHP_BASE_VERS}:../../devel/php-sysvshm
-DEPENDS+=	php53-tidy>=${PHP_BASE_VERS}:../../www/php-tidy
-DEPENDS+=	php53-wddx>=${PHP_BASE_VERS}:../../textproc/php-wddx
-DEPENDS+=	php53-xsl>=${PHP_BASE_VERS}:../../textproc/php-xsl
-DEPENDS+=	php53-xmlrpc>=${PHP_BASE_VERS}:../../net/php-xmlrpc
-DEPENDS+=	php53-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
-DEPENDS+=	php53-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
+# DEPENDS+=	${PHP_PKG_PREFIX}-odbc>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-odbc
+DEPENDS+=	${PHP_PKG_PREFIX}-pcntl>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-pcntl
+DEPENDS+=	${PHP_PKG_PREFIX}-pdo>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-pdo
+DEPENDS+=	${PHP_PKG_PREFIX}-pdo_dblib>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-pdo_dblib
+DEPENDS+=	${PHP_PKG_PREFIX}-pdo_mysql>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-pdo_mysql
+DEPENDS+=	${PHP_PKG_PREFIX}-pdo_pgsql>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-pdo_pgsql
+DEPENDS+=	${PHP_PKG_PREFIX}-pdo_sqlite>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-pdo_sqlite
+DEPENDS+=	${PHP_PKG_PREFIX}-pgsql>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-pgsql
+DEPENDS+=	${PHP_PKG_PREFIX}-posix>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-posix
+DEPENDS+=	${PHP_PKG_PREFIX}-pspell>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-pspell
+DEPENDS+=	${PHP_PKG_PREFIX}-shmop>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-shmop
+DEPENDS+=	${PHP_PKG_PREFIX}-snmp>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-snmp
+DEPENDS+=	${PHP_PKG_PREFIX}-soap>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-soap
+DEPENDS+=	${PHP_PKG_PREFIX}-sockets>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-sockets
+DEPENDS+=	${PHP_PKG_PREFIX}-sqlite>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-sqlite
+DEPENDS+=	${PHP_PKG_PREFIX}-sysvmsg>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvmsg
+DEPENDS+=	${PHP_PKG_PREFIX}-sysvsem>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvsem
+DEPENDS+=	${PHP_PKG_PREFIX}-sysvshm>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvshm
+DEPENDS+=	${PHP_PKG_PREFIX}-tidy>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/php-tidy
+DEPENDS+=	${PHP_PKG_PREFIX}-wddx>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-wddx
+DEPENDS+=	${PHP_PKG_PREFIX}-xmlrpc>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-xmlrpc
+DEPENDS+=	${PHP_PKG_PREFIX}-xsl>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-xsl
+DEPENDS+=	${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}<${NEXT_VERS}:../../archivers/php-zip
+DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}<${NEXT_VERS}:../../archivers/php-zlib
 
-# PHP 5.3.x only extensions
-# not yet
-#DEPENDS+=	php53-mysqlnd>=${PHP_BASE_VERS}:../../databases/php-mysqlnd
+NEXT_VERS=		5.4
+PHP_VERSION_REQD=	53
+META_PACKAGE=		yes
 
-META_PACKAGE=	yes
-
-.include "../../lang/php53/Makefile.common"
+.include "../../lang/php/phpversion.mk"
 .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"