pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/njs njs: use pkgsrc infrastructure for required o...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d17a4b6b95b2
branches:  trunk
changeset: 381864:d17a4b6b95b2
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jul 14 12:46:21 2022 +0000

description:
njs: use pkgsrc infrastructure for required options

diffstat:

 lang/njs/options.mk |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r 29c6c5e71017 -r d17a4b6b95b2 lang/njs/options.mk
--- a/lang/njs/options.mk       Thu Jul 14 11:05:03 2022 +0000
+++ b/lang/njs/options.mk       Thu Jul 14 12:46:21 2022 +0000
@@ -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_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



Home | Main Index | Thread Index | Old Index