[pkgsrc/trunk]: pkgsrc/mail/imap-uw imap-uw: fix non-BSD build breakages from...

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c10b1a0367b5
branches:  trunk
changeset: 372739:c10b1a0367b5
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Sun Jan 30 04:00:42 2022 +0000

description:
imap-uw: fix non-BSD build breakages from previous change set

Redo some of the patches from the previous change set (PR pkg/56645) so
that they reflect the upstream project's method for including its
version of portable_utime(), rather than what was done previously,
which broke non-BSD builds, e.g., on Solaris derivates:

ld: fatal: symbol 'portable_utime' is multiply-defined:
        (file .libs/osdep.o type=FUNC; file .libs/utime.o type=FUNC);
ld: fatal: file processing errors. No output written to .libs/libc-client.so.5.0.0

Compile tested on NetBSD 9.2_STABLE, NetBSD 9.99.93, OmniOS r151038,
and Fedora Linux 34.

diffstat:

 mail/imap-uw/distinfo         |   9 ++++-----
 mail/imap-uw/patches/patch-ab |  23 +++++++++--------------
 mail/imap-uw/patches/patch-ag |  11 +++++++++--
 mail/imap-uw/patches/patch-bi |  20 +++++++++++++++-----
 mail/imap-uw/patches/patch-bj |  13 -------------
 5 files changed, 37 insertions(+), 39 deletions(-)

diffs (175 lines):

diff -r bc77ded1e91b -r c10b1a0367b5 mail/imap-uw/distinfo
--- a/mail/imap-uw/distinfo     Sun Jan 30 01:26:48 2022 +0000
+++ b/mail/imap-uw/distinfo     Sun Jan 30 04:00:42 2022 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.51 2022/01/24 21:05:57 buhrow Exp $
+$NetBSD: distinfo,v 1.52 2022/01/30 04:00:42 gutteridge Exp $
 
 BLAKE2s (imap-2007f.tar.Z) = 6e67d03b84ec0fed4db99c81aea92160304c1f0c7c9ece7d5e9c4375f1490621
 SHA512 (imap-2007f.tar.Z) = 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
 Size (imap-2007f.tar.Z) = 2793529 bytes
 SHA1 (patch-aa) = ac880c250dfee3d0d316063ace5b92cd2f190510
-SHA1 (patch-ab) = d42bb314b2bdf4058d6f44e2740f1876d69aa6cb
+SHA1 (patch-ab) = c7985a2db4d4b5c8d2644492b2e48f8ebe2d64b1
 SHA1 (patch-ac) = eab1435fdf7ab59ea8afbde949a92dd756e6aea3
 SHA1 (patch-ad) = d817dca51413bb8d228c2fabadffa3b924dff11d
 SHA1 (patch-ae) = 85e0917ce1934f6789bbce45ad5321e28cf294d9
 SHA1 (patch-af) = f3a7d2dad7b95940bdb7ee812ee19622cc594c75
-SHA1 (patch-ag) = 4152c1c618bf78f63668070e26e8feb0f7df91ed
+SHA1 (patch-ag) = 9c580a6a89f89f798a42e5ee45de87fe8159700a
 SHA1 (patch-ah) = ca68ec33fbf8ac4138669588b32098eb4f156f75
 SHA1 (patch-ai) = 312d2bd29be2f8fc03c24a635afcb0ca4ae33832
 SHA1 (patch-aj) = 961d90bf0eab651678f5bf04f19742cc4c0ecde3
@@ -35,8 +35,7 @@
 SHA1 (patch-bf) = 63c582e88bd6286295d5d9639bafec355278d537
 SHA1 (patch-bg) = c95483ed73d7c6015df99967c0509cf0ea67d28f
 SHA1 (patch-bh) = c43dc5df9fb61ea44b5195fc15c697e5f540dfae
-SHA1 (patch-bi) = 19867a536878049b31d677f06124c8ca0efde801
-SHA1 (patch-bj) = 09dfd05373d05a339dbaf725f8607522853aa848
+SHA1 (patch-bi) = 5a33faed66a06edc7f68a6007a531cf8cca7591d
 SHA1 (patch-src_c-client_mail.c) = fca90d3a5a8770b8728bdef6aec2623d16c12b6d
 SHA1 (patch-src_c-client_misc.c) = d22ca95fb333b5234c66440faf5d6e30a148bad1
 SHA1 (patch-src_c-client_misc.h) = 5cf51d186b04ebb45c79b8042bbdcb01716dd2ce
diff -r bc77ded1e91b -r c10b1a0367b5 mail/imap-uw/patches/patch-ab
--- a/mail/imap-uw/patches/patch-ab     Sun Jan 30 01:26:48 2022 +0000
+++ b/mail/imap-uw/patches/patch-ab     Sun Jan 30 04:00:42 2022 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.26 2022/01/24 22:21:58 buhrow Exp $
+$NetBSD: patch-ab,v 1.27 2022/01/30 04:00:42 gutteridge Exp $
 
---- src/osdep/unix/Makefile.orig       2011-07-22 17:20:10.000000000 -0700
-+++ src/osdep/unix/Makefile    2022-01-15 07:49:18.399845264 -0800
+--- src/osdep/unix/Makefile.orig       2008-06-04 19:18:34.000000000 +0100
++++ src/osdep/unix/Makefile    2010-01-25 22:56:57.000000000 +0000
 @@ -48,7 +48,7 @@
  # Try to have some consistency in GCC builds.  We want optimization, but we
  # also want to be able to debug.
