Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1579616187292650"
MIME-Version: 1.0
Date: Tue, 21 Jan 2020 14:16:27 +0000
From: "Takahiro Kambe" <taca@netbsd.org>
Subject: CVS commit: pkgsrc/lang/php74
To: pkgsrc-changes@NetBSD.org
Reply-To: taca@netbsd.org
Message-Id: <20200121141627.2E343FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1579616187292650
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	taca
Date:		Tue Jan 21 14:16:27 UTC 2020

Modified Files:
	pkgsrc/lang/php74: Makefile Makefile.php PLIST

Log Message:
lang/php74: switch to use external pcre

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

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php74/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php74/Makefile.php \
    pkgsrc/lang/php74/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1579616187292650
Content-Disposition: inline
Content-Length: 2306
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/php74/Makefile
diff -u pkgsrc/lang/php74/Makefile:1.3 pkgsrc/lang/php74/Makefile:1.4
--- pkgsrc/lang/php74/Makefile:1.3	Sat Jan 18 21:49:43 2020
+++ pkgsrc/lang/php74/Makefile	Tue Jan 21 14:16:26 2020
@@ -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

Index: pkgsrc/lang/php74/Makefile.php
diff -u pkgsrc/lang/php74/Makefile.php:1.1 pkgsrc/lang/php74/Makefile.php:1.2
--- pkgsrc/lang/php74/Makefile.php:1.1	Sun Dec 15 17:56:34 2019
+++ pkgsrc/lang/php74/Makefile.php	Tue Jan 21 14:16:26 2020
@@ -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
Index: pkgsrc/lang/php74/PLIST
diff -u pkgsrc/lang/php74/PLIST:1.1 pkgsrc/lang/php74/PLIST:1.2
--- pkgsrc/lang/php74/PLIST:1.1	Sun Dec 15 17:56:34 2019
+++ pkgsrc/lang/php74/PLIST	Tue Jan 21 14:16:26 2020
@@ -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.
 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


--_----------=_1579616187292650--