[pkgsrc/trunk]: pkgsrc/lang Split off option handling into options.mk

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/022dd8be62e4
branches:  trunk
changeset: 444049:022dd8be62e4
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Jan 02 10:04:10 2021 +0000

description:
Split off option handling into options.mk

diffstat:

 lang/php72/Makefile.php |  75 +-----------------------------------------------
 lang/php72/options.mk   |  74 ++++++++++++++++++++++++++++++++++++++++++++++++
 lang/php73/Makefile.php |  75 +-----------------------------------------------
 lang/php73/options.mk   |  74 ++++++++++++++++++++++++++++++++++++++++++++++++
 lang/php74/Makefile.php |  75 +-----------------------------------------------
 lang/php74/options.mk   |  74 ++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 228 insertions(+), 219 deletions(-)

diffs (truncated from 501 to 300 lines):

diff -r 1f0955291915 -r 022dd8be62e4 lang/php72/Makefile.php
--- a/lang/php72/Makefile.php   Sat Jan 02 09:52:34 2021 +0000
+++ b/lang/php72/Makefile.php   Sat Jan 02 10:04:10 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.16 2020/11/21 19:44:32 otis Exp $
+# $NetBSD: Makefile.php,v 1.17 2021/01/02 10:04:10 taca Exp $
 # used by lang/php72/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -52,78 +52,7 @@
 
 CONFIGURE_ARGS+=       --with-pcre-regex=${BUILDLINK_PREFIX.pcre}
 
-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
-
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
-PKG_SUPPORTED_OPTIONS+=        dtrace
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=       --enable-ipv6
-.else
-CONFIGURE_ARGS+=       --disable-ipv6
-.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
-.  if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=       --with-openssl=yes
-LIBS.SunOS+=           -lcrypto
-.  else
-CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
-.  endif
-.else
-CONFIGURE_ARGS+=       --without-openssl
-.endif
-
-.if !empty(PKG_OPTIONS:Mmaintainer-zts)
-CONFIGURE_ARGS+=       --enable-maintainer-zts
-.endif
-
-.if !empty(PKG_OPTIONS:Mreadline)
-.include "../../devel/readline/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.readline}
-.else
-CONFIGURE_ARGS+=       --without-readline
-.endif
-
-.if !empty(PKG_OPTIONS:Mdtrace)
-PLIST.dtrace=          yes
-CONFIGURE_ARGS+=       --enable-dtrace
-
-# See https://bugs.php.net/bug.php?id=61268
-INSTALL_MAKE_FLAGS+=   -r
-.endif
-
-.if !empty(PKG_OPTIONS:Margon2)
-CONFIGURE_ARGS+=       --with-password-argon2=${BUILDLINK_PREFIX.argon2}
-.include "../../security/argon2/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mdisable-filter-url)
-CFLAGS+=               -DDISABLE_FILTER_URL
-.endif
-
-PLIST_VARS+=    embed
-
-.if !empty(PKGNAME:Mphp-[7-9]*)
-.if !empty(PKG_OPTIONS:Mphp-embed)
-CONFIGURE_ARGS+=       --enable-embed
-INSTALLATION_DIRS+=    include/php/sapi/embed
-PLIST.embed=           yes
-
-.PHONY: post-install-embed
-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/libphp7.so ${DESTDIR}${PREFIX}/lib/
-.endif
-.endif
+.include "options.mk"
 
 DL_AUTO_VARS=          yes
 .include "../../mk/dlopen.buildlink3.mk"
