From owner-svn-src-all@FreeBSD.ORG Sun Sep 15 13:07:31 2013 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3396D802; Sun, 15 Sep 2013 13:07:31 +0000 (UTC) (envelope-from des@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 072E120C6; Sun, 15 Sep 2013 13:07:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FD7UsZ096571; Sun, 15 Sep 2013 13:07:30 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8FD7UYg096570; Sun, 15 Sep 2013 13:07:30 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309151307.r8FD7UYg096570@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sun, 15 Sep 2013 13:07:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255590 - head/tools/build/mk X-SVN-Group: head 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.14 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: Sun, 15 Sep 2013 13:07:31 -0000 Author: des Date: Sun Sep 15 13:07:30 2013 New Revision: 255590 URL: http://svnweb.freebsd.org/changeset/base/255590 Log: Complete the OPENSSH and LDNS sections. Approved by: re (blanket) Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Sep 15 12:41:05 2013 (r255589) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Sep 15 13:07:30 2013 (r255590) @@ -3389,6 +3389,19 @@ OLD_FILES+=usr/share/man/man8/verify_krb OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz .endif +.if ${MK_LDNS} == no +OLD_FILES+=usr/lib/private/libldns.a +OLD_FILES+=usr/lib/private/libldns.so +OLD_LIBS+=usr/lib/private/libldns.so.5 +OLD_FILES+=usr/lib/private/libldns_p.a +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/private/libldns.a +OLD_FILES+=usr/lib32/private/libldns.so +OLD_LIBS+=usr/lib32/private/libldns.so.5 +OLD_FILES+=usr/lib32/private/libldns_p.a +.endif +.endif + #.if ${MK_LIB32} == no # to be filled in #.endif @@ -3715,7 +3728,27 @@ OLD_FILES+=usr/share/man/man8/ntptime.8. #.endif .if ${MK_OPENSSH} == no -OLD_FILES+=usr.bin/ssh-copy-id +OLD_FILES+=usr/bin/sftp +OLD_FILES+=usr/bin/ssh +OLD_FILES+=usr/bin/ssh-add +OLD_FILES+=usr/bin/ssh-agent +OLD_FILES+=usr/bin/ssh-copy-id +OLD_FILES+=usr/bin/ssh-keygen +OLD_FILES+=usr/bin/ssh-keyscan +OLD_FILES+=usr/lib/private/libssh.a +OLD_FILES+=usr/lib/private/libssh.so +OLD_LIBS+=usr/lib/private/libssh.so.5 +OLD_FILES+=usr/lib/private/libssh_p.a +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/private/libssh.a +OLD_FILES+=usr/lib32/private/libssh.so +OLD_LIBS+=usr/lib32/private/libssh.so.5 +OLD_FILES+=usr/lib32/private/libssh_p.a +.endif +OLD_FILES+=usr/libexec/sftp-server +OLD_FILES+=usr/libexec/ssh-keysign +OLD_FILES+=usr/libexec/ssh-pkcs11-helper +OLD_FILES+=usr/sbin/sshd .endif #.if ${MK_OPENSSL} == no @@ -3972,7 +4005,6 @@ OLD_FILES+=usr/lib/librt_p.a OLD_FILES+=usr/lib/libsbuf_p.a OLD_FILES+=usr/lib/libsdp_p.a OLD_FILES+=usr/lib/libsmb_p.a -OLD_FILES+=usr/lib/libssh_p.a OLD_FILES+=usr/lib/libssl_p.a OLD_FILES+=usr/lib/libstdc++_p.a OLD_FILES+=usr/lib/libsupc++_p.a @@ -3995,6 +4027,8 @@ OLD_FILES+=usr/lib/libwrap_p.a OLD_FILES+=usr/lib/liby_p.a OLD_FILES+=usr/lib/libypclnt_p.a OLD_FILES+=usr/lib/libz_p.a +OLD_FILES+=usr/lib/private/libldns_p.a +OLD_FILES+=usr/lib/private/libssh_p.a .endif .if ${MK_RCMDS} == no