[src/trunk]: src/external/bsd/atf Update reachover build files and scripts to...

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

details:   https://anonhg.NetBSD.org/src/rev/a7c098943579
branches:  trunk
changeset: 772798:a7c098943579
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Mon Jan 16 22:42:40 2012 +0000

description:
Update reachover build files and scripts to deal with the just-imported
atf 0.15.

diffstat:

 external/bsd/atf/lib/libatf-c++/Makefile |  4 ++--
 external/bsd/atf/lib/libatf-c/Makefile   |  5 +++--
 external/bsd/atf/lib/libatf-c/bconfig.h  |  8 ++++----
 external/bsd/atf/prepare-import.sh       |  4 ++--
 external/bsd/atf/usr.bin/atf-sh/Makefile |  4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diffs (113 lines):

diff -r 6a5128f2216d -r a7c098943579 external/bsd/atf/lib/libatf-c++/Makefile
--- a/external/bsd/atf/lib/libatf-c++/Makefile  Mon Jan 16 22:41:30 2012 +0000
+++ b/external/bsd/atf/lib/libatf-c++/Makefile  Mon Jan 16 22:42:40 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/06/14 15:27:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2012/01/16 22:42:40 jmmv Exp $
 
 NOLINT=                # defined
 
@@ -55,7 +55,7 @@
 
 realall: atf-c++.pc
 atf-c++.pc: Makefile atf-c++.pc.in
-       ${TOOL_SED} -e 's,__ATF_VERSION__,0.14,g' \
+       ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
            -e 's,__CXX__,g++,g' \
            -e 's,__INCLUDEDIR__,/usr/include,g' \
            -e 's,__LIBDIR__,/usr/lib,g' \
diff -r 6a5128f2216d -r a7c098943579 external/bsd/atf/lib/libatf-c/Makefile
--- a/external/bsd/atf/lib/libatf-c/Makefile    Mon Jan 16 22:41:30 2012 +0000
+++ b/external/bsd/atf/lib/libatf-c/Makefile    Mon Jan 16 22:42:40 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/09/16 16:41:20 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/01/16 22:42:40 jmmv Exp $
 
 NOLINT=                # defined
 
@@ -80,6 +80,7 @@
        ${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}
 
@@ -89,7 +90,7 @@
 
 realall: atf-c.pc
 atf-c.pc: Makefile atf-c.pc.in
-       ${TOOL_SED} -e 's,__ATF_VERSION__,0.14,g' \
+       ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
            -e 's,__CC__,gcc,g' \
            -e 's,__INCLUDEDIR__,/usr/include,g' \
            -e 's,__LIBDIR__,/usr/lib,g' \
diff -r 6a5128f2216d -r a7c098943579 external/bsd/atf/lib/libatf-c/bconfig.h
--- a/external/bsd/atf/lib/libatf-c/bconfig.h   Mon Jan 16 22:41:30 2012 +0000
+++ b/external/bsd/atf/lib/libatf-c/bconfig.h   Mon Jan 16 22:42:40 2012 +0000
@@ -90,13 +90,13 @@
 #define PACKAGE_BUGREPORT "atf-devel%NetBSD.org@localhost"
 
 /* Define to the copyright string applicable to this package. */
-#define PACKAGE_COPYRIGHT "Copyright (c) 2007-2011 The NetBSD Foundation, Inc."
+#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.14"
+#define PACKAGE_STRING "Automated Testing Framework 0.15"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "atf"
@@ -105,10 +105,10 @@
 #define PACKAGE_URL "http://www.NetBSD.org/~jmmv/atf/";
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.14"
+#define PACKAGE_VERSION "0.15"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.14"
+#define VERSION "0.15"
diff -r 6a5128f2216d -r a7c098943579 external/bsd/atf/prepare-import.sh
--- a/external/bsd/atf/prepare-import.sh        Mon Jan 16 22:41:30 2012 +0000
+++ b/external/bsd/atf/prepare-import.sh        Mon Jan 16 22:42:40 2012 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.5 2011/06/14 15:27:11 jmmv Exp $
+# $NetBSD: prepare-import.sh,v 1.6 2012/01/16 22:42:40 jmmv Exp $
 #
 # Use this script to recreate the 'dist' subdirectory from a newly released
 # distfile.  The script takes care of unpacking the distfile, removing any
@@ -16,7 +16,7 @@
 CLEAN_PATTERNS="${CLEAN_PATTERNS} INSTALL TODO"
 CLEAN_PATTERNS="${CLEAN_PATTERNS} Makefile* */Makefile* */*/Makefile*"
 CLEAN_PATTERNS="${CLEAN_PATTERNS} admin"
-CLEAN_PATTERNS="${CLEAN_PATTERNS} atf-sh/atf-sh.m4"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} atf-*/atf-*.m4"
 CLEAN_PATTERNS="${CLEAN_PATTERNS} bconfig.h.in"
 CLEAN_PATTERNS="${CLEAN_PATTERNS} bootstrap"
 CLEAN_PATTERNS="${CLEAN_PATTERNS} configure*"
diff -r 6a5128f2216d -r a7c098943579 external/bsd/atf/usr.bin/atf-sh/Makefile
--- a/external/bsd/atf/usr.bin/atf-sh/Makefile  Mon Jan 16 22:41:30 2012 +0000
+++ b/external/bsd/atf/usr.bin/atf-sh/Makefile  Mon Jan 16 22:42:40 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/06/14 15:27:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2012/01/16 22:42:40 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -29,7 +29,7 @@
 
 realall: atf-sh.pc
 atf-sh.pc: Makefile atf-sh.pc.in
-       ${TOOL_SED} -e 's,__ATF_VERSION__,0.14,g' \
+       ${TOOL_SED} -e 's,__ATF_VERSION__,0.15,g' \
            -e 's,__EXEC_PREFIX__,/usr,g' \
            <${SRCDIR}/atf-sh/atf-sh.pc.in >atf-sh.pc
 CLEANFILES+=   atf-sh.pc