Sun May 29 19:53:59 2022 UTC ()
cyrus-imap24: Another compilation fix


(gavan)
diff -r1.28 -r1.29 pkgsrc/mail/cyrus-imapd24/distinfo
diff -r1.2 -r1.3 pkgsrc/mail/cyrus-imapd24/patches/patch-ac
cvs diff -r1.28 -r1.29 pkgsrc/mail/cyrus-imapd24/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd24/distinfo 2022/05/29 19:47:20 1.28
+++ pkgsrc/mail/cyrus-imapd24/distinfo 2022/05/29 19:53:59 1.29
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.28 2022/05/29 19:47:20 gavan Exp $ 1$NetBSD: distinfo,v 1.29 2022/05/29 19:53:59 gavan Exp $
2 2
3BLAKE2s (cyrus-imapd-2.4.20.tar.gz) = fca8c0a2a00abc61bd61c0b563b36403c843fa0f25e35432692394531da8b158 3BLAKE2s (cyrus-imapd-2.4.20.tar.gz) = fca8c0a2a00abc61bd61c0b563b36403c843fa0f25e35432692394531da8b158
4SHA512 (cyrus-imapd-2.4.20.tar.gz) = a1e7d8b4bc096c57ba36f74f2853eb520503b40beffc80912a0c081bce1df3fa8cd41b00c789d33097be6325563743c9540c11cc6137c51a747880749d2f5b4d 4SHA512 (cyrus-imapd-2.4.20.tar.gz) = a1e7d8b4bc096c57ba36f74f2853eb520503b40beffc80912a0c081bce1df3fa8cd41b00c789d33097be6325563743c9540c11cc6137c51a747880749d2f5b4d
5Size (cyrus-imapd-2.4.20.tar.gz) = 2488878 bytes 5Size (cyrus-imapd-2.4.20.tar.gz) = 2488878 bytes
6SHA1 (patch-ac) = c3b0f801b17bad99a2d84c4885aadbdfca2c28ce 6SHA1 (patch-ac) = d2b973789361e946713577387f1a770b1dd1f96d
7SHA1 (patch-ah) = 4bc62dfdeafdca83ddac02aff0ffd05db28fe0b9 7SHA1 (patch-ah) = 4bc62dfdeafdca83ddac02aff0ffd05db28fe0b9
8SHA1 (patch-ai) = 9167678988f411479d187b232eb10ad8622b4151 8SHA1 (patch-ai) = 9167678988f411479d187b232eb10ad8622b4151
9SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1 9SHA1 (patch-am) = e100e13d5137116f5bd7674e954031b2615e5ab1
10SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474 10SHA1 (patch-ao) = c01c9d32b4d73cbc32d2ad8bfca8b8b021ca2474
11SHA1 (patch-aq) = 101f5d253dae303f187e15eca28aa687f846ba6b 11SHA1 (patch-aq) = 101f5d253dae303f187e15eca28aa687f846ba6b
12SHA1 (patch-configure) = 2b4ea2203f446175fedfe2549534f382e4115579 12SHA1 (patch-configure) = 2b4ea2203f446175fedfe2549534f382e4115579
13SHA1 (patch-imap_idlemsg.c) = 112e8077e1f820d526db342f425dab3ba15e71f2 13SHA1 (patch-imap_idlemsg.c) = 112e8077e1f820d526db342f425dab3ba15e71f2
14SHA1 (patch-imap_mailbox.c) = 9a000763a153863f6c40f8939fe19eab41973cea 14SHA1 (patch-imap_mailbox.c) = 9a000763a153863f6c40f8939fe19eab41973cea
15SHA1 (patch-imtest_Makefile.in) = c76d63144a30ea28af12474376451c9e3288be2b 15SHA1 (patch-imtest_Makefile.in) = c76d63144a30ea28af12474376451c9e3288be2b
16SHA1 (patch-lib_Makefile.in) = a337c7dc7c22a25d029c4b4d8c7c8b5650bff8f2 16SHA1 (patch-lib_Makefile.in) = a337c7dc7c22a25d029c4b4d8c7c8b5650bff8f2
17SHA1 (patch-master_Makefile.in) = ec274fab36541e2c03572e72c6ff8e05f24756ef 17SHA1 (patch-master_Makefile.in) = ec274fab36541e2c03572e72c6ff8e05f24756ef
18SHA1 (patch-notifyd_Makefile.in) = e66b93338f8fc1713be3ff14ba1edad005cb428b 18SHA1 (patch-notifyd_Makefile.in) = e66b93338f8fc1713be3ff14ba1edad005cb428b
19SHA1 (patch-perl_sieve_lib_Makefile.in) = a2b9ee49c0d01262d04175498122cbf14d92cc6f 19SHA1 (patch-perl_sieve_lib_Makefile.in) = a2b9ee49c0d01262d04175498122cbf14d92cc6f
cvs diff -r1.2 -r1.3 pkgsrc/mail/cyrus-imapd24/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd24/patches/patch-ac 2017/10/18 12:06:31 1.2
+++ pkgsrc/mail/cyrus-imapd24/patches/patch-ac 2022/05/29 19:53:59 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ac,v 1.2 2017/10/18 12:06:31 gavan Exp $ 1$NetBSD: patch-ac,v 1.3 2022/05/29 19:53:59 gavan Exp $
2 2
3--- imap/Makefile.in.orig 2010-10-19 03:08:28.000000000 +0000 3--- imap/Makefile.in.orig 2017-08-18 00:29:14.000000000 +0000
4+++ imap/Makefile.in 4+++ imap/Makefile.in
5@@ -179,6 +179,9 @@ mupdate_err.c: mupdate_err.et 5@@ -179,6 +179,9 @@ mupdate_err.c: mupdate_err.et
6  6
7 mupdate_err.h: mupdate_err.c 7 mupdate_err.h: mupdate_err.c
8  8
9+mutex_pthread.o: mutex_pthread.c 9+mutex_pthread.o: mutex_pthread.c
10+ $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $(PTHREAD_CFLAGS) $< 10+ $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $(PTHREAD_CFLAGS) $<
11+ 11+
12 ### Services 12 ### Services
13 idled: idled.o idlemsg.o mutex_fake.o libimap.a $(DEPLIBS) 13 idled: idled.o idlemsg.o mutex_fake.o libimap.a $(DEPLIBS)
14 $(CC) $(LDFLAGS) -o idled \ 14 $(CC) $(LDFLAGS) -o idled \
15@@ -213,16 +216,16 @@ imapd.quant: $(IMAPDOBJS) mutex_fake.o l 15@@ -213,16 +216,16 @@ imapd.quant: $(IMAPDOBJS) mutex_fake.o l
16  16
@@ -23,13 +23,21 @@ $NetBSD: patch-ac,v 1.2 2017/10/18 12:06 @@ -23,13 +23,21 @@ $NetBSD: patch-ac,v 1.2 2017/10/18 12:06
23- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread 23- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
24+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) 24+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
25  25
26 mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ 26 mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
27 libimap.a $(DEPLIBS) 27 libimap.a $(DEPLIBS)
28- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ 28- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
29+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate.pure \ 29+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate.pure \
30 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ 30 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
31- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread 31- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
32+ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) 32+ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
33  33
34 pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ 34 pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
35 $(DEPLIBS) $(SERVICE) 35 $(DEPLIBS) $(SERVICE)
 36@@ -369,6 +372,6 @@ distclean: clean
 37 rm -f Makefile
 38
 39 depend: imap_err.h
 40- ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
 41+ ${MAKEDEPEND} -- $(CPPFLAGS) $(DEFS) $(CFLAGS) -- *.c $(srcdir)/*.c 1>makedepend.log 2>&1
 42
 43 # DO NOT DELETE THIS LINE -- make depend depends on it.