Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching

error, and to sync with reality.

3 files changed, 87 insertions, 339 deletions

diff --git a/devel/atf/Makefile b/devel/atf/Makefile
index b7282ad7e93..1b55beeee21 100644
--- a/devel/atf/Makefile
+++ b/devel/atf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2010/06/03 16:07:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2010/07/04 07:10:50 agc Exp $
 #
 
-DISTNAME=	atf-0.9
+DISTNAME=	atf-0.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/jmmv/atf/0.9/
+MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/jmmv/atf/0.10/
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/~jmmv/atf/
diff --git a/devel/atf/PLIST b/devel/atf/PLIST
index 9f7a1a12b7f..d1ddb89f7ca 100644
--- a/devel/atf/PLIST
+++ b/devel/atf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2010/06/03 16:07:25 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.11.2.1 2010/07/04 07:10:50 agc Exp $
 bin/atf-check
 bin/atf-config
 bin/atf-report
@@ -7,14 +7,12 @@ bin/atf-sh
 bin/atf-version
 include/atf-c++.hpp
 include/atf-c++/application.hpp
-include/atf-c++/atffile.hpp
 include/atf-c++/build.hpp
 include/atf-c++/check.hpp
 include/atf-c++/config.hpp
 include/atf-c++/env.hpp
 include/atf-c++/exceptions.hpp
 include/atf-c++/expand.hpp
-include/atf-c++/formats.hpp
 include/atf-c++/fs.hpp
 include/atf-c++/io.hpp
 include/atf-c++/macros.hpp
@@ -37,28 +35,21 @@ include/atf-c/env.h
 include/atf-c/error.h
 include/atf-c/error_fwd.h
 include/atf-c/fs.h
-include/atf-c/io.h
 include/atf-c/list.h
 include/atf-c/macros.h
 include/atf-c/map.h
 include/atf-c/process.h
 include/atf-c/sanity.h
 include/atf-c/tc.h
-include/atf-c/tcr.h
 include/atf-c/text.h
 include/atf-c/tp.h
-include/atf-c/ui.h
 include/atf-c/user.h
 lib/libatf-c++.la
 lib/libatf-c.la
 lib/pkgconfig/atf-c++.pc
 lib/pkgconfig/atf-c.pc
-libexec/atf-cleanup
-libexec/atf-format
 man/man1/atf-check.1
-man/man1/atf-cleanup.1
 man/man1/atf-config.1
-man/man1/atf-format.1
 man/man1/atf-report.1
 man/man1/atf-run.1
 man/man1/atf-sh.1
@@ -82,331 +73,88 @@ share/xml/atf/tests-results.dtd
 share/xsl/atf/tests-results.xsl
 tests/atf/Atffile
 tests/atf/atf-c++/Atffile
