Build the dom extension embedded. This enables full functionality in xmlreader and fixes joyent/pkgsrc/issues/477. Bump PKREVISION.diff -r1.12 -r1.13 pkgsrc/lang/php56/Makefile
(fhajny)
@@ -1,19 +1,20 @@ | @@ -1,19 +1,20 @@ | |||
1 | # $NetBSD: Makefile,v 1.12 2016/06/24 15:25:21 taca Exp $ | 1 | # $NetBSD: Makefile,v 1.13 2017/04/05 12:28:59 fhajny 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 | # | |
6 | PKGNAME= php-${PHP_VERSION} | 6 | PKGNAME= php-${PHP_VERSION} | |
7 | PKGREVISION= 1 | |||
7 | CATEGORIES= lang | 8 | CATEGORIES= lang | |
8 | 9 | |||
9 | HOMEPAGE= http://www.php.net/ | 10 | HOMEPAGE= http://www.php.net/ | |
10 | COMMENT= PHP Hypertext Preprocessor version 5.6 | 11 | COMMENT= PHP Hypertext Preprocessor version 5.6 | |
11 | LICENSE= php | 12 | LICENSE= php | |
12 | 13 | |||
13 | TEST_TARGET= test | 14 | TEST_TARGET= test | |
14 | 15 | |||
15 | USE_TOOLS+= gmake lex pkg-config | 16 | USE_TOOLS+= gmake lex pkg-config | |
16 | LIBTOOL_OVERRIDE= # empty | 17 | LIBTOOL_OVERRIDE= # empty | |
17 | PHP_CHECK_INSTALLED= No | 18 | PHP_CHECK_INSTALLED= No | |
18 | 19 | |||
19 | PHP_VERSIONS_ACCEPTED= 56 | 20 | PHP_VERSIONS_ACCEPTED= 56 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile.php,v 1.1 2014/11/24 15:37:08 taca Exp $ | 1 | # $NetBSD: Makefile.php,v 1.2 2017/04/05 12:28:59 fhajny Exp $ | |
2 | # used by lang/php56/Makefile | 2 | # used by lang/php56/Makefile | |
3 | # used by www/ap-php/Makefile | 3 | # used by www/ap-php/Makefile | |
4 | # used by www/php-fpm/Makefile | 4 | # used by www/php-fpm/Makefile | |
5 | 5 | |||
6 | .include "../../lang/php56/Makefile.common" | 6 | .include "../../lang/php56/Makefile.common" | |
7 | 7 | |||
8 | DISTINFO_FILE= ${.CURDIR}/../../lang/php56/distinfo | 8 | DISTINFO_FILE= ${.CURDIR}/../../lang/php56/distinfo | |
9 | PATCHDIR= ${.CURDIR}/../../lang/php56/patches | 9 | PATCHDIR= ${.CURDIR}/../../lang/php56/patches | |
10 | 10 | |||
11 | USE_LIBTOOL= YES | 11 | USE_LIBTOOL= YES | |
12 | USE_LANGUAGES= c c++ | 12 | USE_LANGUAGES= c c++ | |
13 | GNU_CONFIGURE= YES | 13 | GNU_CONFIGURE= YES | |
14 | BUILD_DEFS+= VARBASE | 14 | BUILD_DEFS+= VARBASE | |
@@ -21,27 +21,26 @@ CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX | @@ -21,27 +21,26 @@ CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX | |||
21 | CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} | 21 | CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} | |
22 | CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d | 22 | CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d | |
23 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | 23 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | |
24 | CONFIGURE_ARGS+= --localstatedir=${VARBASE} | 24 | CONFIGURE_ARGS+= --localstatedir=${VARBASE} | |
25 | 25 | |||
26 | CONFIGURE_ARGS+= --with-regex=system | 26 | CONFIGURE_ARGS+= --with-regex=system | |
27 | 27 | |||
28 | CONFIGURE_ARGS+= --without-mysql | 28 | CONFIGURE_ARGS+= --without-mysql | |
29 | CONFIGURE_ARGS+= --without-iconv | 29 | CONFIGURE_ARGS+= --without-iconv | |
30 | CONFIGURE_ARGS+= --without-pear | 30 | CONFIGURE_ARGS+= --without-pear | |
31 | #CONFIGURE_ARGS+= --without-intl | 31 | #CONFIGURE_ARGS+= --without-intl | |
32 | 32 | |||
33 | CONFIGURE_ARGS+= --disable-posix | 33 | CONFIGURE_ARGS+= --disable-posix | |
34 | CONFIGURE_ARGS+= --disable-dom | |||
35 | CONFIGURE_ARGS+= --disable-opcache | 34 | CONFIGURE_ARGS+= --disable-opcache | |
36 | CONFIGURE_ARGS+= --disable-pdo | 35 | CONFIGURE_ARGS+= --disable-pdo | |
37 | CONFIGURE_ARGS+= --disable-json | 36 | CONFIGURE_ARGS+= --disable-json | |
38 | 37 | |||
39 | CONFIGURE_ARGS+= --enable-cgi | 38 | CONFIGURE_ARGS+= --enable-cgi | |
40 | CONFIGURE_ARGS+= --enable-mysqlnd | 39 | CONFIGURE_ARGS+= --enable-mysqlnd | |
41 | CONFIGURE_ARGS+= --enable-xml | 40 | CONFIGURE_ARGS+= --enable-xml | |
42 | CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} | 41 | CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} | |
43 | .include "../../textproc/libxml2/buildlink3.mk" | 42 | .include "../../textproc/libxml2/buildlink3.mk" | |
44 | 43 | |||
45 | PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} | 44 | PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} | |
46 | PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline | 45 | PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline | |
47 | PKG_SUGGESTED_OPTIONS+= inet6 ssl | 46 | PKG_SUGGESTED_OPTIONS+= inet6 ssl |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2015/02/20 01:17:49 taca Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2017/04/05 12:28:59 fhajny Exp $ | |
2 | bin/phar | 2 | bin/phar | |
3 | bin/phar.phar | 3 | bin/phar.phar | |
4 | bin/php | 4 | bin/php | |
5 | bin/php-config | 5 | bin/php-config | |
6 | bin/phpize | 6 | bin/phpize | |
7 | include/php/TSRM/TSRM.h | 7 | include/php/TSRM/TSRM.h | |
8 | include/php/TSRM/readdir.h | 8 | include/php/TSRM/readdir.h | |
9 | include/php/TSRM/tsrm_config.h | 9 | include/php/TSRM/tsrm_config.h | |
10 | include/php/TSRM/tsrm_config.w32.h | 10 | include/php/TSRM/tsrm_config.w32.h | |
11 | include/php/TSRM/tsrm_config_common.h | 11 | include/php/TSRM/tsrm_config_common.h | |
12 | include/php/TSRM/tsrm_nw.h | 12 | include/php/TSRM/tsrm_nw.h | |
13 | include/php/TSRM/tsrm_strtok_r.h | 13 | include/php/TSRM/tsrm_strtok_r.h | |
14 | include/php/TSRM/tsrm_win32.h | 14 | include/php/TSRM/tsrm_win32.h | |
@@ -68,26 +68,27 @@ include/php/Zend/zend_string.h | @@ -68,26 +68,27 @@ include/php/Zend/zend_string.h | |||
68 | include/php/Zend/zend_strtod.h | 68 | include/php/Zend/zend_strtod.h | |
69 | include/php/Zend/zend_ts_hash.h | 69 | include/php/Zend/zend_ts_hash.h | |
70 | include/php/Zend/zend_types.h | 70 | include/php/Zend/zend_types.h | |
71 | include/php/Zend/zend_variables.h | 71 | include/php/Zend/zend_variables.h | |
72 | include/php/Zend/zend_virtual_cwd.h | 72 | include/php/Zend/zend_virtual_cwd.h | |
73 | include/php/Zend/zend_vm.h | 73 | include/php/Zend/zend_vm.h | |
74 | include/php/Zend/zend_vm_def.h | 74 | include/php/Zend/zend_vm_def.h | |
75 | include/php/Zend/zend_vm_execute.h | 75 | include/php/Zend/zend_vm_execute.h | |
76 | include/php/Zend/zend_vm_opcodes.h | 76 | include/php/Zend/zend_vm_opcodes.h | |
77 | include/php/ext/date/lib/timelib.h | 77 | include/php/ext/date/lib/timelib.h | |
78 | include/php/ext/date/lib/timelib_config.h | 78 | include/php/ext/date/lib/timelib_config.h | |
79 | include/php/ext/date/lib/timelib_structs.h | 79 | include/php/ext/date/lib/timelib_structs.h | |
80 | include/php/ext/date/php_date.h | 80 | include/php/ext/date/php_date.h | |
81 | include/php/ext/dom/xml_common.h | |||
81 | include/php/ext/ereg/php_ereg.h | 82 | include/php/ext/ereg/php_ereg.h | |
82 | include/php/ext/ereg/php_regex.h | 83 | include/php/ext/ereg/php_regex.h | |
83 | include/php/ext/filter/php_filter.h | 84 | include/php/ext/filter/php_filter.h | |
84 | include/php/ext/hash/php_hash.h | 85 | include/php/ext/hash/php_hash.h | |
85 | include/php/ext/hash/php_hash_adler32.h | 86 | include/php/ext/hash/php_hash_adler32.h | |
86 | include/php/ext/hash/php_hash_crc32.h | 87 | include/php/ext/hash/php_hash_crc32.h | |
87 | include/php/ext/hash/php_hash_fnv.h | 88 | include/php/ext/hash/php_hash_fnv.h | |
88 | include/php/ext/hash/php_hash_gost.h | 89 | include/php/ext/hash/php_hash_gost.h | |
89 | include/php/ext/hash/php_hash_haval.h | 90 | include/php/ext/hash/php_hash_haval.h | |
90 | include/php/ext/hash/php_hash_joaat.h | 91 | include/php/ext/hash/php_hash_joaat.h | |
91 | include/php/ext/hash/php_hash_md.h | 92 | include/php/ext/hash/php_hash_md.h | |
92 | include/php/ext/hash/php_hash_ripemd.h | 93 | include/php/ext/hash/php_hash_ripemd.h | |
93 | include/php/ext/hash/php_hash_sha.h | 94 | include/php/ext/hash/php_hash_sha.h |
@@ -1,29 +1,30 @@ | @@ -1,29 +1,30 @@ | |||
1 | $NetBSD: distinfo,v 1.40 2017/02/20 09:35:17 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.41 2017/04/05 12:28:59 fhajny Exp $ | |
2 | 2 | |||
3 | SHA1 (php-5.6.30.tar.bz2) = 9ac486b7f86c01a297375cae5728b424ac5790ce | 3 | SHA1 (php-5.6.30.tar.bz2) = 9ac486b7f86c01a297375cae5728b424ac5790ce | |
4 | RMD160 (php-5.6.30.tar.bz2) = 445f7a88b802f88484671e2981f44147b13794fc | 4 | RMD160 (php-5.6.30.tar.bz2) = 445f7a88b802f88484671e2981f44147b13794fc | |
5 | SHA512 (php-5.6.30.tar.bz2) = 12734d786cca5767b8b8838affbe1c3d578dd179c8d5339653d905658562c5fdf39a88349213b1340f320320700a5378aed617447b6e15909019788a49ad2da0 | 5 | SHA512 (php-5.6.30.tar.bz2) = 12734d786cca5767b8b8838affbe1c3d578dd179c8d5339653d905658562c5fdf39a88349213b1340f320320700a5378aed617447b6e15909019788a49ad2da0 | |
6 | Size (php-5.6.30.tar.bz2) = 15011816 bytes | 6 | Size (php-5.6.30.tar.bz2) = 15011816 bytes | |
7 | SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0 | 7 | SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0 | |
8 | SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c | 8 | SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c | |
9 | SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19 | 9 | SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19 | |
10 | SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577 | 10 | SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577 | |
11 | SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c | 11 | SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c | |
12 | SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8 | 12 | SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8 | |
13 | SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398 | 13 | SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398 | |
14 | SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5 | 14 | SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5 | |
15 | SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2 | 15 | SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2 | |
16 | SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64 | 16 | SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64 | |
17 | SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 | 17 | SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 | |
18 | SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f | 18 | SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f | |
19 | SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2 | 19 | SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2 | |
20 | SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda | 20 | SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda | |
21 | SHA1 (patch-ext_tidy_tidy.c) = dd66f203196af544dcc06fe2229ba23c3086d3e8 | 21 | SHA1 (patch-ext_tidy_tidy.c) = dd66f203196af544dcc06fe2229ba23c3086d3e8 | |
22 | SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627 | |||
22 | SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419 | 23 | SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419 | |
23 | SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f | 24 | SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f | |
24 | SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d | 25 | SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d | |
25 | SHA1 (patch-run-tests.php) = 3b682267825a87f501a9f3dbd526dca2be9f2807 | 26 | SHA1 (patch-run-tests.php) = 3b682267825a87f501a9f3dbd526dca2be9f2807 | |
26 | SHA1 (patch-sapi_cgi_Makefile.frag) = 0bdf3e3e5f658ee834671307d7fb7ad36d41d48f | 27 | SHA1 (patch-sapi_cgi_Makefile.frag) = 0bdf3e3e5f658ee834671307d7fb7ad36d41d48f | |
27 | SHA1 (patch-sapi_fpm_fpm_events_port.c) = e68f6307869d39364087c18ebf19e86e07d9c82a | 28 | SHA1 (patch-sapi_fpm_fpm_events_port.c) = e68f6307869d39364087c18ebf19e86e07d9c82a | |
28 | SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 564b0a059cb58c671632c6ee8f404f46fe2299f0 | 29 | SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 564b0a059cb58c671632c6ee8f404f46fe2299f0 | |
29 | SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 7c75d8dd9515ef4bca4bdf7c9155fd60f9fbf354 | 30 | SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 7c75d8dd9515ef4bca4bdf7c9155fd60f9fbf354 |
$NetBSD: patch-ext_xsl_php__xsl.h,v 1.1 2017/04/05 12:28:59 fhajny Exp $
The dom header is now supplied by the main php bl3.
--- ext/xsl/php_xsl.h.orig 2017-03-14 13:17:46.000000000 +0000
+++ ext/xsl/php_xsl.h
@@ -41,7 +41,7 @@ extern zend_module_entry xsl_module_entr
#include <libexslt/exsltconfig.h>
#endif
-#include "../dom/xml_common.h"
+#include "dom/xml_common.h"
#include "xsl_fe.h"
#include <libxslt/extensions.h>
@@ -1,19 +1,20 @@ | @@ -1,19 +1,20 @@ | |||
1 | # $NetBSD: Makefile,v 1.5 2017/01/22 11:37:29 maya Exp $ | 1 | # $NetBSD: Makefile,v 1.6 2017/04/05 12:28:59 fhajny 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 | # | |
6 | PKGNAME= php-${PHP_VERSION} | 6 | PKGNAME= php-${PHP_VERSION} | |
7 | PKGREVISION= 1 | |||
7 | CATEGORIES= lang | 8 | CATEGORIES= lang | |
8 | 9 | |||
9 | HOMEPAGE= http://www.php.net/ | 10 | HOMEPAGE= http://www.php.net/ | |
10 | COMMENT= PHP Hypertext Preprocessor version 7.0 | 11 | COMMENT= PHP Hypertext Preprocessor version 7.0 | |
11 | LICENSE= php | 12 | LICENSE= php | |
12 | 13 | |||
13 | TEST_TARGET= test | 14 | TEST_TARGET= test | |
14 | 15 | |||
15 | USE_TOOLS+= gmake lex pkg-config | 16 | USE_TOOLS+= gmake lex pkg-config | |
16 | LIBTOOL_OVERRIDE= # empty | 17 | LIBTOOL_OVERRIDE= # empty | |
17 | PHP_CHECK_INSTALLED= No | 18 | PHP_CHECK_INSTALLED= No | |
18 | 19 | |||
19 | PHP_VERSIONS_ACCEPTED= 70 | 20 | PHP_VERSIONS_ACCEPTED= 70 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile.php,v 1.2 2016/06/24 15:27:57 taca Exp $ | 1 | # $NetBSD: Makefile.php,v 1.3 2017/04/05 12:28:59 fhajny Exp $ | |
2 | # used by lang/php70/Makefile | 2 | # used by lang/php70/Makefile | |
3 | # used by www/ap-php/Makefile | 3 | # used by www/ap-php/Makefile | |
4 | # used by www/php-fpm/Makefile | 4 | # used by www/php-fpm/Makefile | |
5 | 5 | |||
6 | .include "../../lang/php70/Makefile.common" | 6 | .include "../../lang/php70/Makefile.common" | |
7 | 7 | |||
8 | DISTINFO_FILE= ${.CURDIR}/../../lang/php70/distinfo | 8 | DISTINFO_FILE= ${.CURDIR}/../../lang/php70/distinfo | |
9 | PATCHDIR= ${.CURDIR}/../../lang/php70/patches | 9 | PATCHDIR= ${.CURDIR}/../../lang/php70/patches | |
10 | 10 | |||
11 | USE_LIBTOOL= YES | 11 | USE_LIBTOOL= YES | |
12 | USE_LANGUAGES= c c++ | 12 | USE_LANGUAGES= c c++ | |
13 | GNU_CONFIGURE= YES | 13 | GNU_CONFIGURE= YES | |
14 | BUILD_DEFS+= VARBASE | 14 | BUILD_DEFS+= VARBASE | |
@@ -19,27 +19,26 @@ CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX | @@ -19,27 +19,26 @@ CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX | |||
19 | .include "../../mk/bsd.prefs.mk" | 19 | .include "../../mk/bsd.prefs.mk" | |
20 | 20 | |||
21 | CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} | 21 | CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} | |
22 | CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d | 22 | CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d | |
23 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | 23 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | |
24 | CONFIGURE_ARGS+= --localstatedir=${VARBASE} | 24 | CONFIGURE_ARGS+= --localstatedir=${VARBASE} | |
25 | 25 | |||
26 | CONFIGURE_ARGS+= --without-mysqli | 26 | CONFIGURE_ARGS+= --without-mysqli | |
27 | CONFIGURE_ARGS+= --without-iconv | 27 | CONFIGURE_ARGS+= --without-iconv | |
28 | CONFIGURE_ARGS+= --without-pear | 28 | CONFIGURE_ARGS+= --without-pear | |
29 | #CONFIGURE_ARGS+= --without-intl | 29 | #CONFIGURE_ARGS+= --without-intl | |
30 | 30 | |||
31 | CONFIGURE_ARGS+= --disable-posix | 31 | CONFIGURE_ARGS+= --disable-posix | |
32 | CONFIGURE_ARGS+= --disable-dom | |||
33 | CONFIGURE_ARGS+= --disable-opcache | 32 | CONFIGURE_ARGS+= --disable-opcache | |
34 | CONFIGURE_ARGS+= --disable-pdo | 33 | CONFIGURE_ARGS+= --disable-pdo | |
35 | CONFIGURE_ARGS+= --disable-json | 34 | CONFIGURE_ARGS+= --disable-json | |
36 | 35 | |||
37 | CONFIGURE_ARGS+= --enable-cgi | 36 | CONFIGURE_ARGS+= --enable-cgi | |
38 | CONFIGURE_ARGS+= --enable-mysqlnd | 37 | CONFIGURE_ARGS+= --enable-mysqlnd | |
39 | CONFIGURE_ARGS+= --enable-xml | 38 | CONFIGURE_ARGS+= --enable-xml | |
40 | CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} | 39 | CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} | |
41 | .include "../../textproc/libxml2/buildlink3.mk" | 40 | .include "../../textproc/libxml2/buildlink3.mk" | |
42 | 41 | |||
43 | PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} | 42 | PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} | |
44 | PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline | 43 | PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline | |
45 | PKG_SUGGESTED_OPTIONS+= inet6 ssl | 44 | PKG_SUGGESTED_OPTIONS+= inet6 ssl |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2017/02/18 13:09:19 taca Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2017/04/05 12:28:59 fhajny Exp $ | |
2 | bin/phar | 2 | bin/phar | |
3 | bin/phar.phar | 3 | bin/phar.phar | |
4 | bin/php | 4 | bin/php | |
5 | bin/php-config | 5 | bin/php-config | |
6 | bin/phpdbg | 6 | bin/phpdbg | |
7 | bin/phpize | 7 | bin/phpize | |
8 | include/php/TSRM/TSRM.h | 8 | include/php/TSRM/TSRM.h | |
9 | include/php/TSRM/readdir.h | 9 | include/php/TSRM/readdir.h | |
10 | include/php/TSRM/tsrm_config.h | 10 | include/php/TSRM/tsrm_config.h | |
11 | include/php/TSRM/tsrm_config.w32.h | 11 | include/php/TSRM/tsrm_config.w32.h | |
12 | include/php/TSRM/tsrm_config_common.h | 12 | include/php/TSRM/tsrm_config_common.h | |
13 | include/php/TSRM/tsrm_nw.h | 13 | include/php/TSRM/tsrm_nw.h | |
14 | include/php/TSRM/tsrm_strtok_r.h | 14 | include/php/TSRM/tsrm_strtok_r.h | |
@@ -76,26 +76,27 @@ include/php/Zend/zend_strtod.h | @@ -76,26 +76,27 @@ include/php/Zend/zend_strtod.h | |||
76 | include/php/Zend/zend_strtod_int.h | 76 | include/php/Zend/zend_strtod_int.h | |
77 | include/php/Zend/zend_ts_hash.h | 77 | include/php/Zend/zend_ts_hash.h | |
78 | include/php/Zend/zend_types.h | 78 | include/php/Zend/zend_types.h | |
79 | include/php/Zend/zend_variables.h | 79 | include/php/Zend/zend_variables.h | |
80 | include/php/Zend/zend_virtual_cwd.h | 80 | include/php/Zend/zend_virtual_cwd.h | |
81 | include/php/Zend/zend_vm.h | 81 | include/php/Zend/zend_vm.h | |
82 | include/php/Zend/zend_vm_def.h | 82 | include/php/Zend/zend_vm_def.h | |
83 | include/php/Zend/zend_vm_execute.h | 83 | include/php/Zend/zend_vm_execute.h | |
84 | include/php/Zend/zend_vm_opcodes.h | 84 | include/php/Zend/zend_vm_opcodes.h | |
85 | include/php/ext/date/lib/timelib.h | 85 | include/php/ext/date/lib/timelib.h | |
86 | include/php/ext/date/lib/timelib_config.h | 86 | include/php/ext/date/lib/timelib_config.h | |
87 | include/php/ext/date/lib/timelib_structs.h | 87 | include/php/ext/date/lib/timelib_structs.h | |
88 | include/php/ext/date/php_date.h | 88 | include/php/ext/date/php_date.h | |
89 | include/php/ext/dom/xml_common.h | |||
89 | include/php/ext/filter/php_filter.h | 90 | include/php/ext/filter/php_filter.h | |
90 | include/php/ext/hash/php_hash.h | 91 | include/php/ext/hash/php_hash.h | |
91 | include/php/ext/hash/php_hash_adler32.h | 92 | include/php/ext/hash/php_hash_adler32.h | |
92 | include/php/ext/hash/php_hash_crc32.h | 93 | include/php/ext/hash/php_hash_crc32.h | |
93 | include/php/ext/hash/php_hash_fnv.h | 94 | include/php/ext/hash/php_hash_fnv.h | |
94 | include/php/ext/hash/php_hash_gost.h | 95 | include/php/ext/hash/php_hash_gost.h | |
95 | include/php/ext/hash/php_hash_haval.h | 96 | include/php/ext/hash/php_hash_haval.h | |
96 | include/php/ext/hash/php_hash_joaat.h | 97 | include/php/ext/hash/php_hash_joaat.h | |
97 | include/php/ext/hash/php_hash_md.h | 98 | include/php/ext/hash/php_hash_md.h | |
98 | include/php/ext/hash/php_hash_ripemd.h | 99 | include/php/ext/hash/php_hash_ripemd.h | |
99 | include/php/ext/hash/php_hash_sha.h | 100 | include/php/ext/hash/php_hash_sha.h | |
100 | include/php/ext/hash/php_hash_snefru.h | 101 | include/php/ext/hash/php_hash_snefru.h | |
101 | include/php/ext/hash/php_hash_tiger.h | 102 | include/php/ext/hash/php_hash_tiger.h |
@@ -1,29 +1,30 @@ | @@ -1,29 +1,30 @@ | |||
1 | $NetBSD: distinfo,v 1.30 2017/03/23 09:50:36 jperkin Exp $ | 1 | $NetBSD: distinfo,v 1.31 2017/04/05 12:28:59 fhajny Exp $ | |
2 | 2 | |||
3 | SHA1 (php-7.0.17.tar.bz2) = 6c20436c50fdf342891f836f2864a43fdbe0bf71 | 3 | SHA1 (php-7.0.17.tar.bz2) = 6c20436c50fdf342891f836f2864a43fdbe0bf71 | |
4 | RMD160 (php-7.0.17.tar.bz2) = 2f4dd83e4d4253aaad45fa5f28cd973815382edb | 4 | RMD160 (php-7.0.17.tar.bz2) = 2f4dd83e4d4253aaad45fa5f28cd973815382edb | |
5 | SHA512 (php-7.0.17.tar.bz2) = a50e53915cb4af59d90cf5a754f74bc307bf0de7904297eb8364d85418399203b6f81ddff23e4c68d36bfe8c4ce8ae1d511ec3cad21872c5113acc0f494b43d7 | 5 | SHA512 (php-7.0.17.tar.bz2) = a50e53915cb4af59d90cf5a754f74bc307bf0de7904297eb8364d85418399203b6f81ddff23e4c68d36bfe8c4ce8ae1d511ec3cad21872c5113acc0f494b43d7 | |
6 | Size (php-7.0.17.tar.bz2) = 15326542 bytes | 6 | Size (php-7.0.17.tar.bz2) = 15326542 bytes | |
7 | SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56 | 7 | SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56 | |
8 | SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c | 8 | SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c | |
9 | SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76 | 9 | SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76 | |
10 | SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92 | 10 | SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92 | |
11 | SHA1 (patch-ext_intl_config.m4) = 222e35fc2c3e9e559696293fdf66171f8abfca7f | 11 | SHA1 (patch-ext_intl_config.m4) = 222e35fc2c3e9e559696293fdf66171f8abfca7f | |
12 | SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916 | 12 | SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916 | |
13 | SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 | 13 | SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 | |
14 | SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244 | 14 | SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244 | |
15 | SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 | 15 | SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 | |
16 | SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 | 16 | SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 | |
17 | SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 | 17 | SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 | |
18 | SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5 | 18 | SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5 | |
19 | SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56 | 19 | SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56 | |
20 | SHA1 (patch-ext_tidy_tidy.c) = 420559f0b36d054e4d954e666be2a519b67e1b84 | 20 | SHA1 (patch-ext_tidy_tidy.c) = 420559f0b36d054e4d954e666be2a519b67e1b84 | |
21 | SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627 | |||
21 | SHA1 (patch-main_php__config.h.in) = d70a1b53c5e31c37a7bc2703304318d15c371a0a | 22 | SHA1 (patch-main_php__config.h.in) = d70a1b53c5e31c37a7bc2703304318d15c371a0a | |
22 | SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5 | 23 | SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5 | |
23 | SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd | 24 | SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd | |
24 | SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89 | 25 | SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89 | |
25 | SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb | 26 | SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb | |
26 | SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65 | 27 | SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65 | |
27 | SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 | 28 | SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 | |
28 | SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150 | 29 | SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150 | |
29 | SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7 | 30 | SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7 |
$NetBSD: patch-ext_xsl_php__xsl.h,v 1.1 2017/04/05 12:28:59 fhajny Exp $
The dom header is now supplied by the main php bl3.
--- ext/xsl/php_xsl.h.orig 2017-03-14 13:17:46.000000000 +0000
+++ ext/xsl/php_xsl.h
@@ -41,7 +41,7 @@ extern zend_module_entry xsl_module_entr
#include <libexslt/exsltconfig.h>
#endif
-#include "../dom/xml_common.h"
+#include "dom/xml_common.h"
#include "xsl_fe.h"
#include <libxslt/extensions.h>
@@ -1,19 +1,20 @@ | @@ -1,19 +1,20 @@ | |||
1 | # $NetBSD: Makefile,v 1.8 2017/02/18 13:13:07 taca Exp $ | 1 | # $NetBSD: Makefile,v 1.9 2017/04/05 12:28:59 fhajny 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 | # | |
6 | PKGNAME= php-${PHP_VERSION:S/RC/rc/} | 6 | PKGNAME= php-${PHP_VERSION:S/RC/rc/} | |
7 | PKGREVISION= 1 | |||
7 | CATEGORIES= lang | 8 | CATEGORIES= lang | |
8 | 9 | |||
9 | HOMEPAGE= http://www.php.net/ | 10 | HOMEPAGE= http://www.php.net/ | |
10 | COMMENT= PHP Hypertext Preprocessor version 7.1 | 11 | COMMENT= PHP Hypertext Preprocessor version 7.1 | |
11 | LICENSE= php | 12 | LICENSE= php | |
12 | 13 | |||
13 | TEST_TARGET= test | 14 | TEST_TARGET= test | |
14 | 15 | |||
15 | USE_TOOLS+= gmake lex pkg-config | 16 | USE_TOOLS+= gmake lex pkg-config | |
16 | LIBTOOL_OVERRIDE= # empty | 17 | LIBTOOL_OVERRIDE= # empty | |
17 | PHP_CHECK_INSTALLED= No | 18 | PHP_CHECK_INSTALLED= No | |
18 | 19 | |||
19 | PHP_VERSIONS_ACCEPTED= 71 | 20 | PHP_VERSIONS_ACCEPTED= 71 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile.php,v 1.1 2016/08/04 14:09:03 jdolecek Exp $ | 1 | # $NetBSD: Makefile.php,v 1.2 2017/04/05 12:28:59 fhajny Exp $ | |
2 | # used by lang/php71/Makefile | 2 | # used by lang/php71/Makefile | |
3 | # used by www/ap-php/Makefile | 3 | # used by www/ap-php/Makefile | |
4 | # used by www/php-fpm/Makefile | 4 | # used by www/php-fpm/Makefile | |
5 | 5 | |||
6 | .include "../../lang/php71/Makefile.common" | 6 | .include "../../lang/php71/Makefile.common" | |
7 | 7 | |||
8 | DISTINFO_FILE= ${.CURDIR}/../../lang/php71/distinfo | 8 | DISTINFO_FILE= ${.CURDIR}/../../lang/php71/distinfo | |
9 | PATCHDIR= ${.CURDIR}/../../lang/php71/patches | 9 | PATCHDIR= ${.CURDIR}/../../lang/php71/patches | |
10 | 10 | |||
11 | USE_LIBTOOL= YES | 11 | USE_LIBTOOL= YES | |
12 | USE_LANGUAGES= c c++ | 12 | USE_LANGUAGES= c c++ | |
13 | GNU_CONFIGURE= YES | 13 | GNU_CONFIGURE= YES | |
14 | BUILD_DEFS+= VARBASE | 14 | BUILD_DEFS+= VARBASE | |
@@ -19,27 +19,26 @@ CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX | @@ -19,27 +19,26 @@ CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX | |||
19 | .include "../../mk/bsd.prefs.mk" | 19 | .include "../../mk/bsd.prefs.mk" | |
20 | 20 | |||
21 | CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} | 21 | CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} | |
22 | CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d | 22 | CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d | |
23 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | 23 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | |
24 | CONFIGURE_ARGS+= --localstatedir=${VARBASE} | 24 | CONFIGURE_ARGS+= --localstatedir=${VARBASE} | |
25 | 25 | |||
26 | CONFIGURE_ARGS+= --without-mysqli | 26 | CONFIGURE_ARGS+= --without-mysqli | |
27 | CONFIGURE_ARGS+= --without-iconv | 27 | CONFIGURE_ARGS+= --without-iconv | |
28 | CONFIGURE_ARGS+= --without-pear | 28 | CONFIGURE_ARGS+= --without-pear | |
29 | #CONFIGURE_ARGS+= --without-intl | 29 | #CONFIGURE_ARGS+= --without-intl | |
30 | 30 | |||
31 | CONFIGURE_ARGS+= --disable-posix | 31 | CONFIGURE_ARGS+= --disable-posix | |
32 | CONFIGURE_ARGS+= --disable-dom | |||
33 | CONFIGURE_ARGS+= --disable-opcache | 32 | CONFIGURE_ARGS+= --disable-opcache | |
34 | CONFIGURE_ARGS+= --disable-pdo | 33 | CONFIGURE_ARGS+= --disable-pdo | |
35 | CONFIGURE_ARGS+= --disable-json | 34 | CONFIGURE_ARGS+= --disable-json | |
36 | 35 | |||
37 | CONFIGURE_ARGS+= --enable-cgi | 36 | CONFIGURE_ARGS+= --enable-cgi | |
38 | CONFIGURE_ARGS+= --enable-mysqlnd | 37 | CONFIGURE_ARGS+= --enable-mysqlnd | |
39 | CONFIGURE_ARGS+= --enable-xml | 38 | CONFIGURE_ARGS+= --enable-xml | |
40 | CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} | 39 | CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} | |
41 | .include "../../textproc/libxml2/buildlink3.mk" | 40 | .include "../../textproc/libxml2/buildlink3.mk" | |
42 | 41 | |||
43 | PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} | 42 | PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} | |
44 | PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline | 43 | PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline | |
45 | PKG_SUGGESTED_OPTIONS+= inet6 ssl | 44 | PKG_SUGGESTED_OPTIONS+= inet6 ssl |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2017/02/18 13:13:07 taca Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2017/04/05 12:28:59 fhajny Exp $ | |
2 | bin/phar | 2 | bin/phar | |
3 | bin/phar.phar | 3 | bin/phar.phar | |
4 | bin/php | 4 | bin/php | |
5 | bin/php-config | 5 | bin/php-config | |
6 | bin/phpdbg | 6 | bin/phpdbg | |
7 | bin/phpize | 7 | bin/phpize | |
8 | include/php/TSRM/TSRM.h | 8 | include/php/TSRM/TSRM.h | |
9 | include/php/TSRM/readdir.h | 9 | include/php/TSRM/readdir.h | |
10 | include/php/TSRM/tsrm_config.h | 10 | include/php/TSRM/tsrm_config.h | |
11 | include/php/TSRM/tsrm_config.w32.h | 11 | include/php/TSRM/tsrm_config.w32.h | |
12 | include/php/TSRM/tsrm_config_common.h | 12 | include/php/TSRM/tsrm_config_common.h | |
13 | include/php/TSRM/tsrm_nw.h | 13 | include/php/TSRM/tsrm_nw.h | |
14 | include/php/TSRM/tsrm_strtok_r.h | 14 | include/php/TSRM/tsrm_strtok_r.h | |
@@ -77,26 +77,27 @@ include/php/Zend/zend_strtod_int.h | @@ -77,26 +77,27 @@ include/php/Zend/zend_strtod_int.h | |||
77 | include/php/Zend/zend_ts_hash.h | 77 | include/php/Zend/zend_ts_hash.h | |
78 | include/php/Zend/zend_type_info.h | 78 | include/php/Zend/zend_type_info.h | |
79 | include/php/Zend/zend_types.h | 79 | include/php/Zend/zend_types.h | |
80 | include/php/Zend/zend_variables.h | 80 | include/php/Zend/zend_variables.h | |
81 | include/php/Zend/zend_virtual_cwd.h | 81 | include/php/Zend/zend_virtual_cwd.h | |
82 | include/php/Zend/zend_vm.h | 82 | include/php/Zend/zend_vm.h | |
83 | include/php/Zend/zend_vm_def.h | 83 | include/php/Zend/zend_vm_def.h | |
84 | include/php/Zend/zend_vm_execute.h | 84 | include/php/Zend/zend_vm_execute.h | |
85 | include/php/Zend/zend_vm_opcodes.h | 85 | include/php/Zend/zend_vm_opcodes.h | |
86 | include/php/ext/date/lib/timelib.h | 86 | include/php/ext/date/lib/timelib.h | |
87 | include/php/ext/date/lib/timelib_config.h | 87 | include/php/ext/date/lib/timelib_config.h | |
88 | include/php/ext/date/lib/timelib_structs.h | 88 | include/php/ext/date/lib/timelib_structs.h | |
89 | include/php/ext/date/php_date.h | 89 | include/php/ext/date/php_date.h | |
90 | include/php/ext/dom/xml_common.h | |||
90 | include/php/ext/filter/php_filter.h | 91 | include/php/ext/filter/php_filter.h | |
91 | include/php/ext/hash/php_hash.h | 92 | include/php/ext/hash/php_hash.h | |
92 | include/php/ext/hash/php_hash_adler32.h | 93 | include/php/ext/hash/php_hash_adler32.h | |
93 | include/php/ext/hash/php_hash_crc32.h | 94 | include/php/ext/hash/php_hash_crc32.h | |
94 | include/php/ext/hash/php_hash_fnv.h | 95 | include/php/ext/hash/php_hash_fnv.h | |
95 | include/php/ext/hash/php_hash_gost.h | 96 | include/php/ext/hash/php_hash_gost.h | |
96 | include/php/ext/hash/php_hash_haval.h | 97 | include/php/ext/hash/php_hash_haval.h | |
97 | include/php/ext/hash/php_hash_joaat.h | 98 | include/php/ext/hash/php_hash_joaat.h | |
98 | include/php/ext/hash/php_hash_md.h | 99 | include/php/ext/hash/php_hash_md.h | |
99 | include/php/ext/hash/php_hash_ripemd.h | 100 | include/php/ext/hash/php_hash_ripemd.h | |
100 | include/php/ext/hash/php_hash_sha.h | 101 | include/php/ext/hash/php_hash_sha.h | |
101 | include/php/ext/hash/php_hash_sha3.h | 102 | include/php/ext/hash/php_hash_sha3.h | |
102 | include/php/ext/hash/php_hash_snefru.h | 103 | include/php/ext/hash/php_hash_snefru.h |
@@ -1,28 +1,29 @@ | @@ -1,28 +1,29 @@ | |||
1 | $NetBSD: distinfo,v 1.16 2017/03/23 09:33:02 jperkin Exp $ | 1 | $NetBSD: distinfo,v 1.17 2017/04/05 12:28:59 fhajny Exp $ | |
2 | 2 | |||
3 | SHA1 (php-7.1.3.tar.bz2) = 60359b3154d00502f84adfea84d008e3aa0b81ab | 3 | SHA1 (php-7.1.3.tar.bz2) = 60359b3154d00502f84adfea84d008e3aa0b81ab | |
4 | RMD160 (php-7.1.3.tar.bz2) = a54b805e234a8bf7f1f6a1c0b2250e11bcaf1219 | 4 | RMD160 (php-7.1.3.tar.bz2) = a54b805e234a8bf7f1f6a1c0b2250e11bcaf1219 | |
5 | SHA512 (php-7.1.3.tar.bz2) = 90dd06348d5884a2bb4a22ab80bb4f50e603751a1787096f447762fe00e5b4f36deafda045ecf6345883d9f4b711755a854a2e7043f27702acfe78ade90b42d9 | 5 | SHA512 (php-7.1.3.tar.bz2) = 90dd06348d5884a2bb4a22ab80bb4f50e603751a1787096f447762fe00e5b4f36deafda045ecf6345883d9f4b711755a854a2e7043f27702acfe78ade90b42d9 | |
6 | Size (php-7.1.3.tar.bz2) = 15709683 bytes | 6 | Size (php-7.1.3.tar.bz2) = 15709683 bytes | |
7 | SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad | 7 | SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad | |
8 | SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c | 8 | SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c | |
9 | SHA1 (patch-ext_gd_config.m4) = 93b62daad93b9ee6dc28e06016f739bc26b0dc9f | 9 | SHA1 (patch-ext_gd_config.m4) = 93b62daad93b9ee6dc28e06016f739bc26b0dc9f | |
10 | SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92 | 10 | SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92 | |
11 | SHA1 (patch-ext_intl_config.m4) = 1ea3d3e6f05d5fed0bd4ca4518440199aec0954d | 11 | SHA1 (patch-ext_intl_config.m4) = 1ea3d3e6f05d5fed0bd4ca4518440199aec0954d | |
12 | SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916 | 12 | SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916 | |
13 | SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 | 13 | SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 | |
14 | SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244 | 14 | SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244 | |
15 | SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 | 15 | SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 | |
16 | SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 | 16 | SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 | |
17 | SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 | 17 | SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 | |
18 | SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5 | 18 | SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5 | |
19 | SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56 | 19 | SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56 | |
20 | SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627 | |||
20 | SHA1 (patch-main_php__config.h.in) = a954c2963bdc9cbb280a9852e18ac8fb8fc834c2 | 21 | SHA1 (patch-main_php__config.h.in) = a954c2963bdc9cbb280a9852e18ac8fb8fc834c2 | |
21 | SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5 | 22 | SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5 | |
22 | SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd | 23 | SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd | |
23 | SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89 | 24 | SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89 | |
24 | SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb | 25 | SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb | |
25 | SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65 | 26 | SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65 | |
26 | SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 | 27 | SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 | |
27 | SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150 | 28 | SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150 | |
28 | SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7 | 29 | SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7 |
$NetBSD: patch-ext_xsl_php__xsl.h,v 1.1 2017/04/05 12:28:59 fhajny Exp $
The dom header is now supplied by the main php bl3.
--- ext/xsl/php_xsl.h.orig 2017-03-14 13:17:46.000000000 +0000
+++ ext/xsl/php_xsl.h
@@ -41,7 +41,7 @@ extern zend_module_entry xsl_module_entr
#include <libexslt/exsltconfig.h>
#endif
-#include "../dom/xml_common.h"
+#include "dom/xml_common.h"
#include "xsl_fe.h"
#include <libxslt/extensions.h>