From 817f3323c4ae6c5685c1bde18aeac92153ab3fd5 Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Wed, 23 Oct 2013 18:07:07 +0000
Subject: MFC r256450:

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

Approved by:	bapt
Approved by:	re (glebius)
---
 lib/libyaml/Makefile    | 11 +++------
 lib/libyaml/libbsdyml.3 | 61 -------------------------------------------------
 2 files changed, 3 insertions(+), 69 deletions(-)
 delete mode 100644 lib/libyaml/libbsdyml.3

(limited to 'lib/libyaml')

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 .
-- 
cgit v1.1