Mon Sep 16 11:42:50 2019 UTC ()
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


(nia)
diff -r1.2 -r1.3 pkgsrc/www/snownews/MESSAGE
diff -r1.54 -r1.55 pkgsrc/www/snownews/Makefile
diff -r1.6 -r1.7 pkgsrc/www/snownews/PLIST
diff -r1.15 -r1.16 pkgsrc/www/snownews/distinfo
diff -r1.7 -r1.8 pkgsrc/www/snownews/options.mk
diff -r0 -r1.1 pkgsrc/www/snownews/patches/patch-Config.mk.in
diff -r0 -r1.1 pkgsrc/www/snownews/patches/patch-configure
diff -r1.1 -r0 pkgsrc/www/snownews/patches/patch-conversions.c
diff -r1.1 -r0 pkgsrc/www/snownews/patches/patch-digcalc.c
diff -r1.1 -r1.2 pkgsrc/www/snownews/patches/patch-os-support_c
cvs diff -r1.2 -r1.3 pkgsrc/www/snownews/Attic/MESSAGE (expand / switch to unified diff)

--- pkgsrc/www/snownews/Attic/MESSAGE 2007/10/07 12:59:16 1.2
+++ pkgsrc/www/snownews/Attic/MESSAGE 2019/09/16 11:42:50 1.3
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.2 2007/10/07 12:59:16 kano Exp $ 2$NetBSD: MESSAGE,v 1.3 2019/09/16 11:42:50 nia Exp $
3 3
4The NetBSD project provides several RSS feeds of interest to NetBSD users 4The NetBSD project provides several RSS feeds of interest to NetBSD users
5and developers. Information on these feeds can be found at: 5and developers. Information on these feeds can be found at:
6 6
7 http://www.netbsd.org/changes/rss.html 7 https://www.netbsd.org/changes/rss.html
8=========================================================================== 8===========================================================================
cvs diff -r1.54 -r1.55 pkgsrc/www/snownews/Makefile (expand / switch to unified diff)

--- pkgsrc/www/snownews/Makefile 2019/08/11 13:25:08 1.54
+++ pkgsrc/www/snownews/Makefile 2019/09/16 11:42:50 1.55
@@ -1,38 +1,33 @@ @@ -1,38 +1,33 @@
1# $NetBSD: Makefile,v 1.54 2019/08/11 13:25:08 wiz Exp $ 1# $NetBSD: Makefile,v 1.55 2019/09/16 11:42:50 nia Exp $
2 2
3DISTNAME= snownews-1.5.12 3DISTNAME= snownews-1.6.10
4PKGREVISION= 16 
5CATEGORIES= www 4CATEGORIES= www
6MASTER_SITES= http://kiza.kcore.de/software/snownews/download/ 5MASTER_SITES= ${MASTER_SITE_GITHUB:=kouya/}
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://kiza.kcore.de/software/snownews/ 8HOMEPAGE= https://github.com/kouya/snownews
10COMMENT= Small, curses based RSS feed reader 9COMMENT= Small, curses based RSS feed reader
11LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v3
12 11
13DEPENDS+= p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML 12DEPENDS+= p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
14 13
15HAS_CONFIGURE= yes 14USE_TOOLS+= gmake msgfmt perl
16USE_PKGLOCALEDIR= yes 15HAS_CONFIGURE= yes
17USE_TOOLS+= msgfmt perl 16FAKE_NCURSES= yes
18 17
19REPLACE_PERL+= configure opml2snow 18REPLACE_PERL+= opml2snow
20 19
21CONFIG_SHELL= perl 20AUTO_MKDIRS= yes
22CONFIGURE_ARGS+= --prefix=${PREFIX} 
23MAKE_ENV+= EXTRA_CFLAGS=${CFLAGS:Q} 
24 21
25INCOMPAT_CURSES= NetBSD-[0-4].*-* #WA_BOLD, WA_REVERSE, KEY_RESIZE 22CONFIGURE_ARGS+= --prefix=${DESTDIR}${PREFIX}
26FAKE_NCURSES= yes 23CONFIGURE_ARGS+= --mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
27 24
28.include "options.mk" 25# AUTO_MKDIRS can't handle this one.
29 26INSTALLATION_DIRS+= share/locale/be@latin/LC_MESSAGES
30post-configure: 
31 ${ECHO} LOCALEPATH=${PREFIX}/${PKGLOCALEDIR}/locale >> ${WRKSRC}/platform_settings 
32 ${ECHO} MANPATH=${PREFIX}/${PKGMANDIR} >> ${WRKSRC}/platform_settings 
33 27
 28.include "options.mk"
