Module Name: src
Committed By: jmmv
Date: Mon Jan 16 22:42:40 UTC 2012
Modified Files:
src/external/bsd/atf: prepare-import.sh
src/external/bsd/atf/lib/libatf-c: Makefile bconfig.h
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
Log Message:
Update reachover build files and scripts to deal with the just-imported
atf 0.15.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/prepare-import.sh
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/atf/lib/libatf-c/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/usr.bin/atf-sh/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/prepare-import.sh
diff -u src/external/bsd/atf/prepare-import.sh:1.5 src/external/bsd/atf/prepare-import.sh:1.6
--- src/external/bsd/atf/prepare-import.sh:1.5 Tue Jun 14 15:27:11 2011
+++ src/external/bsd/atf/prepare-import.sh Mon Jan 16 22:42:40 2012
@@ -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} *.m4"
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*"
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.13 src/external/bsd/atf/lib/libatf-c/Makefile:1.14
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.13 Fri Sep 16 16:41:20 2011
+++ src/external/bsd/atf/lib/libatf-c/Makefile Mon Jan 16 22:42:40 2012
@@ -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 @@ 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}
@@ -89,7 +90,7 @@ FILESDIR= /usr/lib/pkgconfig
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' \
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.9 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.10
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.9 Tue Jun 14 15:27:11 2011
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Mon Jan 16 22:42:40 2012
@@ -90,13 +90,13 @@
#define PACKAGE_BUGREPORT "atf-de...@netbsd.org"
/* 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"
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.11 src/external/bsd/atf/lib/libatf-c++/Makefile:1.12
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.11 Tue Jun 14 15:27:11 2011
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Mon Jan 16 22:42:40 2012
@@ -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 @@ FILESDIR= /usr/lib/pkgconfig
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' \
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.5 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.6
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.5 Tue Jun 14 15:27:11 2011
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Mon Jan 16 22:42:40 2012
@@ -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 @@ 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' \
+ ${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
