From owner-svn-src-projects@FreeBSD.ORG Wed Nov 26 14:01:28 2014 Return-Path: Delivered-To: svn-src-projects@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 C5973E7D; Wed, 26 Nov 2014 14:01:28 +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 B244ECA1; Wed, 26 Nov 2014 14:01:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQE1S1s069976; Wed, 26 Nov 2014 14:01:28 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQE1SGd069975; Wed, 26 Nov 2014 14:01:28 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411261401.sAQE1SGd069975@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 26 Nov 2014 14:01:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275119 - projects/building-blocks/tools/build/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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Nov 2014 14:01:29 -0000 Author: ngie Date: Wed Nov 26 14:01:27 2014 New Revision: 275119 URL: https://svnweb.freebsd.org/changeset/base/275119 Log: Fix use of OLD_FILES and OLD_LIBS for MK_BSNMP and MK_TESTS Convention in the file is that .a files be added to OLD_FILES and versioned .so's be added to OLD_LIBS Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 13:56:54 2014 (r275118) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 26 14:01:27 2014 (r275119) @@ -354,23 +354,23 @@ OLD_FILES+=usr/include/bsnmp/snmpagent.h OLD_FILES+=usr/include/bsnmp/snmpclient.h OLD_FILES+=usr/include/bsnmp/snmpmod.h OLD_FILES+=usr/lib/libbsnmp.a -OLD_FILES+=usr/lib/libbsnmp.so.6 +OLD_LIBS+=usr/lib/libbsnmp.so.6 OLD_FILES+=usr/lib/libbsnmp_p.a OLD_FILES+=usr/lib/libbsnmptools.a -OLD_FILES+=usr/lib/libbsnmptools.so.0 +OLD_LIBS+=usr/lib/libbsnmptools.so.0 OLD_FILES+=usr/lib/libbsnmptools_p.a -OLD_FILES+=usr/lib/snmp_atm.so.6 -OLD_FILES+=usr/lib/snmp_bridge.so.6 -OLD_FILES+=usr/lib/snmp_hast.so.6 -OLD_FILES+=usr/lib/snmp_hostres.so.6 -OLD_FILES+=usr/lib/snmp_lm75.so.6 -OLD_FILES+=usr/lib/snmp_mibII.so.6 -OLD_FILES+=usr/lib/snmp_netgraph.so.6 -OLD_FILES+=usr/lib/snmp_pf.so.6 -OLD_FILES+=usr/lib/snmp_target.so.6 -OLD_FILES+=usr/lib/snmp_usm.so.6 -OLD_FILES+=usr/lib/snmp_vacm.so.6 -OLD_FILES+=usr/lib/snmp_wlan.so.6 +OLD_LIBS+=usr/lib/snmp_atm.so.6 +OLD_LIBS+=usr/lib/snmp_bridge.so.6 +OLD_LIBS+=usr/lib/snmp_hast.so.6 +OLD_LIBS+=usr/lib/snmp_hostres.so.6 +OLD_LIBS+=usr/lib/snmp_lm75.so.6 +OLD_LIBS+=usr/lib/snmp_mibII.so.6 +OLD_LIBS+=usr/lib/snmp_netgraph.so.6 +OLD_LIBS+=usr/lib/snmp_pf.so.6 +OLD_LIBS+=usr/lib/snmp_target.so.6 +OLD_LIBS+=usr/lib/snmp_usm.so.6 +OLD_LIBS+=usr/lib/snmp_vacm.so.6 +OLD_LIBS+=usr/lib/snmp_wlan.so.6 OLD_FILES+=usr/sbin/bsnmpd OLD_FILES+=usr/sbin/gensnmptree OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz @@ -4390,15 +4390,15 @@ OLD_FILES+=usr/share/man/man8/tftpd.8.gz OLD_FILES+=usr/bin/atf-sh OLD_FILES+=usr/include/atf-c++/config.hpp OLD_FILES+=usr/include/atf-c/config.h -OLD_LIBS+=usr/lib/libatf-c++.a +OLD_FILES+=usr/lib/libatf-c++.a OLD_LIBS+=usr/lib/libatf-c++.so OLD_LIBS+=usr/lib/libatf-c++.so.1 OLD_LIBS+=usr/lib/libatf-c++.so.2 -OLD_LIBS+=usr/lib/libatf-c++_p.a -OLD_LIBS+=usr/lib/libatf-c.a +OLD_FILES+=usr/lib/libatf-c++_p.a +OLD_FILES+=usr/lib/libatf-c.a OLD_LIBS+=usr/lib/libatf-c.so OLD_LIBS+=usr/lib/libatf-c.so.1 -OLD_LIBS+=usr/lib/libatf-c_p.a +OLD_FILES+=usr/lib/libatf-c_p.a OLD_LIBS+=usr/lib/private/libatf-c.so.0 OLD_LIBS+=usr/lib/private/libatf-c++.so.1 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" @@ -4878,11 +4878,11 @@ OLD_FILES+=usr/include/atf-c++/tests.hpp OLD_FILES+=usr/include/atf-c++/utils.hpp OLD_FILES+=usr/include/atf-c++.hpp OLD_FILES+=usr/lib/libatf-c_p.a -OLD_FILES+=usr/lib/libatf-c.so.1 +OLD_LIBS+=usr/lib/libatf-c.so.1 OLD_FILES+=usr/lib/libatf-c.so OLD_FILES+=usr/lib/libatf-c++.a OLD_FILES+=usr/lib/libatf-c++_p.a -OLD_FILES+=usr/lib/libatf-c++.so.1 +OLD_LIBS+=usr/lib/libatf-c++.so.1 OLD_FILES+=usr/lib/libatf-c++.so OLD_FILES+=usr/lib/libatf-c.a OLD_FILES+=usr/libexec/atf-check