From owner-svn-src-head@freebsd.org  Tue Dec  1 15:55:21 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 965E9A3D47F;
 Tue,  1 Dec 2015 15:55:21 +0000 (UTC)
 (envelope-from bdrewery@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 6397F1380;
 Tue,  1 Dec 2015 15:55:21 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB1FtKbT097702;
 Tue, 1 Dec 2015 15:55:20 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB1FtKgx097701;
 Tue, 1 Dec 2015 15:55:20 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201512011555.tB1FtKgx097701@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 1 Dec 2015 15:55:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291591 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Dec 2015 15:55:21 -0000

Author: bdrewery
Date: Tue Dec  1 15:55:20 2015
New Revision: 291591
URL: https://svnweb.freebsd.org/changeset/base/291591

Log:
  Fix removal of libelf.so.2 and add missing files for it.
  
  X-MFC-With:	r291566

Modified:
  head/ObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Tue Dec  1 15:54:46 2015	(r291590)
+++ head/ObsoleteFiles.inc	Tue Dec  1 15:55:20 2015	(r291591)
@@ -39,7 +39,10 @@
 # done
 
 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
-OLD_FILES+=usr/lib/libelf.so.2
+OLD_LIBS+=usr/lib/libelf.so.2
+OLD_FILES+=usr/lib/libelf.a
+OLD_FILES+=usr/lib/libelf.so
+OLD_FILES+=usr/lib/libelf_p.a
 # 20151115: Fox bad upgrade scheme
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312