CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Feb  7 02:26:09 UTC 2022

Modified Files:
        pkgsrc/lang/php80: options.mk
        pkgsrc/lang/php81: options.mk

Log Message:
php80 & php81: update zts option name

Adjust the pkgsrc option name from "maintainer-zts" to "zts" for recent
PHP versions. Relates to PR pkg/56681.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php80/options.mk
cvs rdiff -u -r1.2 -r1.3 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.4 pkgsrc/lang/php80/options.mk:1.5
--- pkgsrc/lang/php80/options.mk:1.4    Fri Feb  4 01:41:01 2022
+++ pkgsrc/lang/php80/options.mk        Mon Feb  7 02:26:09 2022
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.4 2022/02/04 01:41:01 gutteridge Exp $
+# $NetBSD: options.mk,v 1.5 2022/02/07 02:26:09 gutteridge Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
-PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline argon2 php-embed
-PKG_SUPPORTED_OPTIONS+=        disable-filter-url
-PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline
+PKG_OPTIONS_VAR=               PKG_OPTIONS.${PHP_PKG_PREFIX}
+PKG_SUPPORTED_OPTIONS+=                inet6 ssl zts readline argon2 php-embed
+PKG_SUPPORTED_OPTIONS+=                disable-filter-url
+PKG_SUGGESTED_OPTIONS+=                inet6 ssl readline
+PKG_OPTIONS_LEGACY_OPTS+=      maintainer-zts:zts
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
 PKG_SUPPORTED_OPTIONS+=        dtrace
@@ -29,7 +30,7 @@ CONFIGURE_ARGS+=      --with-openssl=${BUILDL
 CONFIGURE_ARGS+=       --without-openssl
 .endif
 
-.if !empty(PKG_OPTIONS:Mmaintainer-zts)
+.if !empty(PKG_OPTIONS:Mzts)
 CONFIGURE_ARGS+=       --enable-zts
 .endif
 
@@ -60,7 +61,7 @@ CFLAGS+=              -DDISABLE_FILTER_URL
 PLIST_VARS+=   embed
 
 .if !empty(PKGNAME:Mphp-[7-9]*)
-.if !empty(PKG_OPTIONS:Mphp-embed)
+.  if !empty(PKG_OPTIONS:Mphp-embed)
 CONFIGURE_ARGS+=       --enable-embed
 INSTALLATION_DIRS+=    include/php/sapi/embed
 PLIST.embed=           yes
@@ -70,5 +71,5 @@ post-install: post-install-embed
 post-install-embed:
        ${INSTALL_DATA} ${WRKSRC}/sapi/embed/php_embed.h ${DESTDIR}${PREFIX}/include/php/sapi/embed/
        ${INSTALL_LIB} ${WRKSRC}/libs/libphp.so ${DESTDIR}${PREFIX}/lib/
-.endif
+.  endif
 .endif

Index: pkgsrc/lang/php81/options.mk
diff -u pkgsrc/lang/php81/options.mk:1.2 pkgsrc/lang/php81/options.mk:1.3
--- pkgsrc/lang/php81/options.mk:1.2    Fri Feb  4 01:41:01 2022
+++ pkgsrc/lang/php81/options.mk        Mon Feb  7 02:26:09 2022
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.2 2022/02/04 01:41:01 gutteridge Exp $
+# $NetBSD: options.mk,v 1.3 2022/02/07 02:26:09 gutteridge Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
-PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline argon2 php-embed
-PKG_SUPPORTED_OPTIONS+=        disable-filter-url
-PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline
+PKG_OPTIONS_VAR=               PKG_OPTIONS.${PHP_PKG_PREFIX}
+PKG_SUPPORTED_OPTIONS+=                inet6 ssl zts readline argon2 php-embed
+PKG_SUPPORTED_OPTIONS+=                disable-filter-url
+PKG_SUGGESTED_OPTIONS+=                inet6 ssl readline
+PKG_OPTIONS_LEGACY_OPTS+=      maintainer-zts:zts
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
 PKG_SUPPORTED_OPTIONS+=        dtrace
@@ -29,7 +30,7 @@ CONFIGURE_ARGS+=      --with-openssl=${BUILDL
 CONFIGURE_ARGS+=       --without-openssl
 .endif
 
-.if !empty(PKG_OPTIONS:Mmaintainer-zts)
+.if !empty(PKG_OPTIONS:Mzts)
 CONFIGURE_ARGS+=       --enable-zts
 .endif