Merge from head@274682

8 files changed, 24 insertions, 36 deletions

diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc
index 40da946..392bbb2 100644
--- a/lib/atf/Makefile.inc
+++ b/lib/atf/Makefile.inc
@@ -25,29 +25,6 @@
 #
 # $FreeBSD$
 
-_CFLAGS:=	${CFLAGS}
-_CPPFLAGS:=	${CPPFLAGS}
-_CXXFLAGS:=	${CXXFLAGS}
-
 CFLAGS+=	-DHAVE_CONFIG_H
-CFLAGS+=	-DATF_ARCH='"${MACHINE}"'
-CFLAGS+=	-DATF_BUILD_CC='"${CC}"'
-CFLAGS+=	-DATF_BUILD_CFLAGS='"${_CFLAGS}"'
-CFLAGS+=	-DATF_BUILD_CPP='"${CPP}"'
-CFLAGS+=	-DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"'
-CFLAGS+=	-DATF_BUILD_CXX='"${CXX}"'
-CFLAGS+=	-DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
-CFLAGS+=	-DATF_CONFDIR='"${CONFDIR}/atf"'
-CFLAGS+=	-DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"'
-CFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
-CFLAGS+=	-DATF_LIBDIR='"${LIBDIR}"'
-CFLAGS+=	-DATF_LIBEXECDIR='"${LIBEXECDIR}"'
-CFLAGS+=	-DATF_MACHINE='"${MACHINE_ARCH}"'
-CFLAGS+=	-DATF_M4='"/usr/bin/m4"'
-CFLAGS+=	-DATF_PKGDATADIR='"${SHAREDIR}/atf"'
-CFLAGS+=	-DATF_SHELL='"/bin/sh"'
-CFLAGS+=	-DATF_WORKDIR='"/tmp"'
 
 WARNS?=		3
-
-# vim: syntax=make
diff --git a/lib/atf/common.mk b/lib/atf/common.mk
index 6338207..581befb 100644
--- a/lib/atf/common.mk
+++ b/lib/atf/common.mk
@@ -14,6 +14,6 @@ atf-version: atf-version-real
 	@cmp -s atf-version atf-version-real \
 	    || cp atf-version-real atf-version
 atf-version-real: .PHONY
-	@grep 'define VERSION' ${ATF}/bconfig.h \
+	@grep 'define VERSION' ${ATF}/config.h \
 	    | cut -d '"' -f 2 >atf-version-real
 CLEANFILES+= atf-version atf-version-real
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
index 163f7fb..352a8f4 100644
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -30,10 +30,10 @@
 
 LIB=		atf-c++
 PRIVATELIB=	true
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 
 # libatf-c++ depends on the C version of the ATF library to build.
-DPADD=		${LIBATFC}
+DPADD=		${LIBATF_C}
 LDADD=		-latf-c
 
 LDFLAGS+=	-L${.OBJDIR}/../libatf-c
@@ -52,7 +52,6 @@ CFLAGS+=	-DHAVE_CONFIG_H
 SRCS=		application.cpp \
 		build.cpp \
 		check.cpp \
-		config.cpp \
 		env.cpp \
 		exceptions.cpp \
 		fs.cpp \
@@ -63,7 +62,6 @@ SRCS=		application.cpp \
 
 INCS=		build.hpp \
 		check.hpp \
-		config.hpp \
 		macros.hpp \
 		tests.hpp \
 		utils.hpp
@@ -72,7 +70,8 @@ INCSDIR=	${INCLUDEDIR}/atf-c++
 INCS+=		atf-c++.hpp
 INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
 
-MAN=		atf-c++-api.3
+MAN=		atf-c++.3
+MLINKS+=	atf-c++.3 atf-c-api++.3  # Backwards compatibility.
 
 .if ${MK_TESTS} != "no"
 SUBDIR=		tests
diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile
index 56355f2..5f5a575 100644
--- a/lib/atf/libatf-c++/tests/Makefile
+++ b/lib/atf/libatf-c++/tests/Makefile
@@ -9,6 +9,8 @@ ATF=		${.CURDIR:H:H:H:H}/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}
 
 FILESDIR=	${TESTSDIR}
@@ -18,7 +20,6 @@ FILES+=		unused_test.cpp
 .for _T in	atf_c++_test \
 		build_test \
 		check_test \
-		config_test \
 		macros_test \
 		tests_test \
 		utils_test
diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile
index b3fd4dc..69c3e7b 100644
--- a/lib/atf/libatf-c++/tests/detail/Makefile
+++ b/lib/atf/libatf-c++/tests/detail/Makefile
@@ -7,6 +7,8 @@ TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++/detail
 ATF=		${.CURDIR:H:H:H:H:H}/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 \
@@ -14,7 +16,6 @@ CFLAGS+=	-I${ATF}
 		exceptions_test \
 		fs_test \
 		process_test \
-		sanity_test \
 		text_test
 ATF_TESTS_CXX+=	${_T}
 SRCS.${_T}=	${_T}.cpp test_helpers.cpp
diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
index 4920eb5..0fbb4ca 100644
--- a/lib/atf/libatf-c/Makefile
+++ b/lib/atf/libatf-c/Makefile
@@ -28,22 +28,31 @@
 .include <src.opts.mk>
 .include <bsd.init.mk>
 
+_CFLAGS:=	${CFLAGS}
+_CPPFLAGS:=	${CPPFLAGS}
+_CXXFLAGS:=	${CXXFLAGS}
+
 LIB=		atf-c
 PRIVATELIB=	true
-SHLIB_MAJOR=	0
+SHLIB_MAJOR=	1
 
 ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
 
+CFLAGS+=	-DATF_BUILD_CC='"${CC}"'
+CFLAGS+=	-DATF_BUILD_CFLAGS='"${_CFLAGS}"'
+CFLAGS+=	-DATF_BUILD_CPP='"${CPP}"'
+CFLAGS+=	-DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"'
+CFLAGS+=	-DATF_BUILD_CXX='"${CXX}"'
+CFLAGS+=	-DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
 CFLAGS+=	-I${ATF}
 CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I.
 
 SRCS=		build.c \
 		check.c \
-		config.c \
 		dynstr.c \
 		env.c \
 		error.c \
@@ -61,7 +70,6 @@ SRCS=		build.c \
 
 INCS=		build.h \
 		check.h \
-		config.h \
 		defs.h \
 		error.h \
 		error_fwd.h \
@@ -74,7 +82,8 @@ INCSDIR=	${INCLUDEDIR}/atf-c
 INCS+=		atf-c.h
 INCSDIR_atf-c.h= ${INCLUDEDIR}
 
-MAN=		atf-c-api.3
+MAN=		atf-c.3
+MLINKS+=	atf-c.3 atf-c-api.3  # Backwards compatibility.
 
 .if ${MK_TESTS} != "no"
 SUBDIR=		tests
diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile
index 70ba1a5..d5b6dc0 100644
--- a/lib/atf/libatf-c/tests/Makefile
+++ b/lib/atf/libatf-c/tests/Makefile
@@ -9,6 +9,7 @@ ATF=		${.CURDIR:H:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
 
+CFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
 CFLAGS+=	-I${ATF}
 
 # macros_test.c contains a double 'const const' which will be gone with
@@ -23,7 +24,6 @@ FILES+=		unused_test.c
 .for _T in	atf_c_test \
 		build_test \
 		check_test \
-		config_test \
 		error_test \
 		macros_test \
 		tc_test \
diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile
index aa85aa3..02c1f2b 100644
--- a/lib/atf/libatf-c/tests/detail/Makefile
+++ b/lib/atf/libatf-c/tests/detail/Makefile
@@ -7,6 +7,7 @@ TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c/detail
 ATF=		${.CURDIR:H:H:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-c/detail
 
+CFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
 CFLAGS+=	-I${ATF}
 
 .for _T in	dynstr_test \