snownews: Update to 1.6.10

Changes:

* Remove dependency on openssl
* Reduce UI flicker
* Reduce disk writes to ~/.snownews
* General code cleanup
* Improve build system
* More translations
* Relicensed to GPLv3

10 files changed, 99 insertions, 204 deletions

diff --git a/www/snownews/MESSAGE b/www/snownews/MESSAGE
index 0bb65d2264b..363cbfad047 100644
--- a/www/snownews/MESSAGE
+++ b/www/snownews/MESSAGE
@@ -1,8 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2007/10/07 12:59:16 kano Exp $
+$NetBSD: MESSAGE,v 1.3 2019/09/16 11:42:50 nia Exp $
 
 The NetBSD project provides several RSS feeds of interest to NetBSD users
 and developers. Information on these feeds can be found at:
 
-   http://www.netbsd.org/changes/rss.html
+   https://www.netbsd.org/changes/rss.html
 ===========================================================================
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 8bf0c46afd6..767ccc7e278 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,38 +1,33 @@
-# $NetBSD: Makefile,v 1.54 2019/08/11 13:25:08 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2019/09/16 11:42:50 nia Exp $
 
-DISTNAME=	snownews-1.5.12
-PKGREVISION=	16
+DISTNAME=	snownews-1.6.10
 CATEGORIES=	www
-MASTER_SITES=	http://kiza.kcore.de/software/snownews/download/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=kouya/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://kiza.kcore.de/software/snownews/
+HOMEPAGE=	https://github.com/kouya/snownews
 COMMENT=	Small, curses based RSS feed reader
-LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-gpl-v3
 
-DEPENDS+=		p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
+DEPENDS+=	p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
 
-HAS_CONFIGURE=		yes
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		msgfmt perl
+USE_TOOLS+=	gmake msgfmt perl
+HAS_CONFIGURE=	yes
+FAKE_NCURSES=	yes
 
-REPLACE_PERL+=		configure opml2snow
+REPLACE_PERL+=	opml2snow
 
-CONFIG_SHELL=		perl
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-MAKE_ENV+=		EXTRA_CFLAGS=${CFLAGS:Q}
+AUTO_MKDIRS=	yes
 
-INCOMPAT_CURSES=	NetBSD-[0-4].*-*	#WA_BOLD, WA_REVERSE, KEY_RESIZE
-FAKE_NCURSES=		yes
+CONFIGURE_ARGS+=	--prefix=${DESTDIR}${PREFIX}
+CONFIGURE_ARGS+=	--mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
-.include "options.mk"
-
-post-configure:
-	${ECHO} LOCALEPATH=${PREFIX}/${PKGLOCALEDIR}/locale >> ${WRKSRC}/platform_settings
-	${ECHO} MANPATH=${PREFIX}/${PKGMANDIR} >> ${WRKSRC}/platform_settings
+# AUTO_MKDIRS can't handle this one.
+INSTALLATION_DIRS+=	share/locale/be@latin/LC_MESSAGES
 
+.include "options.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/snownews/PLIST b/www/snownews/PLIST
index d5d7ab1fcd1..22497939de3 100644
--- a/www/snownews/PLIST
+++ b/www/snownews/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/01 11:56:43 obache Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/09/16 11:42:50 nia Exp $
 bin/opml2snow
 bin/snow2opml
 bin/snownews
@@ -8,13 +8,14 @@ man/it/man1/snownews.1
 man/man1/opml2snow.1
 man/man1/snownews.1
 man/nl/man1/snownews.1
-man/ru_RU.KOI8-R/man1/snownews.1
+man/ru.KOI8-R/man1/snownews.1
 share/locale/be@latin/LC_MESSAGES/snownews.mo
 share/locale/de/LC_MESSAGES/snownews.mo
 share/locale/es/LC_MESSAGES/snownews.mo
 share/locale/fr/LC_MESSAGES/snownews.mo
 share/locale/it/LC_MESSAGES/snownews.mo
 share/locale/ja/LC_MESSAGES/snownews.mo
+share/locale/ko/LC_MESSAGES/snownews.mo
 share/locale/nl/LC_MESSAGES/snownews.mo
 share/locale/pl/LC_MESSAGES/snownews.mo
 share/locale/pt_BR/LC_MESSAGES/snownews.mo
