From nobody Tue Jun 07 11:41: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 0FA2F7CF277; Tue, 7 Jun 2022 11:41: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 4LHT2W74byz4vXp; Tue, 7 Jun 2022 11:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654602068; 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=GwF38KNA57dNGIdbyBCtnYaq7mSyxjLxm4BBQrQ6lqs=; b=TITMSGmWxZbAq4KuZM6EagfBYcLvzT/o/YuF6AgZSyDefV2gXxzmv+P3m2qW4We2ov6wB/ f5KVikA/Ony1VBfPn/IJQaydavbU6mncBXHfB8kZ56C05gvZruTHySDyfBmcS4c0VFhHUV bUZUEkehLx0AV9Kk6SH3lsHFyxVXqhZak+gkuBr/JdfM/8jt4PqZn7SYube53x3mgKRkWw qb9lmIAKv+NQHXM3Dbvnz4Rk6LUBvLYW+iKE4kPY02s9YJ1CY0PnMP70GugppyadT+VIwe mPbtv+mcc9q3atIN5hkWzkSQTQF2WleeuoKs5Ylbeic+gv3zGEoQTQ6qBMT5Jw== 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 D2E6F1A4F2; Tue, 7 Jun 2022 11:41:07 +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 257Bf7ZG098224; Tue, 7 Jun 2022 11:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 257Bf7HC098223; Tue, 7 Jun 2022 11:41:07 GMT (envelope-from git) Date: Tue, 7 Jun 2022 11:41:07 GMT Message-Id: <202206071141.257Bf7HC098223@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: de9d336f38c8 - main - mail/cyrus-imapd34: Fix build with perl 5.36. 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: de9d336f38c82081c69bcb1487a253d432509368 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654602068; 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=GwF38KNA57dNGIdbyBCtnYaq7mSyxjLxm4BBQrQ6lqs=; b=WFOEDPo7xDIoAM1lQ8ma7vAVAfdSck2RpmrQQBbYB4jUBC97M6AqrN5C36FkFcx/KGO5L6 lsflGh73ZE30FFopNvLocISjBwjcnBjAKw1p/3X96LGy4e8KgSYI+PKRyrahlUeNItm8kJ dmNoNPBZOvY0jHOcKJN+0LDgxFGIXeD8yQGY7d64uJMFFVAQTP6l02sB9OWQL2Jrnp1Maq hJp9Jp/PT7Qn/UbFvOsFjDFaPw4/Idb3kMJCepEwqNTdDHfmcUG5Ke5VnFWuE/c2KKg0Ir elpFrvPaF/xrK3eOeIGrpEJFbeAdxxQosHVf2h5YVAlil7gORWHlNEc14ap59g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654602068; a=rsa-sha256; cv=none; b=RL+xOEfUMcefIl5nLO3zIGYYxB4EPkrA1nprjk/KyHJ+wlaMMbfpyhy1JBIoCbNTNlk7iy cw4E9TueVdGG5Eay0V3wasI4yap8FDsw/tneif5kkGpZPUfXzw+3W8amrh/CUie0eHuutW tyzDG0xubwU4TEniSG78efSZ6ttqjtFZ9KQ6a0tsCmQQ8tZUP9ovGq/i7wl7tk+Jkt8JR2 PQ0hJeP1Nmqrf1EU6j3TnKnl1Cll9o3qksCRSI3fjRUDd4EhW9N+MiUjHJW98B91L56nT9 CqprmkwW/URuZV+i1j+2DFPW7I37U+Pd1R8uvctaFposrjDt4btF8odChW5UxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ume: URL: https://cgit.FreeBSD.org/ports/commit/?id=de9d336f38c82081c69bcb1487a253d432509368 commit de9d336f38c82081c69bcb1487a253d432509368 Author: Hajimu UMEMOTO AuthorDate: 2022-06-07 11:33:38 +0000 Commit: Hajimu UMEMOTO CommitDate: 2022-06-07 11:40:54 +0000 mail/cyrus-imapd34: Fix build with perl 5.36. PR: 264447 Obtained from: https://github.com/omniosorg/omnios-extra/pull/1120 --- mail/cyrus-imapd34/Makefile | 8 +------- .../files/{patch-lib_assert.h => patch-lib__assert.h} | 14 +++++++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile index 0f47b85be375..21ae2fd10255 100644 --- a/mail/cyrus-imapd34/Makefile +++ b/mail/cyrus-imapd34/Makefile @@ -195,12 +195,6 @@ PLIST_SUB+= SQUATTER="" PLIST_SUB+= SQUATTER="@comment " .endif -.include - -.if ${PERL_LEVEL} >= 503600 -IGNORE= Cannot build with Perl 3.36 -.endif - post-patch: @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ @@ -255,4 +249,4 @@ post-install-DOCS-on: "! ( -path */html/_sources* -o -name .buildinfo )" ${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source -.include +.include diff --git a/mail/cyrus-imapd34/files/patch-lib_assert.h b/mail/cyrus-imapd34/files/patch-lib__assert.h similarity index 78% rename from mail/cyrus-imapd34/files/patch-lib_assert.h rename to mail/cyrus-imapd34/files/patch-lib__assert.h index 28e06f17a2e7..41ed1dcec7d5 100644 --- a/mail/cyrus-imapd34/files/patch-lib_assert.h +++ b/mail/cyrus-imapd34/files/patch-lib__assert.h @@ -1,9 +1,11 @@ ---- lib/assert.h.orig 2017-09-02 01:09:05 UTC +--- lib/assert.h.orig 2022-01-23 23:38:00 UTC +++ lib/assert.h -@@ -43,6 +43,10 @@ +@@ -43,11 +43,23 @@ #ifndef INCLUDED_ASSERT_H #define INCLUDED_ASSERT_H ++#ifndef PERL_POLLUTE ++ +#ifdef __cplusplus +extern "C" { +#endif @@ -11,12 +13,14 @@ #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 */