news/pan: bring back some patches.

Pan compiled without them but they may still be useful.

5 files changed, 70 insertions, 2 deletions

diff --git a/news/pan/Makefile b/news/pan/Makefile
index 4f2c5109079..bddea8ab9f7 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.113 2021/09/19 17:40:27 rhialto Exp $
+# $NetBSD: Makefile,v 1.114 2021/09/19 18:02:37 rhialto Exp $
 
 PKGNAME=		pan-0.147
+PKGREVISION=		1
 CATEGORIES=		news
 TAG=			${PKGNAME_NOREV:tu:C/-/_/:C/\./_/} # PAN_0_147
 MASTER_SITES=		https://gitlab.gnome.org/GNOME/pan/-/archive/${TAG}/
@@ -41,7 +42,6 @@ pre-build:
 .include "../../mail/gmime/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/pan/patches/patch-pan_general_text-match.cc b/news/pan/patches/patch-pan_general_text-match.cc
new file mode 100644
index 00000000000..201807fe95f
--- /dev/null
+++ b/news/pan/patches/patch-pan_general_text-match.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-pan_general_text-match.cc,v 1.3 2021/09/19 18:02:37 rhialto Exp $
+Avoid clash with host defined ERR (on SunOS)
+--- pan/general/text-match.cc.orig	2012-06-29 22:24:54.000000000 +0000
++++ pan/general/text-match.cc
+@@ -209,7 +209,7 @@ TextMatch :: my_regexec (const StringVie
+       if (_pcre_info->set (_impl_text, state.case_sensitive))
+          _pcre_state = COMPILED;
+       else
+-         _pcre_state = ERR;
++         _pcre_state = PCRE_ERR;
+    }
+ 
+    return _pcre_state != COMPILED
diff --git a/news/pan/patches/patch-pan_general_text-match.h b/news/pan/patches/patch-pan_general_text-match.h
new file mode 100644
index 00000000000..82fa58243e0
--- /dev/null
+++ b/news/pan/patches/patch-pan_general_text-match.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-pan_general_text-match.h,v 1.3 2021/09/19 18:02:37 rhialto Exp $
+Avoid clash with host defined ERR (on SunOS)
+--- pan/general/text-match.h.orig	2012-06-29 22:24:54.000000000 +0000
++++ pan/general/text-match.h
+@@ -108,7 +108,7 @@ private:
+       class PcreInfo;
+       mutable PcreInfo * _pcre_info;
+ 
+-      enum PcreState { NEED_COMPILE, COMPILED, ERR };
++      enum PcreState { NEED_COMPILE, COMPILED, PCRE_ERR };
+       mutable PcreState _pcre_state;
+ 
+ public:
diff --git a/news/pan/patches/patch-pan_gui_group-prefs-dialog.cc b/news/pan/patches/patch-pan_gui_group-prefs-dialog.cc
new file mode 100644
index 00000000000..0644589d32e
--- /dev/null
+++ b/news/pan/patches/patch-pan_gui_group-prefs-dialog.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-pan_gui_group-prefs-dialog.cc,v 1.3 2021/09/19 18:02:37 rhialto Exp $
+
+--- pan/gui/group-prefs-dialog.cc.orig	2021-09-16 16:17:07.000000000 +0000
++++ pan/gui/group-prefs-dialog.cc
+@@ -22,7 +22,7 @@
+ #include <glib.h>
+ #include "gtk-compat.h"
+ #ifdef HAVE_GTKSPELL
+-#include <enchant/enchant.h>
++#include <enchant-2/enchant.h>
+ #endif
+ #include <pan/general/debug.h>
+ #include <pan/general/macros.h>
diff --git a/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc b/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc
new file mode 100644
index 00000000000..26afaef0c75
--- /dev/null
+++ b/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc
@@ -0,0 +1,29 @@
+$NetBSD: patch-pan_usenet-utils_mime-utils.cc,v 1.7 2021/09/19 18:02:37 rhialto Exp $
+
+NetBSD iconv's argument is no longer const.
+
+--- pan/usenet-utils/mime-utils.cc.orig	2019-09-29 21:01:34.000000000 +0000
++++ pan/usenet-utils/mime-utils.cc
+@@ -17,6 +17,13 @@
+  *
+  */
+ 
++#ifdef __NetBSD__
++#include <sys/param.h>
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV
++#endif
++#endif
++
+ #include <config.h>
+ #include <cctype>
+ #include <cstring>
+@@ -77,7 +84,7 @@ namespace pan
+       outbuf = out + converted;
+       outleft = outlen - converted;
+ 
+-#if defined(__NetBSD__)
++#if (defined(__NetBSD__) && !defined(NETBSD_POSIX_ICONV)) || defined(__sun)
+       converted = iconv (cd, &inbuf, &inleft, &outbuf, &outleft);
+ #else
+       converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft);