8 files changed, 213 insertions, 0 deletions
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
new file mode 100644
index 0000000000000..03e7d19c44405
--- /dev/null
+++ b/lib/atf/libatf-c++/Makefile
@@ -0,0 +1,79 @@
+#-
+# Copyright (c) 2011 Google, Inc.
+# 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 AUTHOR 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 AUTHOR 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$
+
+.include <src.opts.mk>
+.include <bsd.init.mk>
+
+LIB_CXX=	atf-c++
+PRIVATELIB=	true
+SHLIB_MAJOR=	2
+
+# libatf-c++ depends on the C version of the ATF library to build.
+LIBADD+=	atf_c
+
+LDFLAGS+=	-L${.OBJDIR:H}/libatf-c
+
+ATF=		${SRCTOP}/contrib/atf
+.PATH:		${ATF}
+.PATH:		${ATF}/atf-c++
+.PATH:		${ATF}/atf-c++/detail
+
+CFLAGS+=	-I${ATF}
+CFLAGS+=	-I${.CURDIR:H}/libatf-c
+CFLAGS+=	-I.
+
+CFLAGS+=	-DHAVE_CONFIG_H
+
+SRCS=		application.cpp \
+		build.cpp \
+		check.cpp \
+		env.cpp \
+		exceptions.cpp \
+		fs.cpp \
+		process.cpp \
+		tests.cpp \
+		text.cpp \
+		utils.cpp
+
+INCS=		build.hpp \
+		check.hpp \
+		macros.hpp \
+		tests.hpp \
+		utils.hpp
+INCSDIR=	${INCLUDEDIR}/atf-c++
+
+INCS+=		atf-c++.hpp
+INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
+
+MAN=		atf-c++.3
+MLINKS+=	atf-c++.3 atf-c-api++.3  # Backwards compatibility.
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+
+.include "../common.mk"
+.include <bsd.lib.mk>
diff --git a/lib/atf/libatf-c++/Makefile.depend b/lib/atf/libatf-c++/Makefile.depend
new file mode 100644
index 0000000000000..b0b52c8a3f369
--- /dev/null
+++ b/lib/atf/libatf-c++/Makefile.depend
@@ -0,0 +1,21 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/atf/libatf-c \
+	lib/libc \
+	lib/libc++ \
+	lib/libcompiler_rt \
+	lib/libcxxrt \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/atf/libatf-c++/Makefile.inc b/lib/atf/libatf-c++/Makefile.inc
new file mode 100644
index 0000000000000..265f86d1ed55a
--- /dev/null
+++ b/lib/atf/libatf-c++/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile
new file mode 100644
index 0000000000000..0e0e455e458d3
--- /dev/null
+++ b/lib/atf/libatf-c++/tests/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+PACKAGE=	tests
+
+TESTS_SUBDIRS=	detail
+
+ATF=		${SRCTOP}/contrib/atf
+.PATH:		${ATF}/atf-c++
+.PATH:		${ATF}/atf-c++/detail
+
+CFLAGS+=	-DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"'
+CFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
+CFLAGS+=	-I${ATF}
+
+${PACKAGE}FILES+=	macros_hpp_test.cpp
+${PACKAGE}FILES+=	unused_test.cpp
+
+.for _T in	atf_c++_test \
+		build_test \
+		check_test \
+		macros_test \
+		tests_test \
+		utils_test
+ATF_TESTS_CXX+=	${_T}
+SRCS.${_T}=	${_T}.cpp test_helpers.cpp
+.endfor
+
+.include <bsd.test.mk>
diff --git a/lib/atf/libatf-c++/tests/Makefile.depend b/lib/atf/libatf-c++/tests/Makefile.depend
new file mode 100644
index 0000000000000..5eb060af3bca2
--- /dev/null
+++ b/lib/atf/libatf-c++/tests/Makefile.depend
@@ -0,0 +1,22 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/atf/libatf-c \
+	lib/atf/libatf-c++ \
+	lib/libc \
+	lib/libc++ \
+	lib/libcompiler_rt \
+	lib/libcxxrt \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/atf/libatf-c++/tests/Makefile.inc b/lib/atf/libatf-c++/tests/Makefile.inc
new file mode 100644
index 0000000000000..265f86d1ed55a
--- /dev/null
+++ b/lib/atf/libatf-c++/tests/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile
new file mode 100644
index 0000000000000..f7d672e792fbc
--- /dev/null
+++ b/lib/atf/libatf-c++/tests/detail/Makefile
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++/detail
+
+ATF=		${SRCTOP}/contrib/atf
+.PATH:		${ATF}/atf-c++/detail
+
+CFLAGS+=	-DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"'
+CFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
+CFLAGS+=	-I${ATF}
+
+.for _T in	application_test \
+		env_test \
+		exceptions_test \
+		fs_test \
+		process_test \
+		text_test
+ATF_TESTS_CXX+=	${_T}
+SRCS.${_T}=	${_T}.cpp test_helpers.cpp
+.endfor
+
+.for p in version_helper
+PROGS_CXX+=	${p}
+SRCS.${p}=	${p}.cpp
+MAN.${p}=	# defined
+BINDIR.${p}=	${TESTSDIR}
+.endfor
+version_helper.o: atf-version
+
+.include "../../../common.mk"
+.include <bsd.test.mk>
diff --git a/lib/atf/libatf-c++/tests/detail/Makefile.depend b/lib/atf/libatf-c++/tests/detail/Makefile.depend
new file mode 100644
index 0000000000000..5eb060af3bca2
--- /dev/null
+++ b/lib/atf/libatf-c++/tests/detail/Makefile.depend
@@ -0,0 +1,22 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/atf/libatf-c \
+	lib/atf/libatf-c++ \
+	lib/libc \
+	lib/libc++ \
+	lib/libcompiler_rt \
+	lib/libcxxrt \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif