Merge from head up to r262415.

4 files changed, 22 insertions, 103 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 4912259..082a4ab 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -119,6 +119,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libtelnet} \
 	${_libthr} \
 	libthread_db \
+	libucl \
 	libufs \
 	libugidfw \
 	libulog \
@@ -129,7 +130,6 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libvmmapi} \
 	libwrap \
 	liby \
-	libyaml \
 	libz \
 	${_atf} \
 	${_clang} \
diff --git a/lib/libucl/Makefile b/lib/libucl/Makefile
new file mode 100644
index 0000000..1bb076d
--- /dev/null
+++ b/lib/libucl/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+LIBUCL=	${.CURDIR}/../../contrib/libucl
+
+LIB=		ucl
+PRIVATELIB=	true
+SHLIB_MAJOR=	1
+SRCS=		ucl_emitter.c \
+		ucl_hash.c \
+		ucl_parser.c  \
+		ucl_util.c \
+		xxhash.c
+
+.PATH:		${LIBUCL}/src
+
+WARNS=		1
+CFLAGS+=	-I${LIBUCL}/include \
+		-I${LIBUCL}/src \
+		-I${LIBUCL}/uthash
+
+.include <bsd.lib.mk>
diff --git a/lib/libyaml/Makefile b/lib/libyaml/Makefile
deleted file mode 100644
index 113eaff..0000000
--- a/lib/libyaml/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-LIBYAML=	${.CURDIR}/../../contrib/libyaml
-
-LIB=		yaml
-PRIVATELIB=	true
-SHLIB_MAJOR=	1
-SRCS=		api.c dumper.c emitter.c loader.c \
-		parser.c reader.c scanner.c writer.c
-
-.PATH:		${LIBYAML}/src ${LIBYAML}/include
-
-WARNS?=		1
-CFLAGS+=	-I${LIBYAML}/include \
-		-I${LIBYAML} \
-		-I${.CURDIR} \
-		-DHAVE_CONFIG_H
-
-.include <bsd.lib.mk>
diff --git a/lib/libyaml/config.h b/lib/libyaml/config.h
deleted file mode 100644
index 7032919..0000000
--- a/lib/libyaml/config.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* $FreeBSD$ */
-
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "yaml"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://pyyaml.org/newticket?component=libyaml"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "yaml"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yaml 0.1.4"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "yaml"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.1.4"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "0.1.4"
-
-/* Define the major version number. */
-#define YAML_VERSION_MAJOR 0
-
-/* Define the minor version number. */
-#define YAML_VERSION_MINOR 1
-
-/* Define the patch version number. */
-#define YAML_VERSION_PATCH 4
-
-/* Define the version string. */
-#define YAML_VERSION_STRING "0.1.4"
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */