MFC r256450:

  Rename libbsdyml to libyaml, make private, and bump
  SHLIB_MAJOR to 1.0

Approved by:	bapt
Approved by:	re (glebius)

8 files changed, 30 insertions, 74 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index a220806..a7dc278 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,17 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131014: libbsdyml becomes private
+OLD_FILES+=usr/lib/libbsdyml.a
+OLD_FILES+=usr/lib/libbsdyml.so
+OLD_LIBS+=usr/lib/libbsdyml.so.0
+OLD_FILES+=usr/lib/libbsdyml_p.a
+OLD_FILES+=usr/lib32/libbsdyml.a
+OLD_FILES+=usr/lib32/libbsdyml.so
+OLD_LIBS+=usr/lib32/libbsdyml.so.0
+OLD_FILES+=usr/lib32/libbsdyml_p.a
+OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz
+OLD_FILES+=usr/include/bsdyml.h
 # 20131013: Removal of the ATF tools
 OLD_FILES+=etc/atf/FreeBSD.conf
 OLD_FILES+=etc/atf/atf-run.hooks
diff --git a/UPDATING b/UPDATING
index 4802987..db0298e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,15 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20131014:
+	libbsdyml has been renamed to libyaml and moved to /usr/lib/private.
+	This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg
+	1.1.4_8 and verify bsdyml not linked in, before running "make
+	delete-old-libs":
+	  # make -C /usr/ports/ports-mgmt/pkg build deinstall install clean
+	  or
+	  # pkg install pkg; ldd /usr/local/sbin/pkg | grep bsdyml
+
 20131010:
 	The rc.d/jail script has been updated to support jail(8)
 	configuration file.  The "jail_<jname>_*" rc.conf(5) variables
diff --git a/lib/libyaml/Makefile b/lib/libyaml/Makefile
index 5ecec78..113eaff 100644
--- a/lib/libyaml/Makefile
+++ b/lib/libyaml/Makefile
@@ -2,15 +2,13 @@
 
 LIBYAML=	${.CURDIR}/../../contrib/libyaml
 
-LIB=		bsdyml
-SHLIB_MAJOR=	0
-INCS=		bsdyml.h
+LIB=		yaml
+PRIVATELIB=	true
+SHLIB_MAJOR=	1
 SRCS=		api.c dumper.c emitter.c loader.c \
 		parser.c reader.c scanner.c writer.c
-MAN=		libbsdyml.3
 
 .PATH:		${LIBYAML}/src ${LIBYAML}/include
-CLEANFILES=	bsdyml.h
 
 WARNS?=		1
 CFLAGS+=	-I${LIBYAML}/include \
@@ -18,7 +16,4 @@ CFLAGS+=	-I${LIBYAML}/include \
 		-I${.CURDIR} \
 		-DHAVE_CONFIG_H
 
-bsdyml.h: yaml.h
-	cp -f ${.ALLSRC} ${.TARGET}
-
 .include <bsd.lib.mk>
diff --git a/lib/libyaml/libbsdyml.3 b/lib/libyaml/libbsdyml.3
deleted file mode 100644
index 927c47c..0000000
--- a/lib/libyaml/libbsdyml.3
+++ /dev/null
@@ -1,61 +0,0 @@
-.\" Copyright (c) 2013 Baptiste Daroussin <bapt@FreeBSD.org>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd March 05, 2013
-.Dt LIBBSDYML 3
-.Os
-.Sh NAME
-.Nm libbsdyml
-.Nd LibYAML library for parsing and emitting YAML
-.Sh SYNOPSIS
-.In bsdyml.h
-.Sh DESCRIPTION
-The
-.Nm
-library is a verbatim copy of the LibYAML version 0.1.4
-.Pp
-The
-.Nm
-library is intended to be used within the
-.Fx
-base system only.
-Use of the
-.Nm
-library for other purposes is not supported and discouraged.
-.Pp
-To avoid version and autoconfiguration issues, the library has been
-renamed to
-.Nm
-rather than retain the original LibYAML library and include file names
-to prevent confusion and autoconfiguration issues for 3rd party
-software.
-.Sh SEE ALSO
-For full documentation, please see the LibYAML webpage at
-.Pa http://pyyaml.org/wiki/LibYAML .
-.Sh AUTHORS
-.An -nosplit
-The original LibYAML was written by
-.An Kirill Simonov Aq xi@resolvent.net .
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 8ef6e7a..7d224cf 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -21,7 +21,6 @@ LIBAVL?=	${DESTDIR}${LIBDIR}/libavl.a
 LIBBEGEMOT?=	${DESTDIR}${LIBDIR}/libbegemot.a
 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
@@ -166,6 +165,7 @@ LIBWIND?=	${DESTDIR}${LIBDIR}/libwind.a
 LIBWRAP?=	${DESTDIR}${LIBDIR}/libwrap.a
 LIBXPG4?=	${DESTDIR}${LIBDIR}/libxpg4.a
 LIBY?=		${DESTDIR}${LIBDIR}/liby.a
+LIBYAML?=	${DESTDIR}${LIBPRIVATEDIR}/libyaml.a
 LIBYPCLNT?=	${DESTDIR}${LIBDIR}/libypclnt.a
 LIBZ?=		${DESTDIR}${LIBDIR}/libz.a
 LIBZFS?=	${DESTDIR}${LIBDIR}/libzfs.a
diff --git a/tools/make_libdeps.sh b/tools/make_libdeps.sh
index 2f5b32b..dcd1c20 100644
--- a/tools/make_libdeps.sh
+++ b/tools/make_libdeps.sh
@@ -48,7 +48,6 @@ 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'
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
index d244bd2..38d82ba 100644
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -4,7 +4,10 @@ PROG=	pkg
 SRCS=	pkg.c dns_utils.c config.c
 
 NO_MAN=	yes
-DPADD=	${LIBARCHIVE} ${LIBELF} ${LIBFETCH} ${LIBBSDYML} ${LIBSBUF}
-LDADD=	-larchive -lelf -lfetch -lbsdyml -lsbuf
+CFLAGS+=-I${.CURDIR}/../../contrib/libyaml/include
+.PATH:	${.CURDIR}/../../contrib/libyaml/include
+DPADD=	${LIBARCHIVE} ${LIBELF} ${LIBFETCH} ${LIBYAML} ${LIBSBUF}
+LDADD=	-larchive -lelf -lfetch -lyaml -lsbuf
+USEPRIVATELIB=	yaml
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c
index 01eaa9f..429aad6 100644
--- a/usr.sbin/pkg/config.c
+++ b/usr.sbin/pkg/config.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/endian.h>
 
 #include <assert.h>
-#include <bsdyml.h>
+#include <yaml.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>