Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 846A91A9239 for ; Fri, 4 Feb 2022 01:41:03 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id B704084EB5; Fri, 4 Feb 2022 01:41:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ECF3384D5E for ; Fri, 4 Feb 2022 01:41:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 6FV1voRiJhpI for ; Fri, 4 Feb 2022 01:41:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 63E9D84EB3 for ; Fri, 4 Feb 2022 01:41:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5151AFB24; Fri, 4 Feb 2022 01:41:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_164393886146850" MIME-Version: 1.0 Date: Fri, 4 Feb 2022 01:41:01 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20220204014101.5151AFB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_164393886146850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Fri Feb 4 01:41:01 UTC 2022 Modified Files: pkgsrc/lang/php80: options.mk pkgsrc/lang/php81: options.mk Log Message: php80 & php81: correct zts option invocation Starting with PHP 8.0, zts is enabled with --enable-zts, rather than the older --enable-maintainer-zts. Addresses PR pkg/56681. The actual pkgsrc option name should probably be adjusted, and the current "maintainer-zts" moved to PKG_LEGACY_OPTIONS. I've left it for another commit. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php80/options.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php81/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_164393886146850 Content-Disposition: inline Content-Length: 1459 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/php80/options.mk diff -u pkgsrc/lang/php80/options.mk:1.3 pkgsrc/lang/php80/options.mk:1.4 --- pkgsrc/lang/php80/options.mk:1.3 Sun Dec 19 05:03:19 2021 +++ pkgsrc/lang/php80/options.mk Fri Feb 4 01:41:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2021/12/19 05:03:19 taca Exp $ +# $NetBSD: options.mk,v 1.4 2022/02/04 01:41:01 gutteridge Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 php-embed @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --without-openssl .endif .if !empty(PKG_OPTIONS:Mmaintainer-zts) -CONFIGURE_ARGS+= --enable-maintainer-zts +CONFIGURE_ARGS+= --enable-zts .endif .if !empty(PKG_OPTIONS:Mreadline) Index: pkgsrc/lang/php81/options.mk diff -u pkgsrc/lang/php81/options.mk:1.1 pkgsrc/lang/php81/options.mk:1.2 --- pkgsrc/lang/php81/options.mk:1.1 Sat Nov 27 07:24:43 2021 +++ pkgsrc/lang/php81/options.mk Fri Feb 4 01:41:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2021/11/27 07:24:43 taca Exp $ +# $NetBSD: options.mk,v 1.2 2022/02/04 01:41:01 gutteridge Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 php-embed @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --without-openssl .endif .if !empty(PKG_OPTIONS:Mmaintainer-zts) -CONFIGURE_ARGS+= --enable-maintainer-zts +CONFIGURE_ARGS+= --enable-zts .endif .if !empty(PKG_OPTIONS:Mreadline) --_----------=_164393886146850--