Wed Apr 12 18:22:20 2017 UTC ()
Pullup ticket #5243 - requested by sevan
lang/php56: build fix
lang/php70: build fix
lang/php71: build fix

Revisions pulled up:
- lang/php56/Makefile                                           1.13
- lang/php56/Makefile.php                                       1.2
- lang/php56/PLIST                                              1.3
- lang/php56/distinfo                                           1.41
- lang/php56/patches/patch-ext_xsl_php__xsl.h                   1.1
- lang/php70/Makefile                                           1.6
- lang/php70/Makefile.php                                       1.3
- lang/php70/PLIST                                              1.3
- lang/php70/distinfo                                           1.31
- lang/php70/patches/patch-ext_xsl_php__xsl.h                   1.1
- lang/php71/Makefile                                           1.9
- lang/php71/Makefile.php                                       1.2
- lang/php71/PLIST                                              1.3
- lang/php71/distinfo                                           1.17
- lang/php71/patches/patch-ext_xsl_php__xsl.h                   1.1
- textproc/Makefile                                             1.918
- textproc/php-dom/DESCR                                        deleted
- textproc/php-dom/Makefile                                     deleted

---
   Module Name:    pkgsrc
   Committed By:   fhajny
   Date:           Wed Apr  5 12:28:59 UTC 2017

   Modified Files:
           pkgsrc/lang/php56: Makefile Makefile.php PLIST distinfo
           pkgsrc/lang/php70: Makefile Makefile.php PLIST distinfo
           pkgsrc/lang/php71: Makefile Makefile.php PLIST distinfo
   Added Files:
           pkgsrc/lang/php56/patches: patch-ext_xsl_php__xsl.h
           pkgsrc/lang/php70/patches: patch-ext_xsl_php__xsl.h
           pkgsrc/lang/php71/patches: patch-ext_xsl_php__xsl.h

   Log Message:
   Build the dom extension embedded. This enables full functionality in xmlreader and fixes joyent/pkgsrc/issues/477. Bump PKREVISION.

---
   Module Name:    pkgsrc
   Committed By:   fhajny
   Date:           Wed Apr  5 12:34:47 UTC 2017

   Modified Files:
           pkgsrc/textproc: Makefile
   Removed Files:
           pkgsrc/textproc/php-dom: DESCR Makefile

   Log Message:
   Remove textproc/php-dom, the module is now built into the resp. PHP packages.


(bsiegert)
diff -r1.12 -r1.12.8.1 pkgsrc/lang/php56/Makefile
diff -r1.1 -r1.1.20.1 pkgsrc/lang/php56/Makefile.php
diff -r1.2 -r1.2.18.1 pkgsrc/lang/php56/PLIST
diff -r1.40 -r1.40.2.1 pkgsrc/lang/php56/distinfo
diff -r0 -r1.1.2.2 pkgsrc/lang/php56/patches/patch-ext_xsl_php__xsl.h
diff -r1.5 -r1.5.2.1 pkgsrc/lang/php70/Makefile
diff -r1.2 -r1.2.8.1 pkgsrc/lang/php70/Makefile.php
diff -r1.2 -r1.2.2.1 pkgsrc/lang/php70/PLIST
diff -r1.30 -r1.30.2.1 pkgsrc/lang/php70/distinfo
diff -r0 -r1.1.2.2 pkgsrc/lang/php70/patches/patch-ext_xsl_php__xsl.h
diff -r1.8 -r1.8.2.1 pkgsrc/lang/php71/Makefile
diff -r1.1 -r1.1.6.1 pkgsrc/lang/php71/Makefile.php
diff -r1.2 -r1.2.2.1 pkgsrc/lang/php71/PLIST
diff -r1.16 -r1.16.2.1 pkgsrc/lang/php71/distinfo
diff -r0 -r1.1.2.2 pkgsrc/lang/php71/patches/patch-ext_xsl_php__xsl.h
diff -r1.915 -r1.915.2.1 pkgsrc/textproc/Makefile
diff -r1.1.1.1 -r0 pkgsrc/textproc/php-dom/DESCR
diff -r1.7 -r0 pkgsrc/textproc/php-dom/Makefile
cvs diff -r1.12 -r1.12.8.1 pkgsrc/lang/php56/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php56/Makefile 2016/06/24 15:25:21 1.12
+++ pkgsrc/lang/php56/Makefile 2017/04/12 18:22:19 1.12.8.1
@@ -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.12.8.1 2017/04/12 18:22:19 bsiegert 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} 6PKGNAME= php-${PHP_VERSION}
 7PKGREVISION= 1
7CATEGORIES= lang 8CATEGORIES= lang
8 9
9HOMEPAGE= http://www.php.net/ 10HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 5.6 11COMMENT= PHP Hypertext Preprocessor version 5.6
11LICENSE= php 12LICENSE= php
12 13
13TEST_TARGET= test 14TEST_TARGET= test
14 15
15USE_TOOLS+= gmake lex pkg-config 16USE_TOOLS+= gmake lex pkg-config
16LIBTOOL_OVERRIDE= # empty 17LIBTOOL_OVERRIDE= # empty
17PHP_CHECK_INSTALLED= No 18PHP_CHECK_INSTALLED= No
18 19
19PHP_VERSIONS_ACCEPTED= 56 20PHP_VERSIONS_ACCEPTED= 56
cvs diff -r1.1 -r1.1.20.1 pkgsrc/lang/php56/Makefile.php (expand / switch to unified diff)

