mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-27 11:55:06 +00:00
Code Issues Releases Activity

Revert r261296. This removes the WITHOUT_NCURSESW option.

Browse Source 
It was the wrong direction.  We will instead remove use of the
non-wide-character supporting libncurses.
This commit is contained in:
Brooks Davis 2014-05-15 16:44:25 +00:00
parent eba21a2dc3
commit 525e2a83f6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=266157
10 changed files with 15 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/usr.bin/dialog/Makefile
View File

@ -3,21 +3,11 @@
DIALOG= ${.CURDIR}/../../../contrib/dialog
PROG= dialog
DPADD= ${LIBDIALOG} ${LIBM}
LDADD= -ldialog -lm
DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM}
LDADD= -ldialog -lncursesw -lm
CFLAGS+= -I${.CURDIR} -I${DIALOG}
.PATH: ${DIALOG}
WARNS?= 6
.include <src.opts.mk>
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
LDADD+= -lncurses
.else
DPADD+= ${LIBNCURSESW}
LDADD+= -lncursesw
.endif
.include <bsd.prog.mk>

9
lib/ncurses/Makefile
View File

@ -1,11 +1,6 @@
# $FreeBSD$
.include <src.opts.mk>
SUBDIR= ncurses form menu panel
.if ${MK_NCURSESW} != "no"
SUBDIR+= ncursesw formw menuw panelw
.endif
SUBDIR= ncurses form menu panel \
ncursesw formw menuw panelw
.include <bsd.subdir.mk>

1
share/mk/src.opts.mk
View File

@ -119,7 +119,6 @@ __DEFAULT_YES_OPTIONS = \
MAIL \
MAILWRAPPER \
MAKE \
NCURSESW \
NDIS \
NETCAT \
NETGRAPH \

13
usr.bin/systat/Makefile
View File

@ -16,16 +16,7 @@ CFLAGS+= -DINET6
WARNS?= 0
DPADD= ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
LDADD= -lm -ldevstat -lkvm
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
LDADD+= -lncurses
.else
CFLAGS+= -DUSE_WIDECHAR
DPADD+= ${LIBNCURSESW}
LDADD+= -lncursesw
.endif
DPADD= ${LIBNCURSESW} ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
LDADD= -lncursesw -lm -ldevstat -lkvm
.include <bsd.prog.mk>

4
usr.bin/systat/main.c
View File

@ -141,11 +141,7 @@ main(int argc, char **argv)
double t;
struct cmdentry *cmd = NULL;
#ifdef USE_WIDECHAR
(void) setlocale(LC_ALL, "");
#else
(void) setlocale(LC_TIME, "");
#endif
SLIST_INIT(&commands);
argc--, argv++;

2
usr.bin/vi/Makefile
View File

@ -36,7 +36,7 @@ CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex
DPADD= ${LIBUTIL}
LDADD= -lutil
.if defined(RESCUE) || defined(RELEASE_CRUNCH) || ${MK_NCURSESW} == "no"
.if defined(RESCUE) || defined(RELEASE_CRUNCH)
DPADD+= ${LIBNCURSES}
LDADD+= -lncurses
.else

14
usr.sbin/bsdinstall/distextract/Makefile
View File

@ -2,20 +2,10 @@
BINDIR= /usr/libexec/bsdinstall
PROG= distextract
DPADD= ${LIBARCHIVE} ${LIBDIALOG} ${LIBM}
LDADD= -larchive -ldialog -lm
DPADD= ${LIBARCHIVE} ${LIBNCURSESW} ${LIBDIALOG} ${LIBM}
LDADD= -larchive -lncursesw -ldialog -lm
WARNS?= 6
MAN=
.include <src.opts.mk>
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
LDADD+= -lncurses
.else
DPADD+= ${LIBNCURSESW}
LDADD+= -lncursesw
.endif
.include <bsd.prog.mk>

14
usr.sbin/bsdinstall/distfetch/Makefile
View File

@ -2,20 +2,10 @@
BINDIR= /usr/libexec/bsdinstall
PROG= distfetch
DPADD= ${LIBFETCH} ${LIBDIALOG} ${LIBM}
LDADD= -lfetch -ldialog -lm
DPADD= ${LIBFETCH} ${LIBNCURSESW} ${LIBDIALOG} ${LIBM}
LDADD= -lfetch -lncursesw -ldialog -lm
WARNS?= 6
MAN=
.include <src.opts.mk>
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
LDADD+= -lncurses
.else
DPADD+= ${LIBNCURSESW}
LDADD+= -lncursesw
.endif
.include <bsd.prog.mk>

14
usr.sbin/bsdinstall/partedit/Makefile
View File

@ -5,8 +5,8 @@ PROG= partedit
LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
${BINDIR}/partedit ${BINDIR}/scriptedpart
SYMLINKS= ${BINDIR}/partedit /usr/sbin/sade
DPADD= ${LIBGEOM} ${LIBUTIL} ${LIBDIALOG} ${LIBM}
LDADD= -lgeom -lutil -ldialog -lm
DPADD= ${LIBGEOM} ${LIBNCURSESW} ${LIBUTIL} ${LIBDIALOG} ${LIBM}
LDADD= -lgeom -lncursesw -lutil -ldialog -lm
PARTEDIT_ARCH= ${MACHINE}
.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
@ -22,14 +22,4 @@ SRCS= diskeditor.c partedit.c gpart_ops.c partedit_${PARTEDIT_ARCH}.c \
WARNS?= 3
MAN= sade.8
.include <src.opts.mk>
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
LDADD+= -lncurses
.else
DPADD+= ${LIBNCURSESW}
LDADD+= -lncursesw
.endif
.include <bsd.prog.mk>

14
usr.sbin/tzsetup/Makefile
View File

@ -7,17 +7,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/dialog -I.
WARNS?= 3
DPADD= ${LIBDIALOG} ${LIBM}
LDADD= -ldialog -lm
.include <src.opts.mk>
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
LDADD+= -lncurses
.else
DPADD+= ${LIBNCURSESW}
LDADD+= -lncursesw
.endif
DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM}
LDADD= -ldialog -lncursesw -lm
.include <bsd.prog.mk>