-tests/atf/atf-c++/d_include_application_hpp.cpp
-tests/atf/atf-c++/d_include_atf_c++_hpp.cpp
-tests/atf/atf-c++/d_include_atffile_hpp.cpp
-tests/atf/atf-c++/d_include_build_hpp.cpp
-tests/atf/atf-c++/d_include_check_hpp.cpp
-tests/atf/atf-c++/d_include_config_hpp.cpp
-tests/atf/atf-c++/d_include_env_hpp.cpp
-tests/atf/atf-c++/d_include_exceptions_hpp.cpp
-tests/atf/atf-c++/d_include_expand_hpp.cpp
-tests/atf/atf-c++/d_include_formats_hpp.cpp
-tests/atf/atf-c++/d_include_fs_hpp.cpp
-tests/atf/atf-c++/d_include_io_hpp.cpp
-tests/atf/atf-c++/d_include_macros_hpp.cpp
-tests/atf/atf-c++/d_include_parser_hpp.cpp
-tests/atf/atf-c++/d_include_process_hpp.cpp
-tests/atf/atf-c++/d_include_sanity_hpp.cpp
-tests/atf/atf-c++/d_include_signals_hpp.cpp
-tests/atf/atf-c++/d_include_tests_hpp.cpp
-tests/atf/atf-c++/d_include_text_hpp.cpp
-tests/atf/atf-c++/d_include_ui_hpp.cpp
-tests/atf/atf-c++/d_include_user_hpp.cpp
-tests/atf/atf-c++/d_include_utils_hpp.cpp
-tests/atf/atf-c++/d_use_macros_hpp.cpp
-tests/atf/atf-c++/t_application
-tests/atf/atf-c++/t_atf_c++
-tests/atf/atf-c++/t_atffile
-tests/atf/atf-c++/t_build
-tests/atf/atf-c++/t_check
-tests/atf/atf-c++/t_config
-tests/atf/atf-c++/t_env
-tests/atf/atf-c++/t_exceptions
-tests/atf/atf-c++/t_expand
-tests/atf/atf-c++/t_formats
-tests/atf/atf-c++/t_fs
-tests/atf/atf-c++/t_io
-tests/atf/atf-c++/t_macros
-tests/atf/atf-c++/t_parser
-tests/atf/atf-c++/t_pkg_config
-tests/atf/atf-c++/t_process
-tests/atf/atf-c++/t_sanity
-tests/atf/atf-c++/t_signals
-tests/atf/atf-c++/t_tests
-tests/atf/atf-c++/t_text
-tests/atf/atf-c++/t_ui
-tests/atf/atf-c++/t_user
-tests/atf/atf-c++/t_utils
+tests/atf/atf-c++/application_test
+tests/atf/atf-c++/atf_c++_test
+tests/atf/atf-c++/build_test
+tests/atf/atf-c++/check_test
+tests/atf/atf-c++/config_test
+tests/atf/atf-c++/env_test
+tests/atf/atf-c++/exceptions_test
+tests/atf/atf-c++/expand_test
+tests/atf/atf-c++/fs_test
+tests/atf/atf-c++/io_test
+tests/atf/atf-c++/macros_hpp_test.cpp
+tests/atf/atf-c++/macros_test
+tests/atf/atf-c++/parser_test
+tests/atf/atf-c++/pkg_config_test
+tests/atf/atf-c++/process_test
+tests/atf/atf-c++/sanity_test
+tests/atf/atf-c++/signals_test
+tests/atf/atf-c++/tests_test
+tests/atf/atf-c++/text_test
+tests/atf/atf-c++/ui_test
+tests/atf/atf-c++/user_test
+tests/atf/atf-c++/utils_test
 tests/atf/atf-c/Atffile
