From nobody Tue Mar 07 00:25:16 2023
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 4PVx6h2jz2z3wbYl;
Tue, 7 Mar 2023 00:25:16 +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 4PVx6h2GnRz3kj2;
Tue, 7 Mar 2023 00:25:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1678148716;
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=jWYbb0KEjVpfIXLkO4H/sXtzzHrK4xLcfd3XMFscGBg=;
b=ehGmH5aSQ32F8L/nuK1+LiVNSj08uXJNKJCrENgjYPxfHvN36sL816eboHdWWuulhoee8S
pAXvonxbTPYBZKblEUthXJ3b4jK7ZxVrncIlaHdKgntjhpd3+dsKcjXC6int7aS1t+dEZO
c/HNIBeLeYgW5G3diODkmxhy9X7dCkRu+c/a64quXXAKdQN80tb0sQfETV6UdYFN7B7tvy
o8jMtEH36k+04pXrGgZxGalk9wXDZRJweu0Lhcp/pT+c6aaQOsxKPqvPHsnhIuFq9iL2+/
h8OcLgPRviwzerpVnbZcFSf7dmPE/iyaAc+e/G4NDCjv2NQK2X9/dvZQk83k7w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1678148716;
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=jWYbb0KEjVpfIXLkO4H/sXtzzHrK4xLcfd3XMFscGBg=;
b=ML97LZmxR4AGGpPK1SdRbpYk186ieC5CJo0F3gDp0R4frl1aOTN3qshuvU973weNUV/Hkz
4trO5CebZZdlUhWA9yS89FQC8pRr15BD1AHJk6TkGFftfGU2YO6UUfZnzgQwTRkjrTU89P
DsmDKAD6RMWjfId1R01b9+jyqXkVrOIENYPQJ5ifX8LSlnL75snw+P7WNQuwSfejhDzJgZ
l8vAeUYfVVWCL9Y9k/MR/2pzh6F/UXAE3RqBZ/M7a2SoioJU/j7qpiJ5oEBI5RfW5wIV4t
wz7CzCNFsAa4HL7gaKgIsIEsZmnVOFvBp93e7wv88b35gkDuPfGs83qjKVXyYg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678148716; a=rsa-sha256; cv=none;
b=poilTNWvfFAXd1g84pnUwxhMfG5BNN8ay92avlGWLC3bvvqpLe9V/UCTLvPThzkf5g+NgD
hJ0HHYZRk+AdHaLjjOGsYjZibElaZqDODgIQQfHaC/jRbOVVpn9UIXUHzAioD2d2p6O3i3
XPkhJyebuCgCbkR6fEB95fTTuAqSBlgxQ5jgXiInTM6e/0sHnFh9kHz3cdDM6aN0NN+uaY
De2vbFf+EH6BVNAkL/YkhVvUahulF4saHhDkXWoQeG4j2rod46sIwbvh3HPRHLyqkmh6zT
wri6zN59jmginsWIBktjKuOlN+eei7cneg1EzeUi3kSTuIquWsVMS2zanr9UGQ==
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 4PVx6h1CtrzNbv;
Tue, 7 Mar 2023 00:25:16 +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 3270PGEX097145;
Tue, 7 Mar 2023 00:25:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3270PGv5097144;
Tue, 7 Mar 2023 00:25:16 GMT
(envelope-from git)
Date: Tue, 7 Mar 2023 00:25:16 GMT
Message-Id: <202303070025.3270PGv5097144@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Koichiro Iwao
Subject: git: 249b0b1cd170 - main - security/softether5: revert adding DEBUG option
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: meta
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 249b0b1cd170851928914fbc6fc6aeb41d822f7f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by meta:
URL: https://cgit.FreeBSD.org/ports/commit/?id=249b0b1cd170851928914fbc6fc6aeb41d822f7f
commit 249b0b1cd170851928914fbc6fc6aeb41d822f7f
Author: Koichiro Iwao
AuthorDate: 2023-03-07 00:17:36 +0000
Commit: Koichiro Iwao
CommitDate: 2023-03-07 00:23:40 +0000
security/softether5: revert adding DEBUG option
Add "WITH_DEBUG_PORTS+= security/softether5" to make.conf instead
if want to enable debug build.
Reported by: danfe, mat
---
security/softether5/Makefile | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/security/softether5/Makefile b/security/softether5/Makefile
index fb8e5a63082b..117360db0d02 100644
--- a/security/softether5/Makefile
+++ b/security/softether5/Makefile
@@ -1,7 +1,7 @@
PORTNAME= softether
DISTVERSION= 5.02.5180-292
DISTVERSIONSUFFIX= -g8c64dc0c
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= security net-vpn
PKGNAMESUFFIX= 5
@@ -39,14 +39,15 @@ GH_TUPLE= SoftEtherVPN:libhamcore:2951ae5:libhamcore/src/libhamcore \
BLAKE2:BLAKE2:b52178a:BLAKE2/3rdparty/BLAKE2 \
cxong:tinydir:ec6bff2:tinydir/3rdparty/tinydir
-CMAKE_ARGS+= -DSE_DBDIR="${SE_DBDIR}" \
+CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DSE_DBDIR="${SE_DBDIR}" \
-DSE_LOGDIR="${SE_LOGDIR}" \
-DSE_PIDDIR="${SE_PIDDIR}" \
-DSE_TAGNAME="${GH_TAGNAME}/freebsd"
CFLAGS+= -I${LOCALBASE}/include/cpu_features
-OPTIONS_DEFINE= DOCS DEBUG
+OPTIONS_DEFINE= DOCS
PORTDOCS= DISCLAIMER.md WARNING.TXT
CONFLICTS_INSTALL= softether-4.[0-9]* softether-devel-4.[0-9]*
@@ -62,14 +63,6 @@ SUB_LIST= SE_DBDIR="${SE_DBDIR}" \
SE_PIDDIR="${SE_PIDDIR}"
SUB_FILES= pkg-message
-.include
-
-# CMAKE_BUILD_TYPE is automatically set by Mk/Uses/cmake.mk
-# just set WITH_DEBUG=yes, CMAKE_ARGS+=-DCMAKE_BUILD_TYPE=Debug takes no effect.
-.if ${PORT_OPTIONS:MDEBUG}
-WITH_DEBUG= yes
-.endif
-
.include
# devel/cpu_features not available on these archs, see devel/cpu_features/Makefile