From owner-svn-src-head@FreeBSD.ORG  Thu Oct 23 23:14:24 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 7E9C133C;
 Thu, 23 Oct 2014 23:14:24 +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 6A478FC7;
 Thu, 23 Oct 2014 23:14:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9NNEOrc022666;
 Thu, 23 Oct 2014 23:14:24 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9NNENYh022661;
 Thu, 23 Oct 2014 23:14:23 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201410232314.s9NNENYh022661@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 23 Oct 2014 23:14:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273567 - in head: etc/mtree lib 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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Oct 2014 23:14:24 -0000

Author: marcel
Date: Thu Oct 23 23:14:23 2014
New Revision: 273567
URL: https://svnweb.freebsd.org/changeset/base/273567

Log:
  Hook libxo to the build.
  
  Sponsored by:	Juniper Networks, Inc.

Added:
  head/lib/libxo/
  head/lib/libxo/Makefile   (contents, props changed)
Modified:
  head/etc/mtree/BSD.include.dist
  head/lib/Makefile

Modified: head/etc/mtree/BSD.include.dist
==============================================================================
--- head/etc/mtree/BSD.include.dist	Thu Oct 23 23:12:30 2014	(r273566)
+++ head/etc/mtree/BSD.include.dist	Thu Oct 23 23:14:23 2014	(r273567)
@@ -249,6 +249,8 @@
     ..
     libmilter
     ..
+    libxo
+    ..
     lzma
     ..
     machine

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Thu Oct 23 23:12:30 2014	(r273566)
+++ head/lib/Makefile	Thu Oct 23 23:14:23 2014	(r273567)
@@ -106,6 +106,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libvgl} \
 	${_libvmmapi} \
 	libwrap \
+	libxo \
 	liby \
 	${_libypclnt} \
 	libz \

Added: head/lib/libxo/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libxo/Makefile	Thu Oct 23 23:14:23 2014	(r273567)
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+LIBXO=	${.CURDIR:H:H}/contrib/libxo
+
+.PATH:	${LIBXO}/libxo
+
+LIB=	xo
+SHLIB_MAJOR=0
+
+SRCS=	libxo.c
+
+CFLAGS+=-I${LIBXO}/libxo
+
+INCS=	xo.h
+INCSDIR=${INCLUDEDIR}/libxo
+
+MAN+=	libxo.3
+MAN+=	xo_attr.3 \
+	xo_create.3 \
+	xo_emit.3 \
+	xo_err.3 \
+	xo_finish.3 \
+	xo_flush.3 \
+	xo_no_setlocale.3 \
+	xo_open_container.3 \
+	xo_open_list.3 \
+	xo_parse_args.3 \
+	xo_set_allocator.3 \
+	xo_set_flags.3 \
+	xo_set_info.3 \
+	xo_set_options.3 \
+	xo_set_style.3 \
+	xo_set_writer.3
+MAN+=	xo_format.5
+
+.include <bsd.lib.mk>