Tue Jan 21 14:16:27 2020 UTC ()
lang/php74: switch to use external pcre

Switch to use external pcre, fixing PR pkg/54793.

Bump PKGREVISION.


(taca)
diff -r1.3 -r1.4 pkgsrc/lang/php74/Makefile
diff -r1.1 -r1.2 pkgsrc/lang/php74/Makefile.php
diff -r1.1 -r1.2 pkgsrc/lang/php74/PLIST
cvs diff -r1.3 -r1.4 pkgsrc/lang/php74/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php74/Makefile 2020/01/18 21:49:43 1.3
+++ pkgsrc/lang/php74/Makefile 2020/01/21 14:16:26 1.4
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.3 2020/01/18 21:49:43 jperkin Exp $ 1# $NetBSD: Makefile,v 1.4 2020/01/21 14:16:26 taca 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 7PKGREVISION= 2
8 8
9COMMENT= PHP Hypertext Preprocessor version 7.4 9COMMENT= PHP Hypertext Preprocessor version 7.4
10LICENSE= php 10LICENSE= php
11 11
12TEST_TARGET= test 12TEST_TARGET= test
13 13
14USE_TOOLS+= gmake lex 14USE_TOOLS+= gmake lex
15LIBTOOL_OVERRIDE= # empty 15LIBTOOL_OVERRIDE= # empty
16PHP_CHECK_INSTALLED= No 16PHP_CHECK_INSTALLED= No
17 17
18PHP_VERSIONS_ACCEPTED= 74 18PHP_VERSIONS_ACCEPTED= 74
19 19
20.include "Makefile.php" 20.include "Makefile.php"
cvs diff -r1.1 -r1.2 pkgsrc/lang/php74/Makefile.php (expand / switch to unified diff)

--- pkgsrc/lang/php74/Makefile.php 2019/12/15 17:56:34 1.1
+++ pkgsrc/lang/php74/Makefile.php 2020/01/21 14:16:26 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.php,v 1.1 2019/12/15 17:56:34 taca Exp $ 1# $NetBSD: Makefile.php,v 1.2 2020/01/21 14:16:26 taca Exp $
2# used by lang/php74/Makefile 2# used by lang/php74/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# segfaults when buidling with many compilers 6# segfaults when buidling with many compilers
7# https://bugs.php.net/bug.php?id=74527 7# https://bugs.php.net/bug.php?id=74527
8# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236 8# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236
9.if ${MACHINE_ARCH} == "i386" 9.if ${MACHINE_ARCH} == "i386"
10CONFIGURE_ARGS+= --disable-gcc-global-regs 10CONFIGURE_ARGS+= --disable-gcc-global-regs
11.endif 11.endif
12 12
13# the binary actually needs full dep on PCRE 13# the binary actually needs full dep on PCRE
14BUILDLINK_DEPMETHOD.pcre2= full 14BUILDLINK_DEPMETHOD.pcre2= full
@@ -23,28 +23,29 @@ PLIST_VARS+= dtrace @@ -23,28 +23,29 @@ PLIST_VARS+= dtrace
23 23
24DISTINFO_FILE= ${.CURDIR}/../../lang/php74/distinfo 24DISTINFO_FILE= ${.CURDIR}/../../lang/php74/distinfo
25PATCHDIR= ${.CURDIR}/../../lang/php74/patches 25PATCHDIR= ${.CURDIR}/../../lang/php74/patches
26 26
27CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} 27CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR}
28CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d 28CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
29CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 29CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
30CONFIGURE_ARGS+= --localstatedir=${VARBASE} 30CONFIGURE_ARGS+= --localstatedir=${VARBASE}
31 31
32CONFIGURE_ARGS+= --without-mysqli 32CONFIGURE_ARGS+= --without-mysqli
33CONFIGURE_ARGS+= --without-iconv 33CONFIGURE_ARGS+= --without-iconv
34CONFIGURE_ARGS+= --without-pear 34CONFIGURE_ARGS+= --without-pear
35CONFIGURE_ARGS+= --without-sqlite3 35CONFIGURE_ARGS+= --without-sqlite3
36#CONFIGURE_ARGS+= --without-intl 36CONFIGURE_ARGS+= --with-external-pcre
37 37
 38CONFIGURE_ARGS+= --disable-intl
