[src/trunk]: src/external/bsd/atf Adjust reachover makefiles for atf 0.9.

[jmmv <jmmv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d57e8ad1ce9d
branches:  trunk
changeset: 755392:d57e8ad1ce9d
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Fri Jun 04 08:33:40 2010 +0000

description:
Adjust reachover makefiles for atf 0.9.

diffstat:

 external/bsd/atf/etc/atf/Makefile               |   4 +-
 external/bsd/atf/lib/libatf-c++/Makefile        |  18 +++++++++++++-
 external/bsd/atf/lib/libatf-c/Makefile          |  20 +++++++++++++---
 external/bsd/atf/lib/libatf-c/bconfig.h         |  15 ++++++++++--
 external/bsd/atf/share/Makefile                 |   4 +-
 external/bsd/atf/share/atf/Makefile             |  19 ----------------
 external/bsd/atf/share/doc/atf/Makefile         |   3 +-
 external/bsd/atf/share/examples/atf/Makefile    |   5 ++-
 external/bsd/atf/share/xml/atf/Makefile         |   4 +-
 external/bsd/atf/share/xsl/atf/Makefile         |   4 +-
 external/bsd/atf/tests/atf/Makefile             |   4 +--
 external/bsd/atf/tests/atf/atf-c++/Makefile     |   4 ++-
 external/bsd/atf/tests/atf/atf-c/Makefile       |   5 ++-
 external/bsd/atf/tests/atf/atf-compile/Makefile |  16 -------------
 external/bsd/atf/tests/atf/atf-run/Makefile     |   4 +-
 external/bsd/atf/tests/atf/atf-sh/Makefile      |   3 +-
 external/bsd/atf/tests/atf/data/Makefile        |  12 ----------
 external/bsd/atf/usr.bin/Makefile               |   4 +-
 external/bsd/atf/usr.bin/atf-compile/Makefile   |  17 --------------
 external/bsd/atf/usr.bin/atf-run/Makefile       |  29 ++----------------------
 external/bsd/atf/usr.bin/atf-sh/Makefile        |  23 +++++++++++++++++++
 external/bsd/atf/usr.bin/atf-version/Makefile   |   4 +-
 22 files changed, 97 insertions(+), 124 deletions(-)

diffs (truncated from 499 to 300 lines):

diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/etc/atf/Makefile
--- a/external/bsd/atf/etc/atf/Makefile Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/etc/atf/Makefile Fri Jun 04 08:33:40 2010 +0000
@@ -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
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/lib/libatf-c++/Makefile
--- a/external/bsd/atf/lib/libatf-c++/Makefile  Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/lib/libatf-c++/Makefile  Fri Jun 04 08:33:40 2010 +0000
@@ -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>
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/lib/libatf-c/Makefile
--- a/external/bsd/atf/lib/libatf-c/Makefile    Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/lib/libatf-c/Makefile    Fri Jun 04 08:33:40 2010 +0000
@@ -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>
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/lib/libatf-c/bconfig.h
--- a/external/bsd/atf/lib/libatf-c/bconfig.h   Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/lib/libatf-c/bconfig.h   Fri Jun 04 08:33:40 2010 +0000
@@ -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"
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/share/Makefile
--- a/external/bsd/atf/share/Makefile   Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/share/Makefile   Fri Jun 04 08:33:40 2010 +0000
@@ -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>
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/share/atf/Makefile
--- a/external/bsd/atf/share/atf/Makefile       Fri Jun 04 08:32:14 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:04 jmmv Exp $
-
-.include <bsd.own.mk>
-
-.if ${MKSHARE} != "no"
-
-SRCDIR=                ${NETBSDSRCDIR}/external/bsd/atf/dist
-.PATH:         ${SRCDIR}/data ${SRCDIR}/atf-sh
-
-# Files in ${SRCDIR}/subrs.
-FILESDIR=      /usr/share/atf
-FILESMODE=     444
-FILES=         atf.footer.subr \
-               atf.header.subr \
-               atf.init.subr
-
-.endif
-
-.include <bsd.prog.mk>
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/share/doc/atf/Makefile
--- a/external/bsd/atf/share/doc/atf/Makefile   Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/share/doc/atf/Makefile   Fri Jun 04 08:33:40 2010 +0000
@@ -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
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/share/examples/atf/Makefile
--- a/external/bsd/atf/share/examples/atf/Makefile      Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/share/examples/atf/Makefile      Fri Jun 04 08:33:40 2010 +0000
@@ -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
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/share/xml/atf/Makefile
--- a/external/bsd/atf/share/xml/atf/Makefile   Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/share/xml/atf/Makefile   Fri Jun 04 08:33:40 2010 +0000
@@ -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
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/share/xsl/atf/Makefile
--- a/external/bsd/atf/share/xsl/atf/Makefile   Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/share/xsl/atf/Makefile   Fri Jun 04 08:33:40 2010 +0000
@@ -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
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/tests/atf/Makefile
--- a/external/bsd/atf/tests/atf/Makefile       Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/tests/atf/Makefile       Fri Jun 04 08:33:40 2010 +0000
@@ -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
 
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/tests/atf/atf-c++/Makefile
--- a/external/bsd/atf/tests/atf/atf-c++/Makefile       Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/tests/atf/atf-c++/Makefile       Fri Jun 04 08:33:40 2010 +0000
@@ -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>
diff -r a79a611669fb -r d57e8ad1ce9d external/bsd/atf/tests/atf/atf-c/Makefile
--- a/external/bsd/atf/tests/atf/atf-c/Makefile Fri Jun 04 08:32:14 2010 +0000
+++ b/external/bsd/atf/tests/atf/atf-c/Makefile Fri Jun 04 08:33:40 2010 +0000
@@ -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