-tests/atf/atf-c/d_include_atf_c_h.c
-tests/atf/atf-c/d_include_build_h.c
-tests/atf/atf-c/d_include_check_h.c
-tests/atf/atf-c/d_include_config_h.c
-tests/atf/atf-c/d_include_dynstr_h.c
-tests/atf/atf-c/d_include_env_h.c
-tests/atf/atf-c/d_include_error_fwd_h.c
-tests/atf/atf-c/d_include_error_h.c
-tests/atf/atf-c/d_include_fs_h.c
-tests/atf/atf-c/d_include_io_h.c
-tests/atf/atf-c/d_include_list_h.c
-tests/atf/atf-c/d_include_macros_h.c
-tests/atf/atf-c/d_include_map_h.c
-tests/atf/atf-c/d_include_process_h.c
-tests/atf/atf-c/d_include_sanity_h.c
-tests/atf/atf-c/d_include_tc_h.c
-tests/atf/atf-c/d_include_tcr_h.c
-tests/atf/atf-c/d_include_text_h.c
-tests/atf/atf-c/d_include_tp_h.c
-tests/atf/atf-c/d_include_ui_h.c
-tests/atf/atf-c/d_include_user_h.c
-tests/atf/atf-c/d_use_macros_h.c
-tests/atf/atf-c/h_processes
-tests/atf/atf-c/t_atf_c
-tests/atf/atf-c/t_build
-tests/atf/atf-c/t_check
-tests/atf/atf-c/t_config
-tests/atf/atf-c/t_dynstr
-tests/atf/atf-c/t_env
-tests/atf/atf-c/t_error
-tests/atf/atf-c/t_fs
-tests/atf/atf-c/t_h_lib
-tests/atf/atf-c/t_io
-tests/atf/atf-c/t_list
-tests/atf/atf-c/t_macros
-tests/atf/atf-c/t_map
-tests/atf/atf-c/t_pkg_config
-tests/atf/atf-c/t_process
-tests/atf/atf-c/t_sanity
-tests/atf/atf-c/t_tc
-tests/atf/atf-c/t_tcr
-tests/atf/atf-c/t_text
-tests/atf/atf-c/t_tp
-tests/atf/atf-c/t_ui
-tests/atf/atf-c/t_user
+tests/atf/atf-c/atf_c_test
+tests/atf/atf-c/build_test
+tests/atf/atf-c/check_test
+tests/atf/atf-c/config_test
+tests/atf/atf-c/dynstr_test
+tests/atf/atf-c/env_test
+tests/atf/atf-c/error_test
+tests/atf/atf-c/fs_test
+tests/atf/atf-c/list_test
+tests/atf/atf-c/macros_h_test.c
+tests/atf/atf-c/macros_test
+tests/atf/atf-c/map_test
+tests/atf/atf-c/pkg_config_test
+tests/atf/atf-c/process_helpers
+tests/atf/atf-c/process_test
+tests/atf/atf-c/sanity_test
+tests/atf/atf-c/tc_test
+tests/atf/atf-c/test_helpers_test
+tests/atf/atf-c/text_test
+tests/atf/atf-c/tp_test
+tests/atf/atf-c/user_test
 tests/atf/atf-check/Atffile
-tests/atf/atf-check/t_integration
-tests/atf/atf-cleanup/Atffile
-tests/atf/atf-cleanup/t_integration
+tests/atf/atf-check/integration_test
 tests/atf/atf-config/Atffile
-tests/atf/atf-config/t_integration
+tests/atf/atf-config/integration_test
 tests/atf/atf-report/Atffile
-tests/atf/atf-report/h_fail
-tests/atf/atf-report/h_misc
-tests/atf/atf-report/h_pass
-tests/atf/atf-report/t_integration
+tests/atf/atf-report/fail_helper
+tests/atf/atf-report/integration_test
+tests/atf/atf-report/misc_helpers
+tests/atf/atf-report/pass_helper
+tests/atf/atf-report/reader_test
 tests/atf/atf-run/Atffile
-tests/atf/atf-run/h_bad_metadata
-tests/atf/atf-run/h_fail
-tests/atf/atf-run/h_misc
-tests/atf/atf-run/h_pass
-tests/atf/atf-run/h_several_tcs
-tests/atf/atf-run/h_zero_tcs
-tests/atf/atf-run/t_config
-tests/atf/atf-run/t_integration
-tests/atf/atf-run/t_requirements
-tests/atf/atf-run/t_test_program
+tests/atf/atf-run/atffile_test
+tests/atf/atf-run/bad_metadata_helper
+tests/atf/atf-run/config_test
+tests/atf/atf-run/expect_helpers
+tests/atf/atf-run/fs_test
+tests/atf/atf-run/integration_test
+tests/atf/atf-run/misc_helpers
+tests/atf/atf-run/pass_helper
+tests/atf/atf-run/requirements_test
+tests/atf/atf-run/several_tcs_helper
+tests/atf/atf-run/test_program_test
+tests/atf/atf-run/zero_tcs_helper
 tests/atf/atf-sh/Atffile