--- pkgsrc/lang/php56/Makefile.php 2014/11/24 15:37:08 1.1
+++ pkgsrc/lang/php56/Makefile.php 2017/04/12 18:22:19 1.1.20.1
@@ -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.1.20.1 2017/04/12 18:22:19 bsiegert 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
8DISTINFO_FILE= ${.CURDIR}/../../lang/php56/distinfo 8DISTINFO_FILE= ${.CURDIR}/../../lang/php56/distinfo
9PATCHDIR= ${.CURDIR}/../../lang/php56/patches 9PATCHDIR= ${.CURDIR}/../../lang/php56/patches
10 10
11USE_LIBTOOL= YES 11USE_LIBTOOL= YES
12USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
13GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
14BUILD_DEFS+= VARBASE 14BUILD_DEFS+= VARBASE
@@ -21,27 +21,26 @@ CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX @@ -21,27 +21,26 @@ CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX
21CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} 21CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR}
22CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d 22CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
24CONFIGURE_ARGS+= --localstatedir=${VARBASE} 24CONFIGURE_ARGS+= --localstatedir=${VARBASE}
25 25
26CONFIGURE_ARGS+= --with-regex=system 26CONFIGURE_ARGS+= --with-regex=system
27 27
28CONFIGURE_ARGS+= --without-mysql 28CONFIGURE_ARGS+= --without-mysql
29CONFIGURE_ARGS+= --without-iconv 29CONFIGURE_ARGS+= --without-iconv
30CONFIGURE_ARGS+= --without-pear 30CONFIGURE_ARGS+= --without-pear
31#CONFIGURE_ARGS+= --without-intl 31#CONFIGURE_ARGS+= --without-intl
32 32
33CONFIGURE_ARGS+= --disable-posix 33CONFIGURE_ARGS+= --disable-posix
34CONFIGURE_ARGS+= --disable-dom 
35CONFIGURE_ARGS+= --disable-opcache 34CONFIGURE_ARGS+= --disable-opcache
36CONFIGURE_ARGS+= --disable-pdo 35CONFIGURE_ARGS+= --disable-pdo
37CONFIGURE_ARGS+= --disable-json 36CONFIGURE_ARGS+= --disable-json
38 37
39CONFIGURE_ARGS+= --enable-cgi 38CONFIGURE_ARGS+= --enable-cgi
40CONFIGURE_ARGS+= --enable-mysqlnd 39CONFIGURE_ARGS+= --enable-mysqlnd
41CONFIGURE_ARGS+= --enable-xml 40CONFIGURE_ARGS+= --enable-xml
42CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} 41CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
43.include "../../textproc/libxml2/buildlink3.mk" 42.include "../../textproc/libxml2/buildlink3.mk"
44 43
45PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} 44PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
46PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline 45PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline
47PKG_SUGGESTED_OPTIONS+= inet6 ssl 46PKG_SUGGESTED_OPTIONS+= inet6 ssl
cvs diff -r1.2 -r1.2.18.1 pkgsrc/lang/php56/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/php56/PLIST 2015/02/20 01:17:49 1.2
+++ pkgsrc/lang/php56/PLIST 2017/04/12 18:22:19 1.2.18.1
@@ -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.2.18.1 2017/04/12 18:22:19 bsiegert Exp $
2bin/phar 2bin/phar
3bin/phar.phar 3bin/phar.phar
4bin/php 4bin/php
5bin/php-config 5bin/php-config
6bin/phpize 6bin/phpize
7include/php/TSRM/TSRM.h 7include/php/TSRM/TSRM.h
8include/php/TSRM/readdir.h 8include/php/TSRM/readdir.h
9include/php/TSRM/tsrm_config.h 9include/php/TSRM/tsrm_config.h
10include/php/TSRM/tsrm_config.w32.h 10include/php/TSRM/tsrm_config.w32.h
11include/php/TSRM/tsrm_config_common.h 11include/php/TSRM/tsrm_config_common.h
12include/php/TSRM/tsrm_nw.h 12include/php/TSRM/tsrm_nw.h
13include/php/TSRM/tsrm_strtok_r.h 13include/php/TSRM/tsrm_strtok_r.h
14include/php/TSRM/tsrm_win32.h 14include/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
68include/php/Zend/zend_strtod.h 68include/php/Zend/zend_strtod.h
69include/php/Zend/zend_ts_hash.h 69include/php/Zend/zend_ts_hash.h
70include/php/Zend/zend_types.h 70include/php/Zend/zend_types.h
71include/php/Zend/zend_variables.h 71include/php/Zend/zend_variables.h
72include/php/Zend/zend_virtual_cwd.h 72include/php/Zend/zend_virtual_cwd.h
73include/php/Zend/zend_vm.h 73include/php/Zend/zend_vm.h
74include/php/Zend/zend_vm_def.h 74include/php/Zend/zend_vm_def.h
75include/php/Zend/zend_vm_execute.h 75include/php/Zend/zend_vm_execute.h
76include/php/Zend/zend_vm_opcodes.h 76include/php/Zend/zend_vm_opcodes.h
77include/php/ext/date/lib/timelib.h 77include/php/ext/date/lib/timelib.h
78include/php/ext/date/lib/timelib_config.h 78include/php/ext/date/lib/timelib_config.h
79include/php/ext/date/lib/timelib_structs.h 79include/php/ext/date/lib/timelib_structs.h
80include/php/ext/date/php_date.h 80include/php/ext/date/php_date.h
 81include/php/ext/dom/xml_common.h
