From owner-svn-src-all@FreeBSD.ORG  Thu Dec 25 03:15:57 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DEB43B3B;
 Thu, 25 Dec 2014 03:15:57 +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 CA72D64C19;
 Thu, 25 Dec 2014 03:15:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBP3Fv5R025643;
 Thu, 25 Dec 2014 03:15:57 GMT (envelope-from alfred@FreeBSD.org)
Received: (from alfred@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBP3FvS6025641;
 Thu, 25 Dec 2014 03:15:57 GMT (envelope-from alfred@FreeBSD.org)
Message-Id: <201412250315.sBP3FvS6025641@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: alfred set sender to
 alfred@FreeBSD.org using -f
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Thu, 25 Dec 2014 03:15:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276195 - in head: . lib/libxo
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.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Dec 2014 03:15:58 -0000

Author: alfred
Date: Thu Dec 25 03:15:56 2014
New Revision: 276195
URL: https://svnweb.freebsd.org/changeset/base/276195

Log:
  Move libxo to /lib
  
  Update ObsoleteFiles to reflect libxo move.
  
  Reviewed by: ngie
  Differential Revision: https://reviews.freebsd.org/D1370

Modified:
  head/ObsoleteFiles.inc
  head/lib/libxo/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Thu Dec 25 02:17:17 2014	(r276194)
+++ head/ObsoleteFiles.inc	Thu Dec 25 03:15:56 2014	(r276195)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20141224: libxo moved to /lib
+OLD_FILES+=usr/lib/libxo.a
+OLD_FILES+=usr/lib/libxo_p.a
 # 20141223: remove in6_gif.h, in_gif.h and if_stf.h
 OLD_FILES+=usr/include/net/if_stf.h
 OLD_FILES+=usr/include/netinet/in_gif.h

Modified: head/lib/libxo/Makefile
==============================================================================
--- head/lib/libxo/Makefile	Thu Dec 25 02:17:17 2014	(r276194)
+++ head/lib/libxo/Makefile	Thu Dec 25 03:15:56 2014	(r276195)
@@ -7,6 +7,8 @@ LIBXO=	${.CURDIR:H:H}/contrib/libxo
 LIB=	xo
 SHLIB_MAJOR=0
 
+SHLIBDIR?=      /lib
+
 SRCS=	libxo.c
 
 CFLAGS+=-I${LIBXO}/libxo