www/nginx-devel: simplify patching for the third-party gridfs module

No functional changes.
freebsd · Jun 19, 2022 · 68c6f28 · 68c6f28
1 parent 3bed76e
commit 68c6f28
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git 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
@@ -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