ncurses: fix build with futur base and ports ncurses

in preparation for the split in base of libtinfo and libncurses, clearly
specify when the packages should link against.

Note this also fixes the build with ports ncurses

audio/cam/Makefile

@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		ncurses tar:tgz
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
-		LIBS="${LDFLAGS} -lncurses" \
+		LIBS="${LDFLAGS} ${NCURSESLIBS}" \
 		BINDIR="${PREFIX}/bin" \
 		MANDIR="${PREFIX}/share/man/man1" \
 		XEFILE=""

audio/cmp3/Makefile

@@ -19,7 +19,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-kenrevs
 
 USES=		gmake ncurses
 GNU_CONFIGURE=	yes
-MAKE_ARGS=	install_directory=${STAGEDIR}${PREFIX}/bin
+MAKE_ARGS=	install_directory=${STAGEDIR}${PREFIX}/bin \
+		LIBS="${NCURSESLIBS} -lform"
 
 PORTDOCS=	README sample.cmp3rc
 PLIST_FILES=	bin/cmp3 bin/rnmp3

audio/funktrackergold/Makefile

@@ -18,7 +18,7 @@ BROKEN_armv7=		fails to compile: function definition is not allowed here
 USES=		compiler:nestedfct ncurses tar:tgz
 
 WRKSRC=		${WRKDIR}/funkgold
-MAKE_ARGS=	EXTRA_LDFLAGS="-lpthread"
+MAKE_ARGS=	EXTRA_LDFLAGS="-lpthread ${NCURSESLIBS}"
 
 PORTDOCS=	INSTALL
 PLIST_FILES=	bin/funkgold

audio/juke/Makefile

@@ -15,6 +15,7 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	VI_BINDINGS
 VI_BINDINGS_DESC=	Use vi-like key bindings
+MAKE_ARGS+=	LIBS="${NCURSESLIBS}"
 
 VI_BINDINGS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-vi
 

audio/mp3c/Makefile

@@ -17,6 +17,7 @@ RUN_DEPENDS=	mp3info:audio/mp3info \
 
 USES=		ncurses
 GNU_CONFIGURE=	yes
+MAKE_ARGS+=	LIBS="${NCURSESLIBS}"
 
 DEFAULT_CDROM_DEVICE?=	cd0
 

audio/mp3info/Makefile

@@ -27,6 +27,7 @@ GTK2_ALL_TARGET=	gmp3info
 GTK2_PLIST_FILES=	bin/gmp3info
 GTK2_USE=		GNOME=gtk20
 GTK2_USES=		gnome pkgconfig
+MAKE_ARGS=	LIBS="\$${LDFLAGS} ${NCURSESLIBS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mp3info ${STAGEDIR}${PREFIX}/bin/

audio/playmidi/Makefile

@@ -19,6 +19,7 @@ HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ENV=	PREFIX=${PREFIX}
 INSTALL_TARGET=	install.lame install.man
+MAKE_ARGS=	LIBNC="${NCURSESLIBS}"
 
 OPTIONS_SINGLE=	DEFAULTDEVICE
 OPTIONS_SINGLE_DEFAULTDEVICE=	EXTERNAL YAMAHA2 YAMAHA4 GRAVISULTRA SBAWE32

audio/rexima/Makefile

@@ -12,5 +12,6 @@ LICENSE=	GPLv2
 
 USES=		ncurses
 PLIST_FILES=	bin/rexima man/man1/rexima.1.gz
+LDFLAGS+=	${NCURSESLIBS}
 
 .include <bsd.port.mk>

audio/siren/Makefile

@@ -69,7 +69,7 @@ CONFIGURE_ARGS=	alsa=no \
 		portaudio=no
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lcurses|-lncurses|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lcurses|${NCURSESLIBS}|' ${WRKSRC}/configure
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/siren

audio/stymulator/Makefile

@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 MANPAGE1=	ymplayer.1 ym2wav.1
 PLIST_FILES=	bin/ym2wav bin/ymplayer bin/stymulator man/man1/ymplayer.1.gz \
 		man/man1/ym2wav.1.gz