diff --git a/www/snownews/distinfo b/www/snownews/distinfo
index 2e2155a2f16..0ab922eaacd 100644
--- a/www/snownews/distinfo
+++ b/www/snownews/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2019/07/07 18:13:23 nia Exp $
+$NetBSD: distinfo,v 1.16 2019/09/16 11:42:50 nia Exp $
 
-SHA1 (snownews-1.5.12.tar.gz) = b3addaac25c2c093aa5e60b8b89e50e7d7450bcf
-RMD160 (snownews-1.5.12.tar.gz) = dbe9c6b88e77ce37bb23e4d3ddc8d63f8bd66151
-SHA512 (snownews-1.5.12.tar.gz) = 7a7ccd5ea57f8bbb73f1429ab931a38203e858c74a383c5347e66088b84f6a7240feeee99e179687ce0a7a89c6c1406ce20d6c5d6771d25a0a0301fa5526e220
-Size (snownews-1.5.12.tar.gz) = 167944 bytes
-SHA1 (patch-conversions.c) = 4ca23e1a1c6f1b98533c4f74eba2e7aa2bed8e75
-SHA1 (patch-digcalc.c) = ce73645e350f8dad93c3801077ceb1628bbed5bd
-SHA1 (patch-os-support_c) = 144a9c0910618ddd64d5d56eb62aa8a9e8155145
+SHA1 (snownews-1.6.10.tar.gz) = 4eda949103a92ea28e5ceff8e25e45b00540adaa
+RMD160 (snownews-1.6.10.tar.gz) = 23b6c18ed8f47381e4fb0886074a9516dae0abcd
+SHA512 (snownews-1.6.10.tar.gz) = df90c3c55da8d11b2936075aab86f66f54f9a6ace0cbe0db54d0e6177ae71e28ab3c700d79b521d55859bb94ef7ecc89e3eb69f215eb9f7286d30cc4e2bec078
+Size (snownews-1.6.10.tar.gz) = 189715 bytes
+SHA1 (patch-Config.mk.in) = 272f80ba5bf0ff6eb89bd30d429835423f45a39d
+SHA1 (patch-configure) = 789dc192a07fab442080e71d929fa17718fb2390
+SHA1 (patch-os-support_c) = 9b843d381c3793bd2f32f72696640a6b005f8a22
diff --git a/www/snownews/options.mk b/www/snownews/options.mk
index 3230b4c2f11..4a7ff3c0d24 100644
--- a/www/snownews/options.mk
+++ b/www/snownews/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2017/01/04 16:08:51 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2019/09/16 11:42:50 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.snownews
 
@@ -6,7 +6,7 @@ PKG_OPTIONS_REQUIRED_GROUPS=	screen
 PKG_OPTIONS_GROUP.screen=	curses wide-curses
 PKG_OPTIONS_LEGACY_OPTS+=	ncurses:curses ncursesw:wide-curses
 
-PKG_SUGGESTED_OPTIONS=	curses
+PKG_SUGGESTED_OPTIONS=	wide-curses
 
 .include "../../mk/bsd.options.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/www/snownews/patches/patch-Config.mk.in b/www/snownews/patches/patch-Config.mk.in
