Module Name: src
Committed By: jmmv
Date: Wed Feb 12 04:08:32 UTC 2014
Modified Files:
src/external/bsd/atf: Makefile.inc
src/external/bsd/atf/etc/atf: Makefile
src/external/bsd/atf/lib/libatf-c: Makefile
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/atf/libexec/atf-check: Makefile
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++: 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/tests/atf/atf-sh: Makefile
src/external/bsd/atf/tests/atf/test-programs: Makefile
src/external/bsd/atf/tests/atf/tools: 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: bconfig.h
src/external/bsd/atf/etc: Makefile.inc
src/external/bsd/atf/lib/libatf-c: defs.h
src/external/bsd/atf/libexec: Makefile.inc
src/external/bsd/atf/share: Makefile.inc
src/external/bsd/atf/share/doc: Makefile.inc
src/external/bsd/atf/share/examples: Makefile.inc
src/external/bsd/atf/share/xml: Makefile.inc
src/external/bsd/atf/share/xsl: Makefile.inc
src/external/bsd/atf/tests: Makefile.inc
src/external/bsd/atf/tests/atf: Makefile.inc
src/external/bsd/atf/tests/atf/atf-c: Makefile.inc
src/external/bsd/atf/tests/atf/atf-c++: Makefile.inc
Removed Files:
src/external/bsd/atf/lib/libatf-c: bconfig.h
Log Message:
Homogenize reachover build file structure with that of kyua-cli:
- Move the majority of the common build definitions to the top-level
Makefile.inc and ensure this gets included everywhere.
- Move the bconfig.h file to the top-level directory.
- Add a statically-generated defs.h file instead of creating one
during the build. Easier to understand and less chances for things
to go wrong.
- Make sure all files using ATF_VERSION have the right dependency to
trigger a rebuild when the value changes.
- Clean up stale -I flags.
This is all mostly for simplicity reasons and to reduce the cognitive
load required to understand the build of the atf and kyua-* packages.
I have tested this with both MKKYUA=no/yes and non-clean/clean builds
so hopefully I got the details right. But if not, let me know please.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/bconfig.h
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/etc/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/etc/atf/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.14 -r0 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/lib/libatf-c/defs.h
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/libexec/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/libexec/atf-check/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/doc/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/share/doc/atf/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/examples/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/share/examples/atf/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/xml/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/share/xml/atf/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/xsl/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/share/xsl/atf/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/tests/atf/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-c/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-c++/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/atf-sh/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/atf/tests/atf/test-programs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/tests/atf/tools/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/usr.bin/atf-config/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.10 -r1.11 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.2 src/external/bsd/atf/Makefile.inc:1.3
--- src/external/bsd/atf/Makefile.inc:1.2 Sat Feb 8 19:15:33 2014
+++ src/external/bsd/atf/Makefile.inc Wed Feb 12 04:08:31 2014
@@ -1,10 +1,42 @@
-# $NetBSD: Makefile.inc,v 1.2 2014/02/08 19:15:33 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.3 2014/02/12 04:08:31 jmmv Exp $
+
+.include <bsd.own.mk>
TOPDIR= ${NETBSDSRCDIR}/external/bsd/atf
SRCDIR= ${TOPDIR}/dist
-ATF_VERSION!= grep 'define VERSION' ${TOPDIR}/lib/libatf-c/bconfig.h \
- | cut -d '"' -f 2
+ATF_VERSION!= grep 'define VERSION' ${TOPDIR}/bconfig.h | cut -d '"' -f 2
+cookie-version: cookie-version-2
+ @cmp -s cookie-version cookie-version-2 \
+ || cp cookie-version-2 cookie-version
+cookie-version-2: .PHONY
+ @echo "${ATF_VERSION}" >cookie-version-2
+CLEANFILES+= cookie-version cookie-version-2
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+
+# Not all source files need these settings, but it's just easier to
+# set them in all cases.
+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_M4=\"/usr/bin/m4\"
+CPPFLAGS+= -DATF_PKGDATADIR=\"/usr/share/atf\"
+CPPFLAGS+= -DATF_SHELL=\"/bin/sh\"
+CPPFLAGS+= -DATF_WORKDIR=\"/tmp\"
+
+CPPFLAGS+= -I${TOPDIR} # For bconfig.h.
+CPPFLAGS+= -I${TOPDIR}/lib/libatf-c # For atf-c/defs.hpp.
+CPPFLAGS+= -I${SRCDIR}
.if defined(USE_ATF_LIBTOOLS)
PRIVATELIBDIR!= cd ${TOPDIR}/lib; ${PRINTOBJDIR}
Index: src/external/bsd/atf/etc/atf/Makefile
diff -u src/external/bsd/atf/etc/atf/Makefile:1.4 src/external/bsd/atf/etc/atf/Makefile:1.5
--- src/external/bsd/atf/etc/atf/Makefile:1.4 Sat Feb 8 19:15:33 2014
+++ src/external/bsd/atf/etc/atf/Makefile Wed Feb 12 04:08:31 2014
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:31 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tools/sample
CONFIGFILES= NetBSD.conf atf-run.hooks common.conf
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.18 src/external/bsd/atf/lib/libatf-c/Makefile:1.19
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.18 Sat Feb 8 19:15:33 2014
+++ src/external/bsd/atf/lib/libatf-c/Makefile Wed Feb 12 04:08:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/02/08 19:15:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2014/02/12 04:08:31 jmmv Exp $
NOLINT= # defined
@@ -12,27 +12,7 @@ CWARNFLAGS+= -Wno-missing-noreturn
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf-c
.PATH: ${SRCDIR}/atf-c/detail
-
-CPPFLAGS+= -I${.CURDIR}
-CPPFLAGS+= -I.
-
-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_M4=\"/usr/bin/m4\"
-CPPFLAGS+= -DATF_PKGDATADIR=\"/usr/share/atf\"
-CPPFLAGS+= -DATF_SHELL=\"/bin/sh\"
-CPPFLAGS+= -DATF_WORKDIR=\"/tmp\"
+.PATH: ${TOPDIR}
config.o: Makefile
@@ -73,22 +53,12 @@ INCSDIR_atf-c.h=/usr/include
MAN= atf-c-api.3
-CLEANFILES+= defs.h
-
-defs.h: defs.h.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}
-
.if ${MKSHARE} != "no"
FILES+= atf-c.pc
FILESDIR= /usr/lib/pkgconfig
realall: atf-c.pc
-atf-c.pc: Makefile atf-c.pc.in bconfig.h
+atf-c.pc: Makefile atf-c.pc.in cookie-version
${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
-e 's,__CC__,gcc,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.21 src/external/bsd/atf/lib/libatf-c++/Makefile:1.22
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.21 Sat Feb 8 19:15:33 2014
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Wed Feb 12 04:08:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/02/08 19:15:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2014/02/12 04:08:31 jmmv Exp $
NOLINT= # defined
@@ -10,16 +10,10 @@ LIBISCXX= yes
LIBDPLIBS+= atf-c ${.CURDIR}/../libatf-c
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
-
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf-c++
.PATH: ${SRCDIR}/atf-c++/detail
-.PATH: ${TOPDIR}/lib/libatf-c # For bconfig.h
-
-CPPFLAGS+= -I${.CURDIR}/../libatf-c
-CPPFLAGS+= -I.
-
-CPPFLAGS+= -DHAVE_CONFIG_H
+.PATH: ${TOPDIR}
WARNS?= 2
@@ -53,7 +47,7 @@ FILES+= atf-c++.pc
FILESDIR= /usr/lib/pkgconfig
realall: atf-c++.pc
-atf-c++.pc: Makefile atf-c++.pc.in bconfig.h
+atf-c++.pc: Makefile atf-c++.pc.in cookie-version
${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
-e 's,__CXX__,g++,g' \
-e 's,__INCLUDEDIR__,/usr/include,g' \
Index: src/external/bsd/atf/lib/tools/Makefile
diff -u src/external/bsd/atf/lib/tools/Makefile:1.4 src/external/bsd/atf/lib/tools/Makefile:1.5
--- src/external/bsd/atf/lib/tools/Makefile:1.4 Tue Feb 11 17:28:21 2014
+++ src/external/bsd/atf/lib/tools/Makefile Wed Feb 12 04:08:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/02/11 17:28:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:31 jmmv Exp $
NOLINT= # defined
@@ -10,26 +10,9 @@ LIBISPRIVATE= yes
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
-.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/tools
-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.
WARNS?= 2
Index: src/external/bsd/atf/libexec/atf-check/Makefile
diff -u src/external/bsd/atf/libexec/atf-check/Makefile:1.2 src/external/bsd/atf/libexec/atf-check/Makefile:1.3
--- src/external/bsd/atf/libexec/atf-check/Makefile:1.2 Sun Feb 20 20:18:56 2011
+++ src/external/bsd/atf/libexec/atf-check/Makefile Wed Feb 12 04:08:31 2014
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2011/02/20 20:18:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2014/02/12 04:08:31 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-sh
BINDIR= /usr/libexec
@@ -13,9 +12,6 @@ MAN= atf-check.1
LDADD+= -latf-c++ -latf-c
DPADD+= ${LIBATF_CXX} ${LIBATF_C}
-CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${SRCDIR}
-
WARNS?= 2
.include <bsd.prog.mk>
Index: src/external/bsd/atf/share/doc/atf/Makefile
diff -u src/external/bsd/atf/share/doc/atf/Makefile:1.5 src/external/bsd/atf/share/doc/atf/Makefile:1.6
--- src/external/bsd/atf/share/doc/atf/Makefile:1.5 Sat Feb 8 19:15:34 2014
+++ src/external/bsd/atf/share/doc/atf/Makefile Wed Feb 12 04:08:31 2014
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/02/08 19:15:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/12 04:08:31 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
.PATH: ${SRCDIR}/atf-c
.PATH: ${SRCDIR}/atf-c++
Index: src/external/bsd/atf/share/examples/atf/Makefile
diff -u src/external/bsd/atf/share/examples/atf/Makefile:1.4 src/external/bsd/atf/share/examples/atf/Makefile:1.5
--- src/external/bsd/atf/share/examples/atf/Makefile:1.4 Sat Feb 8 19:15:34 2014
+++ src/external/bsd/atf/share/examples/atf/Makefile Wed Feb 12 04:08:31 2014
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:31 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
.if ${MKSHARE} != "no"
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tools
.PATH: ${SRCDIR}/tools/sample
Index: src/external/bsd/atf/share/xml/atf/Makefile
diff -u src/external/bsd/atf/share/xml/atf/Makefile:1.4 src/external/bsd/atf/share/xml/atf/Makefile:1.5
--- src/external/bsd/atf/share/xml/atf/Makefile:1.4 Sat Feb 8 19:15:34 2014
+++ src/external/bsd/atf/share/xml/atf/Makefile Wed Feb 12 04:08:31 2014
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:31 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
.if ${MKSHARE} != "no"
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tools
FILESDIR= /usr/share/xml/atf
Index: src/external/bsd/atf/share/xsl/atf/Makefile
diff -u src/external/bsd/atf/share/xsl/atf/Makefile:1.4 src/external/bsd/atf/share/xsl/atf/Makefile:1.5
--- src/external/bsd/atf/share/xsl/atf/Makefile:1.4 Sat Feb 8 19:15:34 2014
+++ src/external/bsd/atf/share/xsl/atf/Makefile Wed Feb 12 04:08:32 2014
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2014/02/08 19:15:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
.if ${MKSHARE} != "no"
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tools
FILESDIR= /usr/share/xsl/atf
Index: src/external/bsd/atf/tests/atf/Makefile
diff -u src/external/bsd/atf/tests/atf/Makefile:1.8 src/external/bsd/atf/tests/atf/Makefile:1.9
--- src/external/bsd/atf/tests/atf/Makefile:1.8 Sat Feb 8 19:15:34 2014
+++ src/external/bsd/atf/tests/atf/Makefile Wed Feb 12 04:08:32 2014
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2014/02/08 19:15:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
TESTSDIR= ${TESTSBASE}/atf
@@ -13,7 +13,6 @@ TESTS_SUBDIRS= atf-c \
TESTS_SUBDIRS+= tools
.endif
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
.include <bsd.test.mk>
Index: src/external/bsd/atf/tests/atf/atf-c/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/Makefile:1.9 src/external/bsd/atf/tests/atf/atf-c/Makefile:1.10
--- src/external/bsd/atf/tests/atf/atf-c/Makefile:1.9 Tue Feb 11 16:11:28 2014
+++ src/external/bsd/atf/tests/atf/atf-c/Makefile Wed Feb 12 04:08:32 2014
@@ -1,18 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2014/02/11 16:11:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
TESTS_SUBDIRS= detail
TESTSDIR= ${TESTSBASE}/atf/atf-c
-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
-
FILESDIR= ${TESTSDIR}
FILES= macros_h_test.c
FILES+= unused_test.c
Index: src/external/bsd/atf/tests/atf/atf-c++/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.9 src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.10
--- src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.9 Tue Feb 11 16:11:28 2014
+++ src/external/bsd/atf/tests/atf/atf-c++/Makefile Wed Feb 12 04:08:32 2014
@@ -1,18 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2014/02/11 16:11:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
TESTS_SUBDIRS= detail
TESTSDIR= ${TESTSBASE}/atf/atf-c++
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-c++
.PATH: ${SRCDIR}/atf-c++/detail
-CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${SRCDIR:H}/lib/libatf-c # For bconfig.h.
-
FILESDIR= ${TESTSDIR}
FILES= macros_hpp_test.cpp
FILES+= unused_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.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 Tue Feb 11 16:11:28 2014
+++ src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile Wed Feb 12 04:08:32 2014
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2014/02/11 16:11:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-c++/detail
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-c++/detail
-CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${SRCDIR:H}/lib/libatf-c # For bconfig.h.
-
PROGS_CXX=
.for prog in version_helper
PROGS_CXX+= ${prog}
Index: src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.6 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.7
--- src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.6 Tue Feb 11 16:11:28 2014
+++ src/external/bsd/atf/tests/atf/atf-c/detail/Makefile Wed Feb 12 04:08:32 2014
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2014/02/11 16:11:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-c/detail
-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=
.for prog in process_helpers \
version_helper
Index: src/external/bsd/atf/tests/atf/atf-sh/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.6 src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.7
--- src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.6 Tue Feb 11 16:11:29 2014
+++ src/external/bsd/atf/tests/atf/atf-sh/Makefile Wed Feb 12 04:08:32 2014
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2014/02/11 16:11:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-sh
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-sh
-CPPFLAGS+= -DHAVE_CONFIG_H
-
TESTS_SH= atf-check_test
TESTS_SH+= atf_check_test
TESTS_SH+= config_test
Index: src/external/bsd/atf/tests/atf/test-programs/Makefile
diff -u src/external/bsd/atf/tests/atf/test-programs/Makefile:1.4 src/external/bsd/atf/tests/atf/test-programs/Makefile:1.5
--- src/external/bsd/atf/tests/atf/test-programs/Makefile:1.4 Tue Feb 11 16:11:29 2014
+++ src/external/bsd/atf/tests/atf/test-programs/Makefile Wed Feb 12 04:08:32 2014
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2014/02/11 16:11:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+.include <bsd.init.mk>
TESTSDIR= ${TESTSBASE}/atf/test-programs
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/test-programs
-CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${SRCDIR}/libs -I${SRCDIR}
-
TESTS_C= c_helpers
TESTS_CXX= cpp_helpers
Index: src/external/bsd/atf/tests/atf/tools/Makefile
diff -u src/external/bsd/atf/tests/atf/tools/Makefile:1.4 src/external/bsd/atf/tests/atf/tools/Makefile:1.5
--- src/external/bsd/atf/tests/atf/tools/Makefile:1.4 Tue Feb 11 16:11:29 2014
+++ src/external/bsd/atf/tests/atf/tools/Makefile Wed Feb 12 04:08:32 2014
@@ -1,17 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2014/02/11 16:11:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+USE_ATF_LIBTOOLS= yes
+
+.include <bsd.init.mk>
TESTSDIR= ${TESTSBASE}/atf/tools
-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
@@ -51,5 +47,4 @@ TESTS_SH= atf-config_test \
atf-report_test \
atf-run_test \
-.include "../../../Makefile.inc"
.include <bsd.test.mk>
Index: src/external/bsd/atf/usr.bin/atf-config/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-config/Makefile:1.7 src/external/bsd/atf/usr.bin/atf-config/Makefile:1.8
--- src/external/bsd/atf/usr.bin/atf-config/Makefile:1.7 Tue Feb 11 17:28:21 2014
+++ src/external/bsd/atf/usr.bin/atf-config/Makefile Wed Feb 12 04:08:32 2014
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2014/02/11 17:28:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+USE_ATF_LIBTOOLS= yes
+
+.include <bsd.init.mk>
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tools
BINDIR= /usr/bin
@@ -10,8 +11,6 @@ PROG_CXX= atf-config
SRCS= atf-config.cpp
MAN= atf-config.1
-USE_ATF_LIBTOOLS= yes
-
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.8 src/external/bsd/atf/usr.bin/atf-report/Makefile:1.9
--- src/external/bsd/atf/usr.bin/atf-report/Makefile:1.8 Tue Feb 11 17:28:21 2014
+++ src/external/bsd/atf/usr.bin/atf-report/Makefile Wed Feb 12 04:08:32 2014
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2014/02/11 17:28:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+USE_ATF_LIBTOOLS= yes
+
+.include <bsd.init.mk>
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tools
BINDIR= /usr/bin
@@ -10,8 +11,6 @@ PROG_CXX= atf-report
SRCS= atf-report.cpp
MAN= atf-report.1
-USE_ATF_LIBTOOLS= yes
-
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.13 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.14
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.13 Tue Feb 11 17:28:21 2014
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Wed Feb 12 04:08:32 2014
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2014/02/11 17:28:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+USE_ATF_LIBTOOLS= yes
+
+.include <bsd.init.mk>
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tools
.PATH: ${SRCDIR}/tools/share
@@ -14,8 +15,6 @@ MAN= atf-run.1
CPPFLAGS+= -DGDB=\"/usr/bin/gdb\"
CPPFLAGS+= -I${SRCDIR}/tools
-USE_ATF_LIBTOOLS= yes
-
CWARNFLAGS.clang+= -Wno-error=unused-private-field
COPTS.atf-run.cpp+= -Wno-stack-protector
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.9 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.10
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.9 Thu Mar 14 07:10:07 2013
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Wed Feb 12 04:08:32 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2013/03/14 07:10:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2014/02/12 04:08:32 jmmv Exp $
.include <bsd.init.mk>
.PATH: ${SRCDIR}/atf-sh
-.PATH: ${TOPDIR}/lib/libatf-c # For bconfig.h.
+.PATH: ${TOPDIR}
BINDIR= /usr/bin
PROG_CXX= atf-sh
@@ -13,9 +13,6 @@ MAN= atf-sh.1 atf-sh-api.3
LDADD+= -latf-c++ -latf-c
DPADD+= ${LIBATF_CXX} ${LIBATF_C}
-CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${SRCDIR}
-
WARNS?= 2
.if ${MKSHARE} != "no"
@@ -28,7 +25,7 @@ FILES+= atf-sh.pc
FILESDIR_atf-sh.pc= /usr/lib/pkgconfig
realall: atf-sh.pc
-atf-sh.pc: Makefile atf-sh.pc.in bconfig.h
+atf-sh.pc: Makefile atf-sh.pc.in cookie-version
${TOOL_SED} -e 's,__ATF_VERSION__,${ATF_VERSION},g' \
-e 's,__EXEC_PREFIX__,/usr,g' \
<${SRCDIR}/atf-sh/atf-sh.pc.in >atf-sh.pc
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.10 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.11
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.10 Tue Feb 11 18:07:30 2014
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Wed Feb 12 04:08:32 2014
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2014/02/11 18:07:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2014/02/12 04:08:32 jmmv Exp $
-.include <bsd.own.mk>
+USE_ATF_LIBTOOLS= yes
+
+.include <bsd.init.mk>
-SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/tools
BINDIR= /usr/bin
@@ -10,11 +11,11 @@ PROG_CXX= atf-version
SRCS= atf-version.cpp
MAN= atf-version.1
-CPPFLAGS+= -DATF_VERSION=\"$(ATF_VERSION)\"
CPPFLAGS+= -I${SRCDIR}/tools
-USE_ATF_LIBTOOLS= yes
-
WARNS?= 2
+CPPFLAGS+= -DATF_VERSION=\"$(ATF_VERSION)\"
+atf-version.o: cookie-version
+
.include <bsd.prog.mk>
Added files:
Index: src/external/bsd/atf/bconfig.h
diff -u /dev/null src/external/bsd/atf/bconfig.h:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/bconfig.h Wed Feb 12 04:08:31 2014
@@ -0,0 +1,93 @@
+/* bconfig.h. Generated from bconfig.h.in by configure. */
+/* bconfig.h.in. Generated from configure.ac by autoheader. */
+
+/* Define to 1 if basename takes a constant pointer */
+/* #undef HAVE_CONST_BASENAME */
+
+/* Define to 1 if dirname takes a constant pointer */
+/* #undef HAVE_CONST_DIRNAME */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if getcwd(NULL, 0) works */
+#define HAVE_GETCWD_DYN 1
+
+/* Define to 1 if getopt allows a + sign for POSIX behavior */
+/* #undef HAVE_GNU_GETOPT */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if getopt has optreset */
+#define HAVE_OPTRESET 1
+
+/* Define to 1 if you have the `putenv' function. */
+#define HAVE_PUTENV 1
+
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `unsetenv' function. */
+#define HAVE_UNSETENV 1
+
+/* Define to 1 if vsnprintf is in std */
+/* #undef HAVE_VSNPRINTF_IN_STD */
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "atf"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "atf-de...@netbsd.org"
+
+/* Define to the copyright string applicable to this package. */
+#define PACKAGE_COPYRIGHT "Copyright (c) 2007-2012 The NetBSD Foundation, Inc."
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "Automated Testing Framework"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "Automated Testing Framework 0.20"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "atf"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "https://github.com/jmmv/atf/";
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.20"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "0.20"
Index: src/external/bsd/atf/etc/Makefile.inc
diff -u /dev/null src/external/bsd/atf/etc/Makefile.inc:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/etc/Makefile.inc Wed Feb 12 04:08:31 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/12 04:08:31 jmmv Exp $
+
+.include "../Makefile.inc"
Index: src/external/bsd/atf/lib/libatf-c/defs.h
diff -u /dev/null src/external/bsd/atf/lib/libatf-c/defs.h:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/lib/libatf-c/defs.h Wed Feb 12 04:08:31 2014
@@ -0,0 +1,37 @@
+/*
+ * Automated Testing Framework (atf)
+ *
+ * Copyright (c) 2008 The NetBSD Foundation, 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#if !defined(ATF_C_DEFS_H)
+#define ATF_C_DEFS_H
+
+#define ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(a, b) __attribute__((__format__(__printf__, a, b)))
+#define ATF_DEFS_ATTRIBUTE_NORETURN __attribute__((__noreturn__))
+#define ATF_DEFS_ATTRIBUTE_UNUSED __attribute__((__unused__))
+
+#endif /* !defined(ATF_C_DEFS_H) */
Index: src/external/bsd/atf/libexec/Makefile.inc
diff -u /dev/null src/external/bsd/atf/libexec/Makefile.inc:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/libexec/Makefile.inc Wed Feb 12 04:08:31 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/12 04:08:31 jmmv Exp $
+
+.include "../Makefile.inc"
Index: src/external/bsd/atf/share/Makefile.inc
diff -u /dev/null src/external/bsd/atf/share/Makefile.inc:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/share/Makefile.inc Wed Feb 12 04:08:31 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/12 04:08:31 jmmv Exp $
+
+.include "../Makefile.inc"
Index: src/external/bsd/atf/share/doc/Makefile.inc
diff -u /dev/null src/external/bsd/atf/share/doc/Makefile.inc:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/share/doc/Makefile.inc Wed Feb 12 04:08:31 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/12 04:08:31 jmmv Exp $
+
+.include "../Makefile.inc"
Index: src/external/bsd/atf/share/examples/Makefile.inc
diff -u /dev/null src/external/bsd/atf/share/examples/Makefile.inc:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/share/examples/Makefile.inc Wed Feb 12 04:08:31 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/12 04:08:31 jmmv Exp $
+
+.include "../Makefile.inc"
Index: src/external/bsd/atf/share/xml/Makefile.inc
diff -u /dev/null src/external/bsd/atf/share/xml/Makefile.inc:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/share/xml/Makefile.inc Wed Feb 12 04:08:31 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/12 04:08:31 jmmv Exp $
+
+.include "../Makefile.inc"
Index: src/external/bsd/atf/share/xsl/Makefile.inc
diff -u /dev/null src/external/bsd/atf/share/xsl/Makefile.inc:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/share/xsl/Makefile.inc Wed Feb 12 04:08:32 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/12 04:08:32 jmmv Exp $
+
+.include "../Makefile.inc"
Index: src/external/bsd/atf/tests/Makefile.inc
diff -u /dev/null src/external/bsd/atf/tests/Makefile.inc:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/tests/Makefile.inc Wed Feb 12 04:08:32 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/12 04:08:32 jmmv Exp $
+
+.include "../Makefile.inc"
Index: src/external/bsd/atf/tests/atf/Makefile.inc
diff -u /dev/null src/external/bsd/atf/tests/atf/Makefile.inc:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/tests/atf/Makefile.inc Wed Feb 12 04:08:32 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/12 04:08:32 jmmv Exp $
+
+.include "../Makefile.inc"
Index: src/external/bsd/atf/tests/atf/atf-c/Makefile.inc
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-c/Makefile.inc:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/tests/atf/atf-c/Makefile.inc Wed Feb 12 04:08:32 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/12 04:08:32 jmmv Exp $
+
+.include "../Makefile.inc"
Index: src/external/bsd/atf/tests/atf/atf-c++/Makefile.inc
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-c++/Makefile.inc:1.1
--- /dev/null Wed Feb 12 04:08:33 2014
+++ src/external/bsd/atf/tests/atf/atf-c++/Makefile.inc Wed Feb 12 04:08:32 2014
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/12 04:08:32 jmmv Exp $
+
+.include "../Makefile.inc"
