newsboat: import newsboat-2.10.1 as wip/newsboat

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: newsboat: import newsboat-2.10.1 as wip/newsboat
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Sat, 14 Oct 2017 20:06:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sat Oct 14 22:06:52 2017 +0200
Changeset:	8364580bd3437f1c3769c26a6c4f5a0091f577bf

Modified Files:
	Makefile
Added Files:
	newsboat/DESCR
	newsboat/Makefile
	newsboat/PLIST
	newsboat/distinfo
	newsboat/patches/patch-Makefile
	newsboat/patches/patch-config.sh
	newsboat/patches/patch-src_controller.cpp

Log Message:
newsboat: import newsboat-2.10.1 as wip/newsboat

Newsboat is a fork of Newsbeuter, an RSS/Atom feed reader for the
text console. The only difference is that Newsboat is actively
maintained while Newsbeuter isn't.

It runs on Linux, FreeBSD, Mac OS X and other Unix-like operating
systems.  Newsboat's great configurability and vast number of
features make it a perfect choice for people that need a slick and
fast feed reader that can be completely controlled via keyboard.
It's the Mutt of RSS feed readers.

wip/newsboat is largely based on news/newsbeuter

The following change to stfl seems to be required (possibly also
for news/newsbeuter) since GNU iconv is apparently assumed:
Index: devel/stfl/Makefile

===================================================================
RCS file: /cvsroot/pkgsrc/devel/stfl/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- devel/stfl/Makefile	9 Jul 2016 06:38:13 -0000	1.3
+++ devel/stfl/Makefile	14 Oct 2017 19:33:10 -0000
@@ -14,6 +14,7 @@
 USE_TOOLS+=	gmake perl
 USE_LIBTOOL=	yes
 USE_CURSES=		wide
+USE_GNU_ICONV=	yes

 INSTALL_MAKE_FLAGS+=	prefix=${PREFIX}

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8364580bd3437f1c3769c26a6c4f5a0091f577bf

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

diffstat:
 Makefile                                  |  1 +
 newsboat/DESCR                            |  9 +++++++
 newsboat/Makefile                         | 44 +++++++++++++++++++++++++++++++
 newsboat/PLIST                            | 28 ++++++++++++++++++++
 newsboat/distinfo                         |  9 +++++++
 newsboat/patches/patch-Makefile           | 22 ++++++++++++++++
 newsboat/patches/patch-config.sh          | 17 ++++++++++++
 newsboat/patches/patch-src_controller.cpp | 18 +++++++++++++
 8 files changed, 148 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 5121f58a85..61d088c1a7 100644
--- a/Makefile
+++ b/Makefile
@@ -2143,6 +2143,7 @@ SUBDIR+=	netwib
 SUBDIR+=	netwmpager
 SUBDIR+=	netwox
 SUBDIR+=	netx
+SUBDIR+=	newsboat
 SUBDIR+=	ngs-sdk-all
 SUBDIR+=	nicotine+
 SUBDIR+=	nightfall
