Module Name: src
Committed By: jmmv
Date: Fri Jun 4 08:33:42 UTC 2010
Modified Files:
src/external/bsd/atf/etc/atf: Makefile
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/share: 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-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-run: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Added Files:
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Removed Files:
src/external/bsd/atf/share/atf: Makefile
src/external/bsd/atf/tests/atf/atf-compile: Makefile
src/external/bsd/atf/tests/atf/data: Makefile
src/external/bsd/atf/usr.bin/atf-compile: Makefile
Log Message:
Adjust reachover makefiles for atf 0.9.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/etc/atf/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/share/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/share/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/doc/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/examples/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/xml/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/xsl/atf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/tests/atf/atf-compile/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/atf-run/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/tests/atf/atf-sh/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/tests/atf/data/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/usr.bin/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/usr.bin/atf-compile/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.3 -r1.4 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/etc/atf/Makefile
diff -u src/external/bsd/atf/etc/atf/Makefile:1.1 src/external/bsd/atf/etc/atf/Makefile:1.2
--- src/external/bsd/atf/etc/atf/Makefile:1.1 Mon Jan 19 07:13:03 2009
+++ src/external/bsd/atf/etc/atf/Makefile Fri Jun 4 08:33:40 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:40 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/data
+.PATH: ${SRCDIR}/atf-run/sample
CONFIGFILES= NetBSD.conf atf-run.hooks
FILESDIR= /etc/atf
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 May 8 08:12:33 2010
+++ src/external/bsd/atf/lib/libatf-c/Makefile Fri Jun 4 08:33:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/08 08:12:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/04 08:33:41 jmmv Exp $
NOLINT= # defined
@@ -44,7 +44,6 @@
io.c \
list.c \
map.c \
- object.c \
process.c \
sanity.c \
text.c \
@@ -68,7 +67,6 @@
list.h \
macros.h \
map.h \
- object.h \
process.h \
sanity.h \
tc.h \
@@ -82,7 +80,7 @@
INCS+= atf-c.h
INCSDIR_atf-c.h=/usr/include
-MAN= # empty
+MAN= atf-c-api.3
CLEANFILES+= defs.h
@@ -92,4 +90,18 @@
< ${.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
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.9,g' \
+ -e 's,__CC__,gcc,g' \
+ -e 's,__INCLUDEDIR__,/usr/include,g' \
+ -e 's,__LIBDIR__,/usr/lib,g' \
+ <${SRCDIR}/atf-c/atf-c.pc.in >atf-c.pc
+CLEANFILES+= atf-c.pc
+.endif
+
.include <bsd.lib.mk>
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.3 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.4
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.3 Sat May 8 08:12:33 2010
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Fri Jun 4 08:33:41 2010
@@ -1,6 +1,15 @@
/* bconfig.h. Generated from bconfig.h.in by configure. */
/* bconfig.h.in. Generated from configure.ac by autoheader. */
+/* Define to the path of chattr(1) if you have it */
+/* #undef CHATTR */
+
+/* Define to 1 if you have chattr(1) */
+/* #undef HAVE_CHATTR */
+
+/* Define to 1 if you have the `chflags' function. */
+#define HAVE_CHFLAGS 1
+
/* Define to 1 if basename takes a constant pointer */
/* #undef HAVE_CONST_BASENAME */
@@ -93,7 +102,7 @@
#define PACKAGE_NAME "Automated Testing Framework"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.8"
+#define PACKAGE_STRING "Automated Testing Framework 0.9"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "atf"
@@ -102,10 +111,10 @@
#define PACKAGE_URL "http://www.NetBSD.org/~jmmv/atf/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.8"
+#define PACKAGE_VERSION "0.9"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.8"
+#define VERSION "0.9"
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.2 src/external/bsd/atf/lib/libatf-c++/Makefile:1.3
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.2 Tue Dec 22 13:38:10 2009
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Fri Jun 4 08:33:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/12/22 13:38:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
NOLINT= # defined
@@ -64,6 +64,20 @@
INCS+= atf-c++.hpp
INCSDIR_atf-c++.hpp=/usr/include
-MAN= # empty
+MAN= atf-c++-api.3
+
+.if ${MKSHARE} != "no"
+FILES+= atf-c++.pc
+FILESDIR= /usr/lib/pkgconfig
+
+realall: atf-c++.pc
+atf-c++.pc: Makefile atf-c++.pc.in
+ ${TOOL_SED} -e 's,__ATF_VERSION__,0.9,g' \
+ -e 's,__CXX__,g++,g' \
+ -e 's,__INCLUDEDIR__,/usr/include,g' \
+ -e 's,__LIBDIR__,/usr/lib,g' \
+ <${SRCDIR}/atf-c++/atf-c++.pc.in >atf-c++.pc
+CLEANFILES+= atf-c++.pc
+.endif
.include <bsd.lib.mk>
Index: src/external/bsd/atf/share/Makefile
diff -u src/external/bsd/atf/share/Makefile:1.1 src/external/bsd/atf/share/Makefile:1.2
--- src/external/bsd/atf/share/Makefile:1.1 Mon Jan 19 07:13:04 2009
+++ src/external/bsd/atf/share/Makefile Fri Jun 4 08:33:41 2010
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:41 jmmv Exp $
-SUBDIR= atf doc examples xml xsl
+SUBDIR= doc examples xml xsl
.include <bsd.subdir.mk>
Index: src/external/bsd/atf/share/doc/atf/Makefile
diff -u src/external/bsd/atf/share/doc/atf/Makefile:1.2 src/external/bsd/atf/share/doc/atf/Makefile:1.3
--- src/external/bsd/atf/share/doc/atf/Makefile:1.2 Tue Dec 22 13:38:10 2009
+++ src/external/bsd/atf/share/doc/atf/Makefile Fri Jun 4 08:33:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/12/22 13:38:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
@@ -15,7 +15,6 @@
.endif
MAN= atf.7 atf-formats.5 atf-test-case.4 atf-test-program.1
-MAN+= atf-c-api.3 atf-c++-api.3 atf-sh-api.3
CLEANFILES+= atf.7 atf.7.tmp
atf.7: atf.7.in
Index: src/external/bsd/atf/share/examples/atf/Makefile
diff -u src/external/bsd/atf/share/examples/atf/Makefile:1.2 src/external/bsd/atf/share/examples/atf/Makefile:1.3
--- src/external/bsd/atf/share/examples/atf/Makefile:1.2 Sun Dec 13 21:14:18 2009
+++ src/external/bsd/atf/share/examples/atf/Makefile Fri Jun 4 08:33:41 2010
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2009/12/13 21:14:18 snj Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/data
+.PATH: ${SRCDIR}/atf-report
+.PATH: ${SRCDIR}/atf-run/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.2 src/external/bsd/atf/share/xml/atf/Makefile:1.3
--- src/external/bsd/atf/share/xml/atf/Makefile:1.2 Sun Dec 13 21:14:18 2009
+++ src/external/bsd/atf/share/xml/atf/Makefile Fri Jun 4 08:33:41 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2009/12/13 21:14:18 snj Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/data
+.PATH: ${SRCDIR}/atf-report
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.2 src/external/bsd/atf/share/xsl/atf/Makefile:1.3
--- src/external/bsd/atf/share/xsl/atf/Makefile:1.2 Sun Dec 13 21:14:18 2009
+++ src/external/bsd/atf/share/xsl/atf/Makefile Fri Jun 4 08:33:41 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2009/12/13 21:14:18 snj Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
.if ${MKSHARE} != "no"
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH: ${SRCDIR}/data
+.PATH: ${SRCDIR}/atf-report
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.2 src/external/bsd/atf/tests/atf/Makefile:1.3
--- src/external/bsd/atf/tests/atf/Makefile:1.2 Sat May 8 08:12:34 2010
+++ src/external/bsd/atf/tests/atf/Makefile Fri Jun 4 08:33:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/05/08 08:12:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
@@ -8,12 +8,10 @@
atf-c++ \
atf-check \
atf-cleanup \
- atf-compile \
atf-config \
atf-report \
atf-run \
atf-sh \
- data \
formats \
test_programs
Index: src/external/bsd/atf/tests/atf/atf-c/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/Makefile:1.3 src/external/bsd/atf/tests/atf/atf-c/Makefile:1.4
--- src/external/bsd/atf/tests/atf/atf-c/Makefile:1.3 Sat May 8 08:12:34 2010
+++ src/external/bsd/atf/tests/atf/atf-c/Makefile Fri Jun 4 08:33:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/05/08 08:12:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
@@ -29,7 +29,6 @@
d_include_list_h.c \
d_include_macros_h.c \
d_include_map_h.c \
- d_include_object_h.c \
d_include_process_h.c \
d_include_sanity_h.c \
d_include_tc_h.c \
@@ -67,4 +66,6 @@
.endfor
.undef test
+TESTS_SH= t_pkg_config
+
.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.2 src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.3
--- src/external/bsd/atf/tests/atf/atf-c++/Makefile:1.2 Tue Dec 22 13:38:10 2009
+++ src/external/bsd/atf/tests/atf/atf-c++/Makefile Fri Jun 4 08:33:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/12/22 13:38:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
.include <bsd.own.mk>
@@ -63,4 +63,6 @@
.endfor
.undef test
+TESTS_SH= t_pkg_config
+
.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.1 src/external/bsd/atf/tests/atf/atf-run/Makefile:1.2
--- src/external/bsd/atf/tests/atf/atf-run/Makefile:1.1 Sat May 8 08:12:34 2010
+++ src/external/bsd/atf/tests/atf/atf-run/Makefile Fri Jun 4 08:33:42 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/05/08 08:12:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:42 jmmv Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
.PATH: ${SRCDIR}/atf-run
.PATH: ${SRCDIR}/tests/atf/atf-run
-CPPFLAGS+= -I${SRCDIR}
+CPPFLAGS+= -I${SRCDIR}/atf-run
TESTS_CXX= h_bad_metadata
TESTS_CXX+= h_fail
Index: src/external/bsd/atf/tests/atf/atf-sh/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.1 src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.2
--- src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.1 Mon Jan 19 07:13:05 2009
+++ src/external/bsd/atf/tests/atf/atf-sh/Makefile Fri Jun 4 08:33:42 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:42 jmmv Exp $
.include <bsd.own.mk>
@@ -10,6 +10,7 @@
TESTS_SH= h_misc
TESTS_SH+= t_atf_check
TESTS_SH+= t_config
+TESTS_SH+= t_integration
TESTS_SH+= t_normalize
TESTS_SH+= t_tc
TESTS_SH+= t_tp
Index: src/external/bsd/atf/usr.bin/Makefile
diff -u src/external/bsd/atf/usr.bin/Makefile:1.1 src/external/bsd/atf/usr.bin/Makefile:1.2
--- src/external/bsd/atf/usr.bin/Makefile:1.1 Mon Jan 19 07:13:06 2009
+++ src/external/bsd/atf/usr.bin/Makefile Fri Jun 4 08:33:42 2010
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:42 jmmv Exp $
-SUBDIR= atf-check atf-compile atf-config atf-report atf-run atf-version
+SUBDIR= atf-check atf-config atf-report atf-run atf-sh atf-version
.include <bsd.subdir.mk>
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.5 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.6
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.5 Sat May 8 16:57:24 2010
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Fri Jun 4 08:33:42 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/05/08 16:57:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/04 08:33:42 jmmv Exp $
.include <bsd.own.mk>
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}/atf-run
-.PATH: ${SRCDIR}/data ${SRCDIR}/atf-sh
+.PATH: ${SRCDIR}/atf-run/share
BINDIR= /usr/bin
PROG_CXX= atf-run
@@ -22,31 +22,8 @@
.if ${MKSHARE} != "no"
FILESDIR= /usr/share/atf
+FILESMODE= 444
FILES= atf-run.hooks
.endif
-# Files in ${SRCDIR}/data.
-FILES+= atf-c.pc \
- atf-c++.pc
-FILESDIR_atf-c.pc= /usr/lib/pkgconfig
-FILESDIR_atf-c++.pc= /usr/lib/pkgconfig
-
-realall: atf-c.pc
-atf-c.pc: Makefile atf-c.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.8,g' \
- -e 's,__CC__,gcc,g' \
- -e 's,__INCLUDEDIR__,/usr/include,g' \
- -e 's,__LIBDIR__,/usr/lib,g' \
- <${SRCDIR}/data/atf-c.pc.in >atf-c.pc
-CLEANFILES+= atf-c.pc
-
-realall: atf-c++.pc
-atf-c++.pc: Makefile atf-c++.pc.in
- ${TOOL_SED} -e 's,__ATF_VERSION__,0.8,g' \
- -e 's,__CXX__,g++,g' \
- -e 's,__INCLUDEDIR__,/usr/include,g' \
- -e 's,__LIBDIR__,/usr/lib,g' \
- <${SRCDIR}/data/atf-c++.pc.in >atf-c++.pc
-CLEANFILES+= atf-c++.pc
-
.include <bsd.prog.mk>
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.3 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.4
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.3 Fri May 14 15:30:39 2010
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Fri Jun 4 08:33:42 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/05/14 15:30:39 christos Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/04 08:33:42 jmmv Exp $
.include <bsd.own.mk>
@@ -12,7 +12,7 @@
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c
-CPPFLAGS+= -I.. -I.
+CPPFLAGS+= -I.
LDADD+= -latf-c++ -latf-c
WARNS?= 2
Added files:
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u /dev/null src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.1
--- /dev/null Fri Jun 4 08:33:43 2010
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Fri Jun 4 08:33:42 2010
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2010/06/04 08:33:42 jmmv Exp $
+
+.include <bsd.own.mk>
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
+.PATH: ${SRCDIR}/atf-sh
+
+BINDIR= /usr/bin
+PROG_CXX= atf-sh
+SRCS= atf-sh.cpp
+MAN= atf-sh.1 atf-sh-api.3
+
+LDADD+= -latf-c++ -latf-c
+
+WARNS?= 2
+
+.if ${MKSHARE} != "no"
+FILESDIR= /usr/share/atf
+FILESMODE= 444
+FILES+= libatf-sh.subr
+.endif
+
+.include <bsd.prog.mk>
