Re: git: 60a66ea271fa - main - www/nginx: Add PCRE2 Support

On 5/27/2022 1:54 PM, Jochen Neumeister wrote:
> +.if empty(PORT_OPTIONS:MPCRE_ONE) && empty(PORT_OPTIONS:MPCRE_TWO)
> +IGNORE=		required at least PCRE_ONE or PCRE_TWO \
> +		to be defined. Please do 'make config' again
> +.endif

I think you wanted to use OPTIONS_SINGLE instead of RADIO. RADIO allows 
0 selections but SINGLE requires at least 1.

Patch and example (I'll let you commit):

diff --git www/nginx/Makefile www/nginx/Makefile
index 5cde9bdf609a..4db585659de0 100644
--- www/nginx/Makefile
+++ www/nginx/Makefile
@@ -101,8 +101,8 @@ OPTIONS_DEFAULT?=   DSO FILE_AIO HTTP HTTP_ADDITION 
HTTP_AUTH_REQ HTTP_CACHE \
                 HTTPV2 MAIL MAIL_SSL STREAM STREAM_SSL STREAM_SSL_PREREAD \
                 THREADS WWW

-OPTIONS_RADIO+=                PCRE
-OPTIONS_RADIO_PCRE=    PCRE_ONE PCRE_TWO
+OPTIONS_SINGLE+=               PCRE
+OPTIONS_SINGLE_PCRE=   PCRE_ONE PCRE_TWO
  PCRE_ONE_LIB_DEPENDS=  libpcre.so:devel/pcre
  PCRE_ONE_CONFIGURE_ON= --without-pcre2
  PCRE_TWO_LIB_DEPENDS=  libpcre2-8.so:devel/pcre2
@@ -229,11 +229,6 @@ CONFIGURE_ENV+=    OPTIMIZE="yes"
  CFLAGS+=       -DNDEBUG
  .endif

-.if empty(PORT_OPTIONS:MPCRE_ONE) && empty(PORT_OPTIONS:MPCRE_TWO)
-IGNORE=                required at least PCRE_ONE or PCRE_TWO \
-               to be defined. Please do 'make config' again
-.endif
-
  .if ${PORT_OPTIONS:MPCRE_ONE}
  NJS_CONFIGURE_ARGS=    --no-pcre2
  .endif



# make check-config
====> You must select one and only one option from the PCRE single
=====> No option was selected (and one must be)
*** Error code 1

Stop.
make: stopped in /root/git/ports/main/www/nginx


-- 
Bryan Drewery