8 files changed, 15 insertions, 127 deletions
diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile
index e0c73357e964..b71b43171824 100644
--- a/mail/mailutils/Makefile
+++ b/mail/mailutils/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mailutils
-PORTVERSION=	3.15
-PORTREVISION=	3
+PORTVERSION=	3.16
 CATEGORIES=	mail
 MASTER_SITES=	GNU GNU_ALPHA
 
@@ -99,8 +98,6 @@ CONFIGURE_ARGS+=	--enable-debug
 post-patch:
 	@${REINPLACE_CMD} -e '/MU_AUTHLIBS=/s,-lldap,-llber &,' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/need_charset_alias=/s|true|false|' \
-		${WRKSRC}/lib/gnu/Makefile.in
 	@${REINPLACE_CMD} -e '/chown/,+1s|ch|#&|' \
 		${WRKSRC}/dotlock/Makefile.in ${WRKSRC}/mda/mda/Makefile.in
 	@${REINPLACE_CMD} -e 's,-E,& -P,' ${WRKSRC}/libmu_scm/Makefile.in
diff --git a/mail/mailutils/distinfo b/mail/mailutils/distinfo
index d1e10c51e40f..88f1c43600a9 100644
--- a/mail/mailutils/distinfo
+++ b/mail/mailutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650221916
-SHA256 (mailutils-3.15.tar.xz) = b7d0c286c352fcc7da7978cfd617cc66736b21fa891aa4f88855f516354f2ddb
-SIZE (mailutils-3.15.tar.xz) = 3112212
+TIMESTAMP = 1682941545
+SHA256 (mailutils-3.16.tar.xz) = 041d158d308c0376184388e9c936cfa841a51cdc25d4db75984a771a3fa002c0
+SIZE (mailutils-3.16.tar.xz) = 3217812
diff --git a/mail/mailutils/files/patch-libmailutils_base_hostname.c b/mail/mailutils/files/patch-libmailutils_base_hostname.c
new file mode 100644
index 000000000000..9e30d3a6d6ab
--- /dev/null
+++ b/mail/mailutils/files/patch-libmailutils_base_hostname.c
@@ -0,0 +1,11 @@
+--- libmailutils/base/hostname.c.orig	2023-05-01 09:46:38 UTC
++++ libmailutils/base/hostname.c
+@@ -23,6 +23,8 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <string.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <netdb.h>
+ #include <mailutils/alloc.h>
+ 
diff --git a/mail/mailutils/files/patch-libmailutils_stream_rdcache__stream.c b/mail/mailutils/files/patch-libmailutils_stream_rdcache__stream.c
deleted file mode 100644
index 1f02934ffa53..000000000000
--- a/mail/mailutils/files/patch-libmailutils_stream_rdcache__stream.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- libmailutils/stream/rdcache_stream.c.orig	2022-02-12 15:20:43 UTC
-+++ libmailutils/stream/rdcache_stream.c
-@@ -21,10 +21,9 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <mailutils/types.h>
-+#include <mailutils/errno.h>
- #include <mailutils/sys/rdcache_stream.h>
- 
--size_t mu_rdcache_stream_max_memory_size = 4096;
--
- static int
- rdcache_read (struct _mu_stream *str, char *buf, size_t size, size_t *pnbytes)
- {
-@@ -38,7 +37,6 @@ rdcache_read (struct _mu_stream *str, char *buf, size_
-       if (status)
- 	return status;
-       sp->offset += nbytes;
--      sp->size += nbytes;
-       buf += nbytes;
-       size -= nbytes;
-     }
-@@ -79,11 +77,29 @@ static int
- }
- 
- static int
--rdcache_size (struct _mu_stream *str, off_t *psize)
-+rdcache_size (struct _mu_stream *str, mu_off_t *psize)
- {
-   struct _mu_rdcache_stream *sp = (struct _mu_rdcache_stream *) str;
--  *psize = sp->size;
--  return 0;
-+  int rc;
-+
-+  if (mu_stream_eof (sp->transport))
-+    {
-+      *psize = sp->size;
-+      rc = 0;
-+    }
-+  else
-+    {
-+      rc = mu_stream_size (sp->transport, psize);
-+      switch (rc)
-+	{
-+	case EAGAIN:
-+	case EINTR:
-+	case ENOSYS:
-+	case EINPROGRESS:
-+	  rc = MU_ERR_INFO_UNAVAILABLE;
-+	}
-+    }
-+  return rc;
- }
- 
- static int
diff --git a/mail/mailutils/files/patch-libmailutils_stream_stream.c b/mail/mailutils/files/patch-libmailutils_stream_stream.c
deleted file mode 100644
index 613b4a46ae51..000000000000
--- a/mail/mailutils/files/patch-libmailutils_stream_stream.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libmailutils/stream/stream.c.orig	2022-02-12 15:20:43 UTC
-+++ libmailutils/stream/stream.c
-@@ -132,6 +132,7 @@ mu_stream_seterr (struct _mu_stream *stream, int code,
-     case EINTR:
-     case ENOSYS:
-     case EINPROGRESS:
-+    case MU_ERR_INFO_UNAVAILABLE:
-       break;
- 
-     default:
diff --git a/mail/mailutils/files/patch-libmailutils_stream_streamcpy.c b/mail/mailutils/files/patch-libmailutils_stream_streamcpy.c
deleted file mode 100644
index 526af4f23266..000000000000
--- a/mail/mailutils/files/patch-libmailutils_stream_streamcpy.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- libmailutils/stream/streamcpy.c.orig	2022-02-12 15:20:43 UTC
-+++ libmailutils/stream/streamcpy.c
-@@ -55,7 +55,11 @@ mu_stream_copy_wcb (mu_stream_t dst, mu_stream_t src, 
- 	case 0:
- 	  break;
- 
-+	case EAGAIN:
-+	case EINTR:
- 	case ENOSYS:
-+	case EINPROGRESS:
-+	case MU_ERR_INFO_UNAVAILABLE:
- 	  size = 0;
- 	  break;
- 
diff --git a/mail/mailutils/files/patch-mh_folder.c b/mail/mailutils/files/patch-mh_folder.c
deleted file mode 100644
index 461e6fdddb08..000000000000
--- a/mail/mailutils/files/patch-mh_folder.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- mh/folder.c.orig	2022-02-12 15:20:43 UTC
-+++ mh/folder.c
-@@ -806,6 +806,14 @@ action_pack (void)
-       mu_error (_("cannot read input mailbox: %s"), mu_strerror (errno));
-       return 1;
-     }
-+
-+  if (count == 0)
-+    {
-+      mu_mailbox_close (mbox);
-+      mu_mailbox_destroy (&mbox);
-+      return 0;
-+    }
-+  
-   pack_tab = mu_calloc (count, sizeof pack_tab[0]); /* Never freed. No use to
- 		 				       try to. */
- 
diff --git a/mail/mailutils/files/patch-mh_msgchk.c b/mail/mailutils/files/patch-mh_msgchk.c
deleted file mode 100644
index 351be084a9d2..000000000000
--- a/mail/mailutils/files/patch-mh_msgchk.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- mh/msgchk.c.orig	2022-02-12 15:20:43 UTC
-+++ mh/msgchk.c
-@@ -274,12 +274,18 @@ checkmail (const char *username, int personal)
- 	      break;
- 
- 	    default:
--	      if (rc != ENOSYS && rc != MU_ERR_INFO_UNAVAILABLE)
--		mu_diag_funcall (MU_DIAG_ERROR, "mu_mailbox_messages_unseen",
--				 mu_url_to_string (url), rc);
-+	      mu_diag_funcall (MU_DIAG_ERROR, "mu_mailbox_messages_unseen",
-+			       mu_url_to_string (url), rc);
-+	      /* FALLTHROUGH */
-+	    case EAGAIN:
-+	    case EINTR:
-+	    case ENOSYS:
-+	    case EINPROGRESS:
-+	    case MU_ERR_INFO_UNAVAILABLE:
- 	      rc = mu_mailbox_messages_recent (mbox, &recent);
- 	      if (rc == 0)
- 		newmail = recent > 0;
-+	      break;
- 	    }
- 
- 	  if (rc)