CVS commit: pkgsrc/www/snownews

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Apr 21 09:28:28 UTC 2021

Modified Files:
        pkgsrc/www/snownews: Makefile PLIST distinfo
        pkgsrc/www/snownews/patches: patch-Config.mk.in patch-configure
Removed Files:
        pkgsrc/www/snownews: MESSAGE options.mk
        pkgsrc/www/snownews/patches: patch-config.h.in patch-os-support_c

Log Message:
snownews: update to 1.7

changes:
    Resuming active maintenance.
    Use curl to load feeds.
    Store feed list as OPML.
    Move configuration and cache to XDG dirs.
    Support Atom feeds.
    Support content:encoded tag in RSS feeds.
    Display UTF8 text.
    Redirect stderr to logfile.
    Fix newsitem text scrolling.
    Fix various build failures.
    Add DESTDIR support.
    Remove obsolete scripts.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 pkgsrc/www/snownews/MESSAGE
cvs rdiff -u -r1.59 -r1.60 pkgsrc/www/snownews/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/snownews/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/snownews/distinfo
cvs rdiff -u -r1.8 -r0 pkgsrc/www/snownews/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/snownews/patches/patch-Config.mk.in \
    pkgsrc/www/snownews/patches/patch-configure
cvs rdiff -u -r1.1 -r0 pkgsrc/www/snownews/patches/patch-config.h.in
cvs rdiff -u -r1.2 -r0 pkgsrc/www/snownews/patches/patch-os-support_c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/snownews/Makefile
diff -u pkgsrc/www/snownews/Makefile:1.59 pkgsrc/www/snownews/Makefile:1.60
--- pkgsrc/www/snownews/Makefile:1.59   Thu Nov  5 09:09:22 2020
+++ pkgsrc/www/snownews/Makefile        Wed Apr 21 09:28:28 2021
@@ -1,34 +1,32 @@
-# $NetBSD: Makefile,v 1.59 2020/11/05 09:09:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.60 2021/04/21 09:28:28 nia Exp $
 
-DISTNAME=      snownews-1.6.10
-PKGREVISION=   3
+DISTNAME=      snownews-1.7
 CATEGORIES=    www
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=kouya/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=msharov/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/kouya/snownews
+HOMEPAGE=      https://github.com/msharov/snownews
 COMMENT=       Small, curses based RSS feed reader
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
-
-USE_TOOLS+=    gmake msgfmt perl pkg-config
+USE_TOOLS+=    gmake msgfmt pkg-config
 HAS_CONFIGURE= yes
 FAKE_NCURSES=  yes
+USE_CURSES=    wide
 
-REPLACE_PERL+= opml2snow
-
-AUTO_MKDIRS=   yes
+LDFLAGS+=      ${BUILDLINK_LDADD.curses}
 
-CONFIGURE_ARGS+=       --prefix=${DESTDIR}${PREFIX}
-CONFIGURE_ARGS+=       --mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+USE_PKGLOCALEDIR=      yes
 
-# AUTO_MKDIRS can't handle this one.
-INSTALLATION_DIRS+=    share/locale/be@latin/LC_MESSAGES
+CONFIGURE_ARGS+=       --prefix=${PREFIX}
+CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=       --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 
-.include "options.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/snownews/PLIST
diff -u pkgsrc/www/snownews/PLIST:1.7 pkgsrc/www/snownews/PLIST:1.8
--- pkgsrc/www/snownews/PLIST:1.7       Mon Sep 16 11:42:50 2019
+++ pkgsrc/www/snownews/PLIST   Wed Apr 21 09:28:28 2021
@@ -1,11 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2019/09/16 11:42:50 nia Exp $
-bin/opml2snow
-bin/snow2opml
+@comment $NetBSD: PLIST,v 1.8 2021/04/21 09:28:28 nia Exp $
 bin/snownews
 man/de/man1/snownews.1
 man/fr/man1/snownews.1
 man/it/man1/snownews.1
-man/man1/opml2snow.1
 man/man1/snownews.1
 man/nl/man1/snownews.1
 man/ru.KOI8-R/man1/snownews.1

Index: pkgsrc/www/snownews/distinfo
diff -u pkgsrc/www/snownews/distinfo:1.18 pkgsrc/www/snownews/distinfo:1.19
--- pkgsrc/www/snownews/distinfo:1.18   Mon Sep 16 18:36:33 2019
+++ pkgsrc/www/snownews/distinfo        Wed Apr 21 09:28:28 2021
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.18 2019/09/16 18:36:33 nia Exp $
+$NetBSD: distinfo,v 1.19 2021/04/21 09:28:28 nia Exp $
 