81include/php/ext/ereg/php_ereg.h 82include/php/ext/ereg/php_ereg.h
82include/php/ext/ereg/php_regex.h 83include/php/ext/ereg/php_regex.h
83include/php/ext/filter/php_filter.h 84include/php/ext/filter/php_filter.h
84include/php/ext/hash/php_hash.h 85include/php/ext/hash/php_hash.h
85include/php/ext/hash/php_hash_adler32.h 86include/php/ext/hash/php_hash_adler32.h
86include/php/ext/hash/php_hash_crc32.h 87include/php/ext/hash/php_hash_crc32.h
87include/php/ext/hash/php_hash_fnv.h 88include/php/ext/hash/php_hash_fnv.h
88include/php/ext/hash/php_hash_gost.h 89include/php/ext/hash/php_hash_gost.h
89include/php/ext/hash/php_hash_haval.h 90include/php/ext/hash/php_hash_haval.h
90include/php/ext/hash/php_hash_joaat.h 91include/php/ext/hash/php_hash_joaat.h
91include/php/ext/hash/php_hash_md.h 92include/php/ext/hash/php_hash_md.h
92include/php/ext/hash/php_hash_ripemd.h 93include/php/ext/hash/php_hash_ripemd.h
93include/php/ext/hash/php_hash_sha.h 94include/php/ext/hash/php_hash_sha.h
cvs diff -r1.40 -r1.40.2.1 pkgsrc/lang/php56/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php56/distinfo 2017/02/20 09:35:17 1.40
+++ pkgsrc/lang/php56/distinfo 2017/04/12 18:22:19 1.40.2.1
@@ -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.40.2.1 2017/04/12 18:22:19 bsiegert Exp $
2 2
3SHA1 (php-5.6.30.tar.bz2) = 9ac486b7f86c01a297375cae5728b424ac5790ce 3SHA1 (php-5.6.30.tar.bz2) = 9ac486b7f86c01a297375cae5728b424ac5790ce
4RMD160 (php-5.6.30.tar.bz2) = 445f7a88b802f88484671e2981f44147b13794fc 4RMD160 (php-5.6.30.tar.bz2) = 445f7a88b802f88484671e2981f44147b13794fc
5SHA512 (php-5.6.30.tar.bz2) = 12734d786cca5767b8b8838affbe1c3d578dd179c8d5339653d905658562c5fdf39a88349213b1340f320320700a5378aed617447b6e15909019788a49ad2da0 5SHA512 (php-5.6.30.tar.bz2) = 12734d786cca5767b8b8838affbe1c3d578dd179c8d5339653d905658562c5fdf39a88349213b1340f320320700a5378aed617447b6e15909019788a49ad2da0
6Size (php-5.6.30.tar.bz2) = 15011816 bytes 6Size (php-5.6.30.tar.bz2) = 15011816 bytes
7SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0 7SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0
8SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c 8SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c
9SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19 9SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19
10SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577 10SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577
11SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c 11SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c
12SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8 12SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8
13SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398 13SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
14SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5 14SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5
15SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2 15SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
16SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64 16SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
17SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 17SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f 18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
19SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2 19SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
20SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda 20SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda
21SHA1 (patch-ext_tidy_tidy.c) = dd66f203196af544dcc06fe2229ba23c3086d3e8 21SHA1 (patch-ext_tidy_tidy.c) = dd66f203196af544dcc06fe2229ba23c3086d3e8
 22SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
22SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419 23SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419
23SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f 24SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f
24SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d 25SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d
25SHA1 (patch-run-tests.php) = 3b682267825a87f501a9f3dbd526dca2be9f2807 26SHA1 (patch-run-tests.php) = 3b682267825a87f501a9f3dbd526dca2be9f2807
26SHA1 (patch-sapi_cgi_Makefile.frag) = 0bdf3e3e5f658ee834671307d7fb7ad36d41d48f 27SHA1 (patch-sapi_cgi_Makefile.frag) = 0bdf3e3e5f658ee834671307d7fb7ad36d41d48f
27SHA1 (patch-sapi_fpm_fpm_events_port.c) = e68f6307869d39364087c18ebf19e86e07d9c82a 28SHA1 (patch-sapi_fpm_fpm_events_port.c) = e68f6307869d39364087c18ebf19e86e07d9c82a
28SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 564b0a059cb58c671632c6ee8f404f46fe2299f0 29SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 564b0a059cb58c671632c6ee8f404f46fe2299f0
29SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 7c75d8dd9515ef4bca4bdf7c9155fd60f9fbf354 30SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 7c75d8dd9515ef4bca4bdf7c9155fd60f9fbf354
File Added: pkgsrc/lang/php56/patches/patch-ext_xsl_php__xsl.h
$NetBSD: patch-ext_xsl_php__xsl.h,v 1.1.2.2 2017/04/12 18:22:19 bsiegert 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>
cvs diff -r1.5 -r1.5.2.1 pkgsrc/lang/php70/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php70/Attic/Makefile 2017/01/22 11:37:29 1.5
+++ pkgsrc/lang/php70/Attic/Makefile 2017/04/12 18:22:19 1.5.2.1
@@ -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.5.2.1 2017/04/12 18:22:19 bsiegert 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} 6PKGNAME= php-${PHP_VERSION}
 7PKGREVISION= 1
