Update php5-extensions package to 5.2.13.

* Change package version scheme.
* Add php5-pspell and php5-sysvmsg.

2 files changed, 61 insertions, 63 deletions

diff --git a/meta-pkgs/php5-extensions/DESCR b/meta-pkgs/php5-extensions/DESCR
index 0bb84786049..47a86b4396e 100644
--- a/meta-pkgs/php5-extensions/DESCR
+++ b/meta-pkgs/php5-extensions/DESCR
@@ -1,4 +1,4 @@
-PHP 5.x is HTML-embedded scripting language.
+PHP 5.2.x is HTML-embedded scripting language.
 
 This package does not contain anything by itself -- it is a
 "meta-package" that depends on other PHP packages.  Its sole purpose is
diff --git a/meta-pkgs/php5-extensions/Makefile b/meta-pkgs/php5-extensions/Makefile
index 63a70339c09..2d1411a031f 100644
--- a/meta-pkgs/php5-extensions/Makefile
+++ b/meta-pkgs/php5-extensions/Makefile
@@ -1,76 +1,74 @@
-# $NetBSD: Makefile,v 1.21 2007/12/19 12:27:30 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2010/03/16 15:52:25 taca Exp $
 
-DISTNAME=	php-extensions-5.2
-#PKGREVISION=	1
-CATEGORIES=	meta-pkgs www php5
+DISTNAME=	php-extensions-${PHP_BASE_VERS}
+CATEGORIES=	meta-pkgs www
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://www.php.net/
-COMMENT=	"meta-package" for the PHP5 HTML-embedded scripting language
+COMMENT=	"meta-package" for the PHP 5.2 HTML-embedded scripting language
 
-# base PHP 5.x package
-DEPENDS+=	php-5.2.*:../../lang/php5
-DEPENDS+=	${APACHE_PKG_PREFIX}-php5-5.2.*:../../www/ap-php
+# base PHP 5.2.x package
+DEPENDS+=	php>=${PHP_BASE_VERS}<5.3:../../lang/php5
+DEPENDS+=	${APACHE_PKG_PREFIX}-php5>=${PHP_BASE_VERS}<5.3:../../www/ap-php
 