34.include "../../converters/libiconv/buildlink3.mk" 29.include "../../converters/libiconv/buildlink3.mk"
35.include "../../devel/gettext-lib/buildlink3.mk" 30.include "../../devel/gettext-lib/buildlink3.mk"
36.include "../../security/openssl/buildlink3.mk" 31.include "../../devel/zlib/buildlink3.mk"
37.include "../../textproc/libxml2/buildlink3.mk" 32.include "../../textproc/libxml2/buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/www/snownews/PLIST (expand / switch to unified diff)

--- pkgsrc/www/snownews/PLIST 2009/06/01 11:56:43 1.6
+++ pkgsrc/www/snownews/PLIST 2019/09/16 11:42:50 1.7
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1@comment $NetBSD: PLIST,v 1.6 2009/06/01 11:56:43 obache Exp $ 1@comment $NetBSD: PLIST,v 1.7 2019/09/16 11:42:50 nia Exp $
2bin/opml2snow 2bin/opml2snow
3bin/snow2opml 3bin/snow2opml
4bin/snownews 4bin/snownews
5man/de/man1/snownews.1 5man/de/man1/snownews.1
6man/fr/man1/snownews.1 6man/fr/man1/snownews.1
7man/it/man1/snownews.1 7man/it/man1/snownews.1
8man/man1/opml2snow.1 8man/man1/opml2snow.1
9man/man1/snownews.1 9man/man1/snownews.1
10man/nl/man1/snownews.1 10man/nl/man1/snownews.1
11man/ru_RU.KOI8-R/man1/snownews.1 11man/ru.KOI8-R/man1/snownews.1
12share/locale/be@latin/LC_MESSAGES/snownews.mo 12share/locale/be@latin/LC_MESSAGES/snownews.mo
13share/locale/de/LC_MESSAGES/snownews.mo 13share/locale/de/LC_MESSAGES/snownews.mo
14share/locale/es/LC_MESSAGES/snownews.mo 14share/locale/es/LC_MESSAGES/snownews.mo
15share/locale/fr/LC_MESSAGES/snownews.mo 15share/locale/fr/LC_MESSAGES/snownews.mo
16share/locale/it/LC_MESSAGES/snownews.mo 16share/locale/it/LC_MESSAGES/snownews.mo
17share/locale/ja/LC_MESSAGES/snownews.mo 17share/locale/ja/LC_MESSAGES/snownews.mo
 18share/locale/ko/LC_MESSAGES/snownews.mo
18share/locale/nl/LC_MESSAGES/snownews.mo 19share/locale/nl/LC_MESSAGES/snownews.mo
19share/locale/pl/LC_MESSAGES/snownews.mo 20share/locale/pl/LC_MESSAGES/snownews.mo
20share/locale/pt_BR/LC_MESSAGES/snownews.mo 21share/locale/pt_BR/LC_MESSAGES/snownews.mo
21share/locale/ru/LC_MESSAGES/snownews.mo 22share/locale/ru/LC_MESSAGES/snownews.mo
22share/locale/se/LC_MESSAGES/snownews.mo 23share/locale/se/LC_MESSAGES/snownews.mo
23share/locale/sl/LC_MESSAGES/snownews.mo 24share/locale/sl/LC_MESSAGES/snownews.mo
24share/locale/uk_UA/LC_MESSAGES/snownews.mo 25share/locale/uk_UA/LC_MESSAGES/snownews.mo
25share/locale/zh_CN/LC_MESSAGES/snownews.mo 26share/locale/zh_CN/LC_MESSAGES/snownews.mo
26share/locale/zh_TW/LC_MESSAGES/snownews.mo 27share/locale/zh_TW/LC_MESSAGES/snownews.mo
cvs diff -r1.15 -r1.16 pkgsrc/www/snownews/distinfo (expand / switch to unified diff)

