summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2020-01-21 14:16:26 +0000
committertaca <taca@pkgsrc.org>2020-01-21 14:16:26 +0000
commit1e836e91c700e965d555748d50a350c521b6a776 (patch)
treecd5492b903670b1cd7240cb4168f1603edaa3109 /lang
parent2dc99046cfa6debff9fae31f2395d60fcf3985a1 (diff)
downloadpkgsrc-1e836e91c700e965d555748d50a350c521b6a776.tar.gz
lang/php74: switch to use external pcre
Switch to use external pcre, fixing PR pkg/54793. Bump PKGREVISION.
Diffstat (limited to 'lang')
-rw-r--r--lang/php74/Makefile4
-rw-r--r--lang/php74/Makefile.php5
-rw-r--r--lang/php74/PLIST7
3 files changed, 6 insertions, 10 deletions
diff --git a/lang/php74/Makefile b/lang/php74/Makefile
index a64d38c87ec..ad75eb121af 100644
--- a/lang/php74/Makefile
+++ b/lang/php74/Makefile
@@ -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 --git a/lang/php74/Makefile.php b/lang/php74/Makefile.php
index 69feee8f335..7a8222cf27d 100644
--- a/lang/php74/Makefile.php
+++ b/lang/php74/Makefile.php
@@ -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-mysqli
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 --git a/lang/php74/PLIST b/lang/php74/PLIST
index fbff154cc3f..12e938cabe0 100644
--- a/lang/php74/PLIST
+++ b/lang/php74/PLIST
@@ -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_structs.h
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