CVS commit: pkgsrc/mail/mblaze

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Oct 11 06:37:20 UTC 2024

Modified Files:
        pkgsrc/mail/mblaze: distinfo
Added Files:
        pkgsrc/mail/mblaze/patches: patch-GNUmakefile patch-rfc2047.c

Log Message:
mblaze: Build fixes for SunOS and old NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/mblaze/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/mblaze/patches/patch-GNUmakefile \
    pkgsrc/mail/mblaze/patches/patch-rfc2047.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/mblaze/distinfo
diff -u pkgsrc/mail/mblaze/distinfo:1.9 pkgsrc/mail/mblaze/distinfo:1.10
--- pkgsrc/mail/mblaze/distinfo:1.9     Fri Sep 13 17:08:49 2024
+++ pkgsrc/mail/mblaze/distinfo Fri Oct 11 06:37:20 2024
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.9 2024/09/13 17:08:49 schmonz Exp $
+$NetBSD: distinfo,v 1.10 2024/10/11 06:37:20 nia Exp $
 
 BLAKE2s (mblaze-1.3.tar.gz) = 93be10a08237e537a6ea5feabc29284bcb7e55363c43ad646b80212a681bbe1f
 SHA512 (mblaze-1.3.tar.gz) = 65acc92654fe2f32328b57969930711128138067c9c23def025eb55b82a237d635b5923e9106ada394954b63eb6cd1e4e55f875aafc6201f21f83e8142905470
 Size (mblaze-1.3.tar.gz) = 102829 bytes
+SHA1 (patch-GNUmakefile) = 113883947fabc8b419b23c55c5685e34aeefef47
+SHA1 (patch-rfc2047.c) = 3725b89e1bdfa8eb7b739171c2f3ab908d530e90

Added files:

Index: pkgsrc/mail/mblaze/patches/patch-GNUmakefile
diff -u /dev/null pkgsrc/mail/mblaze/patches/patch-GNUmakefile:1.1
--- /dev/null   Fri Oct 11 06:37:20 2024
+++ pkgsrc/mail/mblaze/patches/patch-GNUmakefile        Fri Oct 11 06:37:20 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-GNUmakefile,v 1.1 2024/10/11 06:37:20 nia Exp $
+
+Include necessary libraries for getaddrinfo on SunOS.
+
+--- GNUmakefile.orig   2024-10-11 06:35:31.706884126 +0000
++++ GNUmakefile
+@@ -15,6 +15,10 @@ ifeq ($(OS),Darwin)
+ LDLIBS=-liconv
+ endif
+ 
++ifeq ($(OS),SunOS)
++LDLIBS+=-lsocket -lnsl
++endif
++
+ DESTDIR=
+ PREFIX=/usr/local
+ BINDIR=$(PREFIX)/bin
Index: pkgsrc/mail/mblaze/patches/patch-rfc2047.c
diff -u /dev/null pkgsrc/mail/mblaze/patches/patch-rfc2047.c:1.1
--- /dev/null   Fri Oct 11 06:37:20 2024
+++ pkgsrc/mail/mblaze/patches/patch-rfc2047.c  Fri Oct 11 06:37:20 2024
@@ -0,0 +1,32 @@
+$NetBSD: patch-rfc2047.c,v 1.1 2024/10/11 06:37:20 nia Exp $
+
+Compatibility with non-POSIX iconv.
+
+--- rfc2047.c.orig     2024-10-11 06:32:35.457280198 +0000
++++ rfc2047.c
+@@ -8,6 +8,13 @@
+ #include "blaze822.h"
+ #include "blaze822_priv.h"
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV 1
++#endif
++#endif
++
+ // XXX keep trying bytewise on invalid iconv
+ 
+ int
+@@ -232,7 +239,11 @@ blaze822_decode_rfc2047(char *dst, char 
+               }
+ 
+               decchunk = dec;
++#if !defined(NETBSD_POSIX_ICONV) || defined(__sun)
++              ssize_t r = iconv(ic, (const char **)&dec, &declen, &dst, &dlen);
++#else
+               ssize_t r = iconv(ic, &dec, &declen, &dst, &dlen);
++#endif
+               if (r < 0) {
+                       if (errno == E2BIG) {
+                               break;