newsboat237: Fix a cross-build path issue and use GNU iconv.

[Taylor R Campbell (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Taylor R Campbell <riastradh%NetBSD.org@localhost>
Pushed By:	riastradh
Date:		Tue Jan 21 19:18:50 2025 +0000
Changeset:	5df5dd17744629fb3d9b1d3843f6aab4f77ec9de

Modified Files:
	newsboat237/Makefile
	newsboat237/distinfo
	newsboat237/patches/patch-Makefile

Log Message:
newsboat237: Fix a cross-build path issue and use GNU iconv.

The CARGO_TARGET_DIR workaround did a little too much, and I didn't
notice because I tested the change in an incremental build; let's
just make the Makefile respect CARGO_BUILD_TARGET in the one place it
was missed.

GNU iconv is apparently required for iconv_open(..., "WCHAR_T").

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

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

diffstat:
 newsboat237/Makefile               |  5 +++--
 newsboat237/distinfo               |  2 +-
 newsboat237/patches/patch-Makefile | 22 +++++++++++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diffs:
diff --git a/newsboat237/Makefile b/newsboat237/Makefile
index 7504411f80..747d8efe93 100644
--- a/newsboat237/Makefile
+++ b/newsboat237/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	newsboat-2.37
+PKGREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	https://newsboat.org/releases/2.37/
 EXTRACT_SUFX=	.tar.xz
@@ -13,6 +14,7 @@ LICENSE=	mit
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		awk gmake msgfmt pkg-config
+USE_GNU_ICONV=		yes
 USE_CURSES=		wide
 FAKE_NCURSES=		yes
 
@@ -28,8 +30,7 @@ BUILD_TARGET=	all doc
 
 .if ${USE_CROSS_COMPILE:tl} == "yes"
 MAKE_ENV+=	CXX_FOR_BUILD=${NATIVE_CXX:Q}
-MAKE_ENV+=	CARGO_BUILD_FLAGS=--target\ ${RUST_ARCH:Q}
-MAKE_ENV+=	CARGO_TARGET_DIR=${WRKSRC}/target/${RUST_ARCH}
+MAKE_ENV+=	CARGO_BUILD_TARGET=${RUST_ARCH:Q}
 .endif
 MAKE_ENV+=	GETTEXT_LIB_DIR=${BUILDLINK_PREFIX.gettext:Q}/lib
 MAKE_ENV+=	GETTEXT_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext:Q}/include
diff --git a/newsboat237/distinfo b/newsboat237/distinfo
index e075d643b3..a8a1487865 100644
--- a/newsboat237/distinfo
+++ b/newsboat237/distinfo
@@ -726,6 +726,6 @@ Size (windows_x86_64_msvc-0.52.6.crate) = 832564 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-Makefile) = c1b5680212787cc368bd28145fadfa6931de295b
+SHA1 (patch-Makefile) = 8ad3625d15c5d1782a0848f77b24373273197819
 SHA1 (patch-config.sh) = af48319845183552a4d9cea2f117a948b059647d
 SHA1 (patch-newsboat.cpp) = fc29e931269dae31c61d2f15fb3a9da4fc63ca51
diff --git a/newsboat237/patches/patch-Makefile b/newsboat237/patches/patch-Makefile
index 213c54e706..8d1ec6f041 100644
--- a/newsboat237/patches/patch-Makefile
+++ b/newsboat237/patches/patch-Makefile
@@ -1,10 +1,26 @@
 $NetBSD$
 
-Use PTHREAD_LDFLAGS, PTHREAD_LIBS, DL_LDFLAGS, DL_LIBS.
+1. Handle CARGO_BUILD_TARGET in one more place, for the -I path.
+
+2. Use PTHREAD_LDFLAGS, PTHREAD_LIBS, DL_LDFLAGS, DL_LIBS for newsboat.
+
+2. Use PTHREAD_LDFLAGS, PTHREAD_LIBS, DL_LDFLAGS, DL_LIBS for podboat.
 
 --- Makefile.orig	2024-09-22 15:05:50.000000000 +0000
 +++ Makefile
-@@ -57,7 +57,7 @@ FILTERLIB_OUTPUT=libfilter.a
+@@ -23,7 +23,11 @@ CXX_FOR_BUILD?=$(CXX)
+ DEFINES=-DLOCALEDIR='"$(localedir)"' -DCATCH_AMALGAMATED_CUSTOM_MAIN
+ 
+ WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code
++ifdef CARGO_BUILD_TARGET
++INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss -I$(CARGO_TARGET_DIR)/$(CARGO_BUILD_TARGET)/cxxbridge/
++else
+ INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss -I$(CARGO_TARGET_DIR)/cxxbridge/
++endif
+ # Keep in sync with c++ version specified in FFI build.rs
+ BARE_CXXFLAGS=-std=c++14 -O2 -ggdb $(INCLUDES)
+ LDFLAGS+=-L.
+@@ -57,7 +61,7 @@ FILTERLIB_OUTPUT=libfilter.a
  NEWSBOAT=newsboat
  NEWSBOAT_SRCS:=$(shell cat mk/newsboat.deps)
  NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SRCS))
@@ -13,7 +29,7 @@ Use PTHREAD_LDFLAGS, PTHREAD_LIBS, DL_LDFLAGS, DL_LIBS.
  
  RSSPPLIB_SRCS=$(sort $(wildcard rss/*.cpp))
  RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SRCS))
-@@ -66,7 +66,7 @@ RSSPPLIB_OUTPUT=librsspp.a
+@@ -66,7 +70,7 @@ RSSPPLIB_OUTPUT=librsspp.a
  PODBOAT=podboat
  PODBOAT_SRCS:=$(shell cat mk/podboat.deps)
  PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SRCS))