7CATEGORIES= lang 8CATEGORIES= lang
8 9
9HOMEPAGE= http://www.php.net/ 10HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 7.0 11COMMENT= PHP Hypertext Preprocessor version 7.0
11LICENSE= php 12LICENSE= php
12 13
13TEST_TARGET= test 14TEST_TARGET= test
14 15
15USE_TOOLS+= gmake lex pkg-config 16USE_TOOLS+= gmake lex pkg-config
16LIBTOOL_OVERRIDE= # empty 17LIBTOOL_OVERRIDE= # empty
17PHP_CHECK_INSTALLED= No 18PHP_CHECK_INSTALLED= No
18 19
19PHP_VERSIONS_ACCEPTED= 70 20PHP_VERSIONS_ACCEPTED= 70
cvs diff -r1.2 -r1.2.8.1 pkgsrc/lang/php70/Attic/Makefile.php (expand / switch to unified diff)

--- pkgsrc/lang/php70/Attic/Makefile.php 2016/06/24 15:27:57 1.2
+++ pkgsrc/lang/php70/Attic/Makefile.php 2017/04/12 18:22:19 1.2.8.1
@@ -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.2.8.1 2017/04/12 18:22:19 bsiegert 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
8DISTINFO_FILE= ${.CURDIR}/../../lang/php70/distinfo 8DISTINFO_FILE= ${.CURDIR}/../../lang/php70/distinfo
9PATCHDIR= ${.CURDIR}/../../lang/php70/patches 9PATCHDIR= ${.CURDIR}/../../lang/php70/patches
10 10
11USE_LIBTOOL= YES 11USE_LIBTOOL= YES
12USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
13GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
14BUILD_DEFS+= VARBASE 14BUILD_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
21CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} 21CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR}
22CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d 22CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
24CONFIGURE_ARGS+= --localstatedir=${VARBASE} 24CONFIGURE_ARGS+= --localstatedir=${VARBASE}
25 25
26CONFIGURE_ARGS+= --without-mysqli 26CONFIGURE_ARGS+= --without-mysqli
27CONFIGURE_ARGS+= --without-iconv 27CONFIGURE_ARGS+= --without-iconv
28CONFIGURE_ARGS+= --without-pear 28CONFIGURE_ARGS+= --without-pear
29#CONFIGURE_ARGS+= --without-intl 29#CONFIGURE_ARGS+= --without-intl
30 30
31CONFIGURE_ARGS+= --disable-posix 31CONFIGURE_ARGS+= --disable-posix
32CONFIGURE_ARGS+= --disable-dom 
33CONFIGURE_ARGS+= --disable-opcache 32CONFIGURE_ARGS+= --disable-opcache
34CONFIGURE_ARGS+= --disable-pdo 33CONFIGURE_ARGS+= --disable-pdo
35CONFIGURE_ARGS+= --disable-json 34CONFIGURE_ARGS+= --disable-json
36 35
37CONFIGURE_ARGS+= --enable-cgi 36CONFIGURE_ARGS+= --enable-cgi
38CONFIGURE_ARGS+= --enable-mysqlnd 37CONFIGURE_ARGS+= --enable-mysqlnd
39CONFIGURE_ARGS+= --enable-xml 38CONFIGURE_ARGS+= --enable-xml
40CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} 39CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
41.include "../../textproc/libxml2/buildlink3.mk" 40.include "../../textproc/libxml2/buildlink3.mk"
42 41
43PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} 42PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
44PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline 43PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline
45PKG_SUGGESTED_OPTIONS+= inet6 ssl 44PKG_SUGGESTED_OPTIONS+= inet6 ssl
cvs diff -r1.2 -r1.2.2.1 pkgsrc/lang/php70/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/php70/Attic/PLIST 2017/02/18 13:09:19 1.2
+++ pkgsrc/lang/php70/Attic/PLIST 2017/04/12 18:22:19 1.2.2.1
@@ -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.2.2.1 2017/04/12 18:22:19 bsiegert Exp $
2bin/phar 2bin/phar
3bin/phar.phar 3bin/phar.phar
4bin/php 4bin/php
5bin/php-config 5bin/php-config
6bin/phpdbg 6bin/phpdbg
7bin/phpize 7bin/phpize
8include/php/TSRM/TSRM.h 8include/php/TSRM/TSRM.h
9include/php/TSRM/readdir.h 9include/php/TSRM/readdir.h
10include/php/TSRM/tsrm_config.h 10include/php/TSRM/tsrm_config.h
11include/php/TSRM/tsrm_config.w32.h 11include/php/TSRM/tsrm_config.w32.h
12include/php/TSRM/tsrm_config_common.h 12include/php/TSRM/tsrm_config_common.h
13include/php/TSRM/tsrm_nw.h 13include/php/TSRM/tsrm_nw.h
14include/php/TSRM/tsrm_strtok_r.h 14include/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
76include/php/Zend/zend_strtod_int.h 76include/php/Zend/zend_strtod_int.h
77include/php/Zend/zend_ts_hash.h 77include/php/Zend/zend_ts_hash.h
78include/php/Zend/zend_types.h 78include/php/Zend/zend_types.h
79include/php/Zend/zend_variables.h 79include/php/Zend/zend_variables.h
80include/php/Zend/zend_virtual_cwd.h 80include/php/Zend/zend_virtual_cwd.h
81include/php/Zend/zend_vm.h 81include/php/Zend/zend_vm.h
82include/php/Zend/zend_vm_def.h 82include/php/Zend/zend_vm_def.h
83include/php/Zend/zend_vm_execute.h 83include/php/Zend/zend_vm_execute.h
84include/php/Zend/zend_vm_opcodes.h 84include/php/Zend/zend_vm_opcodes.h
85include/php/ext/date/lib/timelib.h 85include/php/ext/date/lib/timelib.h
86include/php/ext/date/lib/timelib_config.h 86include/php/ext/date/lib/timelib_config.h
87include/php/ext/date/lib/timelib_structs.h 87include/php/ext/date/lib/timelib_structs.h
88include/php/ext/date/php_date.h 88include/php/ext/date/php_date.h
 89include/php/ext/dom/xml_common.h
