Sun Apr 3 19:33:11 2022 UTC ()
news/pan: update to 0.150.

Switch back to fetching the distfile from gitlab.gnome.org, since
a) the configure.ac file no longer uses the problematic "$Format:%d$"
   which can change if commits are added (only the stable
   GIT_HASH='$Format:%h$' is left). Hopefully this fixes the problem.
b) the upstream of the pre-made tarball is getting behind
Also there are some pkglint fixes.

The main points of this release are:
- Dropped support for GMime2. Only Gmime3 is supported
- Gtk3 is now default build, Gtk2 is deprecated

15fcc65 set maximum number of serveur connections to 20 (Dominique Dumont)
431f56f Nuke $GIT_REMOTE if not obtained by git config (Petr Kovar)


(rhialto)
diff -r1.119 -r1.120 pkgsrc/news/pan/Makefile
diff -r1.16 -r1.17 pkgsrc/news/pan/PLIST
diff -r1.42 -r1.43 pkgsrc/news/pan/distinfo
diff -r1.3 -r1.4 pkgsrc/news/pan/patches/patch-pan_general_text-match.cc
diff -r1.3 -r1.4 pkgsrc/news/pan/patches/patch-pan_general_text-match.h
cvs diff -r1.119 -r1.120 pkgsrc/news/pan/Makefile (expand / switch to unified diff)

--- pkgsrc/news/pan/Makefile 2021/12/29 13:34:39 1.119
+++ pkgsrc/news/pan/Makefile 2022/04/03 19:33:11 1.120
@@ -1,40 +1,46 @@ @@ -1,40 +1,46 @@
1# $NetBSD: Makefile,v 1.119 2021/12/29 13:34:39 rhialto Exp $ 1# $NetBSD: Makefile,v 1.120 2022/04/03 19:33:11 rhialto Exp $
2 2
3DISTNAME= pan-0.149 3PKGNAME= pan-0.150
4CATEGORIES= news 4CATEGORIES= news
5MASTER_SITES= http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/source/ 5TAG= ${PKGNAME_NOREV:S/pan-/v/} # v0.150
 6MASTER_SITES= https://gitlab.gnome.org/GNOME/pan/-/archive/${TAG}/
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
 8DISTNAME= pan-${TAG}
7 9
8MAINTAINER= rhialto@NetBSD.org 10MAINTAINER= rhialto@NetBSD.org
9HOMEPAGE= http://pan.rebelbase.com/ 11HOMEPAGE= http://pan.rebelbase.com/
10COMMENT= Newsreader for GTK3 12COMMENT= Newsreader for GTK3
11LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
12 14
13USE_TOOLS+= gmake msgfmt perl pkg-config itstool 15USE_TOOLS+= gmake msgfmt perl pkg-config itstool
 16USE_TOOLS+= autoconf automake
14USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
15USE_PKGLOCALEDIR= YES 18USE_PKGLOCALEDIR= YES
16GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
17CONFIGURE_ARGS+= --with-gtk3 20CONFIGURE_ARGS+= --with-gtk3
18CONFIGURE_ARGS+= --with-gnutls 21CONFIGURE_ARGS+= --with-gnutls
19CONFIGURE_ARGS+= --with-gtkspell 22CONFIGURE_ARGS+= --with-gtkspell
20 23
21.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
22.if (${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" && ${OPSYS} != "Linux") 25.if (${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" && ${OPSYS} != "Linux")
23LIBS+= -lcompat 26LIBS+= -lcompat
24.endif 27.endif
25 28
26LIBS.SunOS+= -lsocket -liconv 29LIBS.SunOS+= -lsocket -liconv
27 30
 31pre-configure:
 32 cd ${WRKSRC} && ./autogen.sh
 33
28# "Build" these files out of thin air, since base msgfmt doesn't know 34# "Build" these files out of thin air, since base msgfmt doesn't know
29# about --xml --desktop. 35# about --xml --desktop.
30pre-build: 36pre-build:
31 ${CP} ${FILESDIR}/pan.desktop ${WRKSRC}/org.gnome.pan.desktop 37 ${CP} ${FILESDIR}/pan.desktop ${WRKSRC}/org.gnome.pan.desktop
32 ${CP} ${FILESDIR}/org.gnome.pan.metainfo.xml ${WRKSRC} 38 ${CP} ${FILESDIR}/org.gnome.pan.metainfo.xml ${WRKSRC}
33 39
34.include "../../converters/libiconv/buildlink3.mk" 40.include "../../converters/libiconv/buildlink3.mk"
35.include "../../devel/gettext-lib/buildlink3.mk" 41.include "../../devel/gettext-lib/buildlink3.mk"
36.include "../../devel/zlib/buildlink3.mk" 42.include "../../devel/zlib/buildlink3.mk"
37.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 43.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
38.include "../../mail/gmime3/buildlink3.mk" 44.include "../../mail/gmime3/buildlink3.mk"
39.include "../../security/gnutls/buildlink3.mk" 45.include "../../security/gnutls/buildlink3.mk"
40.include "../../sysutils/desktop-file-utils/desktopdb.mk" 46.include "../../sysutils/desktop-file-utils/desktopdb.mk"
cvs diff -r1.16 -r1.17 pkgsrc/news/pan/PLIST (expand / switch to unified diff)

--- pkgsrc/news/pan/PLIST 2021/12/29 13:34:39 1.16
+++ pkgsrc/news/pan/PLIST 2022/04/03 19:33:11 1.17
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1@comment $NetBSD: PLIST,v 1.16 2021/12/29 13:34:39 rhialto Exp $ 1@comment $NetBSD: PLIST,v 1.17 2022/04/03 19:33:11 rhialto Exp $
2bin/pan 2bin/pan
3man/man1/pan.1 3man/man1/pan.1
4share/applications/org.gnome.pan.desktop 4share/applications/org.gnome.pan.desktop
5share/metainfo/org.gnome.pan.metainfo.xml 
6share/icons/hicolor/16x16/apps/org.gnome.pan.png 5share/icons/hicolor/16x16/apps/org.gnome.pan.png
7share/icons/hicolor/24x24/apps/org.gnome.pan.png 6share/icons/hicolor/24x24/apps/org.gnome.pan.png
8share/icons/hicolor/256x256/apps/org.gnome.pan.png 7share/icons/hicolor/256x256/apps/org.gnome.pan.png
9share/icons/hicolor/32x32/apps/org.gnome.pan.png 8share/icons/hicolor/32x32/apps/org.gnome.pan.png
10share/icons/hicolor/48x48/apps/org.gnome.pan.png 9share/icons/hicolor/48x48/apps/org.gnome.pan.png
11share/locale/am/LC_MESSAGES/pan.mo 10share/locale/am/LC_MESSAGES/pan.mo
12share/locale/ar/LC_MESSAGES/pan.mo 11share/locale/ar/LC_MESSAGES/pan.mo
13share/locale/az/LC_MESSAGES/pan.mo 12share/locale/az/LC_MESSAGES/pan.mo
14share/locale/bg/LC_MESSAGES/pan.mo 13share/locale/bg/LC_MESSAGES/pan.mo
15share/locale/bs/LC_MESSAGES/pan.mo 14share/locale/bs/LC_MESSAGES/pan.mo
16share/locale/ca/LC_MESSAGES/pan.mo 15share/locale/ca/LC_MESSAGES/pan.mo
17share/locale/cs/LC_MESSAGES/pan.mo 16share/locale/cs/LC_MESSAGES/pan.mo
18share/locale/da/LC_MESSAGES/pan.mo 17share/locale/da/LC_MESSAGES/pan.mo
@@ -47,13 +46,14 @@ share/locale/pt_BR/LC_MESSAGES/pan.mo @@ -47,13 +46,14 @@ share/locale/pt_BR/LC_MESSAGES/pan.mo
47share/locale/ro/LC_MESSAGES/pan.mo 46share/locale/ro/LC_MESSAGES/pan.mo
48share/locale/ru/LC_MESSAGES/pan.mo 47share/locale/ru/LC_MESSAGES/pan.mo
49share/locale/sk/LC_MESSAGES/pan.mo 48share/locale/sk/LC_MESSAGES/pan.mo
50share/locale/sl/LC_MESSAGES/pan.mo 49share/locale/sl/LC_MESSAGES/pan.mo
51share/locale/sq/LC_MESSAGES/pan.mo 50share/locale/sq/LC_MESSAGES/pan.mo
52share/locale/sr/LC_MESSAGES/pan.mo 51share/locale/sr/LC_MESSAGES/pan.mo
53share/locale/sr@latin/LC_MESSAGES/pan.mo 52share/locale/sr@latin/LC_MESSAGES/pan.mo
54share/locale/sv/LC_MESSAGES/pan.mo 53share/locale/sv/LC_MESSAGES/pan.mo
55share/locale/tr/LC_MESSAGES/pan.mo 54share/locale/tr/LC_MESSAGES/pan.mo
56share/locale/uk/LC_MESSAGES/pan.mo 55share/locale/uk/LC_MESSAGES/pan.mo
57share/locale/vi/LC_MESSAGES/pan.mo 56share/locale/vi/LC_MESSAGES/pan.mo
58share/locale/zh_CN/LC_MESSAGES/pan.mo 57share/locale/zh_CN/LC_MESSAGES/pan.mo
59share/locale/zh_TW/LC_MESSAGES/pan.mo 58share/locale/zh_TW/LC_MESSAGES/pan.mo
 59share/metainfo/org.gnome.pan.metainfo.xml
cvs diff -r1.42 -r1.43 pkgsrc/news/pan/distinfo (expand / switch to unified diff)

--- pkgsrc/news/pan/distinfo 2021/12/29 13:34:39 1.42
+++ pkgsrc/news/pan/distinfo 2022/04/03 19:33:11 1.43
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.42 2021/12/29 13:34:39 rhialto Exp $ 1$NetBSD: distinfo,v 1.43 2022/04/03 19:33:11 rhialto Exp $
2 2
3BLAKE2s (pan-0.149.tar.bz2) = bab5445f1ac8c1b602237d53ba920b43ed7a7ef3c8a5da85ad2ba3613fdc27b8 3BLAKE2s (pan-v0.150.tar.bz2) = 3a5086a87782d70a6828088a99af7228527066aa9176e468af71d816b92a42eb
4SHA512 (pan-0.149.tar.bz2) = 2e558f53bbc0c9ae907c566fe8efd56ed2ef0edeffa23f922b63c956f16096c2ad1ea0bd43c31f82ee096899550bf47cb7011f354a6941a1d53cb6c6eaa5e5a6 4SHA512 (pan-v0.150.tar.bz2) = ac32fff253a2b104c38f795db2bddf601fabc6de451dcc6b9425007b3dcdb52831cf84fdb762ba0aa13b77b2ce506d4e61517c13361c738617aac04751751fca
5Size (pan-0.149.tar.bz2) = 2328015 bytes 5Size (pan-v0.150.tar.bz2) = 1788225 bytes
6SHA1 (patch-pan_general_text-match.cc) = eaf15f3323f693d094892d3283437ad5ac3c9682 6SHA1 (patch-pan_general_text-match.cc) = d719a6d5a59714f228cfd208627d2d6a70da07ff
7SHA1 (patch-pan_general_text-match.h) = 6ac5a68a8b1cb472df517a8df53eee5a79e4c73c 7SHA1 (patch-pan_general_text-match.h) = 77dae6ba00c3b58b4353f60d90756a409b5699e2
cvs diff -r1.3 -r1.4 pkgsrc/news/pan/patches/patch-pan_general_text-match.cc (expand / switch to unified diff)

--- pkgsrc/news/pan/patches/patch-pan_general_text-match.cc 2021/09/19 18:02:37 1.3
+++ pkgsrc/news/pan/patches/patch-pan_general_text-match.cc 2022/04/03 19:33:11 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-pan_general_text-match.cc,v 1.3 2021/09/19 18:02:37 rhialto Exp $ 1$NetBSD: patch-pan_general_text-match.cc,v 1.4 2022/04/03 19:33:11 rhialto Exp $
 2
2Avoid clash with host defined ERR (on SunOS) 3Avoid clash with host defined ERR (on SunOS)
 4
3--- pan/general/text-match.cc.orig 2012-06-29 22:24:54.000000000 +0000 5--- pan/general/text-match.cc.orig 2012-06-29 22:24:54.000000000 +0000
4+++ pan/general/text-match.cc 6+++ pan/general/text-match.cc
5@@ -209,7 +209,7 @@ TextMatch :: my_regexec (const StringVie 7@@ -209,7 +209,7 @@ TextMatch :: my_regexec (const StringVie
6 if (_pcre_info->set (_impl_text, state.case_sensitive)) 8 if (_pcre_info->set (_impl_text, state.case_sensitive))
7 _pcre_state = COMPILED; 9 _pcre_state = COMPILED;
8 else 10 else
9- _pcre_state = ERR; 11- _pcre_state = ERR;
10+ _pcre_state = PCRE_ERR; 12+ _pcre_state = PCRE_ERR;
11 } 13 }
12  14
13 return _pcre_state != COMPILED 15 return _pcre_state != COMPILED
cvs diff -r1.3 -r1.4 pkgsrc/news/pan/patches/patch-pan_general_text-match.h (expand / switch to unified diff)

--- pkgsrc/news/pan/patches/patch-pan_general_text-match.h 2021/09/19 18:02:37 1.3
+++ pkgsrc/news/pan/patches/patch-pan_general_text-match.h 2022/04/03 19:33:11 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-pan_general_text-match.h,v 1.3 2021/09/19 18:02:37 rhialto Exp $ 1$NetBSD: patch-pan_general_text-match.h,v 1.4 2022/04/03 19:33:11 rhialto Exp $
 2
2Avoid clash with host defined ERR (on SunOS) 3Avoid clash with host defined ERR (on SunOS)
 4
3--- pan/general/text-match.h.orig 2012-06-29 22:24:54.000000000 +0000 5--- pan/general/text-match.h.orig 2012-06-29 22:24:54.000000000 +0000
4+++ pan/general/text-match.h 6+++ pan/general/text-match.h
5@@ -108,7 +108,7 @@ private: 7@@ -108,7 +108,7 @@ private:
6 class PcreInfo; 8 class PcreInfo;
7 mutable PcreInfo * _pcre_info; 9 mutable PcreInfo * _pcre_info;
8  10
9- enum PcreState { NEED_COMPILE, COMPILED, ERR }; 11- enum PcreState { NEED_COMPILE, COMPILED, ERR };
10+ enum PcreState { NEED_COMPILE, COMPILED, PCRE_ERR }; 12+ enum PcreState { NEED_COMPILE, COMPILED, PCRE_ERR };
11 mutable PcreState _pcre_state; 13 mutable PcreState _pcre_state;
12  14
13 public: 15 public: