[pkgsrc/trunk]: pkgsrc/lang/php74 lang/php74: switch to use external pcre

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/de83a6e5f499
branches:  trunk
changeset: 422146:de83a6e5f499
user:      taca <taca%pkgsrc.org@localhost>
date:      Tue Jan 21 14:16:26 2020 +0000

description:
lang/php74: switch to use external pcre

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

Bump PKGREVISION.

diffstat:

 lang/php74/Makefile     |  4 ++--
 lang/php74/Makefile.php |  5 +++--
 lang/php74/PLIST        |  7 +------
 3 files changed, 6 insertions(+), 10 deletions(-)

diffs (57 lines):

diff -r 3413feb66a37 -r de83a6e5f499 lang/php74/Makefile
--- a/lang/php74/Makefile       Tue Jan 21 14:13:06 2020 +0000
+++ b/lang/php74/Makefile       Tue Jan 21 14:16:26 2020 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2020/01/18 21:49:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2020/01/21 14:16:26 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
-PKGREVISION=           1
+PKGREVISION=           2
 
 COMMENT=               PHP Hypertext Preprocessor version 7.4
 LICENSE=               php
diff -r 3413feb66a37 -r de83a6e5f499 lang/php74/Makefile.php
--- a/lang/php74/Makefile.php   Tue Jan 21 14:13:06 2020 +0000
+++ b/lang/php74/Makefile.php   Tue Jan 21 14:16:26 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.1 2019/12/15 17:56:34 taca Exp $
+# $NetBSD: Makefile.php,v 1.2 2020/01/21 14:16:26 taca Exp $
 # used by lang/php74/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -33,8 +33,9 @@
 CONFIGURE_ARGS+=       --without-iconv
 CONFIGURE_ARGS+=       --without-pear
 CONFIGURE_ARGS+=       --without-sqlite3
-#CONFIGURE_ARGS+=      --without-intl
+CONFIGURE_ARGS+=       --with-external-pcre
 
+CONFIGURE_ARGS+=       --disable-intl
 CONFIGURE_ARGS+=       --disable-posix
 CONFIGURE_ARGS+=       --disable-opcache
 CONFIGURE_ARGS+=       --disable-pdo
diff -r 3413feb66a37 -r de83a6e5f499 lang/php74/PLIST
--- a/lang/php74/PLIST  Tue Jan 21 14:13:06 2020 +0000
+++ b/lang/php74/PLIST  Tue Jan 21 14:16:26 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/12/15 17:56:34 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/01/21 14:16:26 taca Exp $
 bin/phar
 bin/phar.phar
 bin/php
@@ -131,11 +131,6 @@
 include/php/ext/mysqlnd/mysqlnd_vio.h
 include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
 include/php/ext/mysqlnd/php_mysqlnd.h
-include/php/ext/pcre/pcre2lib/config.h
-include/php/ext/pcre/pcre2lib/pcre2.h
-include/php/ext/pcre/pcre2lib/pcre2_internal.h
-include/php/ext/pcre/pcre2lib/pcre2_intmodedep.h
-include/php/ext/pcre/pcre2lib/pcre2_ucp.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/phar/php_phar.h
 include/php/ext/session/mod_files.h