From nobody Sun Dec 3 09:58:13 2023
X-Original-To: dev-commits-ports-all@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 4Sjj0k1J71z52dFG;
Sun, 3 Dec 2023 09:58:14 +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 4Sjj0k0dFRz3Y5m;
Sun, 3 Dec 2023 09:58:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1701597494;
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=8OTw8ckVElB50Coc7upvi/eaE7qDAojcdNDB0EmUKgU=;
b=KZ/SorRa/dNm2ERCehl/u/ltDtWT+KwPVG0RWtLKJ+9Z6oDtmtO3yL8NE+j7yX3LvKdTr8
JUOWy0iO35N/G10zM0lsJQ3wf8975R9MCcB3+rE6QMkiRkOC82vcAlSyljfeO7ETpE4iIr
9kO7zecjkuNWcwPL91vGnLrODzA4mImX/oWd4BQKWzrK1igTEZ/8vU6XlNA8V9oatZqFvG
7FtcJdOzI/yNp9BWK9TrFEXqeqICyJaG/sNM0IdoTub9u7opg3mPk3mnA7tl5pf2FLu/Gd
LUrjaxXoCyfdhJDJUB4PG2/YqTckM5IOogjrS3UMbSuZMxrqiHJchtAnpY5c8Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1701597494;
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=8OTw8ckVElB50Coc7upvi/eaE7qDAojcdNDB0EmUKgU=;
b=o4msZ1uSSB3Tvj+lty6xqyas/Au67vGJm1DsZhsgopNN0XQCMNGVozQOiYCABK2F1Wb+iB
4+GxeX2JcINNf6I8O7NPVMzSbesFInp9EXZhuJ6iF9r2k4ZfsAL72fEctBxGSDc5u17TK4
EqM52F7DqBvzxK7ptEpsN5bGO3MYZRFFN5sV2Uqbcge7UCrP1R/U1bjn2wnOM6uI8kPqec
XTclZrgimy5C/iXOGymQaE2ouNJ+lwmEinLY7gAleATfKCy7KCYTNvQwQYEwCH+ojfLJBj
G8HD6WfODKwhIcUJSfhxcFPIxNMF8E5Zu/mjnp1Vy96OuE5u9+g0vdzbOO0ltQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701597494; a=rsa-sha256; cv=none;
b=l9vGyV6bTBITCCHLRq0EsfghnysPUS4perSMCAS6jzEtZb+j3vYbcivdj2kDIKoNtxhz7I
DOlGn3NHiGTsd5UigLJ9zv0CJapDEL3WlP90/UVgXCKva3d2dtbNQHJYIJ8YoKm8LAj3+l
Cq+gOQ0DbcxGc7n4NTvVM2mB75gWclMgbxj8MpUVtReKBe3MJtCoWCiViw5bk+5HBWs3b6
mmE3abqi1M+7YyNqfE+rXEVOPNgxPyxdGvU/mZWEmtve/td+peBzZtvUWS0WA+wvt5gcN2
EH0yslydRTBv8V3FhXALhNxhglTzpQloZGxwMWZ+J33Q4rNMeracfCuTqbXbFg==
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 4Sjj0j6RgLzv3p;
Sun, 3 Dec 2023 09:58:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B39wDb7036375;
Sun, 3 Dec 2023 09:58:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B39wDQA036372;
Sun, 3 Dec 2023 09:58:13 GMT
(envelope-from git)
Date: Sun, 3 Dec 2023 09:58:13 GMT
Message-Id: <202312030958.3B39wDQA036372@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-branches@FreeBSD.org
From: Koichiro Iwao
Subject: git: 8848573087ff - 2023Q4 - www/nginx: fix build with a
third-party passenger module
List-Id: Commit messages for all branches of the ports repository
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help:
List-Post:
List-Subscribe:
List-Unsubscribe:
Sender: owner-dev-commits-ports-all@freebsd.org
X-BeenThere: dev-commits-ports-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: meta
X-Git-Repository: ports
X-Git-Refname: refs/heads/2023Q4
X-Git-Reftype: branch
X-Git-Commit: 8848573087ff210c5383adcd899b055c50467fb4
Auto-Submitted: auto-generated
The branch 2023Q4 has been updated by meta:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8848573087ff210c5383adcd899b055c50467fb4
commit 8848573087ff210c5383adcd899b055c50467fb4
Author: Jochen Neumeister
AuthorDate: 2023-12-03 07:51:41 +0000
Commit: Koichiro Iwao
CommitDate: 2023-12-03 09:57:04 +0000
www/nginx: fix build with a third-party passenger module
PR: 275161
Sponsored by: Netzkommune GmbH
This commit is required to complete PR 275161. The fix for
www/nginx-devel is not necessary at the moment.
(cherry picked from commit b31426d1f77c12e47a60ff4b6b663826afd4702f)
---
www/nginx/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index be56e8b593c4..d037ba99710a 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,6 +1,6 @@
PORTNAME= nginx
PORTVERSION= 1.24.0
-PORTREVISION?= 12
+PORTREVISION?= 13
PORTEPOCH= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
@@ -240,6 +240,10 @@ CONFIGURE_ENV+= OPTIMIZE="yes"
CFLAGS+= -DNDEBUG
.endif
+.if ${PORT_OPTIONS:MPASSENGER}
+CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14"
+.endif
+
# Fix build failure on clang >= 12
.if ${PORT_OPTIONS:MHTTP_PERL} && ${OSVERSION} >= 1301000
CFLAGS+= -Wno-compound-token-split-by-macro