svn commit: r247779 - in head: contrib/libyaml lib lib/libyaml share/mk tools

[Baptiste Daroussin]

Author: bapt
Date: Mon Mar  4 11:27:41 2013
New Revision: 247779
URL: http://svnweb.freebsd.org/changeset/base/247779

Log:
  Import libyaml as libbsdyml (private brand name)
  
  LibYAML is a YAML 1.1 parser and emitter under MIT license which will
  soon be used by the pkg boostrap (usr.bin/pkg) and bhyve
  
  Reviewed by:	roberto, antoine

Added:
  head/contrib/libyaml/
     - copied from r247775, vendor/libyaml/dist/
  head/lib/libyaml/
  head/lib/libyaml/Makefile   (contents, props changed)
  head/lib/libyaml/config.h   (contents, props changed)
Modified:
  head/lib/Makefile
  head/share/mk/bsd.libnames.mk
  head/tools/make_libdeps.sh

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Mon Mar  4 11:22:19 2013	(r247778)
+++ head/lib/Makefile	Mon Mar  4 11:27:41 2013	(r247779)
@@ -119,6 +119,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libvmmapi} \
 	libwrap \
 	liby \
+	libyaml \
 	libz \
 	${_atf} \
 	${_bind} \

Added: head/lib/libyaml/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libyaml/Makefile	Mon Mar  4 11:27:41 2013	(r247779)
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+LIBYAML=	${.CURDIR}/../../contrib/libyaml
+
+LIB=		bsdyml
+SHLIB_MAJOR=	0
+INCS=		bsdyml.h
+SRCS=		api.c dumper.c emitter.c loader.c \
+		parser.c reader.c scanner.c writer.c
+
+.PATH:		${LIBYAML}/src ${LIBYAML}/include
+CLEANFILES=	bsdyml.h
+
+WARNS?=		1
+CFLAGS+=	-I${LIBYAML}/include \
+		-I${LIBYAML} \
+		-I${.CURDIR} \
+		-DHAVE_CONFIG_H
+
+bsdyml.h: yaml.h
+	cp -f ${.ALLSRC} ${.TARGET}
+
+.include <bsd.lib.mk>

Added: head/lib/libyaml/config.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libyaml/config.h	Mon Mar  4 11:27:41 2013	(r247779)
@@ -0,0 +1,83 @@
+/* $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 */

Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk	Mon Mar  4 11:22:19 2013	(r247778)
+++ head/share/mk/bsd.libnames.mk	Mon Mar  4 11:27:41 2013	(r247779)
@@ -25,6 +25,7 @@ LIBBIND9?=	${DESTDIR}${LIBDIR}/libbind9.
 .endif
 LIBBLUETOOTH?=	${DESTDIR}${LIBDIR}/libbluetooth.a
 LIBBSDXML?=	${DESTDIR}${LIBDIR}/libbsdxml.a
+LIBBSDYML?=	${DESTDIR}${LIBDIR}/libbsdyml.a
 LIBBSM?=	${DESTDIR}${LIBDIR}/libbsm.a
 LIBBSNMP?=	${DESTDIR}${LIBDIR}/libbsnmp.a
 LIBBZ2?=	${DESTDIR}${LIBDIR}/libbz2.a

Modified: head/tools/make_libdeps.sh
==============================================================================
--- head/tools/make_libdeps.sh	Mon Mar  4 11:22:19 2013	(r247778)
+++ head/tools/make_libdeps.sh	Mon Mar  4 11:27:41 2013	(r247779)
@@ -47,6 +47,7 @@ sed -E
     -e's; ;! ;g'
     -e's;$;!;'
     -e's;-lbsdxml!;lib/libexpat;g'
+    -e's;-lbsdyml!;lib/libyaml;g'
     -e's;-lpthread!;lib/libthr;g'
     -e's;-lm!;lib/msun;g'
     -e's;-l(ncurses|termcap)!;lib/ncurses/ncurses;g'