89include/php/ext/filter/php_filter.h 90include/php/ext/filter/php_filter.h
90include/php/ext/hash/php_hash.h 91include/php/ext/hash/php_hash.h
91include/php/ext/hash/php_hash_adler32.h 92include/php/ext/hash/php_hash_adler32.h
92include/php/ext/hash/php_hash_crc32.h 93include/php/ext/hash/php_hash_crc32.h
93include/php/ext/hash/php_hash_fnv.h 94include/php/ext/hash/php_hash_fnv.h
94include/php/ext/hash/php_hash_gost.h 95include/php/ext/hash/php_hash_gost.h
95include/php/ext/hash/php_hash_haval.h 96include/php/ext/hash/php_hash_haval.h
96include/php/ext/hash/php_hash_joaat.h 97include/php/ext/hash/php_hash_joaat.h
97include/php/ext/hash/php_hash_md.h 98include/php/ext/hash/php_hash_md.h
98include/php/ext/hash/php_hash_ripemd.h 99include/php/ext/hash/php_hash_ripemd.h
99include/php/ext/hash/php_hash_sha.h 100include/php/ext/hash/php_hash_sha.h
100include/php/ext/hash/php_hash_snefru.h 101include/php/ext/hash/php_hash_snefru.h
101include/php/ext/hash/php_hash_tiger.h 102include/php/ext/hash/php_hash_tiger.h
cvs diff -r1.30 -r1.30.2.1 pkgsrc/lang/php70/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php70/Attic/distinfo 2017/03/23 09:50:36 1.30
+++ pkgsrc/lang/php70/Attic/distinfo 2017/04/12 18:22:19 1.30.2.1
@@ -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.30.2.1 2017/04/12 18:22:19 bsiegert Exp $
2 2
3SHA1 (php-7.0.17.tar.bz2) = 6c20436c50fdf342891f836f2864a43fdbe0bf71 3SHA1 (php-7.0.17.tar.bz2) = 6c20436c50fdf342891f836f2864a43fdbe0bf71
4RMD160 (php-7.0.17.tar.bz2) = 2f4dd83e4d4253aaad45fa5f28cd973815382edb 4RMD160 (php-7.0.17.tar.bz2) = 2f4dd83e4d4253aaad45fa5f28cd973815382edb
5SHA512 (php-7.0.17.tar.bz2) = a50e53915cb4af59d90cf5a754f74bc307bf0de7904297eb8364d85418399203b6f81ddff23e4c68d36bfe8c4ce8ae1d511ec3cad21872c5113acc0f494b43d7 5SHA512 (php-7.0.17.tar.bz2) = a50e53915cb4af59d90cf5a754f74bc307bf0de7904297eb8364d85418399203b6f81ddff23e4c68d36bfe8c4ce8ae1d511ec3cad21872c5113acc0f494b43d7
6Size (php-7.0.17.tar.bz2) = 15326542 bytes 6Size (php-7.0.17.tar.bz2) = 15326542 bytes
7SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56 7SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56
8SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c 8SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
9SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76 9SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76
10SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92 10SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
11SHA1 (patch-ext_intl_config.m4) = 222e35fc2c3e9e559696293fdf66171f8abfca7f 11SHA1 (patch-ext_intl_config.m4) = 222e35fc2c3e9e559696293fdf66171f8abfca7f
12SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916 12SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
13SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 13SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
14SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244 14SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244
15SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 15SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
16SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 16SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
17SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 17SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5 18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
19SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56 19SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
20SHA1 (patch-ext_tidy_tidy.c) = 420559f0b36d054e4d954e666be2a519b67e1b84 20SHA1 (patch-ext_tidy_tidy.c) = 420559f0b36d054e4d954e666be2a519b67e1b84
 21SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