-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-config.h.in) = bb2219b1e82fac3dc4e7c7b1526efbffe040d8d3
-SHA1 (patch-configure) = 789dc192a07fab442080e71d929fa17718fb2390
-SHA1 (patch-os-support_c) = 9b843d381c3793bd2f32f72696640a6b005f8a22
+SHA1 (snownews-1.7.tar.gz) = 27bbfb5c55f3505508eaa3287d9bc372b2beb9f7
+RMD160 (snownews-1.7.tar.gz) = 8c75d9ddceb1a1ac6127f5015ee8e002cb848969
+SHA512 (snownews-1.7.tar.gz) = fc8e8aac41b6fe8d0021a5398898f72a26303b10f300fa4f5b47ab5de536002d7b122bc43b1f230f6755e0202ce689acbb07e794b5fd29ba3b12ed988a930727
+Size (snownews-1.7.tar.gz) = 154948 bytes
+SHA1 (patch-Config.mk.in) = d16738359c9072c783612e7e0a2f782f2895e947
+SHA1 (patch-configure) = c48c16124301c490ae07889313de51ccd2cb39f4

Index: pkgsrc/www/snownews/patches/patch-Config.mk.in
diff -u pkgsrc/www/snownews/patches/patch-Config.mk.in:1.1 pkgsrc/www/snownews/patches/patch-Config.mk.in:1.2
--- pkgsrc/www/snownews/patches/patch-Config.mk.in:1.1  Mon Sep 16 11:42:50 2019
+++ pkgsrc/www/snownews/patches/patch-Config.mk.in      Wed Apr 21 09:28:28 2021
@@ -1,45 +1,21 @@
-$NetBSD: patch-Config.mk.in,v 1.1 2019/09/16 11:42:50 nia Exp $
+$NetBSD: patch-Config.mk.in,v 1.2 2021/04/21 09:28:28 nia Exp $
 
-hunk 1:
+Do not override CFLAGS.
 
-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.orig  2021-04-11 22:41:14.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 ####################################
+@@ -26,13 +26,6 @@ O           := .o/
  
--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
+ #debug                := 1
+ libs          := @pkg_libs@ -liconv -lintl
+-ifdef debug
+-    cflags    := -O0 -ggdb3
+-    ldflags   := -g -rdynamic
+-else
+-    cflags    := -Os -g0 -DNDEBUG=1
+-    ldflags   := -s
+-endif
+-CFLAGS                := -Wall -Wextra -Wredundant-decls -Wshadow
++CFLAGS                += -Wall -Wextra -Wredundant-decls -Wshadow
+ cflags                += -std=c11 @pkg_cflags@ ${CFLAGS}
+ ldflags               += @pkg_ldflags@ ${LDFLAGS}
Index: pkgsrc/www/snownews/patches/patch-configure
diff -u pkgsrc/www/snownews/patches/patch-configure:1.1 pkgsrc/www/snownews/patches/patch-configure:1.2
--- pkgsrc/www/snownews/patches/patch-configure:1.1     Mon Sep 16 11:42:50 2019
+++ pkgsrc/www/snownews/patches/patch-configure Wed Apr 21 09:28:28 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.1 2019/09/16 11:42:50 nia Exp $
+$NetBSD: patch-configure,v 1.2 2021/04/21 09:28:28 nia Exp $
 
-Let pkgsrc take care of libcurses.
+Allow NetBSD curses to be used.
 
---- configure.orig     2018-07-30 11:06:03.000000000 +0000
+--- configure.orig     2021-04-11 22:41:14.000000000 +0000
 +++ configure
-@@ -36,7 +36,7 @@ seds=[s/^#undef \(USE_UNSUPPORTED_AND_BR
- PROGS="CC=gcc CC=clang INSTALL=install MSGFMT=msgfmt"
+@@ -34,7 +34,7 @@ seds=[s/^#undef \(USE_UNSUPPORTED_AND_BR
+ progs="CC=gcc CC=clang CC=cc 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
+-pkgs="libcurl libxml-2.0 libcrypto ncurses"
++pkgs="libcurl libxml-2.0 libcrypto"
+ # Default pkg flags to substitute when pkg-config is not found
+ pkg_libs="-lcurl -lxml2 -lcrypto -lncursesw"
+ pkg_cflags="-I\/usr\/include\/libxml2"