diff -r 1f0955291915 -r 022dd8be62e4 lang/php72/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php72/options.mk     Sat Jan 02 10:04:10 2021 +0000
@@ -0,0 +1,74 @@
+# $NetBSD: options.mk,v 1.1 2021/01/02 10:04:10 taca 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
+
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
+PKG_SUPPORTED_OPTIONS+=        dtrace
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-ipv6
+.else
+CONFIGURE_ARGS+=       --disable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+.  if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --with-openssl=yes
+LIBS.SunOS+=           -lcrypto
+.  else
+CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+.  endif
+.else
+CONFIGURE_ARGS+=       --without-openssl
+.endif
+
+.if !empty(PKG_OPTIONS:Mmaintainer-zts)
+CONFIGURE_ARGS+=       --enable-maintainer-zts
+.endif
+
+.if !empty(PKG_OPTIONS:Mreadline)
+.include "../../devel/readline/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.readline}
+.else
+CONFIGURE_ARGS+=       --without-readline
+.endif
+
+.if !empty(PKG_OPTIONS:Mdtrace)
+PLIST.dtrace=          yes
+CONFIGURE_ARGS+=       --enable-dtrace
+
+# See https://bugs.php.net/bug.php?id=61268
+INSTALL_MAKE_FLAGS+=   -r
+.endif
+
+.if !empty(PKG_OPTIONS:Margon2)
+CONFIGURE_ARGS+=       --with-password-argon2=${BUILDLINK_PREFIX.argon2}
+.include "../../security/argon2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mdisable-filter-url)
+CFLAGS+=               -DDISABLE_FILTER_URL
+.endif
+
+PLIST_VARS+=    embed
+
+.if !empty(PKGNAME:Mphp-[7-9]*)
+.if !empty(PKG_OPTIONS:Mphp-embed)
+CONFIGURE_ARGS+=       --enable-embed
+INSTALLATION_DIRS+=    include/php/sapi/embed
+PLIST.embed=           yes
+
+.PHONY: post-install-embed
+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/libphp7.so ${DESTDIR}${PREFIX}/lib/
+.endif
+.endif
diff -r 1f0955291915 -r 022dd8be62e4 lang/php73/Makefile.php
--- a/lang/php73/Makefile.php   Sat Jan 02 09:52:34 2021 +0000
+++ b/lang/php73/Makefile.php   Sat Jan 02 10:04:10 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.6 2020/11/21 19:43:57 otis Exp $
+# $NetBSD: Makefile.php,v 1.7 2021/01/02 10:04:10 taca Exp $
 # used by lang/php73/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -53,78 +53,7 @@
 CONFIGURE_ARGS+=       --with-pcre-regex=${BUILDLINK_PREFIX.pcre2}
 GNU_CONFIGURE_STRICT=  no
 
-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
-
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
-PKG_SUPPORTED_OPTIONS+=        dtrace
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=       --enable-ipv6
-.else
-CONFIGURE_ARGS+=       --disable-ipv6
-.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
-.  if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=       --with-openssl=yes
-LIBS.SunOS+=           -lcrypto
-.  else
-CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
-.  endif
-.else
-CONFIGURE_ARGS+=       --without-openssl
-.endif
-
-.if !empty(PKG_OPTIONS:Mmaintainer-zts)
-CONFIGURE_ARGS+=       --enable-maintainer-zts
-.endif
-
-.if !empty(PKG_OPTIONS:Mreadline)
-.include "../../devel/readline/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.readline}
-.else
-CONFIGURE_ARGS+=       --without-readline
-.endif
-
-.if !empty(PKG_OPTIONS:Mdtrace)
-PLIST.dtrace=          yes
-CONFIGURE_ARGS+=       --enable-dtrace
-
-# See https://bugs.php.net/bug.php?id=61268
-INSTALL_MAKE_FLAGS+=   -r
-.endif
-
-.if !empty(PKG_OPTIONS:Margon2)
-CONFIGURE_ARGS+=       --with-password-argon2=${BUILDLINK_PREFIX.argon2}
-.include "../../security/argon2/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mdisable-filter-url)
-CFLAGS+=               -DDISABLE_FILTER_URL
-.endif
-
-PLIST_VARS+=    embed
-
-.if !empty(PKGNAME:Mphp-[7-9]*)
-.if !empty(PKG_OPTIONS:Mphp-embed)
-CONFIGURE_ARGS+=       --enable-embed
-INSTALLATION_DIRS+=    include/php/sapi/embed
-PLIST.embed=           yes
-
-.PHONY: post-install-embed
-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/libphp7.so ${DESTDIR}${PREFIX}/lib/
-.endif
-.endif
+.include "options.mk"
 
 DL_AUTO_VARS=          yes
 .include "../../mk/dlopen.buildlink3.mk"
diff -r 1f0955291915 -r 022dd8be62e4 lang/php73/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php73/options.mk     Sat Jan 02 10:04:10 2021 +0000
@@ -0,0 +1,74 @@
+# $NetBSD: options.mk,v 1.1 2021/01/02 10:04:10 taca 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
+
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
+PKG_SUPPORTED_OPTIONS+=        dtrace
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-ipv6
+.else
+CONFIGURE_ARGS+=       --disable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+.  if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --with-openssl=yes
+LIBS.SunOS+=           -lcrypto
+.  else
+CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+.  endif
+.else
+CONFIGURE_ARGS+=       --without-openssl
+.endif
+
+.if !empty(PKG_OPTIONS:Mmaintainer-zts)
+CONFIGURE_ARGS+=       --enable-maintainer-zts
+.endif
+
+.if !empty(PKG_OPTIONS:Mreadline)
+.include "../../devel/readline/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.readline}
+.else
+CONFIGURE_ARGS+=       --without-readline