@@ -11,7 +11,7 @@
  GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign
  
  
-@@ -149,11 +149,11 @@
+@@ -149,7 +149,7 @@
  
  # Normally no need to change any of these
  
@@ -20,12 +20,7 @@
  BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-- unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
-+ unix.o utime.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
- CFLAGS=-g
- 
- CAT=cat
-@@ -537,7 +537,7 @@
+@@ -529,7 +529,7 @@
        $(BUILD) `$(CAT) SPECIALS` OS=bsi \
         CRXTYPE=nfs \
         SPOOLDIR=/var \
@@ -34,7 +29,7 @@
         RSHPATH=/usr/bin/rsh \
         BASECFLAGS="$(GCCCFLAGS)" \
         BASELDFLAGS="-lcrypt"
-@@ -726,7 +726,7 @@
+@@ -718,7 +718,7 @@
         RSHPATH=/usr/bin/rsh \
         BASECFLAGS="-g -O -w" \
         BASELDFLAGS="-lsocket -lnsl -lgen" \
@@ -43,7 +38,7 @@
  
  
  # Note: It is a long and disgusting story about why cc is set to ucbcc.  You
-@@ -863,7 +863,7 @@
+@@ -855,7 +855,7 @@
        @$(SH) ARCHIVE
  
  .c.o:
@@ -52,7 +47,7 @@
  
  
  # Cleanup
-@@ -923,7 +923,7 @@
+@@ -915,7 +915,7 @@
        @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
        @echo is not installed on your system.  Either install OpenSSL first
        @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
@@ -61,7 +56,7 @@
  
  osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
        $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
-@@ -976,7 +976,7 @@
+@@ -968,7 +968,7 @@
         -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
         -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
        echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
diff -r bc77ded1e91b -r c10b1a0367b5 mail/imap-uw/patches/patch-ag
--- a/mail/imap-uw/patches/patch-ag     Sun Jan 30 01:26:48 2022 +0000
+++ b/mail/imap-uw/patches/patch-ag     Sun Jan 30 04:00:42 2022 +0000
@@ -1,6 +1,8 @@
-$NetBSD: patch-ag,v 1.5 2007/08/03 17:03:30 obache Exp $
+$NetBSD: patch-ag,v 1.6 2022/01/30 04:00:42 gutteridge Exp $
 
---- src/osdep/unix/os_bsi.c.orig       2006-12-08 01:12:39.000000000 +0000
+Enable use of portable_utime() on BSDs.
+
+--- src/osdep/unix/os_bsi.c.orig       2011-07-23 00:20:11.000000000 +0000
 +++ src/osdep/unix/os_bsi.c
 @@ -38,7 +38,6 @@
  #include <netdb.h>
@@ -10,3 +12,8 @@
  #include <pwd.h>
  #include "misc.h"
  
+@@ -52,3 +51,4 @@ extern int errno;            /* just in case */
+ #include "tcp_unix.c"
+ #include "gr_waitp.c"
+ #include "tz_bsd.c"
++#include "utime.c"
diff -r bc77ded1e91b -r c10b1a0367b5 mail/imap-uw/patches/patch-bi
--- a/mail/imap-uw/patches/patch-bi     Sun Jan 30 01:26:48 2022 +0000
+++ b/mail/imap-uw/patches/patch-bi     Sun Jan 30 04:00:42 2022 +0000
@@ -1,11 +1,21 @@
-$NetBSD: patch-bi,v 1.1 2022/01/24 22:25:06 buhrow Exp $
+$NetBSD: patch-bi,v 1.2 2022/01/30 04:00:42 gutteridge Exp $
+
+Enable use of portable_utime() on BSDs.
 
---- src/osdep/unix/os_bsi.h.orig       2011-07-22 17:20:11.000000000 -0700
-+++ src/osdep/unix/os_bsi.h    2022-01-15 07:49:59.934504576 -0800
-@@ -41,3 +41,6 @@
+--- src/osdep/unix/os_bsi.h.orig       2011-07-23 00:20:11.000000000 +0000
++++ src/osdep/unix/os_bsi.h
+@@ -34,6 +34,7 @@
+ #include <fcntl.h>
+ #include <syslog.h>
+ #include <sys/file.h>
++#include <utime.h>
+ 
+ 
+ #include "env_unix.h"
+@@ -41,3 +42,6 @@
  #include "ftl.h"
  #include "nl.h"
  #include "tcp.h"
 +
-+#undef utime
 +#define utime portable_utime
++int portable_utime (char *file,time_t timep[2]);
diff -r bc77ded1e91b -r c10b1a0367b5 mail/imap-uw/patches/patch-bj
--- a/mail/imap-uw/patches/patch-bj     Sun Jan 30 01:26:48 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-bj,v 1.1 2022/01/24 22:25:13 buhrow Exp $
-
---- src/osdep/unix/utime.c.orig        2011-07-22 17:20:10.000000000 -0700
-+++ src/osdep/unix/utime.c     2022-01-15 08:29:29.662938659 -0800
-@@ -26,6 +26,8 @@
-  * Last Edited:       30 August 2006
-  */
- 
-+#include <utime.h>
-+#include <string.h>
- #undef utime
- 
- /* Portable utime() that takes it args like real Unix systems