aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2021-12-29 21:27:52 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2021-12-29 21:27:52 +0000
commit8d9d1a87a15f98ac1235c831566f708b7049d920 (patch)
tree02386ce8c80fbe8876215b685b7f16a2271b88eb
parent10b5543da72c7677ae03e5993ae261c769dfdb57 (diff)
downloadports-8d9d1a87a15f98ac1235c831566f708b7049d920.tar.gz
ports-8d9d1a87a15f98ac1235c831566f708b7049d920.zip
www/nginx-devel: choose PCRE library for build
NGINX 1.21.5 adds support for PCRE2 library, in addition to support PCRE1. It's possible to choose regular expression library for the port now. Please note: several modules are required patching to support PCRE2 library, so let's keep PCRE1 as default version for now. Bump PORTREVISION.
-rw-r--r--www/nginx-devel/Makefile37
-rw-r--r--www/nginx-devel/Makefile.options.desc3
2 files changed, 27 insertions, 13 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 24eb3bed05bf..0e3e97a7a0c4 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -2,6 +2,7 @@
PORTNAME?= nginx
PORTVERSION= 1.21.5
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
@@ -54,7 +55,8 @@ CONFIGURE_ARGS+=--prefix=${ETCDIR} \
--pid-path=${NGINX_RUNDIR}/nginx.pid \
--error-log-path=${NGINX_ERRORLOG} \
--user=${WWWOWN} --group=${WWWGRP} \
- --with-compat
+ --with-compat \
+ --with-pcre
ALL_TARGET=
PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
@@ -69,8 +71,8 @@ OPTIONS_GROUP= HTTPGRP MAILGRP STREAMGRP
OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \
HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \
- HTTP_RANDOM_INDEX HTTP_REALIP HTTP_REWRITE HTTP_SECURE_LINK \
- HTTP_SLICE HTTP_SSL HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2
+ HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
+ HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2
OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
@@ -79,11 +81,16 @@ OPTIONS_GROUP_STREAMGRP= STREAM STREAM_REALIP STREAM_SSL \
OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS THREADS WWW
OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
- HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC \
- HTTP_MP4 HTTP_RANDOM_INDEX HTTP_REALIP HTTP_REWRITE \
- HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL HTTP_STATUS \
- HTTP_SUB HTTPV2 MAIL MAIL_SSL STREAM STREAM_REALIP \
- STREAM_SSL STREAM_SSL_PREREAD THREADS WWW
+ HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \
+ HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
+ HTTP_STATUS HTTP_SUB HTTPV2 MAIL MAIL_SSL PCRE_ONE STREAM \
+ STREAM_REALIP STREAM_SSL STREAM_SSL_PREREAD THREADS WWW
+
+OPTIONS_RADIO+= PCRE
+OPTIONS_RADIO_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
OPTIONS_RADIO+= GSSAPI
OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
@@ -152,9 +159,6 @@ HTTP_PERL_USES= perl5
HTTP_PERL_VARS= DSO_BASEMODS+=http_perl_module
HTTP_RANDOM_INDEX_CONFIGURE_ON= --with-http_random_index_module
HTTP_REALIP_CONFIGURE_ON= --with-http_realip_module
-HTTP_REWRITE_LIB_DEPENDS= libpcre.so:devel/pcre
-HTTP_REWRITE_CONFIGURE_ON= --with-pcre --without-pcre2
-HTTP_REWRITE_CONFIGURE_OFF= --without-http_rewrite_module
HTTP_SECURE_LINK_CONFIGURE_ON= --with-http_secure_link_module
HTTP_SLICE_CONFIGURE_ON= --with-http_slice_module
HTTP_SSL_CONFIGURE_ON= --with-http_ssl_module
@@ -218,12 +222,21 @@ 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:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT))
IGNORE= required at least GSSAPI_HEIMDAL or \
GSSAPI_MIT to be defined. Please do \
'make config' again
.endif
+.if ${PORT_OPTIONS:MPCRE_ONE}
+NJS_CONFIGURE_ARGS= --no-pcre2
+.endif
+
pre-everything::
@${ECHO_MSG}
.if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR}
@@ -306,7 +319,7 @@ pre-configure-SMALL_LIGHT-on:
( cd ${WRKSRC_small_light} && ./setup )
do-configure-NJS-on:
- ( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} --no-pcre2 \
+ ( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} \
&& ${SETENV} ${MAKE_ENV} ${MAKE_CMD} njs \
&& ${MV} build/njs ${WRKSRC_njs} )
diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc
index 66252c898a37..0424d95d8150 100644
--- a/www/nginx-devel/Makefile.options.desc
+++ b/www/nginx-devel/Makefile.options.desc
@@ -56,7 +56,6 @@ HTTP_RANDOM_INDEX_DESC= Enable http_random_index module
HTTP_REALIP_DESC= Enable http_realip module
HTTP_REDIS_DESC= 3rd party http_redis module
HTTP_RESPONSE_DESC= 3rd party http_response module
-HTTP_REWRITE_DESC= Enable http_rewrite module
HTTP_SECURE_LINK_DESC= Enable http_secure_link module
HTTP_SLICE_DESC= Enable http_slice module
HTTP_SLICE_AHEAD_DESC= 3rd party http_slice_ahead module
@@ -91,6 +90,8 @@ NAXSI_DESC= 3rd party naxsi module
NJS_DESC= Enable javascript module
OPENTRACING_DESC= 3rd party opentracing module
PASSENGER_DESC= 3rd party passenger module
+PCRE_ONE_DESC= Enable PCRE1 support
+PCRE_TWO_DESC= Enable PCRE2 support
POSTGRES_DESC= 3rd party postgres module
RDS_CSV_DESC= 3rd party rds_csv module
RDS_JSON_DESC= 3rd party rds_json module