pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/snownews snownews: Update to 1.6.10
details: https://anonhg.NetBSD.org/pkgsrc/rev/8695948111b2
branches: trunk
changeset: 339814:8695948111b2
user: nia <nia%pkgsrc.org@localhost>
date: Mon Sep 16 11:42:50 2019 +0000
description:
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
diffstat:
www/snownews/MESSAGE | 4 +-
www/snownews/Makefile | 39 ++++-----
www/snownews/PLIST | 5 +-
www/snownews/distinfo | 16 +-
www/snownews/options.mk | 4 +-
www/snownews/patches/patch-Config.mk.in | 45 ++++++++++
www/snownews/patches/patch-configure | 15 +++
www/snownews/patches/patch-conversions.c | 34 --------
www/snownews/patches/patch-digcalc.c | 127 -------------------------------
www/snownews/patches/patch-os-support_c | 14 +-
10 files changed, 99 insertions(+), 204 deletions(-)
diffs (truncated from 399 to 300 lines):
diff -r 25c554647f84 -r 8695948111b2 www/snownews/MESSAGE
--- a/www/snownews/MESSAGE Mon Sep 16 11:08:33 2019 +0000
+++ b/www/snownews/MESSAGE Mon Sep 16 11:42:50 2019 +0000
@@ -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 -r 25c554647f84 -r 8695948111b2 www/snownews/Makefile
--- a/www/snownews/Makefile Mon Sep 16 11:08:33 2019 +0000
+++ b/www/snownews/Makefile Mon Sep 16 11:42:50 2019 +0000
@@ -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@localhost
-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
+USE_TOOLS+= gmake msgfmt perl
+HAS_CONFIGURE= yes
+FAKE_NCURSES= yes
-HAS_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgfmt perl
+REPLACE_PERL+= opml2snow
-REPLACE_PERL+= configure opml2snow
+AUTO_MKDIRS= yes
-CONFIG_SHELL= perl
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-MAKE_ENV+= EXTRA_CFLAGS=${CFLAGS:Q}
+CONFIGURE_ARGS+= --prefix=${DESTDIR}${PREFIX}
+CONFIGURE_ARGS+= --mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
-INCOMPAT_CURSES= NetBSD-[0-4].*-* #WA_BOLD, WA_REVERSE, KEY_RESIZE
-FAKE_NCURSES= yes
+# AUTO_MKDIRS can't handle this one.
+INSTALLATION_DIRS+= share/locale/be@latin/LC_MESSAGES
.include "options.mk"
-
-post-configure:
- ${ECHO} LOCALEPATH=${PREFIX}/${PKGLOCALEDIR}/locale >> ${WRKSRC}/platform_settings
- ${ECHO} MANPATH=${PREFIX}/${PKGMANDIR} >> ${WRKSRC}/platform_settings
-
.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 -r 25c554647f84 -r 8695948111b2 www/snownews/PLIST
--- a/www/snownews/PLIST Mon Sep 16 11:08:33 2019 +0000
+++ b/www/snownews/PLIST Mon Sep 16 11:42:50 2019 +0000
@@ -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/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 -r 25c554647f84 -r 8695948111b2 www/snownews/distinfo
--- a/www/snownews/distinfo Mon Sep 16 11:08:33 2019 +0000
+++ b/www/snownews/distinfo Mon Sep 16 11:42:50 2019 +0000
@@ -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 -r 25c554647f84 -r 8695948111b2 www/snownews/options.mk
--- a/www/snownews/options.mk Mon Sep 16 11:08:33 2019 +0000
+++ b/www/snownews/options.mk Mon Sep 16 11:42:50 2019 +0000
@@ -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_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 -r 25c554647f84 -r 8695948111b2 www/snownews/patches/patch-Config.mk.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/snownews/patches/patch-Config.mk.in Mon Sep 16 11:42:50 2019 +0000
@@ -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 -r 25c554647f84 -r 8695948111b2 www/snownews/patches/patch-configure
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/snownews/patches/patch-configure Mon Sep 16 11:42:50 2019 +0000
@@ -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 -r 25c554647f84 -r 8695948111b2 www/snownews/patches/patch-conversions.c
--- a/www/snownews/patches/patch-conversions.c Mon Sep 16 11:08:33 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 25c554647f84 -r 8695948111b2 www/snownews/patches/patch-digcalc.c
--- a/www/snownews/patches/patch-digcalc.c Mon Sep 16 11:08:33 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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);
Home |
Main Index |
Thread Index |
Old Index