21SHA1 (patch-main_php__config.h.in) = d70a1b53c5e31c37a7bc2703304318d15c371a0a 22SHA1 (patch-main_php__config.h.in) = d70a1b53c5e31c37a7bc2703304318d15c371a0a
22SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5 23SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
23SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd 24SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
24SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89 25SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
25SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb 26SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb
26SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65 27SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65
27SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 28SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
28SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150 29SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150
29SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7 30SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7
File Added: pkgsrc/lang/php70/patches/Attic/patch-ext_xsl_php__xsl.h
$NetBSD: patch-ext_xsl_php__xsl.h,v 1.1.2.2 2017/04/12 18:22:19 bsiegert 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>
cvs diff -r1.8 -r1.8.2.1 pkgsrc/lang/php71/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php71/Attic/Makefile 2017/02/18 13:13:07 1.8
+++ pkgsrc/lang/php71/Attic/Makefile 2017/04/12 18:22:20 1.8.2.1
@@ -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.8.2.1 2017/04/12 18:22:20 bsiegert 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/}
 7PKGREVISION= 1
7CATEGORIES= lang 8CATEGORIES= lang
8 9
9HOMEPAGE= http://www.php.net/ 10HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 7.1 11COMMENT= PHP Hypertext Preprocessor version 7.1
11LICENSE= php 12LICENSE= php
12 13
13TEST_TARGET= test 14TEST_TARGET= test
14 15
15USE_TOOLS+= gmake lex pkg-config 16USE_TOOLS+= gmake lex pkg-config
16LIBTOOL_OVERRIDE= # empty 17LIBTOOL_OVERRIDE= # empty
17PHP_CHECK_INSTALLED= No 18PHP_CHECK_INSTALLED= No
18 19
19PHP_VERSIONS_ACCEPTED= 71 20PHP_VERSIONS_ACCEPTED= 71
cvs diff -r1.1 -r1.1.6.1 pkgsrc/lang/php71/Attic/Makefile.php (expand / switch to unified diff)

--- pkgsrc/lang/php71/Attic/Makefile.php 2016/08/04 14:09:03 1.1
+++ pkgsrc/lang/php71/Attic/Makefile.php 2017/04/12 18:22:20 1.1.6.1
@@ -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.1.6.1 2017/04/12 18:22:20 bsiegert 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
8DISTINFO_FILE= ${.CURDIR}/../../lang/php71/distinfo 8DISTINFO_FILE= ${.CURDIR}/../../lang/php71/distinfo
9PATCHDIR= ${.CURDIR}/../../lang/php71/patches 9PATCHDIR= ${.CURDIR}/../../lang/php71/patches
10 10
11USE_LIBTOOL= YES 11USE_LIBTOOL= YES
12USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
13GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
14BUILD_DEFS+= VARBASE 14BUILD_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
21CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} 21CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR}
22CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d 22CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
24CONFIGURE_ARGS+= --localstatedir=${VARBASE} 24CONFIGURE_ARGS+= --localstatedir=${VARBASE}
25 25
26CONFIGURE_ARGS+= --without-mysqli 26CONFIGURE_ARGS+= --without-mysqli
27CONFIGURE_ARGS+= --without-iconv 27CONFIGURE_ARGS+= --without-iconv
28CONFIGURE_ARGS+= --without-pear 28CONFIGURE_ARGS+= --without-pear
29#CONFIGURE_ARGS+= --without-intl 29#CONFIGURE_ARGS+= --without-intl
30 30
31CONFIGURE_ARGS+= --disable-posix 31CONFIGURE_ARGS+= --disable-posix
32CONFIGURE_ARGS+= --disable-dom 
33CONFIGURE_ARGS+= --disable-opcache 32CONFIGURE_ARGS+= --disable-opcache
34CONFIGURE_ARGS+= --disable-pdo 33CONFIGURE_ARGS+= --disable-pdo
35CONFIGURE_ARGS+= --disable-json 34CONFIGURE_ARGS+= --disable-json
36 35
37CONFIGURE_ARGS+= --enable-cgi 36CONFIGURE_ARGS+= --enable-cgi
38CONFIGURE_ARGS+= --enable-mysqlnd 37CONFIGURE_ARGS+= --enable-mysqlnd
39CONFIGURE_ARGS+= --enable-xml 38CONFIGURE_ARGS+= --enable-xml
40CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} 39CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
41.include "../../textproc/libxml2/buildlink3.mk" 40.include "../../textproc/libxml2/buildlink3.mk"
42 41
43PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} 42PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
44PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline 43PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline
45PKG_SUGGESTED_OPTIONS+= inet6 ssl 44PKG_SUGGESTED_OPTIONS+= inet6 ssl
cvs diff -r1.2 -r1.2.2.1 pkgsrc/lang/php71/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/php71/Attic/PLIST 2017/02/18 13:13:07 1.2
+++ pkgsrc/lang/php71/Attic/PLIST 2017/04/12 18:22:20 1.2.2.1
@@ -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.2.2.1 2017/04/12 18:22:20 bsiegert Exp $
2bin/phar 2bin/phar
3bin/phar.phar 3bin/phar.phar
4bin/php 4bin/php
5bin/php-config 5bin/php-config
6bin/phpdbg 6bin/phpdbg
7bin/phpize 7bin/phpize
8include/php/TSRM/TSRM.h 8include/php/TSRM/TSRM.h
9include/php/TSRM/readdir.h 9include/php/TSRM/readdir.h
10include/php/TSRM/tsrm_config.h 10include/php/TSRM/tsrm_config.h
11include/php/TSRM/tsrm_config.w32.h 11include/php/TSRM/tsrm_config.w32.h
12include/php/TSRM/tsrm_config_common.h 12include/php/TSRM/tsrm_config_common.h
13include/php/TSRM/tsrm_nw.h 13include/php/TSRM/tsrm_nw.h
14include/php/TSRM/tsrm_strtok_r.h 14include/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
77include/php/Zend/zend_ts_hash.h 77include/php/Zend/zend_ts_hash.h
78include/php/Zend/zend_type_info.h 78include/php/Zend/zend_type_info.h
79include/php/Zend/zend_types.h 79include/php/Zend/zend_types.h
80include/php/Zend/zend_variables.h 80include/php/Zend/zend_variables.h
81include/php/Zend/zend_virtual_cwd.h 81include/php/Zend/zend_virtual_cwd.h
82include/php/Zend/zend_vm.h 82include/php/Zend/zend_vm.h
83include/php/Zend/zend_vm_def.h 83include/php/Zend/zend_vm_def.h
84include/php/Zend/zend_vm_execute.h 84include/php/Zend/zend_vm_execute.h
85include/php/Zend/zend_vm_opcodes.h 85include/php/Zend/zend_vm_opcodes.h
86include/php/ext/date/lib/timelib.h 86include/php/ext/date/lib/timelib.h
87include/php/ext/date/lib/timelib_config.h 87include/php/ext/date/lib/timelib_config.h
88include/php/ext/date/lib/timelib_structs.h 88include/php/ext/date/lib/timelib_structs.h
89include/php/ext/date/php_date.h 89include/php/ext/date/php_date.h
 90include/php/ext/dom/xml_common.h
