git: 68c6f28d2ee8 - main - www/nginx-devel: simplify patching for the third-party gridfs module
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 19 Jun 2022 18:46:07 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=68c6f28d2ee83d9dd8a544c4724331a0f07146f5
commit 68c6f28d2ee83d9dd8a544c4724331a0f07146f5
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2022-06-19 18:44:45 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2022-06-19 18:46:02 +0000
www/nginx-devel: simplify patching for the third-party gridfs module
No functional changes.
---
www/nginx-devel/Makefile | 2 +-
www/nginx-devel/Makefile.extmod | 1 -
www/nginx-devel/files/extra-patch-nginx-gridfs-config | 13 -------------
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 7411f385a5e0..c27808054140 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -271,7 +271,7 @@ post-patch-FASTDFS-on:
${WRKSRC_fastdfs}/src/config
post-patch-GRIDFS-on:
- @${REINPLACE_CMD} 's!%%LOCALBASE%%!${LOCALBASE}!g' \
+ @${REINPLACE_CMD} 's!\/usr!${LOCALBASE}!g' \
${WRKSRC_gridfs}/nginx-gridfs/config
post-patch-HTTP_AUTH_KRB5-on:
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 2a5b8510de74..6d60c7c92cf6 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -78,7 +78,6 @@ FORMINPUT_GH_TUPLE= calio:form-input-nginx-module:v0.12:forminput
FORMINPUT_VARS= DSO_EXTMODS+=forminput
GRIDFS_GH_TUPLE= nieoding:nginx-gridfs:059bdc3:gridfs
-GRIDFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-gridfs-config
GRIDFS_LIB_DEPENDS= libbson-1.0.so:devel/libbson \
libmongoc-1.0.so:devel/mongo-c-driver
GRIDFS_VARS= DSO_EXTMODS+=gridfs GRIDFS_SUBDIR=/nginx-gridfs
diff --git a/www/nginx-devel/files/extra-patch-nginx-gridfs-config b/www/nginx-devel/files/extra-patch-nginx-gridfs-config
deleted file mode 100644
index 062086ba01ff..000000000000
--- a/www/nginx-devel/files/extra-patch-nginx-gridfs-config
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../nginx-gridfs-059bdc3/nginx-gridfs/config.orig 2022-06-17 10:37:42.109106000 -0400
-+++ ../nginx-gridfs-059bdc3/nginx-gridfs/config 2022-06-17 10:39:00.558419000 -0400
-@@ -1,7 +1,7 @@
- ngx_module_type=HTTP
- ngx_module_name=ngx_http_gridfs_module
--ngx_module_incs="/usr/include/libmongoc-1.0 /usr/include/libbson-1.0"
-+ngx_module_incs="%%LOCALBASE%%/include/libmongoc-1.0 %%LOCALBASE%%/include/libbson-1.0"
- ngx_module_libs="-lmongoc-1.0 -lbson-1.0"
- ngx_module_srcs="$ngx_addon_dir/ngx_http_gridfs_module.c"
- . auto/module
--ngx_addon_name=$ngx_module_name
-\ No newline at end of file
-+ngx_addon_name=$ngx_module_name