+LDFLAGS+=	${NCURSESLIBS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lncurses|$$(LDFLAGS) -lncurses|' \

audio/stymulator/files/patch-Makefile

@@ -13,7 +13,7 @@
  
  ymplayer: ymplayer.o sound.o ui.o
 -	$(CC) -o ymplayer $(INCLUDE) ymplayer.o sound.o ui.o -lasound -lym -llzh -lncurses
-+	$(CXX) $(CXXFLAGS) -o ymplayer $(INCLUDE) ymplayer.o sound.o ui.o -lym -llzh -lncurses
++	$(CXX) $(CXXFLAGS) -o ymplayer $(INCLUDE) ymplayer.o sound.o ui.o -lym -llzh ${LFFLAGS} -lncurses
  
  ym2wav: ym2wav.o
 -	$(CC) -o ym2wav $(INCLUDE) ym2wav.o -lym -llzh	

audio/tcd/Makefile

@@ -14,6 +14,7 @@ LICENSE=	GPLv2
 USES=		ncurses sdl
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
+MAKE_ARGS=	LIBS="${NCURSESLIBS}"
 
 PLIST_FILES=	bin/tcd \
 		man/man1/tcd.1.gz

audio/timidity/Makefile

@@ -20,6 +20,7 @@ OPTIONS_SINGLE=	FONTS
 OPTIONS_SINGLE_FONTS=	GOEMON GUSPAT
 OPTIONS_DEFAULT=GOEMON
 OPTIONS_SUB=	yes
+MAKE_ARGS=	EXTRALIBS="${NCURSESLIBS}"
 
 FONTS_DESC=		Default sound fonts
 

audio/umix/Makefile

@@ -11,6 +11,7 @@ COMMENT=	Advanced tool for adjusting soundcard mixers, replacement for aumix
 
 USES=		alias ncurses
 GNU_CONFIGURE=	yes
+MAKE_ARGS=	LIBS="${NCURSESLIBS}"
 
 PLIST_FILES=	bin/umix \
 		man/man1/umix.1.gz

audio/vitunes/Makefile

@@ -18,6 +18,7 @@ LIB_DEPENDS=	libtag.so:audio/taglib
 USES=		ncurses
 ALL_TARGET=	vitunes
 PLIST_FILES=	bin/vitunes man/man1/${PORTNAME}.1.gz
+LDFLAGS+=	${NCURSESLIBS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile

audio/xmcd/Makefile

@@ -30,6 +30,7 @@ pre-patch:
 	@${CP} ${WRKSRC}/xmcd_d/XMcd.ad ${WRKSRC}/xmcd_d/XMcd.ad.in
 
 post-patch:
+	${REINPLACE_CMD} -e "s/-lncurses/${NCURSESLIBS}/g" ${WRKSRC}/cda_d/Imakefile
 	@${SED} -e "s;@PREFIX@;${STAGDIR}${PREFIX};g" ${WRKSRC}/xmcd_d/XMcd.ad.in \
 		> ${WRKSRC}/xmcd_d/XMcd.ad
 

deskutils/dfshow/Makefile

@@ -17,6 +17,6 @@ GH_ACCOUNT=	roberthawdon
 GNU_CONFIGURE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} 's/-lncursesw/-l${NCURSES_IMPL}/g' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} 's/-lncursesw/${NCURSESLIBS}/g' ${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>

devel/notcurses/Makefile

@@ -16,7 +16,7 @@ LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 		libunistring.so:devel/libunistring
 
 USES=		cmake:noninja compiler:c++17-lang localbase \
-		ncurses:port pkgconfig readline
+		ncurses:ports pkgconfig readline
 USE_GITHUB=	yes
 GH_ACCOUNT=	dankamongmen
 USE_LDCONFIG=	yes

devel/stfl/Makefile

@@ -23,7 +23,7 @@ MAKE_ENV=	LDLIBS="${LDFLAGS}"
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Os||;/gcc/d;/-MM/s|-I.|$${CFLAGS}|; \
 		/pkgconfig/s|$$(libdir)|libdata| ; \
-		s/-lncursesw/-l${NCURSES_IMPL}/g' \
+		s/-lncursesw/${NCURSESLIBS}/g' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/Libs.private/s|$$| ${ICONV_LIB}|' \
 		${WRKSRC}/stfl.pc.in

games/gtypist/Makefile

@@ -34,6 +34,6 @@ post-patch:
 		${WRKSRC}/src/script.c \
 		${WRKSRC}/src/gtypist.c \
 		${WRKSRC}/src/utf8.c
-	${REINPLACE_CMD} -e 's/-lncursesw/-l${NCURSES_IMPL}/g' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's/-lncursesw/${NCURSESLIBS}/g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>

games/tty-solitaire/Makefile

@@ -15,7 +15,7 @@ GH_ACCOUNT=	mpereira
 USES=		gmake ncurses
 TEST_TARGET=	test
 
-MAKE_ARGS=	NCURSES=-l${NCURSES_IMPL}
+MAKE_ARGS=	NCURSES="${NCURSESLIBS}"
 
 PORTDOCS=	*
 PLIST_FILES=	bin/ttysolitaire

misc/ipbt/Makefile

@@ -12,7 +12,7 @@ COMMENT=	High-tech ttyrec player with improvements over ttyplay
 USES=		ncurses perl5 shebangfix
 
 ALL_TARGET=	${PORTNAME}
-MAKE_ARGS=	LFLAGS="${LDFLAGS}" NCURSES_LIB=-l${NCURSES_IMPL}
+MAKE_ARGS=	LFLAGS="${LDFLAGS}" NCURSES_LIB="${NCURSESLIBS}
 PLIST_FILES=	bin/ipbt bin/ttygrep bin/ttydump man/man1/ipbt.1.gz
 SHEBANG_FILES=	sbcsgen.pl Makefile ttygrep ttydump
 

misc/mdp/Makefile

@@ -14,7 +14,7 @@ USES=		gmake ncurses
 USE_GITHUB=	yes
 GH_ACCOUNT=	visit1985
 
-MAKE_ARGS=	CURSES=${NCURSES_IMPL}
+MAKE_ARGS=	LDLIBS="${NCURSESLIBS}"
 
 PLIST_FILES=	bin/mdp \
 		share/man/man1/mdp.1.gz

net/httping/Makefile

@@ -50,7 +50,7 @@ MAKE_ENV+=	TFO=yes
 .endif
 
 post-patch-NCURSES-on:
-	@${REINPLACE_CMD} "s/lncursesw/l${NCURSES_IMPL}/g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} "s/-lncursesw/${NCURSESLIBS}/g" ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin

security/kc24/Makefile

@@ -41,6 +41,6 @@ PLIST_FILES=		bin/kc man/man1/kc.1.gz
 MAKE_ENV+=		BUNDLED_BCRYPT=y
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lncursesw|-l${NCURSES_IMPL}|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|-lncursesw|${NCURSESLIBS}|' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>

shells/wcd/Makefile

@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/doc/copying.txt
 
 USES=		gmake ncurses
 MAKE_ARGS=	EXT= PREFIX=${PREFIX} docsubdir=${PORTNAME} \
-		mandir=${PREFIX}/man LIB_CURSES=-l${NCURSES_IMPL}
+		mandir=${PREFIX}/man LIB_CURSES="${NCURSESILBS}
 CFLAGS+=	-I${NCURSESINC}
 
 OPTIONS_DEFINE=	DOCS NLS

sysutils/multitail/Makefile

@@ -21,6 +21,9 @@ MAKE_ARGS=	NCURSES_IMPL="${NCURSES_IMPL}"
 
 OPTIONS_DEFINE=	DOCS
 
+post-patch:
+	${REINPLACE_CMD} -e "s/NCURSES_LIB:/LDFLAGS+/g" ${WRKSRC}/Makefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/multitail ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/multitail.1 ${STAGEDIR}${MANPREFIX}/man/man1

sysutils/powermon/Makefile

@@ -20,7 +20,7 @@ USES=		gmake ncurses
 PLIST_FILES=	man/man8/powermon.8.gz sbin/powermon
 
 post-patch:
-	${REINPLACE_CMD} 's/cursesw/${NCURSES_IMPL}/g' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} 's/-lcursesw/${NCURSESLIBS}/g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/release/powermon \