new file mode 100644
index 00000000000..11f434ecd87
--- /dev/null
+++ b/www/snownews/patches/patch-Config.mk.in
@@ -0,0 +1,45 @@
+$NetBSD: patch-Config.mk.in,v 1.1 2019/09/16 11:42:50 nia Exp $
+
+hunk 1:
+
+Use BSD_INSTALL_*.
+
+hunk 2:
+
+Let pkgsrc set CFLAGS/LDFLAGS.
+
+--- Config.mk.in.orig	2018-07-30 11:06:03.000000000 +0000
++++ Config.mk.in
+@@ -9,11 +9,11 @@ VERSION		:= @PKG_VERSION@
+ 
+ CC		:= @CC@
+ MSGFMT		:= @MSGFMT@
+-INSTALL		:= @INSTALL@
++INSTALL		:= ${BSD_INSTALL}
+ 
+-INSTALLEXE	:= ${INSTALL} -D -p -m 755 -s
+-INSTALLSCR	:= ${INSTALL} -D -p -m 755
+-INSTALLDATA	:= ${INSTALL} -D -p -m 644
++INSTALLEXE	:= ${BSD_INSTALL_PROGRAM}
++INSTALLSCR	:= ${BSD_INSTALL_SCRIPT}
++INSTALLDATA	:= ${BSD_INSTALL_DATA}
+ 
+ ################ Destination #########################################
+ 
+@@ -27,13 +27,12 @@ O		:= .o/
+ 
+ ################ Compiler options ####################################
+ 
+-CFLAGS		:= -Wall -Wextra -Wredundant-decls -Wshadow \
++CFLAGS		+= -Wall -Wextra -Wredundant-decls -Wshadow \
+ 		   -std=c11 -I/usr/include/libxml2
+-LDFLAGS		:= -liconv -lintl -lxml2 -lncurses -lz
++LDFLAGS		+= -liconv -lintl -lxml2 -lncurses -lz
+ ifdef DEBUG
+     CFLAGS	+= -O0 -ggdb3
+     LDFLAGS	+= -g -rdynamic
+ else
+-    CFLAGS	+= -Os -g0 -DNDEBUG=1
+-    LDFLAGS	+= -s
++    CFLAGS	+= -DNDEBUG=1
+ endif
diff --git a/www/snownews/patches/patch-configure b/www/snownews/patches/patch-configure
new file mode 100644
index 00000000000..3728babdb31
--- /dev/null
+++ b/www/snownews/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2019/09/16 11:42:50 nia Exp $
+
+Let pkgsrc take care of libcurses.
+
+--- configure.orig	2018-07-30 11:06:03.000000000 +0000
++++ configure
+@@ -36,7 +36,7 @@ seds=[s/^#undef \(USE_UNSUPPORTED_AND_BR
+ PROGS="CC=gcc CC=clang INSTALL=install MSGFMT=msgfmt"
+ 
+ # Libs found using pkg-config
+-LIBS="libxml-2.0 ncurses zlib"
++LIBS="libxml-2.0 zlib"
+ # Defaults to substitute with pkg-config --libs output
+ DEFLIBS="-lxml2 -lncursesw -lz"
+ # Defaults to substitute with pkg-config --cflags output
diff --git a/www/snownews/patches/patch-conversions.c b/www/snownews/patches/patch-conversions.c
deleted file mode 100644
index 84c7e0a9c39..00000000000
--- a/www/snownews/patches/patch-conversions.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-conversions.c,v 1.1 2019/07/07 18:13:23 nia Exp $
-
-Support OpenSSL 1.1.
-
---- conversions.c.orig	2009-09-17 06:44:27.000000000 +0000
-+++ conversions.c
-@@ -618,20 +618,21 @@ char * Hashify (const char * url) {
- 
- char * genItemHash (char ** hashitems, int items) {
- 	int i;
--	EVP_MD_CTX mdctx;
-+	EVP_MD_CTX *mdctx;
- 	unsigned char md_value[EVP_MAX_MD_SIZE];
- 	unsigned int md_len;
- 	char md5_hex[33];
--
--	EVP_DigestInit(&mdctx, EVP_md5());
-+	
-+	mdctx = EVP_MD_CTX_new();
-+	EVP_DigestInit(mdctx, EVP_md5());
- 	
- 	for (i = 0; i < items; i++) {
- 		if (hashitems[i] != NULL)
--			EVP_DigestUpdate(&mdctx, hashitems[i], (size_t) strlen(hashitems[i]));
-+			EVP_DigestUpdate(mdctx, hashitems[i], (size_t) strlen(hashitems[i]));
- 	}
- 	
--	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
--	EVP_MD_CTX_cleanup(&mdctx);
-+	EVP_DigestFinal_ex(mdctx, md_value, &md_len);
-+	EVP_MD_CTX_free(mdctx);
- 	
- 	for (i = 0; i < md_len; i++) {
- 		sprintf(&md5_hex[2*i], "%02x", md_value[i]);
diff --git a/www/snownews/patches/patch-digcalc.c b/www/snownews/patches/patch-digcalc.c
deleted file mode 100644
index d15853df72d..00000000000
--- a/www/snownews/patches/patch-digcalc.c
+++ /dev/null
@@ -1,127 +0,0 @@
-$NetBSD: patch-digcalc.c,v 1.1 2019/07/07 18:13:23 nia Exp $
-
-Support OpenSSL 1.1.
-
---- digcalc.c.orig	2009-09-17 06:44:27.000000000 +0000
-+++ digcalc.c
-@@ -27,30 +27,32 @@ void DigestCalcHA1(
-     OUT HASHHEX SessionKey
-     )
- {
--	EVP_MD_CTX mdctx;
-+	EVP_MD_CTX *mdctx;
- 	unsigned char md_value[EVP_MAX_MD_SIZE];
- 	unsigned int md_len;
- 	int i;
- 	HASH HA1;
- 	
--	EVP_DigestInit(&mdctx, EVP_md5());
--	EVP_DigestUpdate(&mdctx, pszUserName, strlen(pszUserName));
--	EVP_DigestUpdate(&mdctx, ":", 1);
--	EVP_DigestUpdate(&mdctx, pszRealm, strlen(pszRealm));
--	EVP_DigestUpdate(&mdctx, ":", 1);
--	EVP_DigestUpdate(&mdctx, pszPassword, strlen(pszPassword));
--	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
--	EVP_MD_CTX_cleanup(&mdctx);
-+	mdctx = EVP_MD_CTX_new();
-+	EVP_DigestInit(mdctx, EVP_md5());
-+	EVP_DigestUpdate(mdctx, pszUserName, strlen(pszUserName));
-+	EVP_DigestUpdate(mdctx, ":", 1);
-+	EVP_DigestUpdate(mdctx, pszRealm, strlen(pszRealm));
-+	EVP_DigestUpdate(mdctx, ":", 1);
-+	EVP_DigestUpdate(mdctx, pszPassword, strlen(pszPassword));
-+	EVP_DigestFinal_ex(mdctx, md_value, &md_len);
-+	EVP_MD_CTX_free(mdctx);
- 	
- 	if (strcmp(pszAlg, "md5-sess") == 0) {
--		EVP_DigestInit(&mdctx, EVP_md5());
--		EVP_DigestUpdate(&mdctx, HA1, HASHLEN);
--		EVP_DigestUpdate(&mdctx, ":", 1);
--		EVP_DigestUpdate(&mdctx, pszNonce, strlen(pszNonce));
--		EVP_DigestUpdate(&mdctx, ":", 1);
--		EVP_DigestUpdate(&mdctx, pszCNonce, strlen(pszCNonce));
--		EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
--		EVP_MD_CTX_cleanup(&mdctx);
-+		mdctx = EVP_MD_CTX_new();
-+		EVP_DigestInit(mdctx, EVP_md5());
-+		EVP_DigestUpdate(mdctx, HA1, HASHLEN);
-+		EVP_DigestUpdate(mdctx, ":", 1);
-+		EVP_DigestUpdate(mdctx, pszNonce, strlen(pszNonce));
-+		EVP_DigestUpdate(mdctx, ":", 1);
-+		EVP_DigestUpdate(mdctx, pszCNonce, strlen(pszCNonce));
-+		EVP_DigestFinal_ex(mdctx, md_value, &md_len);
-+		EVP_MD_CTX_free(mdctx);
- 	};
- 	
- 	for (i = 0; i < md_len; i++) {
-@@ -71,45 +73,47 @@ void DigestCalcResponse(
-     OUT HASHHEX Response      /* request-digest or response-digest */
-     )
- {
--	EVP_MD_CTX mdctx;
-+	EVP_MD_CTX *mdctx;
- 	HASHHEX HA2Hex;
- 	unsigned char md_value[EVP_MAX_MD_SIZE];
- 	unsigned int md_len;
- 	int i;
- 	
- 	/* calculate H(A2) */
--	EVP_DigestInit(&mdctx, EVP_md5());
--	EVP_DigestUpdate(&mdctx, pszMethod, strlen(pszMethod));
--	EVP_DigestUpdate(&mdctx, ":", 1);
--	EVP_DigestUpdate(&mdctx, pszDigestUri, strlen(pszDigestUri));
-+	mdctx = EVP_MD_CTX_new();
-+	EVP_DigestInit(mdctx, EVP_md5());
-+	EVP_DigestUpdate(mdctx, pszMethod, strlen(pszMethod));
-+	EVP_DigestUpdate(mdctx, ":", 1);
-+	EVP_DigestUpdate(mdctx, pszDigestUri, strlen(pszDigestUri));
- 	if (strcmp(pszQop, "auth-int") == 0) {
--		EVP_DigestUpdate(&mdctx, ":", 1);
--		EVP_DigestUpdate(&mdctx, HEntity, HASHHEXLEN);
-+		EVP_DigestUpdate(mdctx, ":", 1);
-+		EVP_DigestUpdate(mdctx, HEntity, HASHHEXLEN);
- 	};
--	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
--	EVP_MD_CTX_cleanup(&mdctx);
-+	EVP_DigestFinal_ex(mdctx, md_value, &md_len);
-+	EVP_MD_CTX_free(mdctx);
- 	
- 	for (i = 0; i < md_len; i++) {
- 		sprintf(&HA2Hex[2*i], "%02x", md_value[i]);
- 	}
- 	
- 	/* calculate response */
--	EVP_DigestInit(&mdctx, EVP_md5());
--	EVP_DigestUpdate(&mdctx, HA1, HASHHEXLEN);
--	EVP_DigestUpdate(&mdctx, ":", 1);
--	EVP_DigestUpdate(&mdctx, pszNonce, strlen(pszNonce));
--	EVP_DigestUpdate(&mdctx, ":", 1);
-+	mdctx = EVP_MD_CTX_new();
-+	EVP_DigestInit(mdctx, EVP_md5());
-+	EVP_DigestUpdate(mdctx, HA1, HASHHEXLEN);
-+	EVP_DigestUpdate(mdctx, ":", 1);
-+	EVP_DigestUpdate(mdctx, pszNonce, strlen(pszNonce));
-+	EVP_DigestUpdate(mdctx, ":", 1);
- 	if (*pszQop) {
--		EVP_DigestUpdate(&mdctx, pszNonceCount, strlen(pszNonceCount));
--		EVP_DigestUpdate(&mdctx, ":", 1);
--		EVP_DigestUpdate(&mdctx, pszCNonce, strlen(pszCNonce));
--		EVP_DigestUpdate(&mdctx, ":", 1);
--		EVP_DigestUpdate(&mdctx, pszQop, strlen(pszQop));
--		EVP_DigestUpdate(&mdctx, ":", 1);
-+		EVP_DigestUpdate(mdctx, pszNonceCount, strlen(pszNonceCount));
-+		EVP_DigestUpdate(mdctx, ":", 1);
-+		EVP_DigestUpdate(mdctx, pszCNonce, strlen(pszCNonce));
-+		EVP_DigestUpdate(mdctx, ":", 1);
-+		EVP_DigestUpdate(mdctx, pszQop, strlen(pszQop));
-+		EVP_DigestUpdate(mdctx, ":", 1);
- 	};
--	EVP_DigestUpdate(&mdctx, HA2Hex, HASHHEXLEN);
--	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
--	EVP_MD_CTX_cleanup(&mdctx);
-+	EVP_DigestUpdate(mdctx, HA2Hex, HASHHEXLEN);
-+	EVP_DigestFinal_ex(mdctx, md_value, &md_len);
-+	EVP_MD_CTX_free(mdctx);
- 	
- 	for (i = 0; i < md_len; i++) {
- 		sprintf(&Response[2*i], "%02x", md_value[i]);
diff --git a/www/snownews/patches/patch-os-support_c b/www/snownews/patches/patch-os-support_c
index d63b8aa0955..370063cc647 100644
--- a/www/snownews/patches/patch-os-support_c
+++ b/www/snownews/patches/patch-os-support_c
@@ -1,14 +1,14 @@
-$NetBSD: patch-os-support_c,v 1.1 2012/06/23 23:14:24 dholland Exp $
+$NetBSD: patch-os-support_c,v 1.2 2019/09/16 11:42:50 nia Exp $
 
 Use standard headers. (Required on Solaris for time_t.)
 
---- os-support.c~	2009-09-17 06:44:27.000000000 +0000
+--- os-support.c.orig	2018-07-30 11:06:03.000000000 +0000
 +++ os-support.c
-@@ -28,6 +28,7 @@
- #include <errno.h>
- #include <string.h>
+@@ -16,6 +16,7 @@
+ 
+ #include "os-support.h"
  #include <ctype.h>
 +#include <time.h>
  
- #include "main.h"
- 
+ //-----------------------------------------------------------------------------
+ // This is a replacement for strsep which is not portable (missing on Solaris).