[src/trunk]: src/external/bsd/atf Update reachover build files for atf-0.14.

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

details:   https://anonhg.NetBSD.org/src/rev/3303ee608611
branches:  trunk
changeset: 766066:3303ee608611
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Tue Jun 14 15:27:11 2011 +0000

description:
Update reachover build files for atf-0.14.

diffstat:

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

diffs (121 lines):

diff -r 524301610b29 -r 3303ee608611 external/bsd/atf/lib/libatf-c++/Makefile
--- a/external/bsd/atf/lib/libatf-c++/Makefile  Tue Jun 14 15:26:20 2011 +0000
+++ b/external/bsd/atf/lib/libatf-c++/Makefile  Tue Jun 14 15:27:11 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/04/05 16:37:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2011/06/14 15:27:11 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.13,g' \
+       ${TOOL_SED} -e 's,__ATF_VERSION__,0.14,g' \
            -e 's,__CXX__,g++,g' \
            -e 's,__INCLUDEDIR__,/usr/include,g' \
            -e 's,__LIBDIR__,/usr/lib,g' \
diff -r 524301610b29 -r 3303ee608611 external/bsd/atf/lib/libatf-c/Makefile
--- a/external/bsd/atf/lib/libatf-c/Makefile    Tue Jun 14 15:26:20 2011 +0000
+++ b/external/bsd/atf/lib/libatf-c/Makefile    Tue Jun 14 15:27:11 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/06/11 18:03:57 christos Exp $
+# $NetBSD: Makefile,v 1.12 2011/06/14 15:27:11 jmmv Exp $
 
 NOLINT=                # defined
 
@@ -76,8 +76,8 @@
 
 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_PRINTF(a,b)@|__attribute__((__format__(__printf__,a,b)))|g' \
            < ${.ALLSRC} > ${.TARGET}.tmp
        mv ${.TARGET}.tmp ${.TARGET}
 
@@ -87,7 +87,7 @@
 
 realall: atf-c.pc
 atf-c.pc: Makefile atf-c.pc.in
-       ${TOOL_SED} -e 's,__ATF_VERSION__,0.13,g' \
+       ${TOOL_SED} -e 's,__ATF_VERSION__,0.14,g' \
            -e 's,__CC__,gcc,g' \
            -e 's,__INCLUDEDIR__,/usr/include,g' \
            -e 's,__LIBDIR__,/usr/lib,g' \
diff -r 524301610b29 -r 3303ee608611 external/bsd/atf/lib/libatf-c/bconfig.h
--- a/external/bsd/atf/lib/libatf-c/bconfig.h   Tue Jun 14 15:26:20 2011 +0000
+++ b/external/bsd/atf/lib/libatf-c/bconfig.h   Tue Jun 14 15:27:11 2011 +0000
@@ -96,7 +96,7 @@
 #define PACKAGE_NAME "Automated Testing Framework"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.13"
+#define PACKAGE_STRING "Automated Testing Framework 0.14"
 
 /* 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.13"
+#define PACKAGE_VERSION "0.14"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.13"
+#define VERSION "0.14"
diff -r 524301610b29 -r 3303ee608611 external/bsd/atf/prepare-import.sh
--- a/external/bsd/atf/prepare-import.sh        Tue Jun 14 15:26:20 2011 +0000
+++ b/external/bsd/atf/prepare-import.sh        Tue Jun 14 15:27:11 2011 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.4 2011/03/31 16:45:44 jmmv Exp $
+# $NetBSD: prepare-import.sh,v 1.5 2011/06/14 15:27:11 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,6 +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} bconfig.h.in"
 CLEAN_PATTERNS="${CLEAN_PATTERNS} bootstrap"
 CLEAN_PATTERNS="${CLEAN_PATTERNS} configure*"
diff -r 524301610b29 -r 3303ee608611 external/bsd/atf/usr.bin/atf-sh/Makefile
--- a/external/bsd/atf/usr.bin/atf-sh/Makefile  Tue Jun 14 15:26:20 2011 +0000
+++ b/external/bsd/atf/usr.bin/atf-sh/Makefile  Tue Jun 14 15:27:11 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/02/20 20:18:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/14 15:27:11 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -19,9 +19,20 @@
 WARNS?=                2
 
 .if ${MKSHARE} != "no"
-FILESDIR=      /usr/share/atf
 FILESMODE=     444
-FILES+=                libatf-sh.subr
+
+FILES+=                                libatf-sh.subr
+FILESDIR_libatf-sh.subr=       /usr/share/atf
+
+FILES+=                        atf-sh.pc
+FILESDIR_atf-sh.pc=    /usr/lib/pkgconfig
+
+realall: atf-sh.pc
+atf-sh.pc: Makefile atf-sh.pc.in
+       ${TOOL_SED} -e 's,__ATF_VERSION__,0.14,g' \
+           -e 's,__EXEC_PREFIX__,/usr,g' \
+           <${SRCDIR}/atf-sh/atf-sh.pc.in >atf-sh.pc
+CLEANFILES+=   atf-sh.pc
 .endif
 
 .include <bsd.prog.mk>