From nobody Sun Aug 13 17:38:55 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 4RP4X02Psjz4mRjJ; Sun, 13 Aug 2023 17:38:56 +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 4RP4Wz6dBfz4d0X; Sun, 13 Aug 2023 17:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691948335; 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=XIxCMEckWWdQUm6cxYtuQYEGDNQRdzOiIGmHYPlv97s=; b=oE5zTeXzXY7iX4T2WdZv0nyjRCg+lNozXr92J53bwuU/vLs51T0D0pJStIlB08nh68WFxP kHZJkeJXyZyOdqc9ounHWOAz43E/IjiXfh13o4ZGM0MU/IPK/cXfm8C9qCEW7R9LQB5QBR FRKwbjjvALWXJT/AMfDWWOkG2opAHbcNdgpEEjMIYNS5npuyDzM2+HjGWDX1+WrEIHXwy1 l+EGEloJZopm/D37zXk2R02T+l/xLokhClCK0KnuUsQYXkld8jSMhoxmNJX4Mgy+BMV/2H 7OH0C+vAid7m/6X6x4YbMeCAzRMITg0IM+0MseQVFzlIMh0YSwFOxvQ48GzXcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691948335; 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=XIxCMEckWWdQUm6cxYtuQYEGDNQRdzOiIGmHYPlv97s=; b=rQibFxnmvav97vVWwklzcO79Gw71yfi5lcHaUS5Ieh4LDAHlcgfDpJU9XO+gIJLkIBRDEB LTj1D96kdPueiWUij12FGmeqSVycSWcBm7HqNtDFnH5MKajPqsfQIr1bPg9t43OgGwsVnY qI6vXHNiZmwEExTIFBCdTWsdLlRHY6CzKB1naDytBCxKFEKC5stfPuYKJ3terVNkRJ4BzS bmKKViBISzTLy1tT2826vuB4b9yJVPaNkAhbjDuldBB45AJR5Cph9CqaCtlmyQP9a+JHPY 3jD1UFvPDLp3RwdmYB6NSDt4iTarCgaHywu/eammqLzJEVCm61hCbI547lFuwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691948335; a=rsa-sha256; cv=none; b=b2w6uiR4Zko2AJt8bZ0NxoiTVqUCCMJtrOZ+Q1fZS9yh+JPQ0GYE6Glc2pnt+1YQ17kzNF sk+T2Kk7a0hlzRe942vWdBpRmL6o8T+qvJV18qRFgoLGQSwHG0czRghKzrbObfU5jggN91 xOq9RvZ9isdgBaISkWmfvCNnazWFG3sGMQIstgTt7Z9bRmkxuJjUdMxbd4/v3Q/9iEkthh uEo8+yye2Pjy0cmzbvct3M2h9+pEI45W4S+6QjSAUMSfVMCzvQI5MQANWK7rUWzm1jr4nv QLw0FQypJ8uh36cwN+2Tqwzg7M27Rc3pz5tO9SwAqU3nZTKgdP6yxJRR41YTrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RP4Wz4bC7z196g; Sun, 13 Aug 2023 17:38:55 +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 37DHcttG035153; Sun, 13 Aug 2023 17:38:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37DHctds035150; Sun, 13 Aug 2023 17:38:55 GMT (envelope-from git) Date: Sun, 13 Aug 2023 17:38:55 GMT Message-Id: <202308131738.37DHctds035150@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hajimu UMEMOTO Subject: git: 182235082adf - main - mail/cyrus-imapd{25,30,32}: Fix build with more recent Perl 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: ume X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 182235082adf5e652423da7efae779c269b0bfa3 Auto-Submitted: auto-generated The branch main has been updated by ume: URL: https://cgit.FreeBSD.org/ports/commit/?id=182235082adf5e652423da7efae779c269b0bfa3 commit 182235082adf5e652423da7efae779c269b0bfa3 Author: Hajimu UMEMOTO AuthorDate: 2023-08-13 17:14:45 +0000 Commit: Hajimu UMEMOTO CommitDate: 2023-08-13 17:38:04 +0000 mail/cyrus-imapd{25,30,32}: Fix build with more recent Perl PR: 273093 Reported by: delphij Submitted by: delphij --- mail/cyrus-imapd25/files/patch-lib_assert.h | 16 ++++++++++++++++ mail/cyrus-imapd30/files/patch-lib_assert.h | 14 ++++++++------ mail/cyrus-imapd32/files/patch-lib_assert.h | 14 ++++++++------ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/mail/cyrus-imapd25/files/patch-lib_assert.h b/mail/cyrus-imapd25/files/patch-lib_assert.h new file mode 100644 index 000000000000..7f74a47ca1fd --- /dev/null +++ b/mail/cyrus-imapd25/files/patch-lib_assert.h @@ -0,0 +1,16 @@ +--- lib/assert.h.orig 2021-03-09 02:28:07 UTC ++++ lib/assert.h +@@ -43,11 +43,13 @@ + #ifndef INCLUDED_ASSERT_H + #define INCLUDED_ASSERT_H + ++#ifndef PERL_POLLUTE + #ifdef __STDC__ + #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);} + void assertionfailed(const char *file, int line, const char *expr); + #else + #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);} ++#endif + #endif + + #endif /* INCLUDED_ASSERT_H */ diff --git a/mail/cyrus-imapd30/files/patch-lib_assert.h b/mail/cyrus-imapd30/files/patch-lib_assert.h index 28e06f17a2e7..d08160833f7c 100644 --- a/mail/cyrus-imapd30/files/patch-lib_assert.h +++ b/mail/cyrus-imapd30/files/patch-lib_assert.h @@ -1,9 +1,10 @@ ---- lib/assert.h.orig 2017-09-02 01:09:05 UTC +--- lib/assert.h.orig 2023-02-12 23:06:46 UTC +++ lib/assert.h -@@ -43,6 +43,10 @@ +@@ -43,11 +43,21 @@ #ifndef INCLUDED_ASSERT_H #define INCLUDED_ASSERT_H ++#ifndef PERL_POLLUTE +#ifdef __cplusplus +extern "C" { +#endif @@ -11,12 +12,13 @@ #ifdef __STDC__ #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);} void assertionfailed(const char *file, int line, const char *expr); -@@ -50,4 +54,8 @@ void assertionfailed(const char *file, i + #else #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);} - #endif - ++#endif ++ +#ifdef __cplusplus +} +#endif -+ + #endif + #endif /* INCLUDED_ASSERT_H */ diff --git a/mail/cyrus-imapd32/files/patch-lib_assert.h b/mail/cyrus-imapd32/files/patch-lib_assert.h index 28e06f17a2e7..d08160833f7c 100644 --- a/mail/cyrus-imapd32/files/patch-lib_assert.h +++ b/mail/cyrus-imapd32/files/patch-lib_assert.h @@ -1,9 +1,10 @@ ---- lib/assert.h.orig 2017-09-02 01:09:05 UTC +--- lib/assert.h.orig 2023-02-12 23:06:46 UTC +++ lib/assert.h -@@ -43,6 +43,10 @@ +@@ -43,11 +43,21 @@ #ifndef INCLUDED_ASSERT_H #define INCLUDED_ASSERT_H ++#ifndef PERL_POLLUTE +#ifdef __cplusplus +extern "C" { +#endif @@ -11,12 +12,13 @@ #ifdef __STDC__ #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);} void assertionfailed(const char *file, int line, const char *expr); -@@ -50,4 +54,8 @@ void assertionfailed(const char *file, i + #else #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);} - #endif - ++#endif ++ +#ifdef __cplusplus +} +#endif -+ + #endif + #endif /* INCLUDED_ASSERT_H */