git: d51bc0de306a - main - ncurses: partial revert 266130ce71ef2f1cd944a70789bf003da3254c29

Baptiste Daroussin bapt at FreeBSD.org
Fri Sep 24 13:12:00 UTC 2021 

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d51bc0de306aafb68e7af0a6d16b261dcbd83f95

commit d51bc0de306aafb68e7af0a6d16b261dcbd83f95
Author:     Baptiste Daroussin <bapt at FreeBSD.org>
AuthorDate: 2021-09-24 13:04:52 +0000
Commit:     Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-09-24 13:11:53 +0000

    ncurses: partial revert 266130ce71ef2f1cd944a70789bf003da3254c29
    
    In many places I overlooked at the problem we were trying to solve when
    libncurses is split.
---
 audio/cmp3/Makefile                   | 3 +--
 audio/funktrackergold/Makefile        | 2 +-
 audio/juke/Makefile                   | 1 -
 audio/mp3c/Makefile                   | 1 -
 audio/mp3info/Makefile                | 1 -
 audio/playmidi/Makefile               | 1 -
 audio/rexima/Makefile                 | 1 -
 audio/stymulator/Makefile             | 1 -
 audio/stymulator/files/patch-Makefile | 2 +-
 audio/tcd/Makefile                    | 1 -
 audio/timidity/Makefile               | 1 -
 audio/umix/Makefile                   | 1 -
 audio/vitunes/Makefile                | 1 -
 audio/xmcd/Makefile                   | 1 -
 sysutils/multitail/Makefile           | 3 ---
 15 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 4e2591b921e8..554bc876c4a2 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -19,8 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-kenrevs
 
 USES=		gmake ncurses
 GNU_CONFIGURE=	yes
-MAKE_ARGS=	install_directory=${STAGEDIR}${PREFIX}/bin \
-		LIBS="${NCURSESLIBS} -lform"
+MAKE_ARGS=	install_directory=${STAGEDIR}${PREFIX}/bin
 
 PORTDOCS=	README sample.cmp3rc
 PLIST_FILES=	bin/cmp3 bin/rnmp3
diff --git a/audio/funktrackergold/Makefile b/audio/funktrackergold/Makefile
index 4ce5f6b67023..dc68afcfd9dd 100644
--- a/audio/funktrackergold/Makefile
+++ b/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 ${NCURSESLIBS}"
+MAKE_ARGS=	EXTRA_LDFLAGS="-lpthread"
 
 PORTDOCS=	INSTALL
 PLIST_FILES=	bin/funkgold
diff --git a/audio/juke/Makefile b/audio/juke/Makefile
index 055d9c24c8db..90785dfa04c1 100644
--- a/audio/juke/Makefile
+++ b/audio/juke/Makefile
@@ -15,7 +15,6 @@ 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
 
diff --git a/audio/mp3c/Makefile b/audio/mp3c/Makefile
index 972c24884709..836aa142e9c2 100644
--- a/audio/mp3c/Makefile
+++ b/audio/mp3c/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	mp3info:audio/mp3info \
 
 USES=		ncurses
 GNU_CONFIGURE=	yes
-MAKE_ARGS+=	LIBS="${NCURSESLIBS}"
 
 DEFAULT_CDROM_DEVICE?=	cd0
 
diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
index ee389b4e45cc..64c2d0867105 100644
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@@ -27,7 +27,6 @@ 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/
diff --git a/audio/playmidi/Makefile b/audio/playmidi/Makefile
index e6e16646f03f..48641e96d9c3 100644
--- a/audio/playmidi/Makefile
+++ b/audio/playmidi/Makefile
@@ -19,7 +19,6 @@ 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
diff --git a/audio/rexima/Makefile b/audio/rexima/Makefile
index e4754257ee76..5cb773cbf11e 100644
--- a/audio/rexima/Makefile
+++ b/audio/rexima/Makefile
@@ -12,6 +12,5 @@ LICENSE=	GPLv2
 
 USES=		ncurses
 PLIST_FILES=	bin/rexima man/man1/rexima.1.gz
-LDFLAGS+=	${NCURSESLIBS}
 
 .include <bsd.port.mk>
diff --git a/audio/stymulator/Makefile b/audio/stymulator/Makefile
index 81167ba9fcf2..7442b99cd4f9 100644
--- a/audio/stymulator/Makefile
+++ b/audio/stymulator/Makefile
@@ -21,7 +21,6 @@ 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|' \
diff --git a/audio/stymulator/files/patch-Makefile b/audio/stymulator/files/patch-Makefile
index e0fbec9f6f55..698c78ea0bba 100644
--- a/audio/stymulator/files/patch-Makefile
+++ b/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 ${LFFLAGS} -lncurses
++	$(CXX) $(CXXFLAGS) -o ymplayer $(INCLUDE) ymplayer.o sound.o ui.o -lym -llzh -lncurses
  
  ym2wav: ym2wav.o
 -	$(CC) -o ym2wav $(INCLUDE) ym2wav.o -lym -llzh	
diff --git a/audio/tcd/Makefile b/audio/tcd/Makefile
index e2689dd57b6f..105de5176b97 100644
--- a/audio/tcd/Makefile
+++ b/audio/tcd/Makefile
@@ -14,7 +14,6 @@ LICENSE=	GPLv2
 USES=		ncurses sdl
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-MAKE_ARGS=	LIBS="${NCURSESLIBS}"
 
 PLIST_FILES=	bin/tcd \
 		man/man1/tcd.1.gz
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 9892359167cc..e1c4e86256e6 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -20,7 +20,6 @@ OPTIONS_SINGLE=	FONTS
 OPTIONS_SINGLE_FONTS=	GOEMON GUSPAT
 OPTIONS_DEFAULT=GOEMON
 OPTIONS_SUB=	yes
-MAKE_ARGS=	EXTRALIBS="${NCURSESLIBS}"
 
 FONTS_DESC=		Default sound fonts
 
diff --git a/audio/umix/Makefile b/audio/umix/Makefile
index 0a5dd7888149..c44463f4f8c7 100644
--- a/audio/umix/Makefile
+++ b/audio/umix/Makefile
@@ -11,7 +11,6 @@ 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
diff --git a/audio/vitunes/Makefile b/audio/vitunes/Makefile
index f5f2fe95acf7..5cebc65cdb32 100644
--- a/audio/vitunes/Makefile
+++ b/audio/vitunes/Makefile
@@ -18,7 +18,6 @@ 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
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 68056a605190..3328c4c8b588 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -30,7 +30,6 @@ 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
 
diff --git a/sysutils/multitail/Makefile b/sysutils/multitail/Makefile
index da484654da31..67a5cf076c20 100644
--- a/sysutils/multitail/Makefile
+++ b/sysutils/multitail/Makefile
@@ -21,9 +21,6 @@ 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

More information about the dev-commits-ports-main mailing list