--- pkgsrc/www/snownews/distinfo 2019/07/07 18:13:23 1.15
+++ pkgsrc/www/snownews/distinfo 2019/09/16 11:42:50 1.16
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.15 2019/07/07 18:13:23 nia Exp $ 1$NetBSD: distinfo,v 1.16 2019/09/16 11:42:50 nia Exp $
2 2
3SHA1 (snownews-1.5.12.tar.gz) = b3addaac25c2c093aa5e60b8b89e50e7d7450bcf 3SHA1 (snownews-1.6.10.tar.gz) = 4eda949103a92ea28e5ceff8e25e45b00540adaa
4RMD160 (snownews-1.5.12.tar.gz) = dbe9c6b88e77ce37bb23e4d3ddc8d63f8bd66151 4RMD160 (snownews-1.6.10.tar.gz) = 23b6c18ed8f47381e4fb0886074a9516dae0abcd
5SHA512 (snownews-1.5.12.tar.gz) = 7a7ccd5ea57f8bbb73f1429ab931a38203e858c74a383c5347e66088b84f6a7240feeee99e179687ce0a7a89c6c1406ce20d6c5d6771d25a0a0301fa5526e220 5SHA512 (snownews-1.6.10.tar.gz) = df90c3c55da8d11b2936075aab86f66f54f9a6ace0cbe0db54d0e6177ae71e28ab3c700d79b521d55859bb94ef7ecc89e3eb69f215eb9f7286d30cc4e2bec078
6Size (snownews-1.5.12.tar.gz) = 167944 bytes 6Size (snownews-1.6.10.tar.gz) = 189715 bytes
7SHA1 (patch-conversions.c) = 4ca23e1a1c6f1b98533c4f74eba2e7aa2bed8e75 7SHA1 (patch-Config.mk.in) = 272f80ba5bf0ff6eb89bd30d429835423f45a39d
8SHA1 (patch-digcalc.c) = ce73645e350f8dad93c3801077ceb1628bbed5bd 8SHA1 (patch-configure) = 789dc192a07fab442080e71d929fa17718fb2390
9SHA1 (patch-os-support_c) = 144a9c0910618ddd64d5d56eb62aa8a9e8155145 9SHA1 (patch-os-support_c) = 9b843d381c3793bd2f32f72696640a6b005f8a22
cvs diff -r1.7 -r1.8 pkgsrc/www/snownews/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/snownews/Attic/options.mk 2017/01/04 16:08:51 1.7
+++ pkgsrc/www/snownews/Attic/options.mk 2019/09/16 11:42:50 1.8
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: options.mk,v 1.7 2017/01/04 16:08:51 wiz Exp $ 1# $NetBSD: options.mk,v 1.8 2019/09/16 11:42:50 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.snownews 3PKG_OPTIONS_VAR= PKG_OPTIONS.snownews
4 4
5PKG_OPTIONS_REQUIRED_GROUPS= screen 5PKG_OPTIONS_REQUIRED_GROUPS= screen
6PKG_OPTIONS_GROUP.screen= curses wide-curses 6PKG_OPTIONS_GROUP.screen= curses wide-curses
7PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses 7PKG_OPTIONS_LEGACY_OPTS+= ncurses:curses ncursesw:wide-curses
8 8
9PKG_SUGGESTED_OPTIONS= curses 9PKG_SUGGESTED_OPTIONS= wide-curses
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12.include "../../mk/curses.buildlink3.mk" 12.include "../../mk/curses.buildlink3.mk"
File Added: pkgsrc/www/snownews/patches/patch-Config.mk.in
$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
File Added: pkgsrc/www/snownews/patches/patch-configure
$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
File Deleted: pkgsrc/www/snownews/patches/Attic/patch-conversions.c
File Deleted: pkgsrc/www/snownews/patches/Attic/patch-digcalc.c
cvs diff -r1.1 -r1.2 pkgsrc/www/snownews/patches/Attic/patch-os-support_c (expand / switch to unified diff)

--- pkgsrc/www/snownews/patches/Attic/patch-os-support_c 2012/06/23 23:14:24 1.1
+++ pkgsrc/www/snownews/patches/Attic/patch-os-support_c 2019/09/16 11:42:50 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-os-support_c,v 1.1 2012/06/23 23:14:24 dholland Exp $ 1$NetBSD: patch-os-support_c,v 1.2 2019/09/16 11:42:50 nia Exp $
2 2
3Use standard headers. (Required on Solaris for time_t.) 3Use standard headers. (Required on Solaris for time_t.)
4 4
5--- os-support.c~ 2009-09-17 06:44:27.000000000 +0000 5--- os-support.c.orig 2018-07-30 11:06:03.000000000 +0000
6+++ os-support.c 6+++ os-support.c
7@@ -28,6 +28,7 @@ 7@@ -16,6 +16,7 @@
8 #include <errno.h> 8
9 #include <string.h> 9 #include "os-support.h"
10 #include <ctype.h> 10 #include <ctype.h>
11+#include <time.h> 11+#include <time.h>
12  12
13 #include "main.h" 13 //-----------------------------------------------------------------------------
14  14 // This is a replacement for strsep which is not portable (missing on Solaris).