Re: CVS commit: pkgsrc/lang/njs

["Sergey A. Osokin" <osa%NetBSD.org@localhost>]

Thank you, Thomas!

On Thu, Jul 14, 2022 at 12:46:21PM +0000, Thomas Klausner wrote:
> Module Name:  pkgsrc
> Committed By: wiz
> Date:         Thu Jul 14 12:46:21 UTC 2022
> 
> Modified Files:
>       pkgsrc/lang/njs: options.mk
> 
> Log Message:
> njs: use pkgsrc infrastructure for required options
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/njs/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/njs/options.mk
> diff -u pkgsrc/lang/njs/options.mk:1.2 pkgsrc/lang/njs/options.mk:1.3
> --- pkgsrc/lang/njs/options.mk:1.2    Thu Jul 14 10:59:51 2022
> +++ pkgsrc/lang/njs/options.mk        Thu Jul 14 12:46:21 2022
> @@ -1,9 +1,12 @@
> -# $NetBSD: options.mk,v 1.2 2022/07/14 10:59:51 osa Exp $
> +# $NetBSD: options.mk,v 1.3 2022/07/14 12:46:21 wiz Exp $
>  
>  PKG_OPTIONS_VAR=     PKG_OPTIONS.njs
> -PKG_SUPPORTED_OPTIONS=       pcre pcre2 ssl
> +PKG_SUPPORTED_OPTIONS=       ssl
>  PKG_SUGGESTED_OPTIONS=       pcre ssl
>  
> +PKG_OPTIONS_REQUIRED_GROUPS= regex
> +PKG_OPTIONS_GROUP.regex=     pcre pcre2
> +
>  .include "../../mk/bsd.options.mk"
>  
>  .if !empty(PKG_OPTIONS:Mpcre)
> @@ -26,10 +29,6 @@ SUBST_SED.fix-pcre2=       -e 's,/usr/pkg,${BU
>  SUBST_NOOP_OK.fix-pcre2=yes
>  .endif
>  
> -.if empty(PKG_OPTIONS:Mpcre2) && empty(PKG_OPTIONS:Mpcre)
> -PKG_FAIL_REASON=     "Requires PCRE or PCRE2."
> -.endif
> -
>  .if !empty(PKG_OPTIONS:Mssl)
>  .include "../../security/openssl/buildlink3.mk"
>  .else
>