newsboat: Fixed Makefile and added patches

[nebbionegiuseppe <nebbionegiuseppe%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nebbionegiuseppe <nebbionegiuseppe%gmail.com@localhost>
Pushed By:	nebbionegiuseppe
Date:		Sun Oct 22 18:14:37 2023 +0200
Changeset:	2e19e1f533345c52954cab0c4c178a77148e954f

Modified Files:
	newsboat233/Makefile
	newsboat233/PLIST
	newsboat233/distinfo
Added Files:
	newsboat233/patches/patch-Makefile
	newsboat233/patches/patch-newsboat.cpp

Log Message:
newsboat: Fixed Makefile and added patches

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

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

diffstat:
 newsboat233/Makefile                   | 20 ++++++++++++++++++--
 newsboat233/PLIST                      | 29 +----------------------------
 newsboat233/distinfo                   |  3 ++-
 newsboat233/patches/patch-Makefile     | 22 ++++++++++++++++++++++
 newsboat233/patches/patch-newsboat.cpp | 18 ++++++++++++++++++
 5 files changed, 61 insertions(+), 31 deletions(-)

diffs:
diff --git a/newsboat233/Makefile b/newsboat233/Makefile
index a9964c573d..f3b29b020c 100644
--- a/newsboat233/Makefile
+++ b/newsboat233/Makefile
@@ -21,6 +21,17 @@ TOOL_DEPENDS+=		gettext-tools>=0:../../devel/gettext-tools
 BUILD_TARGET=		all
 FAKE_NCURSES=		yes
 
+
+SUBST_CLASSES+=		  makefile
+SUBST_STAGE.makefile=     pre-configure 
+SUBST_FILES.makefile=     Makefile
+SUBST_MESSAGE.makefile=   Fixing Makefile
+SUBST_SED.makefile=	  -e 's,/usr/local,${PREFIX},g'
+SUBST_SED.makefile+=	  -e 's,^CFLAGS *= ,CFLAGS += ,'
+SUBST_SED.makefile+=	  -e 's,^CPPFLAGS *= ,CPPFLAGS += ,'
+SUBST_SED.makefile+=	  -e 's,^LDFLAGS *= ,LDFLAGS += ,'
+
+
 # The program tries to compile gettext if it does not find it 
 # It checks environment variables, so we have to set them
 MAKE_ENV+=	GETTEXT_LIB_DIR=${BUILDLINK_PREFIX.gettext-lib:Q}/lib
@@ -31,7 +42,9 @@ MAKE_ENV+=	GETTEXT_BIN_DIR=${TOOLBASE:Q}/bin
 
 
 #Not sure if this is useful
-#INSTALL_MAKE_FLAGS+=	prefix=${PREFIX} mandir=${PREFIX}/${PKGMANDIR}
+# INSTALL_MAKE_FLAGS+=	prefix=${PREFIX} mandir=${PREFIX}/${PKGMANDIR}
+# In the meanwhile...
+# INSTALLATION_DIRS_FROM_PLIST= yes
 
 
 .include "../../mk/bsd.prefs.mk"
@@ -45,8 +58,11 @@ SUBST_SED.makefile=	-e 's/^ifneq.*//; s/^endif.*//'
 .endif
 
 
+post-build:
+	${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${GMAKE} newsboat
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/target/release/newsboat \
+	${INSTALL_PROGRAM} ${WRKSRC}/newsboat \
 		${DESTDIR}${PREFIX}/bin
 
 
diff --git a/newsboat233/PLIST b/newsboat233/PLIST
index a00814e7f1..3cc0926bce 100644
--- a/newsboat233/PLIST
+++ b/newsboat233/PLIST
@@ -1,29 +1,2 @@
 @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/sk/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
+bin
diff --git a/newsboat233/distinfo b/newsboat233/distinfo
index afb23ada28..dd21c494ec 100644
--- a/newsboat233/distinfo
+++ b/newsboat233/distinfo
@@ -342,4 +342,5 @@ Size (windows_x86_64_msvc-0.48.0.crate) = 671422 bytes
 BLAKE2s (xdg-2.5.2.crate) = 0f174fa5ab3c513b691bf1bf0a4cb628e25bc0f9a2af9700ec21c07cfe8f8609
 SHA512 (xdg-2.5.2.crate) = 12c7f42d2afd63d8d196511fa069519a0c495fc2555c87c059b96b46d7e2a2c51c31836c48fb329806d312a45a2fd67b4243793aa91e2139e2aa3f05230b2edd
 Size (xdg-2.5.2.crate) = 14394 bytes
-SHA1 (patch-config.sh) = 05f1096af3b5ea2aa2678a8bc3a914ded7435bc8
+SHA1 (patch-Makefile) = 3885ea9915232ff2a47af4e7b13630d759edc26b
+SHA1 (patch-newsboat.cpp) = a2fbce6f0bbb851066dd50de361b956253025a84
diff --git a/newsboat233/patches/patch-Makefile b/newsboat233/patches/patch-Makefile
new file mode 100644
index 0000000000..1a458f8df1
--- /dev/null
+++ b/newsboat233/patches/patch-Makefile
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- Makefile.orig	2023-10-22 15:00:06.184455003 +0000
++++ Makefile
+@@ -56,7 +56,7 @@ FILTERLIB_OUTPUT=libfilter.a
+ NEWSBOAT=newsboat
+ NEWSBOAT_SRCS:=$(shell cat mk/newsboat.deps)
+ NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SRCS))
+-NEWSBOAT_LIBS=-lboat -lnewsboat -lfilter -lpthread -lrsspp -ldl
++NEWSBOAT_LIBS=-lboat -lnewsboat -lfilter ${PTHREAD_LDFLAGS} -lrsspp ${DL_LDFLAGS}
+ 
+ RSSPPLIB_SRCS=$(sort $(wildcard rss/*.cpp))
+ RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SRCS))
+@@ -65,7 +65,7 @@ RSSPPLIB_OUTPUT=librsspp.a
+ PODBOAT=podboat
+ PODBOAT_SRCS:=$(shell cat mk/podboat.deps)
+ PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SRCS))
+-PODBOAT_LIBS=-lboat -lnewsboat -lfilter -lpthread -ldl
++PODBOAT_LIBS=-lboat -lnewsboat -lfilter ${PTHREAD_LDFLAGS} ${DL_LDFLAGS}
+ 
+ TEST_SRCS:=$(wildcard test/*.cpp test/test_helpers/*.cpp)
+ TEST_OBJS:=$(patsubst %.cpp,%.o,$(TEST_SRCS))
diff --git a/newsboat233/patches/patch-newsboat.cpp b/newsboat233/patches/patch-newsboat.cpp
new file mode 100644
index 0000000000..ca405c9d13
--- /dev/null
+++ b/newsboat233/patches/patch-newsboat.cpp
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- newsboat.cpp.orig	2023-09-24 20:34:30.000000000 +0000
++++ newsboat.cpp
+@@ -196,9 +196,13 @@ void print_version(const std::string& ar
+ #if defined(__GNUC__) && defined(__VERSION__)
+ 		ss << "Compiler: g++ " << __VERSION__ << std::endl;
+ #endif
++#if defined(__NetBSD__)
++               std::cout << "Native NetBSD curses" << std::endl;
++#else
+ 		ss << "ncurses: " << curses_version()
+ 			<< " (compiled with " << NCURSES_VERSION << ")"
+ 			<< std::endl;
++#endif
+ 		ss << "libcurl: " << curl_version() << " (compiled with "
+ 			<< LIBCURL_VERSION << ")" << std::endl;
+ 		ss << "SQLite: " << sqlite3_libversion()