1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

ncurses: partial revert 266130ce71

In many places I overlooked at the problem we were trying to solve when
libncurses is split.
This commit is contained in:
Baptiste Daroussin 2021-09-24 15:04:52 +02:00
parent 7bcdcaa543
commit d51bc0de30
15 changed files with 3 additions and 18 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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/

View File

@ -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

View File

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

View File

@ -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|' \

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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