-# extensions buildable with both PHP 4.x and PHP 5.x
-DEPENDS+=	php5-apc-5.2.*:../../www/php-apc
-DEPENDS+=	php5-bcmath-5.2.*:../../math/php-bcmath
-DEPENDS+=	php5-bz2-5.2.*:../../archivers/php-bz2
-DEPENDS+=	php5-calendar-5.2.*:../../misc/php-calendar
-DEPENDS+=	php5-curl-5.2.*:../../www/php-curl
-DEPENDS+=	php5-dba-5.2.*:../../databases/php-dba
-DEPENDS+=	php5-dbase-5.2.*:../../databases/php-dbase
-DEPENDS+=	php5-dbx-5.2.*:../../databases/php-dbx
-DEPENDS+=	php5-eaccelerator-5.2.*:../../www/php-eaccelerator
-DEPENDS+=	php5-exif-5.2.*:../../graphics/php-exif
-# filepro extension removed in 5.2
-# DEPENDS+=	php5-filepro-5.2.*:../../databases/php-filepro
-DEPENDS+=	php5-ftp-5.2.*:../../net/php-ftp
-DEPENDS+=	php5-gd-5.2.*:../../graphics/php-gd
-DEPENDS+=	php5-gettext-5.2.*:../../devel/php-gettext
-DEPENDS+=	php5-gmp-5.2.*:../../devel/php-gmp
-DEPENDS+=	php5-iconv-5.2.*:../../converters/php-iconv
-DEPENDS+=	php5-imap-5.2.*:../../mail/php-imap
-DEPENDS+=	php5-json-5.2.*:../../textproc/php-json
-DEPENDS+=	php5-ldap-5.2.*:../../databases/php-ldap
-DEPENDS+=	php5-mbstring-5.2.*:../../misc/php-mbstring
-DEPENDS+=	php5-mcrypt-5.2.*:../../security/php-mcrypt
-DEPENDS+=	php5-mhash-5.2.*:../../security/php-mhash
-DEPENDS+=	php5-mssql-5.2.*:../../databases/php-mssql
-DEPENDS+=	php5-mysql-5.2.*:../../databases/php-mysql
-# odbc kills Apache1 on startup due to threaded unixodbc
-# DEPENDS+=	php5-odbc-5.2.*:../../databases/php-odbc
-DEPENDS+=	php5-pcntl-5.2.*:../../devel/php-pcntl
-DEPENDS+=	php5-pdflib-5.2.*:../../print/php-pdflib
-DEPENDS+=	php5-pgsql-5.2.*:../../databases/php-pgsql
-DEPENDS+=	php5-posix-5.2.*:../../devel/php-posix
-DEPENDS+=	php5-shmop-5.2.*:../../devel/php-shmop
-DEPENDS+=	php5-snmp-5.2.*:../../net/php-snmp
-DEPENDS+=	php5-sockets-5.2.*:../../net/php-sockets
-DEPENDS+=	php5-sqlite-5.2.*:../../databases/php-sqlite
-DEPENDS+=	php5-sysvsem-5.2.*:../../devel/php-sysvsem
-DEPENDS+=	php5-sysvshm-5.2.*:../../devel/php-sysvshm
-DEPENDS+=	php5-wddx-5.2.*:../../textproc/php-wddx
-DEPENDS+=	php5-xmlrpc-5.2.*:../../net/php-xmlrpc
-DEPENDS+=	php5-zip-5.2.*:../../archivers/php-zip
-DEPENDS+=	php5-zlib-5.2.*:../../archivers/php-zlib
+# extensions buildable with both PHP 5.2 and PHP 5.3
+DEPENDS+=	php5-apc>=${PHP_BASE_VERS}<5.3:../../www/php-apc
+DEPENDS+=	php5-bcmath>=${PHP_BASE_VERS}<5.3:../../math/php-bcmath
+DEPENDS+=	php5-bz2>=${PHP_BASE_VERS}<5.3:../../archivers/php-bz2
+DEPENDS+=	php5-calendar>=${PHP_BASE_VERS}<5.3:../../time/php-calendar
+DEPENDS+=	php5-curl>=${PHP_BASE_VERS}<5.3:../../www/php-curl
+DEPENDS+=	php5-dba>=${PHP_BASE_VERS}<5.3:../../databases/php-dba
+DEPENDS+=	php5-dom>=${PHP_BASE_VERS}<5.3:../../textproc/php-dom
+DEPENDS+=	php5-eaccelerator>=${PHP_BASE_VERS}<5.3:../../www/php-eaccelerator
+DEPENDS+=	php5-exif>=${PHP_BASE_VERS}<5.3:../../graphics/php-exif
+DEPENDS+=	php5-ftp>=${PHP_BASE_VERS}<5.3:../../net/php-ftp
+DEPENDS+=	php5-gd>=${PHP_BASE_VERS}<5.3:../../graphics/php-gd
+DEPENDS+=	php5-gettext>=${PHP_BASE_VERS}<5.3:../../devel/php-gettext
+DEPENDS+=	php5-gmp>=${PHP_BASE_VERS}<5.3:../../devel/php-gmp
+DEPENDS+=	php5-iconv>=${PHP_BASE_VERS}<5.3:../../converters/php-iconv
+DEPENDS+=	php5-imap>=${PHP_BASE_VERS}<5.3:../../mail/php-imap
+DEPENDS+=	php5-json>=${PHP_BASE_VERS}<5.3:../../textproc/php-json
+DEPENDS+=	php5-ldap>=${PHP_BASE_VERS}<5.3:../../databases/php-ldap
+DEPENDS+=	php5-mbstring>=${PHP_BASE_VERS}<5.3:../../converters/php-mbstring
+DEPENDS+=	php5-mcrypt>=${PHP_BASE_VERS}<5.3:../../security/php-mcrypt
+DEPENDS+=	php5-mssql>=${PHP_BASE_VERS}<5.3:../../databases/php-mssql
+DEPENDS+=	php5-mysql>=${PHP_BASE_VERS}<5.3:../../databases/php-mysql
+DEPENDS+=	php5-mysqli>=${PHP_BASE_VERS}<5.3:../../databases/php-mysqli
+# broken
+# DEPENDS+=	php5-odbc>=${PHP_BASE_VERS}<5.3:../../databases/php-odbc
+DEPENDS+=	php5-pcntl>=${PHP_BASE_VERS}<5.3:../../devel/php-pcntl
+DEPENDS+=	php5-pdflib>=${PHP_BASE_VERS}<5.3:../../print/php-pdflib
+DEPENDS+=	php5-pdo>=${PHP_BASE_VERS}<5.3:../../databases/php-pdo
+DEPENDS+=	php5-pdo_dblib>=${PHP_BASE_VERS}<5.3:../../databases/php-pdo_dblib
+DEPENDS+=	php5-pdo_mysql>=${PHP_BASE_VERS}<5.3:../../databases/php-pdo_mysql
+DEPENDS+=	php5-pdo_pgsql>=${PHP_BASE_VERS}<5.3:../../databases/php-pdo_pgsql
+DEPENDS+=	php5-pdo_sqlite>=${PHP_BASE_VERS}<5.3:../../databases/php-pdo_sqlite
+DEPENDS+=	php5-pgsql>=${PHP_BASE_VERS}<5.3:../../databases/php-pgsql
+DEPENDS+=	php5-posix>=${PHP_BASE_VERS}<5.3:../../devel/php-posix
+DEPENDS+=	php5-shmop>=${PHP_BASE_VERS}<5.3:../../devel/php-shmop
+DEPENDS+=	php5-snmp>=${PHP_BASE_VERS}<5.3:../../net/php-snmp
+DEPENDS+=	php5-soap>=${PHP_BASE_VERS}<5.3:../../net/php-soap
+DEPENDS+=	php5-sockets>=${PHP_BASE_VERS}<5.3:../../net/php-sockets
+DEPENDS+=	php5-sqlite>=${PHP_BASE_VERS}<5.3:../../databases/php-sqlite
+DEPENDS+=	php5-sysvmsg>=${PHP_BASE_VERS}<5.3:../../devel/php-sysvmsg
+DEPENDS+=	php5-sysvsem>=${PHP_BASE_VERS}<5.3:../../devel/php-sysvsem
+DEPENDS+=	php5-sysvshm>=${PHP_BASE_VERS}<5.3:../../devel/php-sysvshm
+DEPENDS+=	php5-wddx>=${PHP_BASE_VERS}<5.3:../../textproc/php-wddx
+DEPENDS+=	php5-xsl>=${PHP_BASE_VERS}<5.3:../../textproc/php-xsl
+DEPENDS+=	php5-xmlrpc>=${PHP_BASE_VERS}<5.3:../../net/php-xmlrpc
+DEPENDS+=	php5-zip>=${PHP_BASE_VERS}<5.3:../../archivers/php-zip
+DEPENDS+=	php5-zlib>=${PHP_BASE_VERS}<5.3:../../archivers/php-zlib
 