diff --git a/newsboat/DESCR b/newsboat/DESCR
new file mode 100644
index 0000000000..ca6f0f747c
--- /dev/null
+++ b/newsboat/DESCR
@@ -0,0 +1,9 @@
+Newsboat is a fork of Newsbeuter, an RSS/Atom feed reader for the
+text console. The only difference is that Newsboat is actively
+maintained while Newsbeuter isn't.
+
+It runs on Linux, FreeBSD, Mac OS X and other Unix-like operating
+systems.  Newsboat's great configurability and vast number of
+features make it a perfect choice for people that need a slick and
+fast feed reader that can be completely controlled via keyboard.
+It's the Mutt of RSS feed readers.
diff --git a/newsboat/Makefile b/newsboat/Makefile
new file mode 100644
index 0000000000..594a533b2c
--- /dev/null
+++ b/newsboat/Makefile
@@ -0,0 +1,44 @@
+# $NetBSD$
+
+DISTNAME=	newsboat-2.10.1
+CATEGORIES=	news
+MASTER_SITES=	https://newsboat.org/releases/2.10.1/
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://newsboat.org/
+COMMENT=	RSS/Atom feed reader for the text console
+LICENSE=	mit
+
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake pkg-config msgfmt perl
+USE_GNU_ICONV=	yes
+USE_CURSES=	wide
+
+REPLACE_PERL+=	txt2h.pl
+
+BUILD_DEPENDS+=		asciidoc-[0-9]*:../../textproc/asciidoc
+BUILD_TARGET=		all doc
+FAKE_NCURSES=		yes
+
+INSTALL_MAKE_FLAGS+=	prefix=${PREFIX} mandir=${PREFIX}/${PKGMANDIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+SUBST_CLASSES+=		makefile
+SUBST_STAGE.makefile=	pre-build
+SUBST_MESSAGE.makefile=	Fixing distribution Makefile...
+SUBST_FILES.makefile=	${MAKE_FILE}
+SUBST_SED.makefile=	-e 's/^ifneq.*//; s/^endif.*//'
+.endif
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/stfl/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/newsboat/PLIST b/newsboat/PLIST
new file mode 100644
index 0000000000..f0f41f0f69
--- /dev/null
+++ b/newsboat/PLIST
@@ -0,0 +1,28 @@
+@comment $NetBSD$
+bin/newsboat
+bin/podboat
+man/man1/newsboat.1
+man/man1/podboat.1
+share/doc/newsboat/docbook-xsl.css
+share/doc/newsboat/examples/config
+share/doc/newsboat/faq.html
+share/doc/newsboat/newsboat.html
+share/locale/ca/LC_MESSAGES/newsboat.mo
+share/locale/de/LC_MESSAGES/newsboat.mo
+share/locale/es/LC_MESSAGES/newsboat.mo
+share/locale/es_ES/LC_MESSAGES/newsboat.mo
+share/locale/fr/LC_MESSAGES/newsboat.mo
+share/locale/hu/LC_MESSAGES/newsboat.mo
+share/locale/it/LC_MESSAGES/newsboat.mo
+share/locale/ja/LC_MESSAGES/newsboat.mo
+share/locale/nb/LC_MESSAGES/newsboat.mo
+share/locale/nl/LC_MESSAGES/newsboat.mo
+share/locale/pl/LC_MESSAGES/newsboat.mo
+share/locale/pt_BR/LC_MESSAGES/newsboat.mo
+share/locale/ru/LC_MESSAGES/newsboat.mo
+share/locale/sv/LC_MESSAGES/newsboat.mo
+share/locale/tr/LC_MESSAGES/newsboat.mo
+share/locale/uk/LC_MESSAGES/newsboat.mo
+share/locale/zh/LC_MESSAGES/newsboat.mo
+share/locale/zh_TW/LC_MESSAGES/newsboat.mo
+@pkgdir man/man1
diff --git a/newsboat/distinfo b/newsboat/distinfo
new file mode 100644
index 0000000000..6a27e3ff8a
--- /dev/null
+++ b/newsboat/distinfo
@@ -0,0 +1,9 @@
+$NetBSD$
+
+SHA1 (newsboat-2.10.1.tar.xz) = 841e1dda5f1594bbb332b207fdbdc1f256139436
+RMD160 (newsboat-2.10.1.tar.xz) = 860d704b04629409596d220d1f87b9c70a53fc62
+SHA512 (newsboat-2.10.1.tar.xz) = f2e9e9f60aa3996977fd13cb54140ae035da0ad6e47c6f50646bf0f67e241fe27a7938879a489322a738fbcf34ac21fb899558435e0248b05d469d80e2ab0e1e
+Size (newsboat-2.10.1.tar.xz) = 326872 bytes
+SHA1 (patch-Makefile) = 5b18845c299e6f129737e3cf1335db2203a860a9
+SHA1 (patch-config.sh) = 0db35dcedb8d1d20e5a5203921e0a5490b108a6a
+SHA1 (patch-src_controller.cpp) = c0564d2e3da95f6c9794b2a54ab13cc3e840e027
diff --git a/newsboat/patches/patch-Makefile b/newsboat/patches/patch-Makefile
new file mode 100644
index 0000000000..bcbf02d324
--- /dev/null
+++ b/newsboat/patches/patch-Makefile
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Install man page with proper permissions (executable bit not needed for them!).
+
+--- Makefile.orig	2017-09-22 20:01:50.000000000 +0000
++++ Makefile
+@@ -182,13 +182,13 @@ install-newsbeuter: $(NEWSBEUTER)
+ 	$(MKDIR) $(DESTDIR)$(prefix)/bin
+ 	$(INSTALL) $(NEWSBEUTER) $(DESTDIR)$(prefix)/bin
+ 	$(MKDIR) $(DESTDIR)$(mandir)/man1
+-	$(INSTALL) doc/$(NEWSBEUTER).1 $(DESTDIR)$(mandir)/man1 || true
++	$(INSTALL) -m 644 doc/$(NEWSBEUTER).1 $(DESTDIR)$(mandir)/man1 || true
+ 
+ install-podbeuter: $(PODBEUTER)
+ 	$(MKDIR) $(DESTDIR)$(prefix)/bin
+ 	$(INSTALL) $(PODBEUTER) $(DESTDIR)$(prefix)/bin
+ 	$(MKDIR) $(DESTDIR)$(mandir)/man1
+-	$(INSTALL) doc/$(PODBEUTER).1 $(DESTDIR)$(mandir)/man1 || true
++	$(INSTALL) -m 644 doc/$(PODBEUTER).1 $(DESTDIR)$(mandir)/man1 || true
+ 
+ install-docs:
+ 	$(MKDIR) $(DESTDIR)$(docdir)
diff --git a/newsboat/patches/patch-config.sh b/newsboat/patches/patch-config.sh
new file mode 100644
index 0000000000..666f8951f8
--- /dev/null
+++ b/newsboat/patches/patch-config.sh
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Remove overly "smart" detection script for ncurses.  This doesn't work on NetBSD.
+If libstfl is linked against the system-wide curses, you can't later link against
+ncurses.  Newsboat can use the ncursesw compat offered by NetBSD 6.x native curses.
+
+--- config.sh.orig	2017-09-22 20:01:50.000000000 +0000
++++ config.sh
+@@ -106,6 +106,8 @@ check_pkg "stfl" || fail "stfl"
+ 
+ if [ `uname -s` = "Darwin" ]; then
+ 	check_custom "ncurses5.4" "ncurses5.4-config" || fail "ncurses5.4"
++elif [ `uname -s` = "NetBSD" ]; then
++       echo "Assuming native NetBSD curses should be used"
+ elif [ `uname -s` != "OpenBSD" ]; then
+ 	check_pkg "ncursesw" || \
+ 	check_custom "ncursesw5" "ncursesw5-config" ||  fail "ncursesw"
diff --git a/newsboat/patches/patch-src_controller.cpp b/newsboat/patches/patch-src_controller.cpp
new file mode 100644
index 0000000000..fd5298b96d
--- /dev/null
+++ b/newsboat/patches/patch-src_controller.cpp
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Everything works, but native curses has no curses_version(), so rip out that bit.
+
+--- src/controller.cpp.orig	2017-09-22 20:01:50.000000000 +0000
++++ src/controller.cpp
+@@ -1167,7 +1167,11 @@ void controller::version_information(con
+ #if defined(__GNUC__) && defined(__VERSION__)
+ 		std::cout << "Compiler: g++ " << __VERSION__ << std::endl;
+ #endif
++#if defined(__NetBSD__)
++		std::cout << "Native NetBSD curses" << std::endl;
++#else
+ 		std::cout << "ncurses: " << curses_version() << " (compiled with " << NCURSES_VERSION << ")" << std::endl;
++#endif
+ 		std::cout << "libcurl: " << curl_version()  << " (compiled with " << LIBCURL_VERSION << ")" << std::endl;
+ 		std::cout << "SQLite: " << sqlite3_libversion() << " (compiled with " << SQLITE_VERSION << ")" << std::endl;
+ 		std::cout << "libxml2: compiled with " << LIBXML_DOTTED_VERSION << std::endl << std::endl;
Prev by Date: libretro-glsl-shaders: update to 20171011
Next by Date: newsboat: change DESCR to accommodate updates to news/newsbeuter
Previous by Thread: libretro-glsl-shaders: update to 20171011
Next by Thread: newsboat: change DESCR to accommodate updates to news/newsbeuter
Indexes:
Home | Main Index | Thread Index | Old Index