Sun Mar 15 15:25:57 2015 UTC ()
Drop php53 support.


(taca)
diff -r1.37 -r1.38 pkgsrc/lang/php/ext.mk
diff -r1.89 -r1.90 pkgsrc/lang/php/phpversion.mk
cvs diff -r1.37 -r1.38 pkgsrc/lang/php/ext.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/ext.mk 2015/02/16 10:30:15 1.37
+++ pkgsrc/lang/php/ext.mk 2015/03/15 15:25:57 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ext.mk,v 1.37 2015/02/16 10:30:15 jperkin Exp $ 1# $NetBSD: ext.mk,v 1.38 2015/03/15 15:25:57 taca Exp $
2# 2#
3# PHP extension package framework, for both PECL and bundled PHP extensions. 3# PHP extension package framework, for both PECL and bundled PHP extensions.
4# 4#
5# Just include this file, define MODNAME, define PKGREVISION if necessary, 5# Just include this file, define MODNAME, define PKGREVISION if necessary,
6# add dependencies, and add the appropriate --with-configure-arg, then include 6# add dependencies, and add the appropriate --with-configure-arg, then include
7# bsd.pkg.mk. 7# bsd.pkg.mk.
8 8
9.if !defined(PHPEXT_MK) 9.if !defined(PHPEXT_MK)
10PHPEXT_MK= defined 10PHPEXT_MK= defined
11 11
12_VARGROUPS+= phpext 12_VARGROUPS+= phpext
13_USER_VARS.phpext= # none 13_USER_VARS.phpext= # none
14_PKG_VARS.phpext= MODNAME PECL_VERSION PKGMODNAME MODULESDIR \ 14_PKG_VARS.phpext= MODNAME PECL_VERSION PKGMODNAME MODULESDIR \
@@ -28,32 +28,27 @@ HOMEPAGE?= http://pecl.php.net/package/ @@ -28,32 +28,27 @@ HOMEPAGE?= http://pecl.php.net/package/
28PKGMODNAME?= ${MODNAME:S/-/_/} 28PKGMODNAME?= ${MODNAME:S/-/_/}
29PHPSETUPSUBDIR?= #empty 29PHPSETUPSUBDIR?= #empty
30MODULESDIR?= ${WRKSRC}/modules 30MODULESDIR?= ${WRKSRC}/modules
31PLIST_SUBST+= MODNAME=${PKGMODNAME} 31PLIST_SUBST+= MODNAME=${PKGMODNAME}
32 32
33.if !defined(PECL_VERSION) 33.if !defined(PECL_VERSION)
34# bundled extension 34# bundled extension
35PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PHP_BASE_VERS} 35PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PHP_BASE_VERS}
36EXTRACT_ELEMENTS?= ${DISTNAME}/ext/${PKGMODNAME} 36EXTRACT_ELEMENTS?= ${DISTNAME}/ext/${PKGMODNAME}
37WRKSRC?= ${WRKDIR}/${EXTRACT_ELEMENTS} 37WRKSRC?= ${WRKDIR}/${EXTRACT_ELEMENTS}
38DISTINFO_FILE= ${.CURDIR}/${PHPPKGSRCDIR}/distinfo 38DISTINFO_FILE= ${.CURDIR}/${PHPPKGSRCDIR}/distinfo
39.else 39.else
40# PECL extension 40# PECL extension
41# WARINING: following fixed version number for PHP 5.3.x must not be bumped! 
42.if defined(PECL_LEGACY_VERSION_SCHEME) && ${PKG_PHP_VERSION} == "53" 
43PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-5.3.9.${PECL_VERSION} 
44.else 
45PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PECL_VERSION} 41PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PECL_VERSION}
46.endif 
47MASTER_SITES?= http://pecl.php.net/get/ 42MASTER_SITES?= http://pecl.php.net/get/
48PECL_DISTNAME?= ${MODNAME}-${PECL_VERSION} 43PECL_DISTNAME?= ${MODNAME}-${PECL_VERSION}
49DISTNAME= ${PECL_DISTNAME} 44DISTNAME= ${PECL_DISTNAME}
50DIST_SUBDIR?= php-${MODNAME} 45DIST_SUBDIR?= php-${MODNAME}
51EXTRACT_SUFX?= .tgz 46EXTRACT_SUFX?= .tgz
52.endif 47.endif
53 48
54PHPIZE?= ${BUILDLINK_PREFIX.php}/bin/phpize 49PHPIZE?= ${BUILDLINK_PREFIX.php}/bin/phpize
55PHP_CONFIG?= ${BUILDLINK_PREFIX.php}/bin/php-config 50PHP_CONFIG?= ${BUILDLINK_PREFIX.php}/bin/php-config
56 51
57GNU_CONFIGURE= YES 52GNU_CONFIGURE= YES
58CONFIGURE_ARGS+= --with-php-config=${PHP_CONFIG} 53CONFIGURE_ARGS+= --with-php-config=${PHP_CONFIG}
59 54
cvs diff -r1.89 -r1.90 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2015/03/15 11:50:53 1.89
+++ pkgsrc/lang/php/phpversion.mk 2015/03/15 15:25:57 1.90
@@ -1,136 +1,131 @@ @@ -1,136 +1,131 @@
1# $NetBSD: phpversion.mk,v 1.89 2015/03/15 11:50:53 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.90 2015/03/15 15:25:57 taca Exp $
2# 2#
3# This file selects a PHP version, based on the user's preferences and 3# This file selects a PHP version, based on the user's preferences and
4# the installed packages. It does not add a dependency on the PHP 4# the installed packages. It does not add a dependency on the PHP
5# package. 5# package.
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# PHP_VERSION_DEFAULT 9# PHP_VERSION_DEFAULT
10# The PHP version to choose when more than one is acceptable to 10# The PHP version to choose when more than one is acceptable to
11# the package. 11# the package.
12# 12#
13# Possible: 53 54 55 56 13# Possible: 54 55 56
14# Default: 54 14# Default: 54
15# 15#
16# === Infrastructure variables === 16# === Infrastructure variables ===
17# 17#
18# PHP_VERSION_REQD 18# PHP_VERSION_REQD
19# PHP version to use. This variable should not be set in 19# PHP version to use. This variable should not be set in
20# packages. Normally it is used by bulk build tools. 20# packages. Normally it is used by bulk build tools.
21# 21#
22# Possible: ${PHP_VERSIONS_ACCEPTED} 22# Possible: ${PHP_VERSIONS_ACCEPTED}
23# Default: ${PHP_VERSION_DEFAULT} 23# Default: ${PHP_VERSION_DEFAULT}
24# 24#
25# === Package-settable variables === 25# === Package-settable variables ===
26# 26#
27# PHP_VERSIONS_ACCEPTED 27# PHP_VERSIONS_ACCEPTED
28# The PHP versions that are accepted by the package. 28# The PHP versions that are accepted by the package.
29# 29#
30# Possible: 53 54 55 56 30# Possible: 54 55 56
31# Default: 54 53 31# Default: 54
32# 32#
33# PHP_CHECK_INSTALLED 33# PHP_CHECK_INSTALLED
34# Check installed version of PHP. Should be used lang/php53, 34# Check installed version of PHP. Should be used by lang/php54,
35# lang/php54, lang/php55 and lang/php56 only. 35# lang/php55 and lang/php56 only.
36# 36#
37# Possible: Yes No 37# Possible: Yes No
38# Default: Yes 38# Default: Yes
39# 39#
40# === Variables defined by this file === 40# === Variables defined by this file ===
41# 41#
42# PKG_PHP_VERSION 42# PKG_PHP_VERSION
43# The selected PHP version. 43# The selected PHP version.
44# 44#
45# Possible: 53 54 55 56 45# Possible: 54 55 56
46# Default: ${PHP_VERSION_DEFAULT} 46# Default: ${PHP_VERSION_DEFAULT}
47# 47#
48# PHP_BASE_VERS 48# PHP_BASE_VERS
49# The selected PHP's full version depends on PKG_PHP_VERSION 49# The selected PHP's full version depends on PKG_PHP_VERSION
50# 50#
51# PKG_PHP_MAJOR_VERS 51# PKG_PHP_MAJOR_VERS
52# The selected PHP's major version. 52# The selected PHP's major version.
53# 53#
54# Possible: 5 54# Possible: 5
55# Default: 5 55# Default: 5
56# 56#
57# PKG_PHP 57# PKG_PHP
58# The same as ${PKG_PHP_VERSION}, prefixed with "php-". 58# The same as ${PKG_PHP_VERSION}, prefixed with "php-".
59# 59#
60# PHPPKGSRCDIR 60# PHPPKGSRCDIR
61# The directory of the PHP implementation, relative to the 61# The directory of the PHP implementation, relative to the
62# package directory. 62# package directory.
63# 63#
64# Example: ../../lang/php54 64# Example: ../../lang/php54
65# 65#
66# PHP_PKG_PREFIX 66# PHP_PKG_PREFIX
67# The prefix that is prepended to the package name. 67# The prefix that is prepended to the package name.
68# 68#
69# Example: php53, php54, php55 php56 69# Example: php54, php55 php56
70# 70#
71# PHP_EXTENSION_DIR 71# PHP_EXTENSION_DIR
72# Relative path to ${PREFIX} for PHP's extensions. It is derived from 72# Relative path to ${PREFIX} for PHP's extensions. It is derived from
73# initial release of major version. 73# initial release of major version.
74# 74#
75# Example: lib/php/20090630 75# Example: lib/php/20090630
76# 76#
77# Keywords: php 77# Keywords: php
78# 78#
79 79
80.if !defined(PHPVERSION_MK) 80.if !defined(PHPVERSION_MK)
81PHPVERSION_MK= defined 81PHPVERSION_MK= defined
82 82
83# Define each PHP's version. 83# Define each PHP's version.
84PHP53_VERSION= 5.3.29 
85PHP54_VERSION= 5.4.38 84PHP54_VERSION= 5.4.38
86PHP55_VERSION= 5.5.22 85PHP55_VERSION= 5.5.22
87PHP56_VERSION= 5.6.6 86PHP56_VERSION= 5.6.6
88 87
89# Define initial release of major version. 88# Define initial release of major version.
90PHP53_RELDATE= 20090630 
91PHP54_RELDATE= 20120301 89PHP54_RELDATE= 20120301
92PHP55_RELDATE= 20130620 90PHP55_RELDATE= 20130620
93PHP56_RELDATE= 20140828 91PHP56_RELDATE= 20140828
94 92
95_VARGROUPS+= php 93_VARGROUPS+= php
96_USER_VARS.php= PHP_VERSION_DEFAULT 94_USER_VARS.php= PHP_VERSION_DEFAULT
97_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 95_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
98_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 96_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
99 PKG_PHP_MAJOR_VERS 97 PKG_PHP_MAJOR_VERS
100 98
101.include "../../mk/bsd.prefs.mk" 99.include "../../mk/bsd.prefs.mk"
102 100
103PHP_VERSION_DEFAULT?= 54 101PHP_VERSION_DEFAULT?= 54
104PHP_VERSIONS_ACCEPTED?= 54 55 56 53 102PHP_VERSIONS_ACCEPTED?= 54 55 56
105 103
106# transform the list into individual variables 104# transform the list into individual variables
107.for pv in ${PHP_VERSIONS_ACCEPTED} 105.for pv in ${PHP_VERSIONS_ACCEPTED}
108_PHP_VERSION_${pv}_OK= yes 106_PHP_VERSION_${pv}_OK= yes
109.endfor 107.endfor
110 108
111# check what is installed 109# check what is installed
112.if exists(${LOCALBASE}/lib/php/20140828) 110.if exists(${LOCALBASE}/lib/php/20140828)
113_PHP_VERSION_56_INSTALLED= yes 111_PHP_VERSION_56_INSTALLED= yes
114_PHP_INSTALLED= yes 112_PHP_INSTALLED= yes
115.elif exists(${LOCALBASE}/lib/php/20130620) 113.elif exists(${LOCALBASE}/lib/php/20130620)
116_PHP_VERSION_55_INSTALLED= yes 114_PHP_VERSION_55_INSTALLED= yes
117_PHP_INSTALLED= yes 115_PHP_INSTALLED= yes
118.elif exists(${LOCALBASE}/lib/php/20120301) 116.elif exists(${LOCALBASE}/lib/php/20120301)
119_PHP_VERSION_54_INSTALLED= yes 117_PHP_VERSION_54_INSTALLED= yes
120_PHP_INSTALLED= yes 118_PHP_INSTALLED= yes
121.elif exists(${LOCALBASE}/lib/php/20090626) || exists(${LOCALBASE}/include/php/Zend/zend_gc.h) 
122_PHP_VERSION_53_INSTALLED= yes 
123_PHP_INSTALLED= yes 
124.endif 119.endif
125 120
126# if a version is explicitely required, take it 121# if a version is explicitely required, take it
127.if defined(PHP_VERSION_REQD) 122.if defined(PHP_VERSION_REQD)
128_PHP_VERSION= ${PHP_VERSION_REQD} 123_PHP_VERSION= ${PHP_VERSION_REQD}
129.endif 124.endif
130# if the default is already installed, it is first choice 125# if the default is already installed, it is first choice
131.if !defined(_PHP_VERSION) 126.if !defined(_PHP_VERSION)
132.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 127.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
133.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED) 128.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED)
134_PHP_VERSION= ${PHP_VERSION_DEFAULT} 129_PHP_VERSION= ${PHP_VERSION_DEFAULT}
135.endif 130.endif
136.endif 131.endif
@@ -179,33 +174,27 @@ PKG_FAIL_REASON+= "Package accepts ${PKG @@ -179,33 +174,27 @@ PKG_FAIL_REASON+= "Package accepts ${PKG
179 174
180MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 175MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
181 PKG_PHP=${PKG_PHP} 176 PKG_PHP=${PKG_PHP}
182PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 177PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
183 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \ 178 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \
184 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} 179 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
185 180
186# force the selected PHP version for recursive builds 181# force the selected PHP version for recursive builds
187PHP_VERSION_REQD:= ${PKG_PHP_VERSION} 182PHP_VERSION_REQD:= ${PKG_PHP_VERSION}
188 183
189# 184#
190# set variables for the version we decided to use: 185# set variables for the version we decided to use:
191# 186#
192.if ${_PHP_VERSION} == "53" 187.if ${_PHP_VERSION} == "54"
193PHPPKGSRCDIR= ../../lang/php53 
194PHP_VERSION= ${PHP53_VERSION} 
195PHP_INITIAL_TEENY= 2 
196PHP_PKG_PREFIX= php53 
197PHP_EXTENSION_DIR= lib/php/${PHP53_RELDATE} 
198.elif ${_PHP_VERSION} == "54" 
199PHPPKGSRCDIR= ../../lang/php54 188PHPPKGSRCDIR= ../../lang/php54
200PHP_VERSION= ${PHP54_VERSION} 189PHP_VERSION= ${PHP54_VERSION}
201PHP_INITIAL_TEENY= 4 190PHP_INITIAL_TEENY= 4
202PHP_PKG_PREFIX= php54 191PHP_PKG_PREFIX= php54
203PHP_EXTENSION_DIR= lib/php/${PHP54_RELDATE} 192PHP_EXTENSION_DIR= lib/php/${PHP54_RELDATE}
204.elif ${_PHP_VERSION} == "55" 193.elif ${_PHP_VERSION} == "55"
205PHPPKGSRCDIR= ../../lang/php55 194PHPPKGSRCDIR= ../../lang/php55
206PHP_VERSION= ${PHP55_VERSION} 195PHP_VERSION= ${PHP55_VERSION}
207PHP_INITIAL_TEENY= 1 196PHP_INITIAL_TEENY= 1
208PHP_PKG_PREFIX= php55 197PHP_PKG_PREFIX= php55
209PHP_EXTENSION_DIR= lib/php/${PHP55_RELDATE} 198PHP_EXTENSION_DIR= lib/php/${PHP55_RELDATE}
210.elif ${_PHP_VERSION} == "56" 199.elif ${_PHP_VERSION} == "56"
211PHPPKGSRCDIR= ../../lang/php56 200PHPPKGSRCDIR= ../../lang/php56