sysutils/tty-clock/Makefile

@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 USES=		gmake ncurses pkgconfig
 
 ALL_TARGET=	tty-clock
-LDFLAGS+=	-l${NCURSES_IMPL}
+LDFLAGS+=	${NCURSESLIBS}
 
 PLIST_FILES=	bin/tty-clock \
 		share/man/man1/tty-clock.1.gz

textproc/aspell/Makefile

@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-dict-dir=${DATADIR}	\
 		--enable-docdir=${DOCSDIR}	\
-		--enable-curses=${NCURSES_IMPL} \
+		--enable-curses="${NCURSESLIBS}" \
 		--enable-static
 
 USE_LDCONFIG=	yes

www/gopherus/Makefile

@@ -11,7 +11,7 @@ LICENSE=	BSD2CLAUSE
 USES=		ncurses tar:xz uidfix
 MAKEFILE=	${FILESDIR}/Makefile
 CFLAGS+=	-I${NCURSESINC}
-LDFLAGS+=	-L${NCURSESLIB} -l${NCURSES_IMPL}
+LDFLAGS+=	-L${NCURSESLIB} ${NCURSESLIBS}
 
 PLIST_FILES=	bin/gopherus
 

www/netrik/Makefile

@@ -23,7 +23,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} "s|^CFLAGS =|CFLAGS?=|" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} "s|ncursesw|${NCURSES_IMPL}|g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} "s|-lncursesw|${NCURSESLIBS}|g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} "s/#include <ncursesw\//#include </" \
 		${WRKSRC}/*.c
 

www/newsboat/Makefile

@@ -133,7 +133,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,fail "ncursesw",true,; s,fail "libcrypto",true,' \
 		-e 's,fail "libssl",true,' \
 		${WRKSRC}/config.sh
-	@${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB} -lcrypto -l${NCURSES_IMPL}|;s|-Werror||' \
+	@${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB} -lcrypto ${NCURSESLIBS}|;s|-Werror||' \
 		${WRKSRC}/Makefile
 
 post-install:

x11/bemenu/Makefile

@@ -26,7 +26,7 @@ BACKEND_DESC=	Backend
 
 NCURSES_USES=		ncurses
 NCURSES_MAKE_ARGS=	curses_CFLAGS="-I${NCURSESINC}" \
-			curses_LIBS="-L${NCURSESLIB} -l${NCURSES_IMPL}"
+			curses_LIBS="-L${NCURSESLIB} ${NCURSESLIBS}"
 NCURSES_VARS=		_BEMENU_RENDERERS+=curses
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \