summaryrefslogtreecommitdiff
path: root/news
diff options
context:
space:
mode:
Diffstat (limited to 'news')
-rw-r--r--news/pan/Makefile17
-rw-r--r--news/pan/PLIST3
-rw-r--r--news/pan/distinfo15
-rw-r--r--news/pan/patches/patch-pan-general-e-util.cc23
-rw-r--r--news/pan/patches/patch-pan_general_text-match.cc13
-rw-r--r--news/pan/patches/patch-pan_general_text-match.h13
-rw-r--r--news/pan/patches/patch-pan_gui_group-prefs-dialog.cc13
-rw-r--r--news/pan/patches/patch-pan_usenet-utils_mime-utils.cc29
8 files changed, 16 insertions, 110 deletions
diff --git a/news/pan/Makefile b/news/pan/Makefile
index ebeaae178b7..4f2c5109079 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.112 2021/05/24 19:53:40 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2021/09/19 17:40:27 rhialto Exp $
-DISTNAME= pan-0.146
-PKGREVISION= 7
+PKGNAME= pan-0.147
CATEGORIES= news
-MASTER_SITES= http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/source/
+TAG= ${PKGNAME_NOREV:tu:C/-/_/:C/\./_/} # PAN_0_147
+MASTER_SITES= https://gitlab.gnome.org/GNOME/pan/-/archive/${TAG}/
EXTRACT_SUFX= .tar.bz2
+DISTNAME= pan-${TAG}
MAINTAINER= rhialto@NetBSD.org
HOMEPAGE= http://pan.rebelbase.com/
@@ -12,6 +13,7 @@ COMMENT= Newsreader for GTK2
LICENSE= gnu-gpl-v2
USE_TOOLS+= gmake msgfmt perl pkg-config itstool
+USE_TOOLS+= autoconf automake
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
@@ -24,9 +26,8 @@ LIBS+= -lcompat
LIBS.SunOS+= -lsocket -liconv
-# temporary fix for GLib 2.68 breakage
-# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963
-CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
+pre-configure:
+ cd ${WRKSRC} && ./autogen.sh
# "Build" these files out of thin air, since base msgfmt doesn't know
# about --xml --desktop.
@@ -40,7 +41,7 @@ pre-build:
.include "../../mail/gmime/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.16.0
+.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/PLIST b/news/pan/PLIST
index 3b86a77e9e3..0e15354ad5e 100644
--- a/news/pan/PLIST
+++ b/news/pan/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2018/07/14 15:15:12 maya Exp $
+@comment $NetBSD: PLIST,v 1.15 2021/09/19 17:40:27 rhialto Exp $
bin/pan
man/man1/pan.1
share/appdata/pan.appdata.xml
@@ -31,6 +31,7 @@ share/locale/ga/LC_MESSAGES/pan.mo
share/locale/gl/LC_MESSAGES/pan.mo
share/locale/hr/LC_MESSAGES/pan.mo
share/locale/hu/LC_MESSAGES/pan.mo
+share/locale/id/LC_MESSAGES/pan.mo
share/locale/it/LC_MESSAGES/pan.mo
share/locale/ja/LC_MESSAGES/pan.mo
share/locale/ko/LC_MESSAGES/pan.mo
diff --git a/news/pan/distinfo b/news/pan/distinfo
index 622a341b0cf..e6fe4a665b5 100644
--- a/news/pan/distinfo
+++ b/news/pan/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.35 2020/11/30 13:06:40 nia Exp $
+$NetBSD: distinfo,v 1.36 2021/09/19 17:40:27 rhialto Exp $
-SHA1 (pan-0.146.tar.bz2) = 843bcfb0a432a5f6a15a22c4570f65a2bb55052d
-RMD160 (pan-0.146.tar.bz2) = 50a97800690e7926ef4c20c90350187786d3741a
-SHA512 (pan-0.146.tar.bz2) = 6eb2cdf60bb8cc36b53448edd90ccd3d17d7eb9a96958f6d549ee457578d63edfaababd838009be42e2787bdbac64893eb101170a7d394b05b4c4ee095975810
-Size (pan-0.146.tar.bz2) = 2309326 bytes
-SHA1 (patch-pan-general-e-util.cc) = c252f074b139b100f3f879261b1ba894b5f3350c
-SHA1 (patch-pan_general_text-match.cc) = eaf15f3323f693d094892d3283437ad5ac3c9682
-SHA1 (patch-pan_general_text-match.h) = 6ac5a68a8b1cb472df517a8df53eee5a79e4c73c
-SHA1 (patch-pan_gui_group-prefs-dialog.cc) = ac268282f3af83ac4beb17d431eec10bb2b6eb4b
-SHA1 (patch-pan_usenet-utils_mime-utils.cc) = 6cec0237458495657752dffdb836df32e4f4da6d
+SHA1 (pan-PAN_0_147.tar.bz2) = 7bd4b8cbf6ca95af6c3249363290ed7464404957
+RMD160 (pan-PAN_0_147.tar.bz2) = e313697c2e9d35c9352c8746f8ce4c4e13123405
+SHA512 (pan-PAN_0_147.tar.bz2) = 616aa53447b8d4390ce9e0f9747783512976578bc6fe2b9d4cd772de85e0aa253ecb95f630ef3947711a06ce479fc9df635e7c8ed9278bf9448947aed4cda2c0
+Size (pan-PAN_0_147.tar.bz2) = 1794085 bytes
diff --git a/news/pan/patches/patch-pan-general-e-util.cc b/news/pan/patches/patch-pan-general-e-util.cc
deleted file mode 100644
index 1270857c990..00000000000
--- a/news/pan/patches/patch-pan-general-e-util.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-pan-general-e-util.cc,v 1.1 2018/11/18 14:31:56 rhialto Exp $
-
-Replace UTF-8 colons by real ones, so it works in more locales.
-
-diff --git a/pan/general/e-util.cc b/pan/general/e-util.cc
-index af5ccd0..efb7932 100644
---- pan/general/e-util.cc
-+++ pan/general/e-util.cc
-@@ -208,10 +208,10 @@ EvolutionDateMaker :: set_current_time (time_t now)
- EvolutionDateMaker :: EvolutionDateMaker (time_t now)
- {
- // build the locale strings
-- locale_recent = g_locale_from_utf8 (_("%l∶%M %p"), -1, NULL, NULL, NULL);
-- locale_today = g_locale_from_utf8 (_("Today %l∶%M %p"), -1, NULL, NULL, NULL);
-- locale_this_week = g_locale_from_utf8 (_("%a %l∶%M %p"), -1, NULL, NULL, NULL);
-- locale_this_year = g_locale_from_utf8 (_("%b %d %l∶%M %p"), -1, NULL, NULL, NULL);
-+ locale_recent = g_locale_from_utf8 (_("%l:%M %p"), -1, NULL, NULL, NULL);
-+ locale_today = g_locale_from_utf8 (_("Today %l:%M %p"), -1, NULL, NULL, NULL);
-+ locale_this_week = g_locale_from_utf8 (_("%a %l:%M %p"), -1, NULL, NULL, NULL);
-+ locale_this_year = g_locale_from_utf8 (_("%b %d %l:%M %p"), -1, NULL, NULL, NULL);
- locale_old = g_locale_from_utf8 (_("%b %d %Y"), -1, NULL, NULL, NULL);
-
- // set the current time
diff --git a/news/pan/patches/patch-pan_general_text-match.cc b/news/pan/patches/patch-pan_general_text-match.cc
deleted file mode 100644
index 16d68864c1a..00000000000
--- a/news/pan/patches/patch-pan_general_text-match.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-pan_general_text-match.cc,v 1.1 2015/08/25 08:29:10 richard 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
deleted file mode 100644
index bcec4281be7..00000000000
--- a/news/pan/patches/patch-pan_general_text-match.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-pan_general_text-match.h,v 1.1 2015/08/25 08:29:10 richard 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
deleted file mode 100644
index 2031348cff5..00000000000
--- a/news/pan/patches/patch-pan_gui_group-prefs-dialog.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-pan_gui_group-prefs-dialog.cc,v 1.1 2019/08/01 22:23:14 rjs Exp $
-
---- pan/gui/group-prefs-dialog.cc.orig 2017-12-29 17:15:47.000000000 +0000
-+++ pan/gui/group-prefs-dialog.cc
-@@ -23,7 +23,7 @@ extern "C" {
- #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>
diff --git a/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc b/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc
deleted file mode 100644
index 605e3ca12ca..00000000000
--- a/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-pan_usenet-utils_mime-utils.cc,v 1.5 2020/11/30 13:06:40 nia 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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 01:37:05 +0000