-tests/atf/atf-sh/h_misc
-tests/atf/atf-sh/t_atf_check
-tests/atf/atf-sh/t_config
-tests/atf/atf-sh/t_integration
-tests/atf/atf-sh/t_normalize
-tests/atf/atf-sh/t_tc
-tests/atf/atf-sh/t_tp
-tests/atf/formats/Atffile
-tests/atf/formats/d_atffile_1
-tests/atf/formats/d_atffile_1.expout
-tests/atf/formats/d_atffile_2
-tests/atf/formats/d_atffile_2.expout
-tests/atf/formats/d_atffile_3
-tests/atf/formats/d_atffile_3.expout
-tests/atf/formats/d_atffile_4
-tests/atf/formats/d_atffile_4.expout
-tests/atf/formats/d_atffile_5
-tests/atf/formats/d_atffile_5.expout
-tests/atf/formats/d_atffile_50
-tests/atf/formats/d_atffile_50.experr
-tests/atf/formats/d_atffile_51
-tests/atf/formats/d_atffile_51.experr
-tests/atf/formats/d_atffile_52
-tests/atf/formats/d_atffile_52.experr
-tests/atf/formats/d_atffile_53
-tests/atf/formats/d_atffile_53.experr
-tests/atf/formats/d_atffile_53.expout
-tests/atf/formats/d_atffile_54
-tests/atf/formats/d_atffile_54.experr
-tests/atf/formats/d_atffile_6
-tests/atf/formats/d_atffile_6.expout
-tests/atf/formats/d_config_1
-tests/atf/formats/d_config_1.expout
-tests/atf/formats/d_config_2
-tests/atf/formats/d_config_2.expout
-tests/atf/formats/d_config_3
-tests/atf/formats/d_config_3.expout
-tests/atf/formats/d_config_4
-tests/atf/formats/d_config_4.expout
-tests/atf/formats/d_config_50
-tests/atf/formats/d_config_50.experr
-tests/atf/formats/d_config_51
-tests/atf/formats/d_config_51.experr
-tests/atf/formats/d_config_52
-tests/atf/formats/d_config_52.experr
-tests/atf/formats/d_config_53
-tests/atf/formats/d_config_53.experr
-tests/atf/formats/d_config_53.expout
-tests/atf/formats/d_config_54
-tests/atf/formats/d_config_54.experr
-tests/atf/formats/d_headers_1
-tests/atf/formats/d_headers_1.experr
-tests/atf/formats/d_headers_10
-tests/atf/formats/d_headers_10.experr
-tests/atf/formats/d_headers_11
-tests/atf/formats/d_headers_11.experr
-tests/atf/formats/d_headers_12
-tests/atf/formats/d_headers_12.experr
-tests/atf/formats/d_headers_2
-tests/atf/formats/d_headers_2.experr
-tests/atf/formats/d_headers_3
-tests/atf/formats/d_headers_3.experr
-tests/atf/formats/d_headers_4
-tests/atf/formats/d_headers_4.experr
-tests/atf/formats/d_headers_5
-tests/atf/formats/d_headers_5.experr
-tests/atf/formats/d_headers_6
-tests/atf/formats/d_headers_6.experr
-tests/atf/formats/d_headers_7
-tests/atf/formats/d_headers_7.experr
-tests/atf/formats/d_headers_8
-tests/atf/formats/d_headers_8.experr
-tests/atf/formats/d_headers_9
-tests/atf/formats/d_headers_9.experr
-tests/atf/formats/d_tcr_1
-tests/atf/formats/d_tcr_1.expout
-tests/atf/formats/d_tcr_2
-tests/atf/formats/d_tcr_2.expout
-tests/atf/formats/d_tcr_3
-tests/atf/formats/d_tcr_3.expout
-tests/atf/formats/d_tcr_50
-tests/atf/formats/d_tcr_50.experr
-tests/atf/formats/d_tcr_51
-tests/atf/formats/d_tcr_51.experr
-tests/atf/formats/d_tcr_52
-tests/atf/formats/d_tcr_52.experr
-tests/atf/formats/d_tcr_53
-tests/atf/formats/d_tcr_53.experr
-tests/atf/formats/d_tcr_54
-tests/atf/formats/d_tcr_54.experr
-tests/atf/formats/d_tcr_60
-tests/atf/formats/d_tcr_60.experr
-tests/atf/formats/d_tcr_61
-tests/atf/formats/d_tcr_61.experr
-tests/atf/formats/d_tcr_61.expout
-tests/atf/formats/d_tcr_70
-tests/atf/formats/d_tcr_70.experr
-tests/atf/formats/d_tcr_70.expout
-tests/atf/formats/d_tcr_71
-tests/atf/formats/d_tcr_71.experr
-tests/atf/formats/d_tcr_71.expout
-tests/atf/formats/d_tcr_72
-tests/atf/formats/d_tcr_72.experr
-tests/atf/formats/d_tcr_72.expout
-tests/atf/formats/d_tcr_73
-tests/atf/formats/d_tcr_73.experr
-tests/atf/formats/d_tcr_73.expout
-tests/atf/formats/d_tcr_74
-tests/atf/formats/d_tcr_74.experr
-tests/atf/formats/d_tcr_74.expout
-tests/atf/formats/d_tcr_75
-tests/atf/formats/d_tcr_75.experr
-tests/atf/formats/d_tcr_75.expout
-tests/atf/formats/d_tcr_76
-tests/atf/formats/d_tcr_76.experr
-tests/atf/formats/d_tcr_76.expout
-tests/atf/formats/d_tcr_77
-tests/atf/formats/d_tcr_77.experr
-tests/atf/formats/d_tp_1
-tests/atf/formats/d_tp_1.expout
-tests/atf/formats/d_tp_2
-tests/atf/formats/d_tp_2.expout
-tests/atf/formats/d_tp_3
-tests/atf/formats/d_tp_3.expout
-tests/atf/formats/d_tp_4
-tests/atf/formats/d_tp_4.expout
-tests/atf/formats/d_tp_50
-tests/atf/formats/d_tp_50.experr
-tests/atf/formats/d_tp_51
-tests/atf/formats/d_tp_51.experr
-tests/atf/formats/d_tp_52
-tests/atf/formats/d_tp_52.expout
-tests/atf/formats/d_tp_53
-tests/atf/formats/d_tp_53.experr
-tests/atf/formats/d_tp_54
-tests/atf/formats/d_tp_54.experr
-tests/atf/formats/d_tp_55
-tests/atf/formats/d_tp_55.experr
-tests/atf/formats/d_tp_56
-tests/atf/formats/d_tp_56.experr
-tests/atf/formats/d_tp_57
-tests/atf/formats/d_tp_57.experr
-tests/atf/formats/d_tp_58
-tests/atf/formats/d_tp_58.experr
-tests/atf/formats/d_tp_59
-tests/atf/formats/d_tp_59.experr
-tests/atf/formats/d_tps_1
-tests/atf/formats/d_tps_1.expout
-tests/atf/formats/d_tps_2
-tests/atf/formats/d_tps_2.expout
-tests/atf/formats/d_tps_3
-tests/atf/formats/d_tps_3.expout
-tests/atf/formats/d_tps_4
-tests/atf/formats/d_tps_4.expout
-tests/atf/formats/d_tps_5
-tests/atf/formats/d_tps_5.expout
-tests/atf/formats/d_tps_50
-tests/atf/formats/d_tps_50.experr
-tests/atf/formats/d_tps_51
-tests/atf/formats/d_tps_51.experr
-tests/atf/formats/d_tps_52
-tests/atf/formats/d_tps_52.experr
-tests/atf/formats/d_tps_53
-tests/atf/formats/d_tps_53.experr
-tests/atf/formats/d_tps_53.expout
-tests/atf/formats/d_tps_54
-tests/atf/formats/d_tps_54.experr
-tests/atf/formats/d_tps_54.expout
-tests/atf/formats/d_tps_55
-tests/atf/formats/d_tps_55.experr
-tests/atf/formats/d_tps_55.expout
-tests/atf/formats/d_tps_56
-tests/atf/formats/d_tps_56.experr
-tests/atf/formats/d_tps_56.expout
-tests/atf/formats/d_tps_57
-tests/atf/formats/d_tps_57.experr
-tests/atf/formats/d_tps_57.expout
-tests/atf/formats/d_tps_58
-tests/atf/formats/d_tps_58.experr
-tests/atf/formats/d_tps_58.expout
-tests/atf/formats/d_tps_59
-tests/atf/formats/d_tps_59.experr
-tests/atf/formats/d_tps_60
-tests/atf/formats/d_tps_60.experr
-tests/atf/formats/d_tps_61
-tests/atf/formats/d_tps_61.experr
-tests/atf/formats/d_tps_62
-tests/atf/formats/d_tps_62.experr
-tests/atf/formats/d_tps_62.expout
-tests/atf/formats/d_tps_63
-tests/atf/formats/d_tps_63.experr
-tests/atf/formats/d_tps_63.expout
-tests/atf/formats/d_tps_64
-tests/atf/formats/d_tps_64.experr
-tests/atf/formats/d_tps_64.expout
-tests/atf/formats/d_tps_65
-tests/atf/formats/d_tps_65.experr
-tests/atf/formats/d_tps_65.expout
-tests/atf/formats/d_tps_66
-tests/atf/formats/d_tps_66.experr
-tests/atf/formats/d_tps_66.expout
-tests/atf/formats/h_parser
-tests/atf/formats/t_parsers
-tests/atf/formats/t_writers
-tests/atf/test_programs/Atffile
-tests/atf/test_programs/h_c
-tests/atf/test_programs/h_cpp
-tests/atf/test_programs/h_sh
-tests/atf/test_programs/t_config
-tests/atf/test_programs/t_fork
-tests/atf/test_programs/t_meta_data
-tests/atf/test_programs/t_srcdir
-tests/atf/test_programs/t_status
+tests/atf/atf-sh/atf_check_test
+tests/atf/atf-sh/config_test
+tests/atf/atf-sh/integration_test
+tests/atf/atf-sh/misc_helpers
+tests/atf/atf-sh/normalize_test
+tests/atf/atf-sh/tc_test
+tests/atf/atf-sh/tp_test
+tests/atf/test-programs/Atffile
+tests/atf/test-programs/c_helpers
+tests/atf/test-programs/config_test
+tests/atf/test-programs/cpp_helpers
+tests/atf/test-programs/expect_test
+tests/atf/test-programs/fork_test
+tests/atf/test-programs/meta_data_test
+tests/atf/test-programs/result_test
+tests/atf/test-programs/sh_helpers
+tests/atf/test-programs/srcdir_test
diff --git a/devel/atf/distinfo b/devel/atf/distinfo
index 0cb2cc623ef..3b95211dd97 100644
--- a/devel/atf/distinfo
+++ b/devel/atf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2010/06/03 16:07:26 jmmv Exp $
+$NetBSD: distinfo,v 1.9.2.1 2010/07/04 07:10:50 agc Exp $
 
-SHA1 (atf-0.9.tar.gz) = 10a3dee3543ee9e8b5d2b67bcd3f4b2a8921f21f
-RMD160 (atf-0.9.tar.gz) = e4868246512a815469f7b3cd35971795f23e5d0d
-Size (atf-0.9.tar.gz) = 674458 bytes
+SHA1 (atf-0.10.tar.gz) = f3d1a689204c69dc40211d2ecce0eb4f09f8ad75
+RMD160 (atf-0.10.tar.gz) = 2f0e2e499b87090f81a15f8f756cc48b1e8b9486
+Size (atf-0.10.tar.gz) = 599208 bytes