svn commit: r256998 - in stable/10: . lib/libyaml share/mk tools usr.sbin/pkg
Bryan Drewery
bdrewery at FreeBSD.org
Wed Oct 23 18:07:09 UTC 2013
Author: bdrewery (ports committer)
Date: Wed Oct 23 18:07:07 2013
New Revision: 256998
URL: http://svnweb.freebsd.org/changeset/base/256998
Log:
MFC r256450:
Rename libbsdyml to libyaml, make private, and bump
SHLIB_MAJOR to 1.0
Approved by: bapt
Approved by: re (glebius)
Deleted:
stable/10/lib/libyaml/libbsdyml.3
Modified:
stable/10/ObsoleteFiles.inc (contents, props changed)
stable/10/UPDATING (contents, props changed)
stable/10/lib/libyaml/Makefile
stable/10/share/mk/bsd.libnames.mk
stable/10/tools/make_libdeps.sh
stable/10/usr.sbin/pkg/Makefile
stable/10/usr.sbin/pkg/config.c
Directory Properties:
stable/10/lib/libyaml/ (props changed)
stable/10/share/mk/ (props changed)
stable/10/tools/ (props changed)
stable/10/usr.sbin/pkg/ (props changed)
Modified: stable/10/ObsoleteFiles.inc
==============================================================================
--- stable/10/ObsoleteFiles.inc Wed Oct 23 17:59:46 2013 (r256997)
+++ stable/10/ObsoleteFiles.inc Wed Oct 23 18:07:07 2013 (r256998)
@@ -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
Modified: stable/10/UPDATING
==============================================================================
--- stable/10/UPDATING Wed Oct 23 17:59:46 2013 (r256997)
+++ stable/10/UPDATING Wed Oct 23 18:07:07 2013 (r256998)
@@ -16,6 +16,15 @@ from older versions of FreeBSD, try WITH
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
Modified: stable/10/lib/libyaml/Makefile
==============================================================================
--- stable/10/lib/libyaml/Makefile Wed Oct 23 17:59:46 2013 (r256997)
+++ stable/10/lib/libyaml/Makefile Wed Oct 23 18:07:07 2013 (r256998)
@@ -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>
Modified: stable/10/share/mk/bsd.libnames.mk
==============================================================================
--- stable/10/share/mk/bsd.libnames.mk Wed Oct 23 17:59:46 2013 (r256997)
+++ stable/10/share/mk/bsd.libnames.mk Wed Oct 23 18:07:07 2013 (r256998)
@@ -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
Modified: stable/10/tools/make_libdeps.sh
==============================================================================
--- stable/10/tools/make_libdeps.sh Wed Oct 23 17:59:46 2013 (r256997)
+++ stable/10/tools/make_libdeps.sh Wed Oct 23 18:07:07 2013 (r256998)
@@ -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'
Modified: stable/10/usr.sbin/pkg/Makefile
==============================================================================
--- stable/10/usr.sbin/pkg/Makefile Wed Oct 23 17:59:46 2013 (r256997)
+++ stable/10/usr.sbin/pkg/Makefile Wed Oct 23 18:07:07 2013 (r256998)
@@ -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>
Modified: stable/10/usr.sbin/pkg/config.c
==============================================================================
--- stable/10/usr.sbin/pkg/config.c Wed Oct 23 17:59:46 2013 (r256997)
+++ stable/10/usr.sbin/pkg/config.c Wed Oct 23 18:07:07 2013 (r256998)
@@ -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>
More information about the svn-src-stable
mailing list