Module Name: src Committed By: jmmv Date: Thu Mar 31 16:45:45 UTC 2011
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-run: Makefile Log Message: Adjust reachover build files with the import of atf-0.13. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/prepare-import.sh cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/lib/libatf-c/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/lib/libatf-c/bconfig.h cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/lib/libatf-c++/Makefile cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/usr.bin/atf-run/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.3 src/external/bsd/atf/prepare-import.sh:1.4 --- src/external/bsd/atf/prepare-import.sh:1.3 Wed Oct 20 08:56:16 2010 +++ src/external/bsd/atf/prepare-import.sh Thu Mar 31 16:45:44 2011 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.3 2010/10/20 08:56:16 jmmv Exp $ +# $NetBSD: prepare-import.sh,v 1.4 2011/03/31 16:45:44 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 @@ -13,7 +13,7 @@ CLEAN_PATTERNS= CLEAN_PATTERNS="${CLEAN_PATTERNS} *.m4" -CLEAN_PATTERNS="${CLEAN_PATTERNS} INSTALL" +CLEAN_PATTERNS="${CLEAN_PATTERNS} INSTALL TODO" CLEAN_PATTERNS="${CLEAN_PATTERNS} Makefile* */Makefile* */*/Makefile*" CLEAN_PATTERNS="${CLEAN_PATTERNS} admin" CLEAN_PATTERNS="${CLEAN_PATTERNS} bconfig.h.in" Index: src/external/bsd/atf/lib/libatf-c/Makefile diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.9 src/external/bsd/atf/lib/libatf-c/Makefile:1.10 --- src/external/bsd/atf/lib/libatf-c/Makefile:1.9 Sun Feb 20 20:56:34 2011 +++ src/external/bsd/atf/lib/libatf-c/Makefile Thu Mar 31 16:45:44 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2011/02/20 20:56:34 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2011/03/31 16:45:44 jmmv Exp $ NOLINT= # defined @@ -86,7 +86,7 @@ realall: atf-c.pc atf-c.pc: Makefile atf-c.pc.in - ${TOOL_SED} -e 's,__ATF_VERSION__,0.12,g' \ + ${TOOL_SED} -e 's,__ATF_VERSION__,0.13,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.7 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.8 --- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.7 Sun Nov 7 17:46:46 2010 +++ src/external/bsd/atf/lib/libatf-c/bconfig.h Thu Mar 31 16:45:44 2011 @@ -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, 2008, 2009, 2010 The NetBSD Foundation, Inc." +#define PACKAGE_COPYRIGHT "Copyright (c) 2007-2011 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.12" +#define PACKAGE_STRING "Automated Testing Framework 0.13" /* 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.12" +#define PACKAGE_VERSION "0.13" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.12" +#define VERSION "0.13" Index: src/external/bsd/atf/lib/libatf-c++/Makefile diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.8 src/external/bsd/atf/lib/libatf-c++/Makefile:1.9 --- src/external/bsd/atf/lib/libatf-c++/Makefile:1.8 Sun Feb 20 20:18:56 2011 +++ src/external/bsd/atf/lib/libatf-c++/Makefile Thu Mar 31 16:45:45 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2011/02/20 20:18:56 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2011/03/31 16:45:45 jmmv Exp $ NOLINT= # defined @@ -54,7 +54,7 @@ realall: atf-c++.pc atf-c++.pc: Makefile atf-c++.pc.in - ${TOOL_SED} -e 's,__ATF_VERSION__,0.12,g' \ + ${TOOL_SED} -e 's,__ATF_VERSION__,0.13,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-run/Makefile diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.9 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.10 --- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.9 Sun Feb 20 20:18:57 2011 +++ src/external/bsd/atf/usr.bin/atf-run/Makefile Thu Mar 31 16:45:45 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2011/02/20 20:18:57 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2011/03/31 16:45:45 jmmv Exp $ .include <bsd.own.mk> @@ -13,6 +13,7 @@ signals.cpp test-program.cpp timer.cpp user.cpp MAN= atf-run.1 +CPPFLAGS+= -DGDB=\"/usr/bin/gdb\" CPPFLAGS+= -DHAVE_CONFIG_H CPPFLAGS+= -I${SRCDIR} CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c