Sat Nov 5 14:30:31 2016 UTC ()
Update php71 to 7.1.0RC5.

Changes between RC4 and RC5:

- Core:
  . Fixed bug #73350 (Exception::__toString() cause circular references).
    (Laruence)
  . Fixed bug #73329 ((Float)"Nano" == NAN). (Anatol)

- CLI Server:
  . Fixed bug #73360 (Unable to work in root with unicode chars). (Anatol)

- SQLite3:
  . Fixed bug #73333 (2147483647 is fetched as string). (cmb)

Change since RC3 and RC4:

- Core:
  . Fixed bug #73288 (Segfault in __clone > Exception.toString > __get).
    (Laruence)
  . Fixed for #73240 (Write out of bounds at number_format). (Stas)
  . Fix pthreads detection when cross-compiling (ffontaine)
  . Fixed bug #73337 (try/catch not working with two exceptions inside a same
    operation). (Dmitry)

- BCmath:
  . Fix bug #73190 (memcpy negative parameter _bc_new_num_ex). (Stas)

- Date:
  . Fixed bug #45554 (Inconsistent behavior of the u format char). (Derick)
  . Fixed bug #48225 (DateTime parser doesn't set microseconds for "now").
    (Derick)
  . Fixed bug #52514 (microseconds are missing in DateTime class). (Derick)
  . Fixed bug #52519 (microseconds in DateInterval are missing). (Derick)
  . Fixed bug #60089 (DateTime::createFromFormat() U after u nukes microtime).
    (Derick)
  . Fixed bug #64887 (Allow DateTime modification with subsecond items).
    (Derick)
  . Fixed bug #68506 (General DateTime improvments needed for microseconds to
    become useful). (Derick)
  . Fixed bug #73109 (timelib_meridian doesn't parse dots correctly). (Derick)
  . Fixed bug #73247 (DateTime constructor does not initialise microseconds
    property). (Derick)
  . Fixed bug #73147 (Use After Free in PHP7 unserialize()). (Stas)
  . Fixed bug #73189 (Memcpy negative size parameter php_resolve_path). (Stas)

- DOM:
  . Fixed bug #73150 (missing NULL check in dom_document_save_html). (Stas)

- GD:
  . Fixed bug #73213 (Integer overflow in imageline() with antialiasing). (cmb)
  . Fixed bug #73272 (imagescale() is not affected by, but affects
    imagesetinterpolation()). (cmb)
  . Fixed bug #73279 (Integer overflow in gdImageScaleBilinearPalette()). (cmb)
  . Fixed bug #73280 (Stack Buffer Overflow in GD dynamicGetbuf). (cmb)

- Intl:
  . Fixed bug #73007 (add locale length check). (Stas)
  . Fixed bug #73218 (add mitigation for ICU int overflow). (Stas)

- OCI8
  . Fixed bug #71148 (Bind reference overwritten on PHP 7). (Oracle Corp.)

- OpenSSL:
  . Fixed bug #73276 (crash in openssl_random_pseudo_bytes function). (Stas)

- Session:
  . Fixed bug #73273 (session_unset() empties values from all variables in which
    is $_session stored). (Nikita)

- SOAP:
  . Fixed bug #73037 (SoapServer reports Bad Request when gzipped). (Anatol)
  . Fixed bug #73237 (Nested object in "any" element overwrites other fields).
    (Keith Smiley)
  . Fixed bug #69137 (Peer verification fails when using a proxy with SoapClient)
    (Keith Smiley)

- SimpleXML:
  . Fixed bug #73293 (NULL pointer dereference in SimpleXMLElement::asXML()).
    (Stas)

- SQLite3:
  . Updated to SQLite3 3.15.0. (cmb)

- Standard:
  . Fixed bug #73203 (passing additional_parameters causes mail to fail). (cmb)


