From nobody Sun Jun 19 18:46:07 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 512B4864D6D; Sun, 19 Jun 2022 18:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LR1vN1pYVz3qKZ; Sun, 19 Jun 2022 18:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655664368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZPmRqllxfm6H/JhFZ7ORa7fRmpXvM0DmMOGi32NA+EM=; b=coh1+ceIhVFLA5JzNAOFg3MKkmk7Te9WuwMtre8VqI/7SalA572wm4NzShEOfemNuhyIQr vF3mmO+AucJnn5B2itdp+DggR4MqMkVqy5xFUw6aHWfAlgkNhERGWaIRItUt8cfo8WYWGB NdceQlOlIA96jv+7DZybdToMV2wKGS0wNToO/j6XLS39//LTK4AZ+r8T1uGXvDMA+OD09/ UvnQ175IWFXDcBTAMFDG1nY8z6n+xmSx9dVEJaKTQ+Zob7nr3Dw42n/doI93+a1o/lg9UU Be7/wLqgEo1pwbO+QSsX2Xp1I85L/AqytXYB7+iMS8M/u0exzwOuQ0skJIuypA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 19CDF611C; Sun, 19 Jun 2022 18:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25JIk75D043438; Sun, 19 Jun 2022 18:46:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25JIk73V043437; Sun, 19 Jun 2022 18:46:07 GMT (envelope-from git) Date: Sun, 19 Jun 2022 18:46:07 GMT Message-Id: <202206191846.25JIk73V043437@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 68c6f28d2ee8 - main - www/nginx-devel: simplify patching for the third-party gridfs module List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68c6f28d2ee83d9dd8a544c4724331a0f07146f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655664368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZPmRqllxfm6H/JhFZ7ORa7fRmpXvM0DmMOGi32NA+EM=; b=xytO34qjxLU0jBZx6Im+FlGmzwTCXN3pPCjq+J0W/tO9H6xta36Pvh1+O4WvcThG1sggvR A810H4syMGe2QU6JthXkMwlMe9sTF4YMimWsnpXGBsjE+nR5L8C0k+isVwBQYT0wA2rv8x pJfmYvf96Ccq8TL2MTGCA8fvxjO33CUeBxA67Klwt0RhAWBdG/QJyd6YzY2Fb93RWExBpa w8pjclHtRbnKSosfGx/2QrleuEBqT9EoBbN6rYnKr5bYi0ReeCzDmd1OL0I2rEZO9HOE/C HD9Olc1e7dnFlbvsCyTNk8XGdwEnb0qDN1zjYqXv8JL3qkjT0tIlFgGEZhH/aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655664368; a=rsa-sha256; cv=none; b=pGSGTlx7YcMdcdqXWECNEDhYg7iDl1ugSqyGEfgxJAbs2Br4JA+r8UDN9OO9/uJ/y7sBj8 fjVZByizI/ExNFYU3dTN6v0o5N+5PCpdKtLwJVQ5LlFZ1NzaHnRVj7Hu+5IMgwvMXoJpr2 uYTxDza5jvSfZFVMpnBvSs+OBiqU1NY8tqT5Vmz8K2z9ulJ3rUaMYKhQqFFxpLUbApNPfi 20qNey2hCYtu2hPXVUBL243cQsu+/4psoJHnTELHihoa0+0P15lSd+U+NbLcY/lE4fLjY4 j2akfRi/nXHZ855TjhtPf6OYjAJ0HV9wWa/cJzTsAyblZtkSEFmyHZYRAm/JGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=68c6f28d2ee83d9dd8a544c4724331a0f07146f5 commit 68c6f28d2ee83d9dd8a544c4724331a0f07146f5 Author: Sergey A. Osokin AuthorDate: 2022-06-19 18:44:45 +0000 Commit: Sergey A. Osokin 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