Thu Jul 5 09:48:49 2012 UTC ()
Use of PHP_VERSION_REQD in Makefiles breaks the bulk build.
PHP_VERSIONS_ACCEPTED should be used instead.


(cheusov)
diff -r1.8 -r1.9 pkgsrc/meta-pkgs/php53-extensions/Makefile
diff -r1.1 -r1.2 pkgsrc/meta-pkgs/php54-extensions/Makefile
cvs diff -r1.8 -r1.9 pkgsrc/meta-pkgs/php53-extensions/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/php53-extensions/Attic/Makefile 2012/06/16 05:44:03 1.8
+++ pkgsrc/meta-pkgs/php53-extensions/Attic/Makefile 2012/07/05 09:48:49 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2012/06/16 05:44:03 taca Exp $ 1# $NetBSD: Makefile,v 1.9 2012/07/05 09:48:49 cheusov Exp $
2 2
3DISTNAME= ${PHP_PKG_PREFIX}-extensions-${PHP_BASE_VERS} 3DISTNAME= ${PHP_PKG_PREFIX}-extensions-${PHP_BASE_VERS}
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= meta-pkgs www 5CATEGORIES= meta-pkgs www
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.php.net/ 10HOMEPAGE= http://www.php.net/
11COMMENT= "meta-package" for the PHP 5.3 HTML-embedded scripting language 11COMMENT= "meta-package" for the PHP 5.3 HTML-embedded scripting language
12 12
13DEPENDS+= php>=${PHP_BASE_VERS}<${NEXT_VERS}:${PHPPKGSRCDIR} 13DEPENDS+= php>=${PHP_BASE_VERS}<${NEXT_VERS}:${PHPPKGSRCDIR}
14DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/ap-php 14DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/ap-php
@@ -53,19 +53,19 @@ DEPENDS+= ${PHP_PKG_PREFIX}-soap>=${PHP_ @@ -53,19 +53,19 @@ DEPENDS+= ${PHP_PKG_PREFIX}-soap>=${PHP_
53DEPENDS+= ${PHP_PKG_PREFIX}-sockets>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-sockets 53DEPENDS+= ${PHP_PKG_PREFIX}-sockets>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-sockets
54DEPENDS+= ${PHP_PKG_PREFIX}-sqlite>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-sqlite 54DEPENDS+= ${PHP_PKG_PREFIX}-sqlite>=${PHP_BASE_VERS}<${NEXT_VERS}:../../databases/php-sqlite
55DEPENDS+= ${PHP_PKG_PREFIX}-sysvmsg>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvmsg 55DEPENDS+= ${PHP_PKG_PREFIX}-sysvmsg>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvmsg
56DEPENDS+= ${PHP_PKG_PREFIX}-sysvsem>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvsem 56DEPENDS+= ${PHP_PKG_PREFIX}-sysvsem>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvsem
57DEPENDS+= ${PHP_PKG_PREFIX}-sysvshm>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvshm 57DEPENDS+= ${PHP_PKG_PREFIX}-sysvshm>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvshm
58DEPENDS+= ${PHP_PKG_PREFIX}-tidy>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/php-tidy 58DEPENDS+= ${PHP_PKG_PREFIX}-tidy>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/php-tidy
59DEPENDS+= ${PHP_PKG_PREFIX}-wddx>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-wddx 59DEPENDS+= ${PHP_PKG_PREFIX}-wddx>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-wddx
60DEPENDS+= ${PHP_PKG_PREFIX}-xmlrpc>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-xmlrpc 60DEPENDS+= ${PHP_PKG_PREFIX}-xmlrpc>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-xmlrpc
61DEPENDS+= ${PHP_PKG_PREFIX}-xsl>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-xsl 61DEPENDS+= ${PHP_PKG_PREFIX}-xsl>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-xsl
62DEPENDS+= ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}<${NEXT_VERS}:../../archivers/php-zip 62DEPENDS+= ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}<${NEXT_VERS}:../../archivers/php-zip
63DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}<${NEXT_VERS}:../../archivers/php-zlib 63DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}<${NEXT_VERS}:../../archivers/php-zlib
64 64
65NEXT_VERS= 5.4 65NEXT_VERS= 5.4
66PHP_VERSION_REQD= 53 66PHP_VERSIONS_ACCEPTED= 53
67META_PACKAGE= yes 67META_PACKAGE= yes
68 68
69.include "../../lang/php/phpversion.mk" 69.include "../../lang/php/phpversion.mk"
70.include "../../mk/apache.mk" 70.include "../../mk/apache.mk"
71.include "../../mk/bsd.pkg.mk" 71.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/meta-pkgs/php54-extensions/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/php54-extensions/Attic/Makefile 2012/06/16 05:45:24 1.1
+++ pkgsrc/meta-pkgs/php54-extensions/Attic/Makefile 2012/07/05 09:48:49 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1 2012/06/16 05:45:24 taca Exp $ 1# $NetBSD: Makefile,v 1.2 2012/07/05 09:48:49 cheusov Exp $
2 2
3DISTNAME= ${PHP_PKG_PREFIX}-extensions-${PHP_BASE_VERS} 3DISTNAME= ${PHP_PKG_PREFIX}-extensions-${PHP_BASE_VERS}
4CATEGORIES= meta-pkgs www 4CATEGORIES= meta-pkgs www
5MASTER_SITES= # empty 5MASTER_SITES= # empty
6DISTFILES= # empty 6DISTFILES= # empty
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.php.net/ 9HOMEPAGE= http://www.php.net/
10COMMENT= "meta-package" for the PHP 5.4 HTML-embedded scripting language 10COMMENT= "meta-package" for the PHP 5.4 HTML-embedded scripting language
11 11
12DEPENDS+= php>=${PHP_BASE_VERS}<${NEXT_VERS}:${PHPPKGSRCDIR} 12DEPENDS+= php>=${PHP_BASE_VERS}<${NEXT_VERS}:${PHPPKGSRCDIR}
13DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/ap-php 13DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/ap-php
14DEPENDS+= ${PHP_PKG_PREFIX}-fpm>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/php-fpm 14DEPENDS+= ${PHP_PKG_PREFIX}-fpm>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/php-fpm
@@ -51,19 +51,19 @@ DEPENDS+= ${PHP_PKG_PREFIX}-snmp>=${PHP_ @@ -51,19 +51,19 @@ DEPENDS+= ${PHP_PKG_PREFIX}-snmp>=${PHP_
51DEPENDS+= ${PHP_PKG_PREFIX}-soap>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-soap 51DEPENDS+= ${PHP_PKG_PREFIX}-soap>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-soap
52DEPENDS+= ${PHP_PKG_PREFIX}-sockets>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-sockets 52DEPENDS+= ${PHP_PKG_PREFIX}-sockets>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-sockets
53DEPENDS+= ${PHP_PKG_PREFIX}-sysvmsg>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvmsg 53DEPENDS+= ${PHP_PKG_PREFIX}-sysvmsg>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvmsg
54DEPENDS+= ${PHP_PKG_PREFIX}-sysvsem>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvsem 54DEPENDS+= ${PHP_PKG_PREFIX}-sysvsem>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvsem
55DEPENDS+= ${PHP_PKG_PREFIX}-sysvshm>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvshm 55DEPENDS+= ${PHP_PKG_PREFIX}-sysvshm>=${PHP_BASE_VERS}<${NEXT_VERS}:../../devel/php-sysvshm
56DEPENDS+= ${PHP_PKG_PREFIX}-tidy>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/php-tidy 56DEPENDS+= ${PHP_PKG_PREFIX}-tidy>=${PHP_BASE_VERS}<${NEXT_VERS}:../../www/php-tidy
57DEPENDS+= ${PHP_PKG_PREFIX}-wddx>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-wddx 57DEPENDS+= ${PHP_PKG_PREFIX}-wddx>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-wddx
58DEPENDS+= ${PHP_PKG_PREFIX}-xmlrpc>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-xmlrpc 58DEPENDS+= ${PHP_PKG_PREFIX}-xmlrpc>=${PHP_BASE_VERS}<${NEXT_VERS}:../../net/php-xmlrpc
59DEPENDS+= ${PHP_PKG_PREFIX}-xsl>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-xsl 59DEPENDS+= ${PHP_PKG_PREFIX}-xsl>=${PHP_BASE_VERS}<${NEXT_VERS}:../../textproc/php-xsl
60DEPENDS+= ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}<${NEXT_VERS}:../../archivers/php-zip 60DEPENDS+= ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}<${NEXT_VERS}:../../archivers/php-zip
61DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}<${NEXT_VERS}:../../archivers/php-zlib 61DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}<${NEXT_VERS}:../../archivers/php-zlib
62 62
63NEXT_VERS= 5.5 63NEXT_VERS= 5.5
64PHP_VERSION_REQD= 54 64PHP_VERSIONS_ACCEPTED= 54
65META_PACKAGE= yes 65META_PACKAGE= yes
66 66
67.include "../../lang/php/phpversion.mk" 67.include "../../lang/php/phpversion.mk"
68.include "../../mk/apache.mk" 68.include "../../mk/apache.mk"
69.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"