Received: by mail.netbsd.org (Postfix, from userid 605) id C28E884D57; Fri, 7 Dec 2018 16:04:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CE3B384D2C for ; Fri, 7 Dec 2018 16:04:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id vz8lW1NeKiIw for ; Fri, 7 Dec 2018 16:04:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 08C9584CCC for ; Fri, 7 Dec 2018 16:04:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0268AFB16; Fri, 7 Dec 2018 16:04:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1544198690284960" MIME-Version: 1.0 Date: Fri, 7 Dec 2018 16:04:50 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20181207160451.0268AFB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1544198690284960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Fri Dec 7 16:04:50 UTC 2018 Modified Files: pkgsrc/lang/php70: Makefile.php pkgsrc/lang/php71: Makefile.php pkgsrc/lang/php72: Makefile.php Log Message: lang/php7?: revert previous commit Revert previous commit and unbreak lang/php7{0,1,2}. sqlite3 problem would be another way, after update current PHP versions. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/php70/Makefile.php cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/php71/Makefile.php cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/php72/Makefile.php Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1544198690284960 Content-Disposition: inline Content-Length: 2616 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/php70/Makefile.php diff -u pkgsrc/lang/php70/Makefile.php:1.12 pkgsrc/lang/php70/Makefile.php:1.13 --- pkgsrc/lang/php70/Makefile.php:1.12 Fri Dec 7 01:54:52 2018 +++ pkgsrc/lang/php70/Makefile.php Fri Dec 7 16:04:50 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.12 2018/12/07 01:54:52 manu Exp $ +# $NetBSD: Makefile.php,v 1.13 2018/12/07 16:04:50 taca Exp $ # used by lang/php70/Makefile # used by www/ap-php/Makefile # used by www/php-fpm/Makefile @@ -46,9 +46,6 @@ CONFIGURE_ARGS+= --enable-xml CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} .include "../../textproc/libxml2/buildlink3.mk" -CONFIGURE_ARGS+= --with-sqlite3=shared -.include "../../databases/sqlite3/buildlink3.mk" - PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline disable-filter-url PKG_SUGGESTED_OPTIONS+= inet6 ssl readline Index: pkgsrc/lang/php71/Makefile.php diff -u pkgsrc/lang/php71/Makefile.php:1.11 pkgsrc/lang/php71/Makefile.php:1.12 --- pkgsrc/lang/php71/Makefile.php:1.11 Fri Dec 7 01:54:52 2018 +++ pkgsrc/lang/php71/Makefile.php Fri Dec 7 16:04:50 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.11 2018/12/07 01:54:52 manu Exp $ +# $NetBSD: Makefile.php,v 1.12 2018/12/07 16:04:50 taca Exp $ # used by lang/php71/Makefile # used by www/ap-php/Makefile # used by www/php-fpm/Makefile @@ -46,9 +46,6 @@ CONFIGURE_ARGS+= --enable-xml CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} .include "../../textproc/libxml2/buildlink3.mk" -CONFIGURE_ARGS+= --with-sqlite3=shared -.include "../../databases/sqlite3/buildlink3.mk" - PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline disable-filter-url PKG_SUGGESTED_OPTIONS+= inet6 ssl readline Index: pkgsrc/lang/php72/Makefile.php diff -u pkgsrc/lang/php72/Makefile.php:1.9 pkgsrc/lang/php72/Makefile.php:1.10 --- pkgsrc/lang/php72/Makefile.php:1.9 Fri Dec 7 01:54:53 2018 +++ pkgsrc/lang/php72/Makefile.php Fri Dec 7 16:04:50 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.9 2018/12/07 01:54:53 manu Exp $ +# $NetBSD: Makefile.php,v 1.10 2018/12/07 16:04:50 taca Exp $ # used by lang/php72/Makefile # used by www/ap-php/Makefile # used by www/php-fpm/Makefile @@ -49,9 +49,6 @@ CONFIGURE_ARGS+= --enable-xml CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} .include "../../textproc/libxml2/buildlink3.mk" -CONFIGURE_ARGS+= --with-sqlite3=shared -.include "../../databases/sqlite3/buildlink3.mk" - CONFIGURE_ARGS+= --with-pcre-regex=${BUILDLINK_PREFIX.pcre} PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} --_----------=_1544198690284960--