svn commit: r266157 - in head: gnu/usr.bin/dialog lib/ncurses share/mk usr.bin/systat usr.bin/vi usr.sbin/bsdinstall/distextract usr.sbin/bsdinstall/distfetch usr.sbin/bsdinstall/partedit usr.sbin/...

Brooks Davis brooks at FreeBSD.org
Thu May 15 16:44:27 UTC 2014 

Author: brooks
Date: Thu May 15 16:44:25 2014
New Revision: 266157
URL: http://svnweb.freebsd.org/changeset/base/266157

Log:
  Revert r261296.  This removes the WITHOUT_NCURSESW option.
  
  It was the wrong direction.  We will instead remove use of the
  non-wide-character supporting libncurses.

Modified:
  head/gnu/usr.bin/dialog/Makefile
  head/lib/ncurses/Makefile
  head/share/mk/src.opts.mk
  head/usr.bin/systat/Makefile
  head/usr.bin/systat/main.c
  head/usr.bin/vi/Makefile
  head/usr.sbin/bsdinstall/distextract/Makefile
  head/usr.sbin/bsdinstall/distfetch/Makefile
  head/usr.sbin/bsdinstall/partedit/Makefile
  head/usr.sbin/tzsetup/Makefile

Modified: head/gnu/usr.bin/dialog/Makefile
==============================================================================
--- head/gnu/usr.bin/dialog/Makefile	Thu May 15 16:24:20 2014	(r266156)
+++ head/gnu/usr.bin/dialog/Makefile	Thu May 15 16:44:25 2014	(r266157)
@@ -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>

Modified: head/lib/ncurses/Makefile
==============================================================================
--- head/lib/ncurses/Makefile	Thu May 15 16:24:20 2014	(r266156)
+++ head/lib/ncurses/Makefile	Thu May 15 16:44:25 2014	(r266157)
@@ -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>

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Thu May 15 16:24:20 2014	(r266156)
+++ head/share/mk/src.opts.mk	Thu May 15 16:44:25 2014	(r266157)
@@ -119,7 +119,6 @@ __DEFAULT_YES_OPTIONS = \
     MAIL \
     MAILWRAPPER \
     MAKE \
-    NCURSESW \
     NDIS \
     NETCAT \
     NETGRAPH \

Modified: head/usr.bin/systat/Makefile
==============================================================================
--- head/usr.bin/systat/Makefile	Thu May 15 16:24:20 2014	(r266156)
+++ head/usr.bin/systat/Makefile	Thu May 15 16:44:25 2014	(r266157)
@@ -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>

Modified: head/usr.bin/systat/main.c
==============================================================================
--- head/usr.bin/systat/main.c	Thu May 15 16:24:20 2014	(r266156)
+++ head/usr.bin/systat/main.c	Thu May 15 16:44:25 2014	(r266157)
@@ -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++;

Modified: head/usr.bin/vi/Makefile
==============================================================================
--- head/usr.bin/vi/Makefile	Thu May 15 16:24:20 2014	(r266156)
+++ head/usr.bin/vi/Makefile	Thu May 15 16:44:25 2014	(r266157)
@@ -36,7 +36,7 @@ CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRC
 DPADD=		${LIBUTIL}
 LDADD=		-lutil
 
-.if defined(RESCUE) || defined(RELEASE_CRUNCH) || ${MK_NCURSESW} == "no"
+.if defined(RESCUE) || defined(RELEASE_CRUNCH)
 DPADD+=		${LIBNCURSES}
 LDADD+=		-lncurses
 .else

Modified: head/usr.sbin/bsdinstall/distextract/Makefile
==============================================================================
--- head/usr.sbin/bsdinstall/distextract/Makefile	Thu May 15 16:24:20 2014	(r266156)
+++ head/usr.sbin/bsdinstall/distextract/Makefile	Thu May 15 16:44:25 2014	(r266157)
@@ -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>

Modified: head/usr.sbin/bsdinstall/distfetch/Makefile
==============================================================================
--- head/usr.sbin/bsdinstall/distfetch/Makefile	Thu May 15 16:24:20 2014	(r266156)
+++ head/usr.sbin/bsdinstall/distfetch/Makefile	Thu May 15 16:44:25 2014	(r266157)
@@ -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>

Modified: head/usr.sbin/bsdinstall/partedit/Makefile
==============================================================================
--- head/usr.sbin/bsdinstall/partedit/Makefile	Thu May 15 16:24:20 2014	(r266156)
+++ head/usr.sbin/bsdinstall/partedit/Makefile	Thu May 15 16:44:25 2014	(r266157)
@@ -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.
 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>

Modified: head/usr.sbin/tzsetup/Makefile
==============================================================================
--- head/usr.sbin/tzsetup/Makefile	Thu May 15 16:24:20 2014	(r266156)
+++ head/usr.sbin/tzsetup/Makefile	Thu May 15 16:44:25 2014	(r266157)
@@ -7,17 +7,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/dial
 
 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>

More information about the svn-src-all mailing list