Module Name: src
Committed By: jmmv
Date: Wed Oct 20 09:20:14 UTC 2010
Modified Files:
src/external/bsd/atf: Makefile
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/tests/atf: Makefile
src/external/bsd/atf/tests/atf/atf-c: Makefile
src/external/bsd/atf/tests/atf/atf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-report: Makefile
src/external/bsd/atf/tests/atf/atf-run: Makefile
src/external/bsd/atf/tests/atf/atf-sh: Makefile
src/external/bsd/atf/usr.bin: Makefile
src/external/bsd/atf/usr.bin/atf-config: Makefile
src/external/bsd/atf/usr.bin/atf-report: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Added Files:
src/external/bsd/atf/libexec: Makefile
src/external/bsd/atf/libexec/atf-check: Makefile
src/external/bsd/atf/tests/atf/atf-c++/detail: Makefile
src/external/bsd/atf/tests/atf/atf-c/detail: Makefile
Removed Files:
src/external/bsd/atf/tests/atf/atf-check: Makefile
src/external/bsd/atf/usr.bin/atf-check: Makefile
Log Message:
Adjust reachover makefiles for atf 0.11.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r0 -r1.4 src/external/bsd/atf/libexec/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/libexec/atf-check/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/tests/atf/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
cvs rdiff -u -r1.3 -r0 src/external/bsd/atf/tests/atf/atf-check/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/tests/atf/atf-report/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/tests/atf/atf-run/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/tests/atf/atf-sh/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/usr.bin/Makefile
cvs rdiff -u -r1.3 -r0 src/external/bsd/atf/usr.bin/atf-check/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/atf-config/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/usr.bin/atf-version/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/Makefile
diff -u src/external/bsd/atf/Makefile:1.2 src/external/bsd/atf/Makefile:1.3
--- src/external/bsd/atf/Makefile:1.2 Sat Jul 3 08:14:11 2010
+++ src/external/bsd/atf/Makefile Wed Oct 20 09:20:09 2010
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2010/07/03 08:14:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/10/20 09:20:09 jmmv Exp $
-SUBDIR= etc lib .WAIT share usr.bin tests
+SUBDIR= etc lib .WAIT libexec share usr.bin tests
.include <bsd.subdir.mk>
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.6 src/external/bsd/atf/lib/libatf-c/Makefile:1.7
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.6 Sat Jul 3 08:14:11 2010
+++ src/external/bsd/atf/lib/libatf-c/Makefile Wed Oct 20 09:20:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/07/03 08:14:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2010/10/20 09:20:09 jmmv Exp $
NOLINT= # defined
@@ -10,6 +10,7 @@
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf-c
+.PATH: ${SRCDIR}/atf-c/detail
CPPFLAGS+= -I${.CURDIR}
CPPFLAGS+= -I.
@@ -47,6 +48,7 @@
sanity.c \
text.c \
user.c \
+ utils.c \
tc.c \
tp.c \
tp_main.c
@@ -55,20 +57,12 @@
check.h \
config.h \
defs.h \
- dynstr.h \
- env.h \
error.h \
error_fwd.h \
- fs.h \
- list.h \
macros.h \
- map.h \
- process.h \
- sanity.h \
tc.h \
- text.h \
tp.h \
- user.h
+ utils.h
INCSDIR= /usr/include/atf-c
INCS+= atf-c.h
@@ -90,7 +84,7 @@
realall: atf-c.pc
atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.10,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.11,g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.5 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.6
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.5 Sat Jul 3 08:14:11 2010
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Wed Oct 20 09:20:09 2010
@@ -31,6 +31,9 @@
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
+/* Define to 1 if getopt has optreset */
+/* #undef HAVE_OPTRESET */
+
/* Define to 1 if you have the `putenv' function. */
#define HAVE_PUTENV 1
@@ -102,7 +105,7 @@
#define PACKAGE_NAME "Automated Testing Framework"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.10"
+#define PACKAGE_STRING "Automated Testing Framework 0.11"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "atf"
@@ -111,10 +114,10 @@
#define PACKAGE_URL "http://www.NetBSD.org/~jmmv/atf/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10"
+#define PACKAGE_VERSION "0.11"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.10"
+#define VERSION "0.11"
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.4 src/external/bsd/atf/lib/libatf-c++/Makefile:1.5
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.4 Sat Jul 3 08:14:11 2010
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Wed Oct 20 09:20:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/07/03 08:14:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/10/20 09:20:10 jmmv Exp $
NOLINT= # defined
@@ -11,6 +11,7 @@
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf-c++
+.PATH: ${SRCDIR}/atf-c++/detail
CPPFLAGS+= -I${.CURDIR}/../libatf-c
CPPFLAGS+= -I.
@@ -27,33 +28,17 @@
exceptions.cpp \
expand.cpp \
fs.cpp \
- io.cpp \
parser.cpp \
process.cpp \
- signals.cpp \
tests.cpp \
text.cpp \
- ui.cpp \
- user.cpp
+ ui.cpp
-INCS= application.hpp \
- build.hpp \
+INCS= build.hpp \
check.hpp \
config.hpp \
- env.hpp \
- exceptions.hpp \
- expand.hpp \
- fs.hpp \
- io.hpp \
macros.hpp \
- parser.hpp \
- process.hpp \
- sanity.hpp \
- signals.hpp \
tests.hpp \
- text.hpp \
- ui.hpp \
- user.hpp \
utils.hpp
INCSDIR= /usr/include/atf-c++
@@ -68,7 +53,7 @@
realall: atf-c++.pc
atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.10,g' \
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.11,g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
-e 's,__LIBDIR__,/usr/lib,g' \
Index: src/external/bsd/atf/tests/atf/Makefile
diff -u src/external/bsd/atf/tests/atf/Makefile:1.5 src/external/bsd/atf/tests/atf/Makefile:1.6
--- src/external/bsd/atf/tests/atf/Makefile:1.5 Tue Jul 13 21:12:38 2010
+++ src/external/bsd/atf/tests/atf/Makefile Wed Oct 20 09:20:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/07/13 21:12:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2010/10/20 09:20:10 jmmv Exp $
.include <bsd.own.mk>
@@ -7,7 +7,6 @@
SUBDIR= atf-c \
atf-c++ \
- atf-check \
atf-config \
atf-report \
atf-run \
Index: src/external/bsd/atf/tests/atf/atf-c/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/Makefile:1.6 src/external/bsd/atf/tests/atf/atf-c/Makefile:1.7
--- src/external/bsd/atf/tests/atf/atf-c/Makefile:1.6 Tue Jul 13 21:12:38 2010
+++ src/external/bsd/atf/tests/atf/atf-c/Makefile Wed Oct 20 09:20:10 2010
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.6 2010/07/13 21:12:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2010/10/20 09:20:10 jmmv Exp $
.include <bsd.own.mk>
+TESTS_SUBDIRS= detail
+
TESTSDIR= ${TESTSBASE}/atf/atf-c
ATFFILE= yes
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-c
+.PATH: ${SRCDIR}/atf-c/detail
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${NETBSDSRCDIR}/external/bsd/atf/lib/libatf-c
-PROGS= process_helpers
-SRCS.process_helpers= process_helpers.c
-MAN.process_helpers= # defined
-BINDIR.process_helpers= ${TESTSDIR}
-
FILESDIR= ${TESTSDIR}
FILES= macros_h_test.c
@@ -24,20 +22,11 @@
build_test \
check_test \
config_test \
- dynstr_test \
- env_test \
error_test \
- fs_test \
- test_helpers_test \
- list_test \
macros_test \
- map_test \
- process_test \
- sanity_test \
tc_test \
- text_test \
tp_test \
- user_test
+ utils_test
TESTS_C+= ${test}
SRCS.${test}= ${test}.c test_helpers.c
.endfor
Index: src/external/bsd/atf/tests/atf/atf-c++/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.5 src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.6
--- src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.5 Tue Jul 13 21:12:38 2010
+++ src/external/bsd/atf/tests/atf/atf-c++/Makefile Wed Oct 20 09:20:11 2010
@@ -1,39 +1,29 @@
-# $NetBSD: Makefile,v 1.5 2010/07/13 21:12:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2010/10/20 09:20:11 jmmv Exp $
.include <bsd.own.mk>
+TESTS_SUBDIRS= detail
+
TESTSDIR= ${TESTSBASE}/atf/atf-c++
ATFFILE= yes
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-c++
+.PATH: ${SRCDIR}/atf-c++/detail
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-c
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-c++
FILESDIR= ${TESTSDIR}
FILES= macros_hpp_test.cpp
TESTS_CXX=
-.for test in application_test \
- atf_c++_test \
+.for test in atf_c++_test \
build_test \
check_test \
config_test \
- env_test \
- exceptions_test \
- expand_test \
- fs_test \
- io_test \
macros_test \
- parser_test \
- process_test \
- sanity_test \
- signals_test \
tests_test \
- text_test \
- ui_test \
- user_test \
utils_test
TESTS_CXX+= ${test}
SRCS.${test}= ${test}.cpp test_helpers.cpp
Index: src/external/bsd/atf/tests/atf/atf-report/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-report/Makefile:1.4 src/external/bsd/atf/tests/atf/atf-report/Makefile:1.5
--- src/external/bsd/atf/tests/atf/atf-report/Makefile:1.4 Tue Jul 13 21:12:39 2010
+++ src/external/bsd/atf/tests/atf/atf-report/Makefile Wed Oct 20 09:20:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/07/13 21:12:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/10/20 09:20:11 jmmv Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-report
-.PATH: ${SRCDIR}/atf-c++
+.PATH: ${SRCDIR}/atf-c++/detail
TESTS_CXX= fail_helper
TESTS_CXX+= misc_helpers
@@ -16,8 +16,8 @@
TESTS_SH= integration_test
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${SRCDIR}/atf-c++
+CPPFLAGS+= -I${SRCDIR}
-SRCS.reader_test= reader_test.cpp reader.cpp
+SRCS.reader_test= reader_test.cpp reader.cpp test_helpers.cpp
.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-run/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-run/Makefile:1.4 src/external/bsd/atf/tests/atf/atf-run/Makefile:1.5
--- src/external/bsd/atf/tests/atf/atf-run/Makefile:1.4 Tue Jul 13 21:12:39 2010
+++ src/external/bsd/atf/tests/atf/atf-run/Makefile Wed Oct 20 09:20:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/07/13 21:12:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/10/20 09:20:12 jmmv Exp $
.include <bsd.own.mk>
@@ -8,11 +8,12 @@
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-run
.PATH: ${SRCDIR}/atf-c++
+.PATH: ${SRCDIR}/atf-c++/detail
.PATH: ${.CURDIR}/../../../lib/libatf-c
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${SRCDIR}/atf-run
-CPPFLAGS+= -I${SRCDIR}/atf-c++
+CPPFLAGS+= -I${SRCDIR}
CPPFLAGS+= -I${.CURDIR}/../../../lib/libatf-c
TESTS_CXX= atffile_test
@@ -20,18 +21,25 @@
TESTS_CXX+= config_test
TESTS_CXX+= expect_helpers
TESTS_CXX+= fs_test
+TESTS_CXX+= io_test
TESTS_CXX+= misc_helpers
TESTS_CXX+= pass_helper
TESTS_CXX+= requirements_test
TESTS_CXX+= several_tcs_helper
+TESTS_CXX+= signals_test
TESTS_CXX+= test_program_test
+TESTS_CXX+= user_test
TESTS_CXX+= zero_tcs_helper
TESTS_SH= integration_test
SRCS.atffile_test= atffile_test.cpp atffile.cpp test_helpers.cpp
SRCS.config_test= config_test.cpp config.cpp test_helpers.cpp
-SRCS.fs_test= fs_test.cpp fs.cpp test_helpers.cpp
-SRCS.requirements_test= requirements_test.cpp requirements.cpp
-SRCS.test_program_test= test_program_test.cpp test-program.cpp fs.cpp timer.cpp
+SRCS.fs_test= fs_test.cpp fs.cpp test_helpers.cpp user.cpp
+SRCS.io_test= io_test.cpp io.cpp signals.cpp test_helpers.cpp
+SRCS.requirements_test= requirements_test.cpp requirements.cpp user.cpp
+SRCS.signals_test= signals_test.cpp signals.cpp
+SRCS.test_program_test= fs.cpp io.cpp signals.cpp test_helpers.cpp \
+ test_program_test.cpp test-program.cpp timer.cpp
+SRCS.user_test= user_test.cpp user.cpp
.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-sh/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.4 src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.5
--- src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.4 Tue Jul 13 21:12:39 2010
+++ src/external/bsd/atf/tests/atf/atf-sh/Makefile Wed Oct 20 09:20:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/07/13 21:12:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/10/20 09:20:12 jmmv Exp $
.include <bsd.own.mk>
@@ -10,7 +10,8 @@
CPPFLAGS+= -DHAVE_CONFIG_H
-TESTS_SH= atf_check_test
+TESTS_SH= atf-check_test
+TESTS_SH+= atf_check_test
TESTS_SH+= config_test
TESTS_SH+= integration_test
TESTS_SH+= misc_helpers
Index: src/external/bsd/atf/usr.bin/Makefile
diff -u src/external/bsd/atf/usr.bin/Makefile:1.2 src/external/bsd/atf/usr.bin/Makefile:1.3
--- src/external/bsd/atf/usr.bin/Makefile:1.2 Fri Jun 4 08:33:42 2010
+++ src/external/bsd/atf/usr.bin/Makefile Wed Oct 20 09:20:12 2010
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/10/20 09:20:12 jmmv Exp $
-SUBDIR= atf-check atf-config atf-report atf-run atf-sh atf-version
+SUBDIR= atf-config atf-report atf-run atf-sh atf-version
.include <bsd.subdir.mk>
Index: src/external/bsd/atf/usr.bin/atf-config/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-config/Makefile:1.3 src/external/bsd/atf/usr.bin/atf-config/Makefile:1.4
--- src/external/bsd/atf/usr.bin/atf-config/Makefile:1.3 Sat Jul 3 08:14:13 2010
+++ src/external/bsd/atf/usr.bin/atf-config/Makefile Wed Oct 20 09:20:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/07/03 08:14:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/10/20 09:20:13 jmmv Exp $
.include <bsd.own.mk>
@@ -13,6 +13,7 @@
LDADD+= -latf-c++ -latf-c
CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${SRCDIR}
WARNS?= 2
Index: src/external/bsd/atf/usr.bin/atf-report/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-report/Makefile:1.3 src/external/bsd/atf/usr.bin/atf-report/Makefile:1.4
--- src/external/bsd/atf/usr.bin/atf-report/Makefile:1.3 Sat Jul 3 08:14:13 2010
+++ src/external/bsd/atf/usr.bin/atf-report/Makefile Wed Oct 20 09:20:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/07/03 08:14:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/10/20 09:20:13 jmmv Exp $
.include <bsd.own.mk>
@@ -13,6 +13,7 @@
LDADD+= -latf-c++ -latf-c
CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${SRCDIR}
WARNS?= 2
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.7 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.8
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.7 Sat Jul 3 08:14:13 2010
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Wed Oct 20 09:20:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/07/03 08:14:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2010/10/20 09:20:13 jmmv Exp $
.include <bsd.own.mk>
@@ -9,11 +9,12 @@
BINDIR= /usr/bin
PROG_CXX= atf-run
-SRCS= atf-run.cpp atffile.cpp config.cpp fs.cpp requirements.cpp \
- test-program.cpp timer.cpp
+SRCS= atf-run.cpp atffile.cpp config.cpp fs.cpp io.cpp requirements.cpp \
+ signals.cpp test-program.cpp timer.cpp user.cpp
MAN= atf-run.1
CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${SRCDIR}
CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c
LDADD+= -latf-c++ -latf-c
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.2 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.3
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.2 Sat Jul 3 08:14:13 2010
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Wed Oct 20 09:20:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/07/03 08:14:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/10/20 09:20:13 jmmv Exp $
.include <bsd.own.mk>
@@ -13,6 +13,7 @@
LDADD+= -latf-c++ -latf-c
CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${SRCDIR}
WARNS?= 2
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.5 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.6
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.5 Sat Jul 3 08:14:13 2010
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Wed Oct 20 09:20:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/07/03 08:14:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2010/10/20 09:20:13 jmmv Exp $
.include <bsd.own.mk>
@@ -11,6 +11,7 @@
MAN= atf-version.1
CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${SRCDIR}
CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c
CPPFLAGS+= -I${.CURDIR}
LDADD+= -latf-c++ -latf-c
Added files:
Index: src/external/bsd/atf/libexec/Makefile
diff -u /dev/null src/external/bsd/atf/libexec/Makefile:1.4
--- /dev/null Wed Oct 20 09:20:14 2010
+++ src/external/bsd/atf/libexec/Makefile Wed Oct 20 09:20:10 2010
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.4 2010/10/20 09:20:10 jmmv Exp $
+
+SUBDIR= atf-check
+
+.include <bsd.subdir.mk>
Index: src/external/bsd/atf/libexec/atf-check/Makefile
diff -u /dev/null src/external/bsd/atf/libexec/atf-check/Makefile:1.1
--- /dev/null Wed Oct 20 09:20:14 2010
+++ src/external/bsd/atf/libexec/atf-check/Makefile Wed Oct 20 09:20:10 2010
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2010/10/20 09:20:10 jmmv Exp $
+
+.include <bsd.own.mk>
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/atf-sh
+
+BINDIR= /usr/libexec
+PROG_CXX= atf-check
+SRCS= atf-check.cpp
+MAN= atf-check.1
+
+LDADD+= -latf-c++ -latf-c
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${SRCDIR}
+
+WARNS?= 2
+
+.include <bsd.prog.mk>
Index: src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile:1.1
--- /dev/null Wed Oct 20 09:20:14 2010
+++ src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile Wed Oct 20 09:20:11 2010
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.1 2010/10/20 09:20:11 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/atf/atf-c++/detail
+ATFFILE= yes
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/atf-c++/detail
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-c++
+
+TESTS_CXX=
+.for test in application_test \
+ env_test \
+ exceptions_test \
+ expand_test \
+ fs_test \
+ parser_test \
+ process_test \
+ sanity_test \
+ text_test \
+ ui_test
+TESTS_CXX+= ${test}
+SRCS.${test}= ${test}.cpp test_helpers.cpp
+.endfor
+.undef test
+
+.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.1
--- /dev/null Wed Oct 20 09:20:14 2010
+++ src/external/bsd/atf/tests/atf/atf-c/detail/Makefile Wed Oct 20 09:20:11 2010
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1 2010/10/20 09:20:11 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/atf/atf-c/detail
+ATFFILE= yes
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/atf-c/detail
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${NETBSDSRCDIR}/external/bsd/atf/lib/libatf-c
+
+PROGS= process_helpers
+SRCS.process_helpers= process_helpers.c
+MAN.process_helpers= # defined
+BINDIR.process_helpers= ${TESTSDIR}
+
+TESTS_C=
+.for test in dynstr_test \
+ env_test \
+ fs_test \
+ list_test \
+ map_test \
+ process_test \
+ sanity_test \
+ test_helpers_test \
+ text_test \
+ user_test
+TESTS_C+= ${test}
+SRCS.${test}= ${test}.c test_helpers.c
+.endfor
+.undef test
+
+.include <bsd.test.mk>
