git: d0c4f648b9c6 - main - www/nginx: fix dependences for some modules
Date: Mon, 30 Jan 2023 08:02:03 UTC
The branch main has been updated by joneum:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d0c4f648b9c68d9b845cc2b7df1212d66dd9d737
commit d0c4f648b9c68d9b845cc2b7df1212d66dd9d737
Author: Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2023-01-30 07:59:50 +0000
Commit: Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2023-01-30 08:01:57 +0000
www/nginx: fix dependences for some modules
HTTP_DAV_EXT module requires libraries, so let's define them with a more canonical way.
While I'm here use the same way to define dependences for the HTTP_XSLT module as well.
PR: 261134
Sponsored by: Netzkommune GmbH
---
www/nginx/Makefile | 6 +++---
www/nginx/Makefile.extmod | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 0b08c5cf37aa..1b95142c4658 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,6 +1,6 @@
PORTNAME= nginx
PORTVERSION= 1.22.1
-PORTREVISION?= 2
+PORTREVISION?= 3
PORTEPOCH= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
@@ -164,8 +164,8 @@ HTTP_SSL_CONFIGURE_ON= --with-http_ssl_module
HTTP_SSL_USES= ssl
HTTP_STATUS_CONFIGURE_ON= --with-http_stub_status_module
HTTP_SUB_CONFIGURE_ON= --with-http_sub_module
-HTTP_XSLT_USES= gnome
-HTTP_XSLT_USE= GNOME=libxml2,libxslt
+HTTP_XSLT_LIB_DEPENDS= libxml2.so:textproc/libxml2 \
+ libxslt.so:textproc/libxslt
HTTP_XSLT_VARS= DSO_BASEMODS+=http_xslt_module
HTTPV2_IMPLIES= HTTP_SSL
HTTPV2_CONFIGURE_ON= --with-http_v2_module
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index fa7472f5823f..9f4bb82416cd 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -90,7 +90,8 @@ HTTP_AUTH_PAM_GH_TUPLE= sto:ngx_http_auth_pam_module:v1.5.1:auth_pam
HTTP_AUTH_PAM_VARS= DSO_EXTMODS+=auth_pam
HTTP_DAV_EXT_IMPLIES= HTTP_DAV
-HTTP_DAV_EXT_LIB_DEPENDS= libexpat.so:textproc/expat2
+HTTP_DAV_EXT_LIB_DEPENDS= libxml2.so:textproc/libxml2 \
+ libxslt.so:textproc/libxslt
HTTP_DAV_EXT_GH_TUPLE= arut:nginx-dav-ext-module:v3.0.0:dav_ext
HTTP_DAV_EXT_VARS= DSO_EXTMODS+=dav_ext
HTTP_DAV_EXT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_dav_ext_module.c