CVS commit: pkgsrc/lang

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

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.

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)