From owner-svn-src-all@FreeBSD.ORG Thu Oct 23 00:43:09 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BBD139AB; Thu, 23 Oct 2014 00:43:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C77FC08; Thu, 23 Oct 2014 00:43:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9N0h9E4079515; Thu, 23 Oct 2014 00:43:09 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9N0h8WJ079511; Thu, 23 Oct 2014 00:43:08 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201410230043.s9N0h8WJ079511@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 23 Oct 2014 00:43:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r273499 - in stable/10: usr.bin/bc usr.bin/clang/lldb usr.bin/talk usr.sbin/gstat X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 00:43:09 -0000 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 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