diff --git a/external/bsd/atf/lib/libatf-c/bconfig.h b/external/bsd/atf/lib/libatf-c/bconfig.h index 40d0ddadec06..60f43a724cdf 100644 --- a/external/bsd/atf/lib/libatf-c/bconfig.h +++ b/external/bsd/atf/lib/libatf-c/bconfig.h @@ -58,9 +58,6 @@ /* Define to 1 if vsnprintf is in std */ /* #undef HAVE_VSNPRINTF_IN_STD */ -/* Define to the last valid signal number */ -#define LAST_SIGNO 63 - /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" @@ -78,7 +75,7 @@ #define PACKAGE_NAME "Automated Testing Framework" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Automated Testing Framework 0.19" +#define PACKAGE_STRING "Automated Testing Framework 0.20" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "atf" @@ -87,10 +84,10 @@ #define PACKAGE_URL "https://github.com/jmmv/atf/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.19" +#define PACKAGE_VERSION "0.20" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.19" +#define VERSION "0.20" diff --git a/external/bsd/atf/lib/tools/Makefile b/external/bsd/atf/lib/tools/Makefile index 3ff3e301b992..e43a49e23c17 100644 --- a/external/bsd/atf/lib/tools/Makefile +++ b/external/bsd/atf/lib/tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/02/08 19:15:33 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2014/02/11 16:11:28 jmmv Exp $ NOLINT= # defined @@ -29,6 +29,7 @@ CPPFLAGS+= -DATF_MACHINE=\"${MACHINE}\" CPPFLAGS+= -DATF_PKGDATADIR=\"/usr/share/atf\" CPPFLAGS+= -DATF_SHELL=\"/bin/sh\" CPPFLAGS+= -DATF_WORKDIR=\"/tmp\" +CPPFLAGS+= -DLAST_SIGNO=63 CPPFLAGS+= -I${SRCDIR}/tools CPPFLAGS+= -I. CPPFLAGS+= -I${TOPDIR}/lib/libatf-c # For bconfig.h diff --git a/external/bsd/atf/prepare-import.sh b/external/bsd/atf/prepare-import.sh index 97e7cbb8db60..a17abd6339bd 100755 --- a/external/bsd/atf/prepare-import.sh +++ b/external/bsd/atf/prepare-import.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.7 2014/02/08 19:06:05 jmmv Exp $ +# $NetBSD: prepare-import.sh,v 1.8 2014/02/11 16:11:28 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 @@ -14,6 +14,7 @@ ProgName=${0##*/} CLEAN_PATTERNS= CLEAN_PATTERNS="${CLEAN_PATTERNS} *.m4" CLEAN_PATTERNS="${CLEAN_PATTERNS} INSTALL TODO" +CLEAN_PATTERNS="${CLEAN_PATTERNS} Atffile */Atffile */*/Atffile" CLEAN_PATTERNS="${CLEAN_PATTERNS} Makefile* */Makefile* */*/Makefile*" CLEAN_PATTERNS="${CLEAN_PATTERNS} admin" CLEAN_PATTERNS="${CLEAN_PATTERNS} atf-*/atf-*.m4" diff --git a/external/bsd/atf/tests/atf/atf-c++/Makefile b/external/bsd/atf/tests/atf/atf-c++/Makefile index aa3ea64b2bab..f37745461e97 100644 --- a/external/bsd/atf/tests/atf/atf-c++/Makefile +++ b/external/bsd/atf/tests/atf/atf-c++/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2014/02/08 19:15:34 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2014/02/11 16:11:28 jmmv Exp $ .include TESTS_SUBDIRS= detail TESTSDIR= ${TESTSBASE}/atf/atf-c++ -ATFFILE= yes SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist .PATH: ${SRCDIR}/atf-c++ diff --git a/external/bsd/atf/tests/atf/atf-c++/detail/Makefile b/external/bsd/atf/tests/atf/atf-c++/detail/Makefile index 0a45864e0516..b55000179bbf 100644 --- a/external/bsd/atf/tests/atf/atf-c++/detail/Makefile +++ b/external/bsd/atf/tests/atf/atf-c++/detail/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2014/02/08 19:15:34 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2014/02/11 16:11:28 jmmv Exp $ .include TESTSDIR= ${TESTSBASE}/atf/atf-c++/detail -ATFFILE= yes SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist .PATH: ${SRCDIR}/atf-c++/detail diff --git a/external/bsd/atf/tests/atf/atf-c/Makefile b/external/bsd/atf/tests/atf/atf-c/Makefile index 6ae793c46bc9..b2ef8beb68ed 100644 --- a/external/bsd/atf/tests/atf/atf-c/Makefile +++ b/external/bsd/atf/tests/atf/atf-c/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2012/07/11 22:40:16 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2014/02/11 16:11:28 jmmv Exp $ .include TESTS_SUBDIRS= detail TESTSDIR= ${TESTSBASE}/atf/atf-c -ATFFILE= yes SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist .PATH: ${SRCDIR}/atf-c diff --git a/external/bsd/atf/tests/atf/atf-c/detail/Makefile b/external/bsd/atf/tests/atf/atf-c/detail/Makefile index 389ce3f113b9..5d5b0927a947 100644 --- a/external/bsd/atf/tests/atf/atf-c/detail/Makefile +++ b/external/bsd/atf/tests/atf/atf-c/detail/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2014/02/08 19:15:34 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2014/02/11 16:11:28 jmmv Exp $ .include TESTSDIR= ${TESTSBASE}/atf/atf-c/detail -ATFFILE= yes SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist .PATH: ${SRCDIR}/atf-c/detail diff --git a/external/bsd/atf/tests/atf/atf-config/Makefile b/external/bsd/atf/tests/atf/atf-config/Makefile index 1517afa21266..9b4848364a33 100644 --- a/external/bsd/atf/tests/atf/atf-config/Makefile +++ b/external/bsd/atf/tests/atf/atf-config/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2010/07/13 21:12:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2014/02/11 16:11:28 jmmv Exp $ .include TESTSDIR= ${TESTSBASE}/atf/atf-config -ATFFILE= yes SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist .PATH: ${SRCDIR}/atf-config diff --git a/external/bsd/atf/tests/atf/atf-report/Makefile b/external/bsd/atf/tests/atf/atf-report/Makefile index a6e68b3e9c9d..c1607865886d 100644 --- a/external/bsd/atf/tests/atf/atf-report/Makefile +++ b/external/bsd/atf/tests/atf/atf-report/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2010/10/20 09:20:11 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2014/02/11 16:11:29 jmmv Exp $ .include TESTSDIR= ${TESTSBASE}/atf/atf-report -ATFFILE= yes SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist .PATH: ${SRCDIR}/atf-report diff --git a/external/bsd/atf/tests/atf/atf-run/Makefile b/external/bsd/atf/tests/atf/atf-run/Makefile index a0ea258981ff..8f43dd5a207c 100644 --- a/external/bsd/atf/tests/atf/atf-run/Makefile +++ b/external/bsd/atf/tests/atf/atf-run/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2010/11/07 17:46:46 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2014/02/11 16:11:29 jmmv Exp $ .include TESTSDIR= ${TESTSBASE}/atf/atf-run -ATFFILE= yes SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist .PATH: ${SRCDIR}/atf-run diff --git a/external/bsd/atf/tests/atf/atf-sh/Makefile b/external/bsd/atf/tests/atf/atf-sh/Makefile index 78bcb9a5f987..3b84d14a1094 100644 --- a/external/bsd/atf/tests/atf/atf-sh/Makefile +++ b/external/bsd/atf/tests/atf/atf-sh/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2010/10/20 09:20:12 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2014/02/11 16:11:29 jmmv Exp $ .include TESTSDIR= ${TESTSBASE}/atf/atf-sh -ATFFILE= yes SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist .PATH: ${SRCDIR}/atf-sh diff --git a/external/bsd/atf/tests/atf/test-programs/Makefile b/external/bsd/atf/tests/atf/test-programs/Makefile index 4d5b21a1bf9c..2115e3776d0a 100644 --- a/external/bsd/atf/tests/atf/test-programs/Makefile +++ b/external/bsd/atf/tests/atf/test-programs/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2013/02/15 17:08:35 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2014/02/11 16:11:29 jmmv Exp $ .include TESTSDIR= ${TESTSBASE}/atf/test-programs -ATFFILE= yes SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist .PATH: ${SRCDIR}/test-programs diff --git a/external/bsd/atf/tests/atf/tools/Makefile b/external/bsd/atf/tests/atf/tools/Makefile index ecd3d8b4a14d..fcfe0105d44b 100644 --- a/external/bsd/atf/tests/atf/tools/Makefile +++ b/external/bsd/atf/tests/atf/tools/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2014/02/08 19:15:34 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2014/02/11 16:11:29 jmmv Exp $ .include TESTSDIR= ${TESTSBASE}/atf/tools -ATFFILE= yes SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist .PATH: ${SRCDIR}/tools