-# PHP 5.x-only extensions
-DEPENDS+=	php5-dom-5.2.*:../../textproc/php5-dom
-DEPENDS+=	php5-mysqli-5.2.*:../../databases/php5-mysqli
-DEPENDS+=	php5-soap-5.2.*:../../net/php5-soap
-DEPENDS+=	php5-xsl-5.2.*:../../textproc/php5-xsl
-DEPENDS+=	php5-pdo-5.2.*:../../databases/php-pdo
-DEPENDS+=	php5-pdo_dblib-5.2.*:../../databases/php-pdo_dblib
-DEPENDS+=	php5-pdo_mysql-5.2.*:../../databases/php-pdo_mysql
-# odbc kills Apache1 on startup due to threaded unixodbc
-# DEPENDS+=	php5-pdo_odbc-5.2.*:../../databases/php-pdo_odbc
-DEPENDS+=	php5-pdo_pgsql-5.2.*:../../databases/php-pdo_pgsql
-DEPENDS+=	php5-pdo_sqlite-5.2.*:../../databases/php-pdo_sqlite
+# PHP 5.2.x only extensions
+DEPENDS+=	php5-dbase>=${PHP_BASE_VERS}<5.3:../../databases/php-dbase
+DEPENDS+=	php5-dbx>=${PHP_BASE_VERS}<5.3:../../databases/php-dbx
+DEPENDS+=	php5-mhash>=${PHP_BASE_VERS}<5.3:../../security/php-mhash
+DEPENDS+=	php5-pspell>=${PHP_BASE_VERS}<5.3:../../textproc/php-pspell
 
 META_PACKAGE=	yes
 
+.include "../../lang/php5/Makefile.common"
 .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"