Fix missing includes. Prefer C++11 over TR1 when using libc++ or C++11.

22 files changed, 551 insertions, 5 deletions

diff --git a/devel/kyua-cli/distinfo b/devel/kyua-cli/distinfo
index f8d57554897..1c22fca78f2 100644
--- a/devel/kyua-cli/distinfo
+++ b/devel/kyua-cli/distinfo
@@ -1,8 +1,28 @@
-$NetBSD: distinfo,v 1.13 2013/03/02 18:16:38 joerg Exp $
+$NetBSD: distinfo,v 1.14 2013/05/06 14:46:58 joerg Exp $
 
 SHA1 (kyua-cli-0.6.tar.gz) = 85453765a497d381570d6f658d90038af894a90f
 RMD160 (kyua-cli-0.6.tar.gz) = a60e317639e60fd688a76297791670b680e7d505
 Size (kyua-cli-0.6.tar.gz) = 487249 bytes
-SHA1 (patch-engine_metadata.hpp) = 49939194e11a31d77b27f21ba4fa90438d165db6
+SHA1 (patch-engine_action.hpp) = b90db41a66614e4aceda84687370b8f0092e8686
+SHA1 (patch-engine_context.hpp) = b4c35db43745e334ab1d7e5c654744b3b30c95e9
+SHA1 (patch-engine_metadata.hpp) = 134fd2ebcbef63d018f3032dbba5ed5b888be068
+SHA1 (patch-engine_test__case.hpp) = a98337a39252a0a5685f25bf707009dd95190883
+SHA1 (patch-engine_test__program.hpp) = af343296fe3df794b66472c2784e1c8b3297ba1d
+SHA1 (patch-store_backend.hpp) = 5633b5780833bb2c3a09963932eca9d08710a807
+SHA1 (patch-store_transaction.cpp) = 98179f580b2d2f053f3d51c6ddd923af03de5941
+SHA1 (patch-store_transaction.hpp) = 5c4066c41d4b56d304aff5a12bf9f765e8abed09
+SHA1 (patch-utils_cmdline_exceptions.cpp) = f1e524db998802d3979595abd496ae609b32a1ea
+SHA1 (patch-utils_cmdline_exceptions.hpp) = 7f893a224b263aaefde1232ab594c403849581f1
+SHA1 (patch-utils_config_tree.hpp) = b5cef0e44597c2a1c9936c51050c5e77d22add0f
+SHA1 (patch-utils_datetime.cpp) = cb5fd42fb737f8fe862a3bddcd1ecba27d71be8f
+SHA1 (patch-utils_datetime.hpp) = 458d6c061f6bb4363c0e107660fd169abf04cb7c
+SHA1 (patch-utils_format_exceptions.cpp) = 065c4f51d5bca6ecfc8b27fb65c2dc65a4986c08
+SHA1 (patch-utils_format_exceptions.hpp) = 31041332e10f4936f02bbd07a32f59b50e45fe2f
+SHA1 (patch-utils_fs_auto__cleaners.hpp) = 9ad6c230654ee270aa99a591060b975aae39b86f
+SHA1 (patch-utils_fs_exceptions.cpp) = a74fc2f7f13339a69edb0c157da1928610890646
+SHA1 (patch-utils_fs_exceptions.hpp) = 06c0b7cef761b218a1b570bcd889ab82e9eb8720
+SHA1 (patch-utils_sqlite_database.hpp) = 899bfe56fdaf4328f27653313572aeda54a8b764
+SHA1 (patch-utils_sqlite_statement.hpp) = bd4fdadba994d7125c2d5d4ba3c98ca4b2a8f69f
+SHA1 (patch-utils_sqlite_transaction.hpp) = 4020ff30555b20d669a57ceab55c27954913165f
 SHA1 (patch-utils_units.cpp) = cc1870352204fcd39fb4dc6d66134635cf6a46bb
 SHA1 (patch-utils_units.hpp) = 3cbbcc8889f2cfedd070202a1a9942c35f2f63eb
