Module Name: src
Committed By: jmmv
Date: Sat Feb 8 19:15:34 UTC 2014
Modified Files:
src/external/bsd/atf: Makefile.inc
src/external/bsd/atf/etc/atf: Makefile
src/external/bsd/atf/lib: Makefile
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile shlib_version
src/external/bsd/atf/share/doc/atf: Makefile
src/external/bsd/atf/share/examples/atf: Makefile
src/external/bsd/atf/share/xml/atf: Makefile
src/external/bsd/atf/share/xsl/atf: 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++/detail: Makefile
src/external/bsd/atf/tests/atf/atf-c/detail: 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-version: Makefile
Added Files:
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/atf/tests/atf/tools: Makefile
Log Message:
Adjust reachover Makefiles for atf-0.19.
The main change here is that the atf-config, atf-report, atf-run and
atf-version tools no longer depend on libatf-c nor libatf-c++. Instead,
they depend on an internal libtools.a that contains code specifically
for these tools and nothing else, making them self-contained.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/etc/atf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/lib/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/lib/libatf-c++/shlib_version
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/share/doc/atf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/share/examples/atf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/share/xml/atf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/share/xsl/atf/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/tests/atf/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
cvs rdiff -u -r0 -r1.3 src/external/bsd/atf/tests/atf/tools/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/usr.bin/atf-config/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r1.7 -r1.8 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.inc
diff -u src/external/bsd/atf/Makefile.inc:1.1 src/external/bsd/atf/Makefile.inc:1.2
--- src/external/bsd/atf/Makefile.inc:1.1 Thu Mar 14 07:10:05 2013
+++ src/external/bsd/atf/Makefile.inc Sat Feb 8 19:15:33 2014
@@ -1,7 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.1 2013/03/14 07:10:05 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.2 2014/02/08 19:15:33 jmmv Exp $
TOPDIR= ${NETBSDSRCDIR}/external/bsd/atf
SRCDIR= ${TOPDIR}/dist
ATF_VERSION!= grep 'define VERSION' ${TOPDIR}/lib/libatf-c/bconfig.h \
| cut -d '"' -f 2
+
+.if defined(USE_ATF_LIBTOOLS)
+PRIVATELIBDIR!= cd ${TOPDIR}/lib; ${PRINTOBJDIR}
+CPPFLAGS+= -I${PRIVATELIBDIR}/tools
+LDADD+= ${PRIVATELIBDIR}/tools/libtools.a
+DPADD+= ${PRIVATELIBDIR}/tools/libtools.a
+.endif
Index: src/external/bsd/atf/etc/atf/Makefile
diff -u src/external/bsd/atf/etc/atf/Makefile:1.3 src/external/bsd/atf/etc/atf/Makefile:1.4
--- src/external/bsd/atf/etc/atf/Makefile:1.3 Sun Nov 7 17:46:45 2010
+++ src/external/bsd/atf/etc/atf/Makefile Sat Feb 8 19:15:33 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/11/07 17:46:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:33 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/atf-run/sample
+.PATH: ${SRCDIR}/tools/sample
CONFIGFILES= NetBSD.conf atf-run.hooks common.conf
FILESDIR= /etc/atf
Index: src/external/bsd/atf/lib/Makefile
diff -u src/external/bsd/atf/lib/Makefile:1.1 src/external/bsd/atf/lib/Makefile:1.2
--- src/external/bsd/atf/lib/Makefile:1.1 Mon Jan 19 07:13:04 2009
+++ src/external/bsd/atf/lib/Makefile Sat Feb 8 19:15:33 2014
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2014/02/08 19:15:33 jmmv Exp $
-SUBDIR= libatf-c .WAIT libatf-c++
+SUBDIR= libatf-c .WAIT libatf-c++ tools
.include <bsd.subdir.mk>
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.17 src/external/bsd/atf/lib/libatf-c/Makefile:1.18
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.17 Thu Mar 14 07:10:06 2013
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sat Feb 8 19:15:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/03/14 07:10:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2014/02/08 19:15:33 jmmv Exp $
NOLINT= # defined
@@ -6,6 +6,7 @@ NOLINT= # defined
LIB= atf-c
+CWARNFLAGS+= -Wno-format
CWARNFLAGS+= -Wno-missing-noreturn
.PATH: ${SRCDIR}
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.20 src/external/bsd/atf/lib/libatf-c++/Makefile:1.21
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.20 Thu Sep 12 17:14:20 2013
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sat Feb 8 19:15:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2013/09/12 17:14:20 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2014/02/08 19:15:33 jmmv Exp $
NOLINT= # defined
@@ -29,20 +29,16 @@ SRCS= application.cpp \
config.cpp \
env.cpp \
exceptions.cpp \
- expand.cpp \
fs.cpp \
- parser.cpp \
process.cpp \
tests.cpp \
text.cpp \
- ui.cpp \
utils.cpp
INCS= build.hpp \
check.hpp \
config.hpp \
macros.hpp \
- noncopyable.hpp \
tests.hpp \
utils.hpp
INCSDIR= /usr/include/atf-c++
Index: src/external/bsd/atf/lib/libatf-c++/shlib_version
diff -u src/external/bsd/atf/lib/libatf-c++/shlib_version:1.1 src/external/bsd/atf/lib/libatf-c++/shlib_version:1.2
--- src/external/bsd/atf/lib/libatf-c++/shlib_version:1.1 Wed Jul 11 22:40:16 2012
+++ src/external/bsd/atf/lib/libatf-c++/shlib_version Sat Feb 8 19:15:33 2014
@@ -1,3 +1,3 @@
-# $NetBSD: shlib_version,v 1.1 2012/07/11 22:40:16 jmmv Exp $
-major=0
+# $NetBSD: shlib_version,v 1.2 2014/02/08 19:15:33 jmmv Exp $
+major=1
minor=0
Index: src/external/bsd/atf/share/doc/atf/Makefile
diff -u src/external/bsd/atf/share/doc/atf/Makefile:1.4 src/external/bsd/atf/share/doc/atf/Makefile:1.5
--- src/external/bsd/atf/share/doc/atf/Makefile:1.4 Tue Nov 2 14:41:32 2010
+++ src/external/bsd/atf/share/doc/atf/Makefile Sat Feb 8 19:15:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/11/02 14:41:32 njoly Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
@@ -8,6 +8,7 @@ SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf
.PATH: ${SRCDIR}/atf-c++
.PATH: ${SRCDIR}/atf-sh
.PATH: ${SRCDIR}/doc
+.PATH: ${SRCDIR}/tools
.if ${MKDOC} != "no"
FILESDIR= /usr/share/doc/atf
@@ -21,7 +22,7 @@ atf.7: atf.7.in
${TOOL_SED} \
-e 's,__DOCDIR__,/usr/share/doc/atf,g' \
-e 's,__TESTSDIR__,/usr/tests,g' \
- <${SRCDIR}/doc/atf.7.in >atf.7.tmp
+ <${SRCDIR}/tools/atf.7.in >atf.7.tmp
mv atf.7.tmp atf.7
.include <bsd.files.mk>
Index: src/external/bsd/atf/share/examples/atf/Makefile
diff -u src/external/bsd/atf/share/examples/atf/Makefile:1.3 src/external/bsd/atf/share/examples/atf/Makefile:1.4
--- src/external/bsd/atf/share/examples/atf/Makefile:1.3 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/share/examples/atf/Makefile Sat Feb 8 19:15:34 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/atf-report
-.PATH: ${SRCDIR}/atf-run/sample
+.PATH: ${SRCDIR}/tools
+.PATH: ${SRCDIR}/tools/sample
FILESDIR= /usr/share/examples/atf
FILESMODE= 444
Index: src/external/bsd/atf/share/xml/atf/Makefile
diff -u src/external/bsd/atf/share/xml/atf/Makefile:1.3 src/external/bsd/atf/share/xml/atf/Makefile:1.4
--- src/external/bsd/atf/share/xml/atf/Makefile:1.3 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/share/xml/atf/Makefile Sat Feb 8 19:15:34 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/atf-report
+.PATH: ${SRCDIR}/tools
FILESDIR= /usr/share/xml/atf
FILESMODE= 444
Index: src/external/bsd/atf/share/xsl/atf/Makefile
diff -u src/external/bsd/atf/share/xsl/atf/Makefile:1.3 src/external/bsd/atf/share/xsl/atf/Makefile:1.4
--- src/external/bsd/atf/share/xsl/atf/Makefile:1.3 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/share/xsl/atf/Makefile Sat Feb 8 19:15:34 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/atf-report
+.PATH: ${SRCDIR}/tools
FILESDIR= /usr/share/xsl/atf
FILESMODE= 444
Index: src/external/bsd/atf/tests/atf/Makefile
diff -u src/external/bsd/atf/tests/atf/Makefile:1.7 src/external/bsd/atf/tests/atf/Makefile:1.8
--- src/external/bsd/atf/tests/atf/Makefile:1.7 Mon Feb 25 00:22:11 2013
+++ src/external/bsd/atf/tests/atf/Makefile Sat Feb 8 19:15:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/02/25 00:22:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
@@ -10,9 +10,7 @@ TESTS_SUBDIRS= atf-c \
test-programs
.if !(${MKKYUA} != "no")
-TESTS_SUBDIRS+= atf-config \
- atf-report \
- atf-run
+TESTS_SUBDIRS+= tools
.endif
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
Index: src/external/bsd/atf/tests/atf/atf-c++/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.7 src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.8
--- src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.7 Wed Jul 11 22:40:16 2012
+++ src/external/bsd/atf/tests/atf/atf-c++/Makefile Sat Feb 8 19:15:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/07/11 22:40:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
@@ -12,7 +12,7 @@ SRCDIR= ${NETBSDSRCDIR}/external/bsd/at
.PATH: ${SRCDIR}/atf-c++/detail
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-c++
+CPPFLAGS+= -I${SRCDIR:H}/lib/libatf-c # For bconfig.h.
FILESDIR= ${TESTSDIR}
FILES= macros_hpp_test.cpp
Index: src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile:1.2 src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile:1.3
--- src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile:1.2 Fri Feb 15 17:08:35 2013
+++ src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile Sat Feb 8 19:15:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/02/15 17:08:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
@@ -9,20 +9,25 @@ SRCDIR= ${NETBSDSRCDIR}/external/bsd/at
.PATH: ${SRCDIR}/atf-c++/detail
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libatf-c++
+CPPFLAGS+= -I${SRCDIR:H}/lib/libatf-c # For bconfig.h.
+
+PROGS_CXX=
+.for prog in version_helper
+PROGS_CXX+= ${prog}
+SRCS.${prog}= ${prog}.cpp
+MAN.${prog}= # defined
+BINDIR.${prog}= ${TESTSDIR}
+.endfor
TESTS_CXX=
.for test in application_test \
auto_array_test \
env_test \
exceptions_test \
- expand_test \
fs_test \
- parser_test \
process_test \
sanity_test \
- text_test \
- ui_test
+ text_test
TESTS_CXX+= ${test}
SRCS.${test}= ${test}.cpp test_helpers.cpp
.endfor
Index: src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.4 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.5
--- src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.4 Fri Feb 15 17:08:35 2013
+++ src/external/bsd/atf/tests/atf/atf-c/detail/Makefile Sat Feb 8 19:15:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/02/15 17:08:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
@@ -11,10 +11,14 @@ SRCDIR= ${NETBSDSRCDIR}/external/bsd/at
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}
+PROGS=
+.for prog in process_helpers \
+ version_helper
+PROGS+= ${prog}
+SRCS.${prog}= ${prog}.c
+MAN.${prog}= # defined
+BINDIR.${prog}= ${TESTSDIR}
+.endfor
TESTS_C=
.for test in dynstr_test \
Index: src/external/bsd/atf/usr.bin/atf-config/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-config/Makefile:1.5 src/external/bsd/atf/usr.bin/atf-config/Makefile:1.6
--- src/external/bsd/atf/usr.bin/atf-config/Makefile:1.5 Sun Feb 20 20:18:57 2011
+++ src/external/bsd/atf/usr.bin/atf-config/Makefile Sat Feb 8 19:15:34 2014
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.5 2011/02/20 20:18:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/atf-config
+.PATH: ${SRCDIR}/tools
BINDIR= /usr/bin
PROG_CXX= atf-config
SRCS= atf-config.cpp
MAN= atf-config.1
-LDADD+= -latf-c++ -latf-c
-DPADD+= ${LIBATF_CXX} ${LIBATF_C}
+USE_ATF_LIBTOOLS= yes
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${SRCDIR}
+CPPFLAGS+= -I${SRCDIR}/tools
WARNS?= 2
Index: src/external/bsd/atf/usr.bin/atf-report/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-report/Makefile:1.6 src/external/bsd/atf/usr.bin/atf-report/Makefile:1.7
--- src/external/bsd/atf/usr.bin/atf-report/Makefile:1.6 Sat Jun 16 17:02:33 2012
+++ src/external/bsd/atf/usr.bin/atf-report/Makefile Sat Feb 8 19:15:34 2014
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.6 2012/06/16 17:02:33 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/atf-report
+.PATH: ${SRCDIR}/tools
BINDIR= /usr/bin
PROG_CXX= atf-report
-SRCS= atf-report.cpp reader.cpp
+SRCS= atf-report.cpp
MAN= atf-report.1
-LDADD+= -latf-c++ -latf-c
-DPADD+= ${LIBATF_CXX} ${LIBATF_C}
+USE_ATF_LIBTOOLS= yes
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${SRCDIR}
+CPPFLAGS+= -I${SRCDIR}/tools
WARNS?= 2
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.11 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.12
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.11 Sat Jun 16 17:02:33 2012
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Sat Feb 8 19:15:34 2014
@@ -1,24 +1,22 @@
-# $NetBSD: Makefile,v 1.11 2012/06/16 17:02:33 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/atf-run
-.PATH: ${SRCDIR}/atf-run/share
-.PATH: ${.CURDIR}/../../lib/libatf-c
+.PATH: ${SRCDIR}/tools
+.PATH: ${SRCDIR}/tools/share
BINDIR= /usr/bin
PROG_CXX= atf-run
-SRCS= atf-run.cpp atffile.cpp config.cpp fs.cpp io.cpp requirements.cpp \
- signals.cpp test-program.cpp timer.cpp user.cpp
+SRCS= atf-run.cpp
MAN= atf-run.1
CPPFLAGS+= -DGDB=\"/usr/bin/gdb\"
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${SRCDIR}
-CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c
-LDADD+= -latf-c++ -latf-c
-DPADD+= ${LIBATF_CXX} ${LIBATF_C}
+CPPFLAGS+= -I${SRCDIR}/tools
+CPPFLAGS+= -I${SRCDIR:H}/lib/libatf-c # For bconfig.h.
+
+USE_ATF_LIBTOOLS= yes
CWARNFLAGS.clang+= -Wno-error=unused-private-field
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.7 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.8
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.7 Sun Feb 20 20:18:57 2011
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Sat Feb 8 19:15:34 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2011/02/20 20:18:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2014/02/08 19:15:34 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/admin ${SRCDIR}/atf-version
+.PATH: ${SRCDIR}/tools
BINDIR= /usr/bin
PROG_CXX= atf-version
@@ -11,11 +11,11 @@ SRCS= atf-version.cpp
MAN= atf-version.1
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${SRCDIR}
-CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c
+CPPFLAGS+= -I${SRCDIR}/tools
+CPPFLAGS+= -I${SRCDIR:H}/lib/libatf-c # For bconfig.h.
CPPFLAGS+= -I${.CURDIR}
-LDADD+= -latf-c++ -latf-c
-DPADD+= ${LIBATF_CXX} ${LIBATF_C}
+
+USE_ATF_LIBTOOLS= yes
WARNS?= 2
Added files:
Index: src/external/bsd/atf/lib/tools/Makefile
diff -u /dev/null src/external/bsd/atf/lib/tools/Makefile:1.1
--- /dev/null Sat Feb 8 19:15:34 2014
+++ src/external/bsd/atf/lib/tools/Makefile Sat Feb 8 19:15:33 2014
@@ -0,0 +1,69 @@
+# $NetBSD: Makefile,v 1.1 2014/02/08 19:15:33 jmmv Exp $
+
+NOLINT= # defined
+
+.include <bsd.init.mk>
+
+LIB= tools
+LIBISCXX= yes
+LIBISPRIVATE= yes
+
+LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
+
+.PATH: ${SRCDIR}
+.PATH: ${SRCDIR}/tools
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -DATF_ARCH=\"${MACHINE_ARCH}\"
+CPPFLAGS+= -DATF_BUILD_CC=\"/usr/bin/cc\"
+CPPFLAGS+= -DATF_BUILD_CFLAGS=\"\"
+CPPFLAGS+= -DATF_BUILD_CPP=\"/usr/bin/cpp\"
+CPPFLAGS+= -DATF_BUILD_CPPFLAGS=\"\"
+CPPFLAGS+= -DATF_BUILD_CXX=\"/usr/bin/c++\"
+CPPFLAGS+= -DATF_BUILD_CXXFLAGS=\"\"
+CPPFLAGS+= -DATF_CONFDIR=\"/etc/atf\"
+CPPFLAGS+= -DATF_INCLUDEDIR=\"/usr/include\"
+CPPFLAGS+= -DATF_LIBDIR=\"/usr/lib\"
+CPPFLAGS+= -DATF_LIBEXECDIR=\"/usr/libexec\"
+CPPFLAGS+= -DATF_MACHINE=\"${MACHINE}\"
+CPPFLAGS+= -DATF_PKGDATADIR=\"/usr/share/atf\"
+CPPFLAGS+= -DATF_SHELL=\"/bin/sh\"
+CPPFLAGS+= -DATF_WORKDIR=\"/tmp\"
+CPPFLAGS+= -I${SRCDIR}/tools
+CPPFLAGS+= -I.
+CPPFLAGS+= -I${TOPDIR}/lib/libatf-c # For bconfig.h
+
+WARNS?= 2
+
+SRCS= application.cpp \
+ atffile.cpp \
+ config.cpp \
+ config_file.cpp \
+ env.cpp \
+ exceptions.cpp \
+ expand.cpp \
+ fs.cpp \
+ io.cpp \
+ parser.cpp \
+ process.cpp \
+ reader.cpp \
+ requirements.cpp \
+ signals.cpp \
+ test-program.cpp \
+ text.cpp \
+ timers.cpp \
+ ui.cpp \
+ user.cpp
+
+CLEANFILES+= defs.hpp
+
+beforedepend: defs.hpp
+defs.hpp: defs.hpp.in
+ ${TOOL_SED} \
+ -e 's|@ATTRIBUTE_FORMAT_PRINTF@|__attribute__((__format__(__printf__, a, b)))|g' \
+ -e 's|@ATTRIBUTE_NORETURN@|__attribute__((__noreturn__))|g' \
+ -e 's|@ATTRIBUTE_UNUSED@|__attribute__((__unused__))|g' \
+ <${.ALLSRC} >${.TARGET}.tmp
+ mv ${.TARGET}.tmp ${.TARGET}
+
+.include <bsd.lib.mk>
Index: src/external/bsd/atf/tests/atf/tools/Makefile
diff -u /dev/null src/external/bsd/atf/tests/atf/tools/Makefile:1.3
--- /dev/null Sat Feb 8 19:15:35 2014
+++ src/external/bsd/atf/tests/atf/tools/Makefile Sat Feb 8 19:15:34 2014
@@ -0,0 +1,56 @@
+# $NetBSD: Makefile,v 1.3 2014/02/08 19:15:34 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/atf/tools
+ATFFILE= yes
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/tools
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${SRCDIR:H}/lib/libatf-c # For bconfig.h.
+
+USE_ATF_LIBTOOLS= yes
+
+PROGS=
+.for prog in bad_metadata_helper \
+ process_helpers
+PROGS+= ${prog}
+SRCS.${prog}= ${prog}.c
+MAN.${prog}= # defined
+BINDIR.${prog}= ${TESTSDIR}
+.endfor
+
+TESTS_C= expect_helpers \
+ several_tcs_helper \
+ zero_tcs_helper
+
+TESTS_CXX= application_test \
+ atffile_test \
+ auto_array_test \
+ config_file_test \
+ config_test \
+ fail_helper \
+ env_test \
+ expand_test \
+ fs_test \
+ io_test \
+ misc_helpers \
+ parser_test \
+ pass_helper \
+ process_test \
+ reader_test \
+ requirements_test \
+ signals_test \
+ test_program_test \
+ text_test \
+ ui_test \
+ user_test
+
+TESTS_SH= atf-config_test \
+ atf-report_test \
+ atf-run_test \
+
+.include "../../../Makefile.inc"
+.include <bsd.test.mk>
