diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2022-06-07 11:33:38 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2022-06-07 11:40:54 +0000 |
| commit | de9d336f38c82081c69bcb1487a253d432509368 (patch) | |
| tree | bd2e247de17dec682aa31080a19c9a74f7780d7c | |
| parent | 26421ab516e64dbecd8d73f4821d1e19b8bd5de2 (diff) | |
| download | ports-de9d336f38c82081c69bcb1487a253d432509368.tar.gz ports-de9d336f38c82081c69bcb1487a253d432509368.zip | |
mail/cyrus-imapd34: Fix build with perl 5.36.
PR: 264447
Obtained from: https://github.com/omniosorg/omnios-extra/pull/1120
| -rw-r--r-- | mail/cyrus-imapd34/Makefile | 8 | ||||
| -rw-r--r-- | mail/cyrus-imapd34/files/patch-lib__assert.h (renamed from mail/cyrus-imapd34/files/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 <bsd.port.pre.mk> - -.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 <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/cyrus-imapd34/files/patch-lib_assert.h b/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 */ |