90include/php/ext/filter/php_filter.h 91include/php/ext/filter/php_filter.h
91include/php/ext/hash/php_hash.h 92include/php/ext/hash/php_hash.h
92include/php/ext/hash/php_hash_adler32.h 93include/php/ext/hash/php_hash_adler32.h
93include/php/ext/hash/php_hash_crc32.h 94include/php/ext/hash/php_hash_crc32.h
94include/php/ext/hash/php_hash_fnv.h 95include/php/ext/hash/php_hash_fnv.h
95include/php/ext/hash/php_hash_gost.h 96include/php/ext/hash/php_hash_gost.h
96include/php/ext/hash/php_hash_haval.h 97include/php/ext/hash/php_hash_haval.h
97include/php/ext/hash/php_hash_joaat.h 98include/php/ext/hash/php_hash_joaat.h
98include/php/ext/hash/php_hash_md.h 99include/php/ext/hash/php_hash_md.h
99include/php/ext/hash/php_hash_ripemd.h 100include/php/ext/hash/php_hash_ripemd.h
100include/php/ext/hash/php_hash_sha.h 101include/php/ext/hash/php_hash_sha.h
101include/php/ext/hash/php_hash_sha3.h 102include/php/ext/hash/php_hash_sha3.h
102include/php/ext/hash/php_hash_snefru.h 103include/php/ext/hash/php_hash_snefru.h
cvs diff -r1.16 -r1.16.2.1 pkgsrc/lang/php71/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php71/Attic/distinfo 2017/03/23 09:33:02 1.16
+++ pkgsrc/lang/php71/Attic/distinfo 2017/04/12 18:22:20 1.16.2.1
@@ -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.16.2.1 2017/04/12 18:22:20 bsiegert Exp $
2 2
3SHA1 (php-7.1.3.tar.bz2) = 60359b3154d00502f84adfea84d008e3aa0b81ab 3SHA1 (php-7.1.3.tar.bz2) = 60359b3154d00502f84adfea84d008e3aa0b81ab
4RMD160 (php-7.1.3.tar.bz2) = a54b805e234a8bf7f1f6a1c0b2250e11bcaf1219 4RMD160 (php-7.1.3.tar.bz2) = a54b805e234a8bf7f1f6a1c0b2250e11bcaf1219
5SHA512 (php-7.1.3.tar.bz2) = 90dd06348d5884a2bb4a22ab80bb4f50e603751a1787096f447762fe00e5b4f36deafda045ecf6345883d9f4b711755a854a2e7043f27702acfe78ade90b42d9 5SHA512 (php-7.1.3.tar.bz2) = 90dd06348d5884a2bb4a22ab80bb4f50e603751a1787096f447762fe00e5b4f36deafda045ecf6345883d9f4b711755a854a2e7043f27702acfe78ade90b42d9
6Size (php-7.1.3.tar.bz2) = 15709683 bytes 6Size (php-7.1.3.tar.bz2) = 15709683 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_intl_config.m4) = 1ea3d3e6f05d5fed0bd4ca4518440199aec0954d 11SHA1 (patch-ext_intl_config.m4) = 1ea3d3e6f05d5fed0bd4ca4518440199aec0954d
12SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916 12SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
13SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 13SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
14SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244 14SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244
15SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 15SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
16SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 16SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
17SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 17SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5 18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
19SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56 19SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
 20SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