38CONFIGURE_ARGS+= --disable-posix 39CONFIGURE_ARGS+= --disable-posix
39CONFIGURE_ARGS+= --disable-opcache 40CONFIGURE_ARGS+= --disable-opcache
40CONFIGURE_ARGS+= --disable-pdo 41CONFIGURE_ARGS+= --disable-pdo
41CONFIGURE_ARGS+= --disable-json 42CONFIGURE_ARGS+= --disable-json
42 43
43CONFIGURE_ARGS+= --enable-cgi 44CONFIGURE_ARGS+= --enable-cgi
44CONFIGURE_ARGS+= --enable-mysqlnd 45CONFIGURE_ARGS+= --enable-mysqlnd
45CONFIGURE_ARGS+= --enable-xml 46CONFIGURE_ARGS+= --enable-xml
46#CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} 47#CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
47 48
48CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" 49CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
49 50
50.include "../../textproc/libxml2/buildlink3.mk" 51.include "../../textproc/libxml2/buildlink3.mk"
cvs diff -r1.1 -r1.2 pkgsrc/lang/php74/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/php74/PLIST 2019/12/15 17:56:34 1.1
+++ pkgsrc/lang/php74/PLIST 2020/01/21 14:16:26 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2019/12/15 17:56:34 taca Exp $ 1@comment $NetBSD: PLIST,v 1.2 2020/01/21 14:16:26 taca 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/tsrm_win32.h 9include/php/TSRM/tsrm_win32.h
10include/php/Zend/zend.h 10include/php/Zend/zend.h
11include/php/Zend/zend_API.h 11include/php/Zend/zend_API.h
12include/php/Zend/zend_alloc.h 12include/php/Zend/zend_alloc.h
13include/php/Zend/zend_alloc_sizes.h 13include/php/Zend/zend_alloc_sizes.h
14include/php/Zend/zend_arena.h 14include/php/Zend/zend_arena.h
@@ -121,31 +121,26 @@ include/php/ext/mysqlnd/mysqlnd_plugin.h @@ -121,31 +121,26 @@ include/php/ext/mysqlnd/mysqlnd_plugin.h
121include/php/ext/mysqlnd/mysqlnd_portability.h 121include/php/ext/mysqlnd/mysqlnd_portability.h
122include/php/ext/mysqlnd/mysqlnd_priv.h 122include/php/ext/mysqlnd/mysqlnd_priv.h
123include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h 123include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
124include/php/ext/mysqlnd/mysqlnd_ps.h 124include/php/ext/mysqlnd/mysqlnd_ps.h
125include/php/ext/mysqlnd/mysqlnd_read_buffer.h 125include/php/ext/mysqlnd/mysqlnd_read_buffer.h
126include/php/ext/mysqlnd/mysqlnd_result.h 126include/php/ext/mysqlnd/mysqlnd_result.h
127include/php/ext/mysqlnd/mysqlnd_result_meta.h 127include/php/ext/mysqlnd/mysqlnd_result_meta.h
128include/php/ext/mysqlnd/mysqlnd_reverse_api.h 128include/php/ext/mysqlnd/mysqlnd_reverse_api.h
129include/php/ext/mysqlnd/mysqlnd_statistics.h 129include/php/ext/mysqlnd/mysqlnd_statistics.h
130include/php/ext/mysqlnd/mysqlnd_structs.h 130include/php/ext/mysqlnd/mysqlnd_structs.h
131include/php/ext/mysqlnd/mysqlnd_vio.h 131include/php/ext/mysqlnd/mysqlnd_vio.h
132include/php/ext/mysqlnd/mysqlnd_wireprotocol.h 132include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
133include/php/ext/mysqlnd/php_mysqlnd.h 133include/php/ext/mysqlnd/php_mysqlnd.h
134include/php/ext/pcre/pcre2lib/config.h 
135include/php/ext/pcre/pcre2lib/pcre2.h 
136include/php/ext/pcre/pcre2lib/pcre2_internal.h 
137include/php/ext/pcre/pcre2lib/pcre2_intmodedep.h 
138include/php/ext/pcre/pcre2lib/pcre2_ucp.h 
139include/php/ext/pcre/php_pcre.h 134include/php/ext/pcre/php_pcre.h
140include/php/ext/phar/php_phar.h 135include/php/ext/phar/php_phar.h
141include/php/ext/session/mod_files.h 136include/php/ext/session/mod_files.h
142include/php/ext/session/mod_user.h 137include/php/ext/session/mod_user.h
143include/php/ext/session/php_session.h 138include/php/ext/session/php_session.h
144include/php/ext/simplexml/php_simplexml.h 139include/php/ext/simplexml/php_simplexml.h
145include/php/ext/simplexml/php_simplexml_exports.h 140include/php/ext/simplexml/php_simplexml_exports.h
146include/php/ext/spl/php_spl.h 141include/php/ext/spl/php_spl.h
147include/php/ext/spl/spl_array.h 142include/php/ext/spl/spl_array.h
148include/php/ext/spl/spl_directory.h 143include/php/ext/spl/spl_directory.h
149include/php/ext/spl/spl_dllist.h 144include/php/ext/spl/spl_dllist.h
150include/php/ext/spl/spl_engine.h 145include/php/ext/spl/spl_engine.h
151include/php/ext/spl/spl_exceptions.h 146include/php/ext/spl/spl_exceptions.h