pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang php80 & php81: update zts option name



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8695cc091a40
branches:  trunk
changeset: 373134:8695cc091a40
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Mon Feb 07 02:26:09 2022 +0000

description:
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.

diffstat:

 lang/php80/options.mk |  17 +++++++++--------
 lang/php81/options.mk |  13 +++++++------
 2 files changed, 16 insertions(+), 14 deletions(-)

diffs (72 lines):

diff -r ba5f8599c5f2 -r 8695cc091a40 lang/php80/options.mk
--- a/lang/php80/options.mk     Mon Feb 07 02:14:35 2022 +0000
+++ b/lang/php80/options.mk     Mon Feb 07 02:26:09 2022 +0000
@@ -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+=       --without-openssl
 .endif
 
-.if !empty(PKG_OPTIONS:Mmaintainer-zts)
+.if !empty(PKG_OPTIONS:Mzts)
 CONFIGURE_ARGS+=       --enable-zts
 .endif
 
@@ -60,7 +61,7 @@
 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-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
diff -r ba5f8599c5f2 -r 8695cc091a40 lang/php81/options.mk
--- a/lang/php81/options.mk     Mon Feb 07 02:14:35 2022 +0000
+++ b/lang/php81/options.mk     Mon Feb 07 02:26:09 2022 +0000
@@ -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+=       --without-openssl
 .endif
 
-.if !empty(PKG_OPTIONS:Mmaintainer-zts)
+.if !empty(PKG_OPTIONS:Mzts)
 CONFIGURE_ARGS+=       --enable-zts
 .endif
 



Home | Main Index | Thread Index | Old Index