aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/usr.bin/dialog/Makefile14
-rw-r--r--lib/ncurses/Makefile9
-rw-r--r--share/mk/src.opts.mk1
-rw-r--r--usr.bin/systat/Makefile13
-rw-r--r--usr.bin/systat/main.c4
-rw-r--r--usr.bin/vi/Makefile2
-rw-r--r--usr.sbin/bsdinstall/distextract/Makefile14
-rw-r--r--usr.sbin/bsdinstall/distfetch/Makefile14
-rw-r--r--usr.sbin/bsdinstall/partedit/Makefile14
-rw-r--r--usr.sbin/tzsetup/Makefile14
10 files changed, 15 insertions, 84 deletions
diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
index a7e0a57ad594..f9281c8fd685 100644
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@@ -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>
diff --git a/lib/ncurses/Makefile b/lib/ncurses/Makefile
index 822905f44dcc..05cd7a29bb28 100644
--- a/lib/ncurses/Makefile
+++ b/lib/ncurses/Makefile
@@ -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>
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 80ebe76766f1..887858de00bf 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -119,7 +119,6 @@ __DEFAULT_YES_OPTIONS = \
MAIL \
MAILWRAPPER \
MAKE \
- NCURSESW \
NDIS \
NETCAT \
NETGRAPH \
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 8d024ffca9cc..1bb2da05a052 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -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>
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index e80dc6133808..e0e627af12af 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -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++;
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 16675c9f73d2..e3ee3f6e8081 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -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
diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile
index e359bba590e5..f84c4d744a37 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@@ -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>
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile
index 2ac9eb611b73..ed1f5996ec58 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@@ -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>
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
index 328259c1ec11..fb758884a572 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -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>
diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index 5646b2acec04..4ef65331cc15 100644
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -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>