From owner-svn-src-projects@freebsd.org  Wed Apr 27 15:27:24 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53A08B1ED8C
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 27 Apr 2016 15:27:24 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 2497319B2;
 Wed, 27 Apr 2016 15:27:24 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3RFRNgr082192;
 Wed, 27 Apr 2016 15:27:23 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3RFRNh3082189;
 Wed, 27 Apr 2016 15:27:23 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201604271527.u3RFRNh3082189@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Wed, 27 Apr 2016 15:27:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r298701 - in projects/zfsd/head: cddl/sbin/zfsd share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Apr 2016 15:27:24 -0000

Author: asomers
Date: Wed Apr 27 15:27:23 2016
New Revision: 298701
URL: https://svnweb.freebsd.org/changeset/base/298701

Log:
  Replace LDADD with LIBADD and NO_MAN with MK_MAN
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/cddl/sbin/zfsd/Makefile.common
  projects/zfsd/head/share/mk/src.libnames.mk

Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile.common
==============================================================================
--- projects/zfsd/head/cddl/sbin/zfsd/Makefile.common	Wed Apr 27 15:25:18 2016	(r298700)
+++ projects/zfsd/head/cddl/sbin/zfsd/Makefile.common	Wed Apr 27 15:27:23 2016	(r298701)
@@ -10,7 +10,7 @@ SRCS=		callout.cc		\
 		zpool_list.cc		\
 		zfsd_main.cc
 
-NO_MAN=		YES
+MK_MAN=		no
 
 WARNS?=		3
 
@@ -36,7 +36,7 @@ CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCF
 
 DPADD=  ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \
 	${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL}
-LDADD=  -ldevdctl -lzfs -lzfs_core -lutil -lgeom -lbsdxml -lsbuf -lnvpair -luutil
+LIBADD=  devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil
 
 cscope:
 	find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \

Modified: projects/zfsd/head/share/mk/src.libnames.mk
==============================================================================
--- projects/zfsd/head/share/mk/src.libnames.mk	Wed Apr 27 15:25:18 2016	(r298700)
+++ projects/zfsd/head/share/mk/src.libnames.mk	Wed Apr 27 15:27:23 2016	(r298701)
@@ -82,6 +82,7 @@ _LIBRARIES=	\
 		cuse \
 		cxxrt \
 		devctl \
+		devdctl \
 		devinfo \
 		devstat \
 		dialog \