diff --git a/devel/kyua-cli/patches/patch-engine_action.hpp b/devel/kyua-cli/patches/patch-engine_action.hpp
new file mode 100644
index 00000000000..0d73d9cc34b
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-engine_action.hpp
@@ -0,0 +1,27 @@
+$NetBSD: patch-engine_action.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- engine/action.hpp.orig	2013-05-06 08:08:05.000000000 +0000
++++ engine/action.hpp
+@@ -33,7 +33,13 @@
+ #define ENGINE_ACTION_HPP
+ 
+ #include <ostream>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ namespace engine {
+ 
+@@ -50,7 +56,7 @@ class action {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+ public:
+     explicit action(const context&);
diff --git a/devel/kyua-cli/patches/patch-engine_context.hpp b/devel/kyua-cli/patches/patch-engine_context.hpp
new file mode 100644
index 00000000000..27d4fc7b436
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-engine_context.hpp
@@ -0,0 +1,27 @@
+$NetBSD: patch-engine_context.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- engine/context.hpp.orig	2013-05-06 08:09:15.000000000 +0000
++++ engine/context.hpp
+@@ -35,7 +35,13 @@
+ #include <map>
+ #include <ostream>
+ #include <string>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ #include "utils/fs/path.hpp"
+ 
+@@ -51,7 +57,7 @@ class context {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+ public:
+     context(const utils::fs::path&,
diff --git a/devel/kyua-cli/patches/patch-engine_metadata.hpp b/devel/kyua-cli/patches/patch-engine_metadata.hpp
index 302e058d581..848f134eede 100644
--- a/devel/kyua-cli/patches/patch-engine_metadata.hpp
+++ b/devel/kyua-cli/patches/patch-engine_metadata.hpp
@@ -1,8 +1,20 @@
-$NetBSD: patch-engine_metadata.hpp,v 1.1 2013/03/02 18:16:39 joerg Exp $
+$NetBSD: patch-engine_metadata.hpp,v 1.2 2013/05/06 14:46:58 joerg Exp $
 
---- engine/metadata.hpp.orig	2013-02-28 21:58:41.000000000 +0000
+--- engine/metadata.hpp.orig	2013-01-26 03:01:41.000000000 +0000
 +++ engine/metadata.hpp
-@@ -44,7 +44,7 @@
+@@ -38,13 +38,19 @@
+ #include <set>
+ #include <string>
+ 
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ #include "utils/noncopyable.hpp"
  
  namespace utils {
  namespace config { class tree; }
@@ -11,3 +23,12 @@ $NetBSD: patch-engine_metadata.hpp,v 1.1 2013/03/02 18:16:39 joerg Exp $
  namespace fs { class path; }
  namespace units { class bytes; }
  }  // namespace utils
+@@ -73,7 +79,7 @@ class metadata {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+     friend class metadata_builder;
+ 
diff --git a/devel/kyua-cli/patches/patch-engine_test__case.hpp b/devel/kyua-cli/patches/patch-engine_test__case.hpp
new file mode 100644
index 00000000000..30deea610c4
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-engine_test__case.hpp
@@ -0,0 +1,36 @@
+$NetBSD: patch-engine_test__case.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- engine/test_case.hpp.orig	2013-05-06 08:06:18.000000000 +0000
++++ engine/test_case.hpp
+@@ -34,7 +34,13 @@
+ 
+ #include <ostream>
+ #include <string>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ #include "engine/metadata.hpp"
+ #include "utils/config/tree.hpp"
+@@ -71,7 +77,7 @@ class test_case {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+ public:
+     test_case(const std::string&, const test_program&,
+@@ -96,7 +102,7 @@ std::ostream& operator<<(std::ostream&, 
+ 
+ 
+ /// Pointer to a test case.
+-typedef std::tr1::shared_ptr< test_case > test_case_ptr;
++typedef shared_ptr< test_case > test_case_ptr;
+ 
+ 
+ test_result debug_test_case(const test_case*, const utils::config::tree&,
diff --git a/devel/kyua-cli/patches/patch-engine_test__program.hpp b/devel/kyua-cli/patches/patch-engine_test__program.hpp
new file mode 100644
index 00000000000..e9f393eaf72
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-engine_test__program.hpp
@@ -0,0 +1,38 @@
+$NetBSD: patch-engine_test__program.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- engine/test_program.hpp.orig	2013-05-06 08:09:43.000000000 +0000
++++ engine/test_program.hpp
+@@ -40,8 +40,14 @@
+ 
+ #include <ostream>
+ #include <string>
+-#include <tr1/memory>
+ #include <vector>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
++#include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ #include "engine/test_case.hpp"
+ #include "utils/fs/path.hpp"
+@@ -61,7 +67,7 @@ class test_program {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+ public:
+     test_program(const std::string&, const utils::fs::path&,
+@@ -89,7 +95,7 @@ std::ostream& operator<<(std::ostream&, 
+ 
+ 
+ /// Pointer to a test program.
+-typedef std::tr1::shared_ptr< test_program > test_program_ptr;
++typedef shared_ptr< test_program > test_program_ptr;
+ 
+ 
+ /// Collection of test programs.
diff --git a/devel/kyua-cli/patches/patch-store_backend.hpp b/devel/kyua-cli/patches/patch-store_backend.hpp
new file mode 100644
index 00000000000..108c886c52e
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-store_backend.hpp
@@ -0,0 +1,28 @@
+$NetBSD: patch-store_backend.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- store/backend.hpp.orig	2013-05-06 07:36:42.000000000 +0000
++++ store/backend.hpp
+@@ -32,7 +32,14 @@
+ #if !defined(STORE_BACKEND_HPP)
+ #define STORE_BACKEND_HPP
+ 
++#include <ciso646>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ namespace utils {
+ namespace fs {
+@@ -72,7 +79,7 @@ class backend {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+     friend class metadata;
+ 
diff --git a/devel/kyua-cli/patches/patch-store_transaction.cpp b/devel/kyua-cli/patches/patch-store_transaction.cpp
new file mode 100644
index 00000000000..428007f9fc3
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-store_transaction.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-store_transaction.cpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- store/transaction.cpp.orig	2013-05-06 08:17:59.000000000 +0000
++++ store/transaction.cpp
+@@ -437,7 +437,7 @@ struct store::results_iterator::impl {
+ ///
+ /// \param pimpl_ The internal implementation details of the iterator.
+ store::results_iterator::results_iterator(
+-    std::tr1::shared_ptr< impl > pimpl_) :
++    shared_ptr< impl > pimpl_) :
+     _pimpl(pimpl_)
+ {
+ }
+@@ -680,7 +680,7 @@ store::results_iterator
+ store::transaction::get_action_results(const int64_t action_id)
+ {
+     try {
+-        return results_iterator(std::tr1::shared_ptr< results_iterator::impl >(
++        return results_iterator(shared_ptr< results_iterator::impl >(
+            new results_iterator::impl(_pimpl->_backend, action_id)));
+     } catch (const sqlite::error& e) {
+         throw error(e.what());
diff --git a/devel/kyua-cli/patches/patch-store_transaction.hpp b/devel/kyua-cli/patches/patch-store_transaction.hpp
new file mode 100644
index 00000000000..fbe707774b1
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-store_transaction.hpp
@@ -0,0 +1,40 @@
+$NetBSD: patch-store_transaction.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- store/transaction.hpp.orig	2013-05-06 08:16:11.000000000 +0000
++++ store/transaction.hpp
+@@ -37,7 +37,13 @@ extern "C" {
+ }
+ 
+ #include <string>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ #include <utility>
+ 
+ #include "engine/test_program.hpp"
+@@ -77,10 +83,10 @@ class results_iterator {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+     friend class transaction;
+-    results_iterator(std::tr1::shared_ptr< impl >);
++    results_iterator(shared_ptr< impl >);
+ 
+ public:
+     ~results_iterator(void);
+@@ -106,7 +112,7 @@ class transaction {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+     friend class backend;
+     transaction(backend&);
diff --git a/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.cpp b/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.cpp
new file mode 100644
index 00000000000..373b70a1fad
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-utils_cmdline_exceptions.cpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/cmdline/exceptions.cpp.orig	2013-05-06 08:19:49.000000000 +0000
++++ utils/cmdline/exceptions.cpp
+@@ -26,6 +26,7 @@
+ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
++#include <string>
+ #include "utils/cmdline/exceptions.hpp"
+ 
+ #include "utils/format/macros.hpp"
diff --git a/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.hpp b/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.hpp
new file mode 100644
index 00000000000..9fc13498da9
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.hpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-utils_cmdline_exceptions.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/cmdline/exceptions.hpp.orig	2013-05-06 08:24:33.000000000 +0000
++++ utils/cmdline/exceptions.hpp
+@@ -33,6 +33,7 @@
+ #define UTILS_CMDLINE_EXCEPTIONS_HPP
+ 
+ #include <stdexcept>
++#include <string>
+ 
+ namespace utils {
+ namespace cmdline {
diff --git a/devel/kyua-cli/patches/patch-utils_config_tree.hpp b/devel/kyua-cli/patches/patch-utils_config_tree.hpp
new file mode 100644
index 00000000000..e306a78d5f3
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_config_tree.hpp
@@ -0,0 +1,27 @@
+$NetBSD: patch-utils_config_tree.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/config/tree.hpp.orig	2013-01-26 03:01:41.000000000 +0000
++++ utils/config/tree.hpp
+@@ -34,7 +34,13 @@
+ 
+ #include <map>
+ #include <string>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ #include <lutok/state.hpp>
+ 
+@@ -82,7 +88,7 @@ typedef std::map< std::string, std::stri
+ /// deep_copy().
+ class tree {
+     /// The root of the tree.
+-    std::tr1::shared_ptr< detail::static_inner_node > _root;
++    shared_ptr< detail::static_inner_node > _root;
+ 
+     explicit tree(detail::static_inner_node*);
+ 
diff --git a/devel/kyua-cli/patches/patch-utils_datetime.cpp b/devel/kyua-cli/patches/patch-utils_datetime.cpp
new file mode 100644
index 00000000000..2ecc9d0bf71
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_datetime.cpp
@@ -0,0 +1,40 @@
+$NetBSD: patch-utils_datetime.cpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/datetime.cpp.orig	2013-05-06 08:18:02.000000000 +0000
++++ utils/datetime.cpp
+@@ -183,7 +183,7 @@ struct timestamp::impl {
+ /// Constructs a new timestamp.
+ ///
+ /// \param pimpl_ An existing impl representation.
+-datetime::timestamp::timestamp(std::tr1::shared_ptr< impl > pimpl_) :
++datetime::timestamp::timestamp(shared_ptr< impl > pimpl_) :
+     _pimpl(pimpl_)
+ {
+ }
+@@ -201,7 +201,7 @@ datetime::timestamp::from_microseconds(c
+     ::timeval data;
+     data.tv_sec = static_cast< time_t >(value / 1000000);
+     data.tv_usec = static_cast< suseconds_t >(value % 1000000);
+-    return timestamp(std::tr1::shared_ptr< impl >(new impl(data)));
++    return timestamp(shared_ptr< impl >(new impl(data)));
+ }
+ 
+ 
+@@ -257,7 +257,7 @@ datetime::timestamp::from_values(const i
+     ::timeval data;
+     data.tv_sec = ::mktime(&timedata);
+     data.tv_usec = static_cast< suseconds_t >(microsecond);
+-    return timestamp(std::tr1::shared_ptr< impl >(new impl(data)));
++    return timestamp(shared_ptr< impl >(new impl(data)));
+ }
+ 
+ 
+@@ -276,7 +276,7 @@ datetime::timestamp::now(void)
+         INV(ret != -1);
+     }
+ 
+-    return timestamp(std::tr1::shared_ptr< impl >(new impl(data)));
++    return timestamp(shared_ptr< impl >(new impl(data)));
+ }
+ 
+ 
diff --git a/devel/kyua-cli/patches/patch-utils_datetime.hpp b/devel/kyua-cli/patches/patch-utils_datetime.hpp
new file mode 100644
index 00000000000..38db6f40c6d
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_datetime.hpp
@@ -0,0 +1,30 @@
+$NetBSD: patch-utils_datetime.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/datetime.hpp.orig	2013-05-06 07:34:28.000000000 +0000
++++ utils/datetime.hpp
+@@ -40,7 +40,13 @@ extern "C" {
+ #include <ostream>
+ #include <string>
+ 
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ namespace utils {
+ namespace datetime {
+@@ -81,9 +87,9 @@ class timestamp {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+-    timestamp(std::tr1::shared_ptr< impl >);
++    timestamp(shared_ptr< impl >);
+ 
+ public:
+     static timestamp from_microseconds(const int64_t);
diff --git a/devel/kyua-cli/patches/patch-utils_format_exceptions.cpp b/devel/kyua-cli/patches/patch-utils_format_exceptions.cpp
new file mode 100644
index 00000000000..16155bb7313
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_format_exceptions.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-utils_format_exceptions.cpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/format/exceptions.cpp.orig	2013-05-06 08:20:35.000000000 +0000
++++ utils/format/exceptions.cpp
+@@ -26,6 +26,7 @@
+ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
++#include <string>
+ #include "utils/format/exceptions.hpp"
+ 
+ using utils::format::bad_format_error;
diff --git a/devel/kyua-cli/patches/patch-utils_format_exceptions.hpp b/devel/kyua-cli/patches/patch-utils_format_exceptions.hpp
new file mode 100644
index 00000000000..d7ab5840c3f
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_format_exceptions.hpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-utils_format_exceptions.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/format/exceptions.hpp.orig	2013-05-06 08:27:56.000000000 +0000
++++ utils/format/exceptions.hpp
+@@ -33,6 +33,7 @@
+ #define UTILS_FORMAT_EXCEPTIONS_HPP
+ 
+ #include <stdexcept>
++#include <string>
+ 
+ namespace utils {
+ namespace format {
diff --git a/devel/kyua-cli/patches/patch-utils_fs_auto__cleaners.hpp b/devel/kyua-cli/patches/patch-utils_fs_auto__cleaners.hpp
new file mode 100644
index 00000000000..296afa5348d
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_fs_auto__cleaners.hpp
@@ -0,0 +1,36 @@
+$NetBSD: patch-utils_fs_auto__cleaners.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/fs/auto_cleaners.hpp.orig	2013-05-06 08:10:18.000000000 +0000
++++ utils/fs/auto_cleaners.hpp
+@@ -33,7 +33,13 @@
+ #define UTILS_FS_AUTO_CLEANERS_HPP
+ 
+ #include <string>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ #include "utils/fs/path.hpp"
+ 
+@@ -48,7 +54,7 @@ namespace fs {
+ class auto_directory {
+     struct impl;
+     /// Reference-counted, shared implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+ public:
+     explicit auto_directory(const path&);
+@@ -68,7 +74,7 @@ public:
+ class auto_file {
+     struct impl;
+     /// Reference-counted, shared implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+ public:
+     explicit auto_file(const path&);
diff --git a/devel/kyua-cli/patches/patch-utils_fs_exceptions.cpp b/devel/kyua-cli/patches/patch-utils_fs_exceptions.cpp
new file mode 100644
index 00000000000..05c5ff59de7
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_fs_exceptions.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-utils_fs_exceptions.cpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/fs/exceptions.cpp.orig	2013-05-06 08:21:29.000000000 +0000
++++ utils/fs/exceptions.cpp
+@@ -29,6 +29,7 @@
+ #include "utils/fs/exceptions.hpp"
+ 
+ #include <cstring>
++#include <string>
+ 
+ #include "utils/format/macros.hpp"
+ 
diff --git a/devel/kyua-cli/patches/patch-utils_fs_exceptions.hpp b/devel/kyua-cli/patches/patch-utils_fs_exceptions.hpp
new file mode 100644
index 00000000000..238474d3661
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_fs_exceptions.hpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-utils_fs_exceptions.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/fs/exceptions.hpp.orig	2013-05-06 08:21:46.000000000 +0000
++++ utils/fs/exceptions.hpp
+@@ -33,6 +33,7 @@
+ #define UTILS_FS_EXCEPTIONS_HPP
+ 
+ #include <stdexcept>
++#include <string>
+ 
+ namespace utils {
+ namespace fs {
diff --git a/devel/kyua-cli/patches/patch-utils_sqlite_database.hpp b/devel/kyua-cli/patches/patch-utils_sqlite_database.hpp
new file mode 100644
index 00000000000..63650c8a87f
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_sqlite_database.hpp
@@ -0,0 +1,27 @@
+$NetBSD: patch-utils_sqlite_database.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/sqlite/database.hpp.orig	2013-05-06 07:46:57.000000000 +0000
++++ utils/sqlite/database.hpp
+@@ -40,7 +40,13 @@ extern "C" {
+ }
+ 
+ #include <cstddef>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ #include "utils/fs/path.hpp"
+ 
+@@ -79,7 +85,7 @@ class database {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+     friend class database_c_gate;
+     database(void*, const bool);
diff --git a/devel/kyua-cli/patches/patch-utils_sqlite_statement.hpp b/devel/kyua-cli/patches/patch-utils_sqlite_statement.hpp
new file mode 100644
index 00000000000..8a60ec91f69
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_sqlite_statement.hpp
@@ -0,0 +1,27 @@
+$NetBSD: patch-utils_sqlite_statement.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/sqlite/statement.hpp.orig	2013-05-06 08:04:34.000000000 +0000
++++ utils/sqlite/statement.hpp
+@@ -40,7 +40,13 @@ extern "C" {
+ }
+ 
+ #include <string>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ namespace utils {
+ namespace sqlite {
+@@ -92,7 +98,7 @@ class statement {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+     statement(database&, void*);
+     friend class database;
diff --git a/devel/kyua-cli/patches/patch-utils_sqlite_transaction.hpp b/devel/kyua-cli/patches/patch-utils_sqlite_transaction.hpp
new file mode 100644
index 00000000000..fc459707cdd
--- /dev/null
+++ b/devel/kyua-cli/patches/patch-utils_sqlite_transaction.hpp
@@ -0,0 +1,28 @@
+$NetBSD: patch-utils_sqlite_transaction.hpp,v 1.1 2013/05/06 14:46:58 joerg Exp $
+
+--- utils/sqlite/transaction.hpp.orig	2013-05-06 08:10:32.000000000 +0000
++++ utils/sqlite/transaction.hpp
+@@ -32,7 +32,14 @@
+ #if !defined(UTILS_SQLITE_TRANSACTION_HPP)
+ #define UTILS_SQLITE_TRANSACTION_HPP
+ 
++#include <ciso646>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ 
+ namespace utils {
+ namespace sqlite {
+@@ -49,7 +56,7 @@ class transaction {
+     struct impl;
+ 
+     /// Pointer to the shared internal implementation.
+-    std::tr1::shared_ptr< impl > _pimpl;
++    shared_ptr< impl > _pimpl;
+ 
+     explicit transaction(database&);
+     friend class database;