CVS commit: pkgsrc/mail/cyrus-imapd24

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sat Apr 30 00:25:49 UTC 2022

Modified Files:
        pkgsrc/mail/cyrus-imapd24: Makefile distinfo
Added Files:
        pkgsrc/mail/cyrus-imapd24/patches: patch-configure patch-imap_idlemsg.c

Log Message:
cyrus-imapd24: fix SunOS builds

Addresses PR pkg/56809 from Geoff Adams.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/mail/cyrus-imapd24/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mail/cyrus-imapd24/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/cyrus-imapd24/patches/patch-configure \
    pkgsrc/mail/cyrus-imapd24/patches/patch-imap_idlemsg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/cyrus-imapd24/Makefile
diff -u pkgsrc/mail/cyrus-imapd24/Makefile:1.75 pkgsrc/mail/cyrus-imapd24/Makefile:1.76
--- pkgsrc/mail/cyrus-imapd24/Makefile:1.75     Mon Apr 18 19:11:33 2022
+++ pkgsrc/mail/cyrus-imapd24/Makefile  Sat Apr 30 00:25:49 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2022/04/18 19:11:33 adam Exp $
+# $NetBSD: Makefile,v 1.76 2022/04/30 00:25:49 gutteridge Exp $
 
 DISTNAME=      cyrus-imapd-2.4.20
-PKGREVISION=   18
+PKGREVISION=   19
 CATEGORIES=    mail
 MASTER_SITES=  http://cyrusimap.org/releases/
 MASTER_SITES+= https://www.cyrusimap.org/releases/old/

Index: pkgsrc/mail/cyrus-imapd24/distinfo
diff -u pkgsrc/mail/cyrus-imapd24/distinfo:1.25 pkgsrc/mail/cyrus-imapd24/distinfo:1.26
--- pkgsrc/mail/cyrus-imapd24/distinfo:1.25     Tue Oct 26 10:53:57 2021
+++ pkgsrc/mail/cyrus-imapd24/distinfo  Sat Apr 30 00:25:49 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2021/10/26 10:53:57 nia Exp $
+$NetBSD: distinfo,v 1.26 2022/04/30 00:25:49 gutteridge Exp $
 
 BLAKE2s (cyrus-imapd-2.4.20.tar.gz) = fca8c0a2a00abc61bd61c0b563b36403c843fa0f25e35432692394531da8b158
 SHA512 (cyrus-imapd-2.4.20.tar.gz) = a1e7d8b4bc096c57ba36f74f2853eb520503b40beffc80912a0c081bce1df3fa8cd41b00c789d33097be6325563743c9540c11cc6137c51a747880749d2f5b4d
@@ -9,4 +9,6 @@ SHA1 (patch-ai) = 9167678988f411479d187b
 SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1
 SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474
 SHA1 (patch-aq) = 101f5d253dae303f187e15eca28aa687f846ba6b
+SHA1 (patch-configure) = 2b4ea2203f446175fedfe2549534f382e4115579
+SHA1 (patch-imap_idlemsg.c) = 112e8077e1f820d526db342f425dab3ba15e71f2
 SHA1 (patch-imap_mailbox.c) = 9a000763a153863f6c40f8939fe19eab41973cea

Added files:

Index: pkgsrc/mail/cyrus-imapd24/patches/patch-configure
diff -u /dev/null pkgsrc/mail/cyrus-imapd24/patches/patch-configure:1.1
--- /dev/null   Sat Apr 30 00:25:49 2022
+++ pkgsrc/mail/cyrus-imapd24/patches/patch-configure   Sat Apr 30 00:25:49 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2022/04/30 00:25:49 gutteridge Exp $
+
+Fix SunOS build of the libcyrus.a library.
+
+--- configure.orig     2017-08-18 00:57:00.000000000 +0000
++++ configure
+@@ -10608,7 +10608,7 @@ elif test "${with_perl}" != "no"; then
+     PERL_SUBDIRS="imap"
+     PERL="${with_perl}"
+     case "${target_os}" in
+-        linux*|netbsd*|freebsd*|dragonfly*)
++        linux*|netbsd*|freebsd*|dragonfly*|solaris2*)
+             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
+ $as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
+             eval `${PERL} -V:cccdlflags`
Index: pkgsrc/mail/cyrus-imapd24/patches/patch-imap_idlemsg.c
diff -u /dev/null pkgsrc/mail/cyrus-imapd24/patches/patch-imap_idlemsg.c:1.1
--- /dev/null   Sat Apr 30 00:25:49 2022
+++ pkgsrc/mail/cyrus-imapd24/patches/patch-imap_idlemsg.c      Sat Apr 30 00:25:49 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-imap_idlemsg.c,v 1.1 2022/04/30 00:25:49 gutteridge Exp $
+
+Fix SunOS build, where "sun" is defined, which clashes with variable naming.
+
+--- imap/idlemsg.c.orig        2017-08-18 00:29:14.000000000 +0000
++++ imap/idlemsg.c
+@@ -64,6 +64,11 @@
+ #include "idlemsg.h"
+ #include "global.h"
+ 
++/* SunOS defines the macro "sun", which clashes with variable naming here. */
++#ifdef sun
++#undef sun
++#endif
++
+ /* UNIX socket variables */
+ static int idle_sock = -1;
+ static struct sockaddr_un idle_local;