git: bd9c59e452e5 - main - www/{nginx,nginx-devel,freenginx}: Drop the pcre1 dependency
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 18 Oct 2026 15:32:49 UTC
The branch main has been updated by joneum:
URL: https://cgit.FreeBSD.org/ports/commit/?id=bd9c59e452e552ebab5d8675be521d12da595e83
commit bd9c59e452e552ebab5d8675be521d12da595e83
Author: Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2026-10-18 15:23:49 +0000
Commit: Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2026-10-18 15:32:39 +0000
www/{nginx,nginx-devel,freenginx}: Drop the pcre1 dependency
Nothing calls a pcre1 symbol; modsecurity3 itself is built with pcre2.
The slave ports kept listing PCRE_ONE, an option that no longer exists.
Sponsored by: Netzkommune GmbH
---
www/freenginx/Makefile | 5 -----
www/nginx-devel/Makefile | 5 -----
www/nginx-full/Makefile | 2 +-
www/nginx-lite/Makefile | 2 +-
www/nginx-naxsi/Makefile | 2 +-
www/nginx/Makefile | 7 +------
6 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile
index 872e9f10dc7f..3219b3e305c7 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -240,12 +240,7 @@ CFLAGS+= -DNDEBUG
CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14"
.endif
-.if empty(PORT_OPTIONS:MMODSECURITY3)
CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib"
-.else
-CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre2-8"
-LIB_DEPENDS+= libpcre2-8.so:devel/pcre2
-.endif
.if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML)
CONFIGURE_ENV+= NJS_LIBXSLT=NO
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 6564efb9ff54..021aefb37f49 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -253,11 +253,6 @@ CFLAGS+= -DNDEBUG
CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14"
.endif
-.if (PORT_OPTIONS:MMODSECURITY3)
-CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre"
-LIB_DEPENDS+= libpcre.so:devel/pcre
-.endif
-
.if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML)
CONFIGURE_ENV+= NJS_LIBXSLT=NO
NJS_CONFIGURE_ARGS= --no-libxml2
diff --git a/www/nginx-full/Makefile b/www/nginx-full/Makefile
index 60b95d86ad56..20ac44576ff7 100644
--- a/www/nginx-full/Makefile
+++ b/www/nginx-full/Makefile
@@ -34,7 +34,7 @@ OPTIONS_DEFAULT=DSO DEBUG DEBUGLOG FILE_AIO GOOGLE_PERFTOOLS \
HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP \
ARRAYVAR BROTLI DRIZZLE DYNAMIC_TLS DYNAMIC_HC DYNAMIC_UPSTREAM \
ENCRYPTSESSION FORMINPUT GRIDFS ICONV LET LINK LUA MEMC MODSECURITY3 \
- NAXSI PASSENGER PCRE_ONE POSTGRES RDS_CSV RDS_JSON REDIS2 \
+ NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2 \
RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT \
SRCACHE STATSD VOD VTS UDPLOG X11 XSS WEBSOCKIFY ZSTD
diff --git a/www/nginx-lite/Makefile b/www/nginx-lite/Makefile
index 658aa3ae6b5d..c2984ab47e70 100644
--- a/www/nginx-lite/Makefile
+++ b/www/nginx-lite/Makefile
@@ -17,6 +17,6 @@ CONFLICTS= nginx-1.* \
OPTIONS_DEFAULT=FILE_AIO HTTP HTTP_CACHE \
HTTP_REALIP HTTP_REWRITE \
- HTTP_SSL THREADS PCRE_ONE
+ HTTP_SSL THREADS
.include "${MASTERDIR}/Makefile"
diff --git a/www/nginx-naxsi/Makefile b/www/nginx-naxsi/Makefile
index 9ca86a078778..f906f0c56015 100644
--- a/www/nginx-naxsi/Makefile
+++ b/www/nginx-naxsi/Makefile
@@ -15,6 +15,6 @@ OPTIONS_DEFAULT?=DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
HTTP_DAV HTTP_FLV HTTP_GZIP_STATIC HTTP_GUNZIP_FILTER \
HTTP_MP4 HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK \
HTTP_SLICE HTTP_REWRITE HTTP_SSL HTTP_STATUS HTTP_SUB \
- HTTPV2 MAIL MAIL_SSL NAXSI STREAM PCRE_ONE STREAM_SSL THREADS WWW
+ HTTPV2 MAIL MAIL_SSL NAXSI STREAM STREAM_SSL THREADS WWW
.include "${MASTERDIR}/Makefile"
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index e83a5e686db5..73173a207109 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nginx
PORTVERSION= ${NGINX_VERSION}
.include "version.mk"
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
@@ -240,12 +240,7 @@ CFLAGS+= -DNDEBUG
CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14"
.endif
-.if empty(PORT_OPTIONS:MMODSECURITY3) && empty(PORT_OPTIONS:MPASSENGER)
CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib"
-.else
-CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre"
-LIB_DEPENDS+= libpcre.so:devel/pcre
-.endif
.if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML)
CONFIGURE_ENV+= NJS_LIBXSLT=NO