svn commit: r273499 - in stable/10: usr.bin/bc usr.bin/clang/lldb usr.bin/talk usr.sbin/gstat

[Garrett Cooper]

Author: ngie
Date: Thu Oct 23 00:43:08 2014
New Revision: 273499
URL: https://svnweb.freebsd.org/changeset/base/273499

Log:
  MFC r270650 (this is what should have been committed in r273497):
  
    Convert LIBCURSES to LIBNCURSES to fix "make checkdpadd"
  
    Also, add a missing LIBPANEL dependency for lldb
  
    Approved by: rpaulo (mentor)
    Suggested by: brooks
    Phabric: D675 (as part of a larger diff)
    PR: 192762

Modified:
  stable/10/usr.bin/bc/Makefile
  stable/10/usr.bin/clang/lldb/Makefile
  stable/10/usr.bin/talk/Makefile
  stable/10/usr.sbin/gstat/Makefile

Modified: stable/10/usr.bin/bc/Makefile
==============================================================================
--- stable/10/usr.bin/bc/Makefile	Thu Oct 23 00:40:56 2014	(r273498)
+++ stable/10/usr.bin/bc/Makefile	Thu Oct 23 00:43:08 2014	(r273499)
@@ -5,8 +5,8 @@ PROG=		bc
 SRCS=		bc.y scan.l tty.c
 CFLAGS+=	-I. -I${.CURDIR}
 
-LDADD+=		-ledit -lcurses
-DPADD+=		${LIBEDIT} ${LIBCURSES}
+DPADD+=		${LIBEDIT} ${LIBNCURSESW}
+LDADD+=		-ledit -lncursesw
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 

Modified: stable/10/usr.bin/clang/lldb/Makefile
==============================================================================
--- stable/10/usr.bin/clang/lldb/Makefile	Thu Oct 23 00:40:56 2014	(r273498)
+++ stable/10/usr.bin/clang/lldb/Makefile	Thu Oct 23 00:43:08 2014	(r273499)
@@ -16,8 +16,8 @@ SRCS=	Driver.cpp \
 lldb.1:
 	ln -fs ${LLDB_SRCS}/docs/lldb.1 ${.TARGET}
 
-DPADD=	${LIBEDIT} ${LIBCURSES} ${LIBEXECINFO}
-LDADD=	-lcurses -ledit -lexecinfo -lpanel
+DPADD=	${LIBEDIT} ${LIBNCURSESW} ${LIBEXECINFO} ${LIBPANEL}
+LDADD=	-ledit -lncursesw -lexecinfo -lpanel
 
 LLDB_LIBS=\
 	lldb \

Modified: stable/10/usr.bin/talk/Makefile
==============================================================================
--- stable/10/usr.bin/talk/Makefile	Thu Oct 23 00:40:56 2014	(r273498)
+++ stable/10/usr.bin/talk/Makefile	Thu Oct 23 00:43:08 2014	(r273499)
@@ -4,7 +4,7 @@
 PROG=	talk
 SRCS=	ctl.c ctl_transact.c display.c get_addrs.c get_iface.c get_names.c \
 	init_disp.c invite.c io.c look_up.c msgs.c talk.c
-DPADD=	${LIBCURSESW}
-LDADD=	-lcursesw
+DPADD=	${LIBNCURSESW}
+LDADD=	-lncursesw
 
 .include <bsd.prog.mk>

Modified: stable/10/usr.sbin/gstat/Makefile
==============================================================================
--- stable/10/usr.sbin/gstat/Makefile	Thu Oct 23 00:40:56 2014	(r273498)
+++ stable/10/usr.sbin/gstat/Makefile	Thu Oct 23 00:43:08 2014	(r273499)
@@ -2,7 +2,7 @@
 
 PROG=	gstat
 MAN=	gstat.8
-DPADD=	${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBEDIT} ${LIBCURSES}
-LDADD=	-ldevstat -lkvm -lgeom -lbsdxml -lsbuf -ledit -lcurses
+DPADD=	${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBEDIT} ${LIBNCURSESW}
+LDADD=	-ldevstat -lkvm -lgeom -lbsdxml -lsbuf -ledit -lncursesw
 
 .include <bsd.prog.mk>