20SHA1 (patch-main_php__config.h.in) = a954c2963bdc9cbb280a9852e18ac8fb8fc834c2 21SHA1 (patch-main_php__config.h.in) = a954c2963bdc9cbb280a9852e18ac8fb8fc834c2
21SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5 22SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
22SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd 23SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
23SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89 24SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
24SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb 25SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb
25SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65 26SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65
26SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 27SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
27SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150 28SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150
28SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7 29SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7
File Added: pkgsrc/lang/php71/patches/Attic/patch-ext_xsl_php__xsl.h
$NetBSD: patch-ext_xsl_php__xsl.h,v 1.1.2.2 2017/04/12 18:22:20 bsiegert 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>
cvs diff -r1.915 -r1.915.2.1 pkgsrc/textproc/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/Makefile 2017/03/19 15:26:33 1.915
+++ pkgsrc/textproc/Makefile 2017/04/12 18:22:20 1.915.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.915 2017/03/19 15:26:33 taca Exp $ 1# $NetBSD: Makefile,v 1.915.2.1 2017/04/12 18:22:20 bsiegert Exp $
2# 2#
3 3
4COMMENT= Text processing utilities (does not include desktop publishing) 4COMMENT= Text processing utilities (does not include desktop publishing)
5 5
6SUBDIR+= CRF++ 6SUBDIR+= CRF++
7SUBDIR+= DWB 7SUBDIR+= DWB
8SUBDIR+= FlightCrew 8SUBDIR+= FlightCrew
9SUBDIR+= GutenMark 9SUBDIR+= GutenMark
10SUBDIR+= GutenMark-words 10SUBDIR+= GutenMark-words
11SUBDIR+= LDoc 11SUBDIR+= LDoc
12SUBDIR+= Markdown 12SUBDIR+= Markdown
13SUBDIR+= OdfConverter 13SUBDIR+= OdfConverter
14SUBDIR+= R-formatR 14SUBDIR+= R-formatR
@@ -665,27 +665,26 @@ SUBDIR+= p5-cabocha @@ -665,27 +665,26 @@ SUBDIR+= p5-cabocha
665SUBDIR+= p5-highlight 665SUBDIR+= p5-highlight
666SUBDIR+= p5-iCal-Parser 666SUBDIR+= p5-iCal-Parser
667SUBDIR+= p5-libxml 667SUBDIR+= p5-libxml
668SUBDIR+= p5-marisa 668SUBDIR+= p5-marisa
669SUBDIR+= p5-mecab 669SUBDIR+= p5-mecab
670SUBDIR+= p5-mobiperl 670SUBDIR+= p5-mobiperl
671SUBDIR+= p5-native-hyperestraier 671SUBDIR+= p5-native-hyperestraier
672SUBDIR+= p5-podlators 672SUBDIR+= p5-podlators
673SUBDIR+= p5-yamcha 673SUBDIR+= p5-yamcha
674SUBDIR+= par 674SUBDIR+= par
675SUBDIR+= pdfgrep 675SUBDIR+= pdfgrep
676SUBDIR+= pear-Console_Table 676SUBDIR+= pear-Console_Table
677SUBDIR+= pear-File_Find 677SUBDIR+= pear-File_Find
678SUBDIR+= php-dom 
679SUBDIR+= php-enchant 678SUBDIR+= php-enchant
680SUBDIR+= php-excel 679SUBDIR+= php-excel
681SUBDIR+= php-intl 680SUBDIR+= php-intl
682SUBDIR+= php-json 681SUBDIR+= php-json
683SUBDIR+= php-mecab 682SUBDIR+= php-mecab
684SUBDIR+= php-pspell 683SUBDIR+= php-pspell
685SUBDIR+= php-sphinx 684SUBDIR+= php-sphinx
686SUBDIR+= php-wddx 685SUBDIR+= php-wddx
687SUBDIR+= php-xsl 686SUBDIR+= php-xsl
688SUBDIR+= php-yaml 687SUBDIR+= php-yaml
689SUBDIR+= po-mode 688SUBDIR+= po-mode
690SUBDIR+= po4a 689SUBDIR+= po4a
691SUBDIR+= pod2mdoc 690SUBDIR+= pod2mdoc
File Deleted: pkgsrc/textproc/php-dom/Attic/DESCR
File Deleted: pkgsrc/textproc/php-dom/Attic/Makefile