(jdolecek)
diff -r1.161 -r1.162 pkgsrc/lang/php/phpversion.mk
diff -r1.3 -r1.4 pkgsrc/lang/php71/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/php71/distinfo
cvs diff -r1.161 -r1.162 pkgsrc/lang/php/phpversion.mk (switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2016/10/16 11:58:42 1.161
+++ pkgsrc/lang/php/phpversion.mk 2016/11/05 14:30:30 1.162
@@ -1,235 +1,235 @@ @@ -1,235 +1,235 @@
1# $NetBSD: phpversion.mk,v 1.161 2016/10/16 11:58:42 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.162 2016/11/05 14:30:30 jdolecek 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: 56 70 71 13# Possible: 56 70 71
14# Default: 56 14# Default: 56
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: 56 70 71 30# Possible: 56 70 71
31# Default: 56 31# Default: 56
32# 32#
33# PHP_VERSIONS_INCOMPATIBLE 33# PHP_VERSIONS_INCOMPATIBLE
34# The PHP versions that are not supported by the package. 34# The PHP versions that are not supported by the package.
35# 35#
36# Possible: 56 70 71 36# Possible: 56 70 71
37# Default: (empty) 37# Default: (empty)
38# 38#
39# PHP_CHECK_INSTALLED 39# PHP_CHECK_INSTALLED
40# Check installed version of PHP. Should be used by lang/php56, 40# Check installed version of PHP. Should be used by lang/php56,
41# lang/php70, or lang/php71 only. 41# lang/php70, or lang/php71 only.
42# 42#
43# Possible: Yes No 43# Possible: Yes No
44# Default: Yes 44# Default: Yes
45# 45#
46# === Variables defined by this file === 46# === Variables defined by this file ===
47# 47#
48# PKG_PHP_VERSION 48# PKG_PHP_VERSION
49# The selected PHP version. 49# The selected PHP version.
50# 50#
51# Possible: 56 70 71 51# Possible: 56 70 71
52# Default: ${PHP_VERSION_DEFAULT} 52# Default: ${PHP_VERSION_DEFAULT}
53# 53#
54# PHP_BASE_VERS 54# PHP_BASE_VERS
55# The selected PHP's full version depends on PKG_PHP_VERSION 55# The selected PHP's full version depends on PKG_PHP_VERSION
56# 56#
57# PKG_PHP_MAJOR_VERS 57# PKG_PHP_MAJOR_VERS
58# The selected PHP's major version. 58# The selected PHP's major version.
59# 59#
60# Possible: 5 7 60# Possible: 5 7
61# Default: 5 61# Default: 5
62# 62#
63# PKG_PHP 63# PKG_PHP
64# The same as ${PKG_PHP_VERSION}, prefixed with "php-". 64# The same as ${PKG_PHP_VERSION}, prefixed with "php-".
65# 65#
66# PHPPKGSRCDIR 66# PHPPKGSRCDIR
67# The directory of the PHP implementation, relative to the 67# The directory of the PHP implementation, relative to the
68# package directory. 68# package directory.
69# 69#
70# Example: ../../lang/php56 70# Example: ../../lang/php56
71# 71#
72# PHP_PKG_PREFIX 72# PHP_PKG_PREFIX
73# The prefix that is prepended to the package name. 73# The prefix that is prepended to the package name.
74# 74#
75# Example: php56 php70 php71 75# Example: php56 php70 php71
76# 76#
77# PHP_EXTENSION_DIR 77# PHP_EXTENSION_DIR
78# Relative path to ${PREFIX} for PHP's extensions. It is derived from 78# Relative path to ${PREFIX} for PHP's extensions. It is derived from
79# initial release of major version. 79# initial release of major version.
80# 80#
81# Example: lib/php/20140828 81# Example: lib/php/20140828
82# 82#
83# Keywords: php 83# Keywords: php
84# 84#
85 85
86.if !defined(PHPVERSION_MK) 86.if !defined(PHPVERSION_MK)
87PHPVERSION_MK= defined 87PHPVERSION_MK= defined
88 88
89# Define each PHP's version. 89# Define each PHP's version.
90PHP56_VERSION= 5.6.27 90PHP56_VERSION= 5.6.27
91PHP70_VERSION= 7.0.12 91PHP70_VERSION= 7.0.12
92PHP71_VERSION= 7.1.0RC3 92PHP71_VERSION= 7.1.0RC5
93 93
94# Define initial release of major version. 94# Define initial release of major version.
95PHP56_RELDATE= 20140828 95PHP56_RELDATE= 20140828
96PHP70_RELDATE= 20151203 96PHP70_RELDATE= 20151203
97PHP71_RELDATE= 20160303 97PHP71_RELDATE= 20160303
98 98
99_VARGROUPS+= php 99_VARGROUPS+= php
100_USER_VARS.php= PHP_VERSION_DEFAULT 100_USER_VARS.php= PHP_VERSION_DEFAULT
101_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 101_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
102_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 102_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
103 PKG_PHP_MAJOR_VERS 103 PKG_PHP_MAJOR_VERS
104 104
105.include "../../mk/bsd.prefs.mk" 105.include "../../mk/bsd.prefs.mk"
106 106
107PHP_VERSION_DEFAULT?= 56 107PHP_VERSION_DEFAULT?= 56
108PHP_VERSIONS_ACCEPTED?= 56 70 71 108PHP_VERSIONS_ACCEPTED?= 56 70 71
109.for pv in ${PHP_VERSIONS_ACCEPTED} 109.for pv in ${PHP_VERSIONS_ACCEPTED}
110. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv}) 110. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
111_PHP_VERSIONS_ACCEPTED+= ${pv} 111_PHP_VERSIONS_ACCEPTED+= ${pv}
112. endif 112. endif
113.endfor 113.endfor
114 114
115# transform the list into individual variables 115# transform the list into individual variables
116.for pv in ${_PHP_VERSIONS_ACCEPTED} 116.for pv in ${_PHP_VERSIONS_ACCEPTED}
117_PHP_VERSION_${pv}_OK= yes 117_PHP_VERSION_${pv}_OK= yes
118.endfor 118.endfor
119 119
120# check what is installed 120# check what is installed
121.if exists(${LOCALBASE}/lib/php/${PHP71_RELDATE}) 121.if exists(${LOCALBASE}/lib/php/${PHP71_RELDATE})
122_PHP_VERSION_71_INSTALLED= yes 122_PHP_VERSION_71_INSTALLED= yes
123_PHP_INSTALLED= yes 123_PHP_INSTALLED= yes
124.elif exists(${LOCALBASE}/lib/php/${PHP70_RELDATE}) 124.elif exists(${LOCALBASE}/lib/php/${PHP70_RELDATE})
125_PHP_VERSION_70_INSTALLED= yes 125_PHP_VERSION_70_INSTALLED= yes
126_PHP_INSTALLED= yes 126_PHP_INSTALLED= yes
127.elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE}) 127.elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE})
128_PHP_VERSION_56_INSTALLED= yes 128_PHP_VERSION_56_INSTALLED= yes
129_PHP_INSTALLED= yes 129_PHP_INSTALLED= yes
130.endif 130.endif
131 131
132# if a version is explicitely required, take it 132# if a version is explicitely required, take it
133.if defined(PHP_VERSION_REQD) 133.if defined(PHP_VERSION_REQD)
134_PHP_VERSION= ${PHP_VERSION_REQD} 134_PHP_VERSION= ${PHP_VERSION_REQD}
135.endif 135.endif
136# if the default is already installed, it is first choice 136# if the default is already installed, it is first choice
137.if !defined(_PHP_VERSION) 137.if !defined(_PHP_VERSION)
138.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 138.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
139.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED) 139.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED)
140_PHP_VERSION= ${PHP_VERSION_DEFAULT} 140_PHP_VERSION= ${PHP_VERSION_DEFAULT}
141.endif 141.endif
142.endif 142.endif
143.endif 143.endif
144# prefer an already installed version, in order of "accepted" 144# prefer an already installed version, in order of "accepted"
145.if !defined(_PHP_VERSION) 145.if !defined(_PHP_VERSION)
146.for pv in ${_PHP_VERSIONS_ACCEPTED} 146.for pv in ${_PHP_VERSIONS_ACCEPTED}
147.if defined(_PHP_VERSION_${pv}_INSTALLED) 147.if defined(_PHP_VERSION_${pv}_INSTALLED)
148_PHP_VERSION?= ${pv} 148_PHP_VERSION?= ${pv}
149.else 149.else
150# keep information as last resort - see below 150# keep information as last resort - see below
151_PHP_VERSION_FIRSTACCEPTED?= ${pv} 151_PHP_VERSION_FIRSTACCEPTED?= ${pv}
152.endif 152.endif
153.endfor 153.endfor
154.endif 154.endif
155# if the default is OK for the addon pkg, take this 155# if the default is OK for the addon pkg, take this
156.if !defined(_PHP_VERSION) 156.if !defined(_PHP_VERSION)
157.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 157.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
158_PHP_VERSION= ${PHP_VERSION_DEFAULT} 158_PHP_VERSION= ${PHP_VERSION_DEFAULT}
159.endif 159.endif
160.endif 160.endif
161# take the first one accepted by the package 161# take the first one accepted by the package
162.if !defined(_PHP_VERSION) 162.if !defined(_PHP_VERSION)
163_PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED} 163_PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED}
164.endif 164.endif
165 165
166# 166#
167# Variable assignment for multi-PHP packages 167# Variable assignment for multi-PHP packages
168MULTI+= PHP_VERSION_REQD=${_PHP_VERSION} 168MULTI+= PHP_VERSION_REQD=${_PHP_VERSION}
169 169
170# export some of internal variables 170# export some of internal variables
171PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//} 171PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//}
172PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/} 172PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/}
173 173
174# Major version 174# Major version
175PKG_PHP_MAJOR_VERS:= ${_PHP_VERSION:C/^([0-9]).*/\1/} 175PKG_PHP_MAJOR_VERS:= ${_PHP_VERSION:C/^([0-9]).*/\1/}
176 176
177PHP_CHECK_INSTALLED?= Yes 177PHP_CHECK_INSTALLED?= Yes
178 178
179# if installed PHP isn't compatible with required PHP, bail out 179# if installed PHP isn't compatible with required PHP, bail out
180.if empty(PHP_CHECK_INSTALLED:M[nN][oO]) 180.if empty(PHP_CHECK_INSTALLED:M[nN][oO])
181.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED) 181.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED)
182PKG_FAIL_REASON+= "Package accepts ${PKG_PHP}, but different version is installed" 182PKG_FAIL_REASON+= "Package accepts ${PKG_PHP}, but different version is installed"
183.endif 183.endif
184.endif 184.endif
185 185
186MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 186MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
187 PKG_PHP=${PKG_PHP} 187 PKG_PHP=${PKG_PHP}
188PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 188PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
189 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \ 189 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \
190 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} 190 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
191 191
192# force the selected PHP version for recursive builds 192# force the selected PHP version for recursive builds
193PHP_VERSION_REQD:= ${PKG_PHP_VERSION} 193PHP_VERSION_REQD:= ${PKG_PHP_VERSION}
194 194
195# 195#
196# set variables for the version we decided to use: 196# set variables for the version we decided to use:
197# 197#
198.if ${_PHP_VERSION} == "56" 198.if ${_PHP_VERSION} == "56"
199PHPPKGSRCDIR= ../../lang/php56 199PHPPKGSRCDIR= ../../lang/php56
200PHP_VERSION= ${PHP56_VERSION} 200PHP_VERSION= ${PHP56_VERSION}
201PHP_INITIAL_TEENY= 3 201PHP_INITIAL_TEENY= 3
202PHP_PKG_PREFIX= php56 202PHP_PKG_PREFIX= php56
203PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE} 203PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE}
204.elif ${_PHP_VERSION} == "70" 204.elif ${_PHP_VERSION} == "70"
205PHPPKGSRCDIR= ../../lang/php70 205PHPPKGSRCDIR= ../../lang/php70
206PHP_VERSION= ${PHP70_VERSION} 206PHP_VERSION= ${PHP70_VERSION}
207PHP_INITIAL_TEENY= 0 207PHP_INITIAL_TEENY= 0
208PHP_PKG_PREFIX= php70 208PHP_PKG_PREFIX= php70
209PHP_EXTENSION_DIR= lib/php/${PHP70_RELDATE} 209PHP_EXTENSION_DIR= lib/php/${PHP70_RELDATE}
210.elif ${_PHP_VERSION} == "71" 210.elif ${_PHP_VERSION} == "71"
211PHPPKGSRCDIR= ../../lang/php71 211PHPPKGSRCDIR= ../../lang/php71
212PHP_VERSION= ${PHP71_VERSION} 212PHP_VERSION= ${PHP71_VERSION}
213PHP_INITIAL_TEENY= 0 213PHP_INITIAL_TEENY= 0
214PHP_PKG_PREFIX= php71 214PHP_PKG_PREFIX= php71
215PHP_EXTENSION_DIR= lib/php/${PHP71_RELDATE} 215PHP_EXTENSION_DIR= lib/php/${PHP71_RELDATE}
216.else 216.else
217# force an error 217# force an error
218PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package" 218PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package"
219.endif 219.endif
220 220
221_PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 221_PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
222_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 222_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
223 223
224PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY} 224PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY}
225 225
226# 226#
227# check installed version aginst required: 227# check installed version aginst required:
228# 228#
229.if !empty(PHP_CHECK_INSTALLED:M[nN][oO]) 229.if !empty(PHP_CHECK_INSTALLED:M[nN][oO])
230.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED} 230.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED}
231PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed." 231PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed."
232.endif 232.endif
233.endif 233.endif
234 234
235.endif # PHPVERSION_MK 235.endif # PHPVERSION_MK
cvs diff -r1.3 -r1.4 pkgsrc/lang/php71/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/php71/Attic/Makefile 2016/09/12 15:38:01 1.3
+++ pkgsrc/lang/php71/Attic/Makefile 2016/11/05 14:30:30 1.4
@@ -1,71 +1,71 @@ @@ -1,71 +1,71 @@
1# $NetBSD: Makefile,v 1.3 2016/09/12 15:38:01 taca Exp $ 1# $NetBSD: Makefile,v 1.4 2016/11/05 14:30:30 jdolecek Exp $
2 2
3# 3#
4# We can't omit PKGNAME here to handle PKG_OPTIONS. 4# We can't omit PKGNAME here to handle PKG_OPTIONS.
5# 5#
6PKGNAME= php-${PHP_VERSION:S/RC/rc/} 6PKGNAME= php-${PHP_VERSION:S/RC/rc/}
7CATEGORIES= lang 7CATEGORIES= lang
8 8
9HOMEPAGE= http://www.php.net/ 9HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 7.1 10COMMENT= PHP Hypertext Preprocessor version 7.1
11LICENSE= php 11LICENSE= php
12 12
13# 7.1 is in beta, available only on dev location 13# 7.1 is in beta, available only on dev location
14MASTER_SITES= https://downloads.php.net/~davey/ 14MASTER_SITES= https://downloads.php.net/~krakjoe/
15 15
16TEST_TARGET= test 16TEST_TARGET= test
17 17
18USE_TOOLS+= gmake lex pkg-config 18USE_TOOLS+= gmake lex pkg-config
19LIBTOOL_OVERRIDE= # empty 19LIBTOOL_OVERRIDE= # empty
20PHP_CHECK_INSTALLED= No 20PHP_CHECK_INSTALLED= No
21 21
22PHP_VERSIONS_ACCEPTED= 71 22PHP_VERSIONS_ACCEPTED= 71
23 23
24.include "Makefile.php" 24.include "Makefile.php"
25 25
26CGIDIR= ${PREFIX}/libexec/cgi-bin 26CGIDIR= ${PREFIX}/libexec/cgi-bin
27EGDIR= ${PREFIX}/share/examples/php 27EGDIR= ${PREFIX}/share/examples/php
28MESSAGE_SUBST+= CGIDIR=${CGIDIR} 28MESSAGE_SUBST+= CGIDIR=${CGIDIR}
29 29
30CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} 30CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q}
31MAKE_ENV+= INSTALL_ROOT=${DESTDIR} 31MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
32 32
33CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini 33CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
34PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" 34PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
35 35
36SUBST_CLASSES+= path 36SUBST_CLASSES+= path
37SUBST_MESSAGE.path= Fixing common paths. 37SUBST_MESSAGE.path= Fixing common paths.
38SUBST_STAGE.path= pre-configure 38SUBST_STAGE.path= pre-configure
39SUBST_FILES.path= ext/phar/phar/phar.php 39SUBST_FILES.path= ext/phar/phar/phar.php
40SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php 40SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php
41SUBST_FILES.path+= sapi/cgi/Makefile.frag 41SUBST_FILES.path+= sapi/cgi/Makefile.frag
42SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' 42SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g'
43SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' 43SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
44 44
45INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php 45INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
46 46
47# Make sure modules can link correctly 47# Make sure modules can link correctly
48.if ${OPSYS} == "Darwin" 48.if ${OPSYS} == "Darwin"
49INSTALL_UNSTRIPPED= yes 49INSTALL_UNSTRIPPED= yes
50.endif 50.endif
51 51
52# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2) 52# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
53# and lacks the zone memory allocator 53# and lacks the zone memory allocator
54.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 54.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
55CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC 55CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
56.endif 56.endif
57 57
58post-extract: 58post-extract:
59 cd ${WRKSRC} && \ 59 cd ${WRKSRC} && \
60 ${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \; 60 ${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \;
61 61
62post-install: 62post-install:
63 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php 63 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
64 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ 64 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
65 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 65 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
66 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php 66 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
67 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ 67 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
68 ${DESTDIR}${EGDIR} 68 ${DESTDIR}${EGDIR}
69 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php 69 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php
70 70
71.include "../../mk/bsd.pkg.mk" 71.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/lang/php71/Attic/distinfo (switch to unified diff)

--- pkgsrc/lang/php71/Attic/distinfo 2016/10/08 09:16:09 1.7
+++ pkgsrc/lang/php71/Attic/distinfo 2016/11/05 14:30:30 1.8
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: distinfo,v 1.7 2016/10/08 09:16:09 jdolecek Exp $ 1$NetBSD: distinfo,v 1.8 2016/11/05 14:30:30 jdolecek Exp $
2 2
3SHA1 (php-7.1.0RC3.tar.bz2) = e12ba1e7adaba8f69e60b89277c7d0f9d858762e 3SHA1 (php-7.1.0RC5.tar.bz2) = f8387ec993a622d4e0dbb58751aaf0a6bcde226d
4RMD160 (php-7.1.0RC3.tar.bz2) = 903a92ae604d0c6c531cb335dcf87acfff47004b 4RMD160 (php-7.1.0RC5.tar.bz2) = b34b659f52d926f5ecbdac93e2ae5e3259bd4736
5SHA512 (php-7.1.0RC3.tar.bz2) = 63b06efbe28577760127db42101a16a5bcb7ce0a5be05777749f514e7c8487dbdfc44f3e10ea2e31e9de8a7c8c7506b93d99f4155f2a2a757808e9987213c74f 5SHA512 (php-7.1.0RC5.tar.bz2) = c6ff2ce84cdf6d772e1f9eebc85397b269634a956d82266526b6d75f784cff2a0abb90bd562df18fae3cb0f434c9eded3cce804910fdbf94cab221b193d420e5
6Size (php-7.1.0RC3.tar.bz2) = 15595095 bytes 6Size (php-7.1.0RC5.tar.bz2) = 15539145 bytes
7SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad 7SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
8SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c 8SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
9SHA1 (patch-ext_gd_config.m4) = 93b62daad93b9ee6dc28e06016f739bc26b0dc9f 9SHA1 (patch-ext_gd_config.m4) = 93b62daad93b9ee6dc28e06016f739bc26b0dc9f
10SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92 10SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
11SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916 11SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
12SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 12SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
13SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244 13SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244
14SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 14SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
15SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 15SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
16SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 16SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
17SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5 17SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
18SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56 18SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
19SHA1 (patch-ext_standard_php__dns.h) = 3687ceac4dff4605263b53acb761b071f7446ccb 19SHA1 (patch-ext_standard_php__dns.h) = 3687ceac4dff4605263b53acb761b071f7446ccb
20SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5 20SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
21SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd 21SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
22SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89 22SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
23SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb 23SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb
24SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65 24SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65
25SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 25SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
26SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150 26SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150
27SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7 27SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7