Use <memory> for libc++.

9 files changed, 226 insertions, 5 deletions

diff --git a/x11/gtkmm-utils/distinfo b/x11/gtkmm-utils/distinfo
index 7d4066f0650..e177b59ab1c 100644
--- a/x11/gtkmm-utils/distinfo
+++ b/x11/gtkmm-utils/distinfo
@@ -1,10 +1,17 @@
-$NetBSD: distinfo,v 1.3 2012/11/16 00:27:20 joerg Exp $
+$NetBSD: distinfo,v 1.4 2013/04/30 22:32:43 joerg Exp $
 
 SHA1 (gtkmm-utils-0.4.1.tar.gz) = dbf1af7f0ee27c380786651591ef83549ce97ca0
 RMD160 (gtkmm-utils-0.4.1.tar.gz) = 1db5390fc26f0f55fa19511e63b9d4ea6edb7250
 Size (gtkmm-utils-0.4.1.tar.gz) = 388799 bytes
 SHA1 (patch-aa) = 6bcc502c2901da1b468d9b9cb5d02f0d426828d6
 SHA1 (patch-ab) = 1ac7b0b9cf87176264d12711b7e57f26fff30adf
-SHA1 (patch-ac) = 81d58f752d8cc0383b9c3d532360e2cc7426ea01
+SHA1 (patch-ac) = 6a8fc343d1d85a69590ef6771fde19e2ae9b8167
+SHA1 (patch-examples_logging.h) = fdec2424092506e870a59cf8ab5f6dde8596783b
+SHA1 (patch-examples_tiles-simple.cc) = e9f68f794548cb6e80fa0cf2989893533b286e22
+SHA1 (patch-examples_tiles-simple.h) = fc7e3a92ca5580875917a6365105ad3c6cb55b12
+SHA1 (patch-glibmm-utils_log-stream.h) = 3d88342af3c11551d9da124b8e0c510d5b842f85
+SHA1 (patch-glibmm-utils_scope-logger.h) = 86f28a8e6c4634d09172081d9a95f944c21564d4
 SHA1 (patch-glibmm-utils_ustring.h) = 31afa32fe4a38d4b2ca8ef83ad1d944c8c0d4779
 SHA1 (patch-glibmm-utils_ustring_cc) = 111019060ddfa53afc4c3a2d965d7993049262a9
+SHA1 (patch-gtkmm-utils_tile-view.cc) = 08471ce32b241c8081491c59afd645e5837c93af
+SHA1 (patch-gtkmm-utils_tile-view.h) = 3d74946cfd46d84686850fb9b0f82bd0b13750d8
diff --git a/x11/gtkmm-utils/patches/patch-ac b/x11/gtkmm-utils/patches/patch-ac
index d49d55bce59..40cc4bd24af 100644
--- a/x11/gtkmm-utils/patches/patch-ac
+++ b/x11/gtkmm-utils/patches/patch-ac
@@ -1,8 +1,16 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/04/30 10:17:46 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2013/04/30 22:32:43 joerg Exp $
 
---- glibmm-utils/log-stream.cc.orig	2008-10-14 14:11:14.000000000 +0200
+--- glibmm-utils/log-stream.cc.orig	2008-10-14 12:11:14.000000000 +0000
 +++ glibmm-utils/log-stream.cc
-@@ -36,6 +36,10 @@
+@@ -26,7 +26,6 @@
+ #include <list>
+ #include <vector>
+ #include <fstream>
+-#include <tr1/memory>
+ #include <glibmm.h>
+ #include <glibmm/thread.h>
+ #include <glib/gstdio.h>
+@@ -36,11 +35,21 @@
  #include "date.h"
  #include "ustring.h"
  
@@ -13,3 +21,41 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/04/30 10:17:46 wiz Exp $
  namespace Glib {
  namespace Util {
  
+ using namespace std ;
+ 
++#ifdef _LIBCPP_VERSION
++using std::shared_ptr;
++#else
++using std::tr1::shared_ptr;
++#endif
++
+ static LogStream::StreamType s_stream_type = LogStream::COUT_STREAM ;
+ static LogStream::LogLevel s_level_filter = LogStream::LOG_LEVEL_NORMAL ;
+ static bool s_is_active = true ;
+@@ -54,7 +63,7 @@ static bool s_is_active = true ;
+ 
+ class LogSink {
+ protected:
+-    mutable tr1::shared_ptr<Glib::Mutex> m_ostream_mutex ;
++    mutable shared_ptr<Glib::Mutex> m_ostream_mutex ;
+     ostream *m_out ;
+ 
+     //non copyable
+@@ -206,7 +215,7 @@ public:
+ };//end class OStreamSink
+ 
+ class OfstreamLogSink : public LogSink {
+-    std::tr1::shared_ptr<ofstream> m_ofstream ;
++    shared_ptr<ofstream> m_ofstream ;
+ 
+     void init_from_path (const Glib::ustring &a_file_path)
+     {
+@@ -250,7 +259,7 @@ public:
+     }
+ };//end class OfstreamLogSink
+ 
+-typedef std::tr1::shared_ptr<LogSink> LogSinkSafePtr ;
++typedef shared_ptr<LogSink> LogSinkSafePtr ;
+ struct LogStream::Priv
+ {
+     enum LogStream::StreamType stream_type ;
diff --git a/x11/gtkmm-utils/patches/patch-examples_logging.h b/x11/gtkmm-utils/patches/patch-examples_logging.h
new file mode 100644
index 00000000000..f6012afac2f
--- /dev/null
+++ b/x11/gtkmm-utils/patches/patch-examples_logging.h
@@ -0,0 +1,28 @@
+$NetBSD: patch-examples_logging.h,v 1.1 2013/04/30 22:32:43 joerg Exp $
+
+--- examples/logging.h.orig	2013-04-30 21:44:34.000000000 +0000
++++ examples/logging.h
+@@ -24,7 +24,14 @@
+ #ifndef __GTKMM_UTILS_LOGGING_EXAMPLE_H__
+ #define __GTKMM_UTILS_LOGGING_EXAMPLE_H__
+ 
++#include <ciso646>
++#ifdef _LIBCPP_VERSION
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
+ #include <gtkmm.h>
+ 
+ class Calculator;
+@@ -61,7 +68,7 @@ protected:
+     Gtk::Label label_result;
+     Gtk::Entry entry_result;
+ 
+-    std::tr1::shared_ptr<Calculator> calculator;
++    shared_ptr<Calculator> calculator;
+ };
+ 
+ #endif // __GTKMM_UTILS_LOGGING_EXAMPLE_H__
diff --git a/x11/gtkmm-utils/patches/patch-examples_tiles-simple.cc b/x11/gtkmm-utils/patches/patch-examples_tiles-simple.cc
new file mode 100644
index 00000000000..374a8a4bad1
--- /dev/null
+++ b/x11/gtkmm-utils/patches/patch-examples_tiles-simple.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-examples_tiles-simple.cc,v 1.1 2013/04/30 22:32:43 joerg Exp $
+
+--- examples/tiles-simple.cc.orig	2013-04-30 21:46:09.000000000 +0000
++++ examples/tiles-simple.cc
+@@ -24,8 +24,6 @@
+ #include <iostream>
+ #include "tiles-simple.h"
+ 
+-using std::tr1::shared_ptr;
+-
+ ExampleWindow::ExampleWindow()
+     :
+     show_navigation_("Show navigation bar"),
diff --git a/x11/gtkmm-utils/patches/patch-examples_tiles-simple.h b/x11/gtkmm-utils/patches/patch-examples_tiles-simple.h
new file mode 100644
index 00000000000..1e4f1dee7b6
--- /dev/null
+++ b/x11/gtkmm-utils/patches/patch-examples_tiles-simple.h
@@ -0,0 +1,30 @@
+$NetBSD: patch-examples_tiles-simple.h,v 1.1 2013/04/30 22:32:43 joerg Exp $
+
+--- examples/tiles-simple.h.orig	2013-04-30 21:45:40.000000000 +0000
++++ examples/tiles-simple.h
+@@ -21,8 +21,15 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
+-#include <list>
++#include <ciso646>
++#ifdef _LIBCPP_VERSION
++#include <memory>
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
++#include <list>
+ #include <gtkmm.h>
+ #include "gtkmm-utils/tile.h"
+ #include "gtkmm-utils/tile-view.h"
+@@ -44,7 +51,7 @@ protected:
+ 
+     Gtk::VBox vbox_;
+     Gtk::Util::TileView tile_view_;
+-    std::list<std::tr1::shared_ptr<Gtk::Util::Tile> > tiles_;
++    std::list<shared_ptr<Gtk::Util::Tile> > tiles_;
+ 
+     Gtk::CheckButton show_navigation_;
+     // tpp = tiles per page
diff --git a/x11/gtkmm-utils/patches/patch-glibmm-utils_log-stream.h b/x11/gtkmm-utils/patches/patch-glibmm-utils_log-stream.h
new file mode 100644
index 00000000000..e76e20c6ee7
--- /dev/null
+++ b/x11/gtkmm-utils/patches/patch-glibmm-utils_log-stream.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-glibmm-utils_log-stream.h,v 1.1 2013/04/30 22:32:43 joerg Exp $
+
+--- glibmm-utils/log-stream.h.orig	2013-04-30 21:39:17.000000000 +0000
++++ glibmm-utils/log-stream.h
+@@ -23,7 +23,12 @@
+ #define __GLIBMM_UTILS_LOG_STREAM_H__
+ 
+ #include <string>
++
++#ifdef _LIBCPP_VERSION
++#include <memory>
++#else
+ #include <tr1/memory>
++#endif
+ #include <glibmm/ustring.h>
+ 
+ #ifndef GLIBMM_DEFAULT_DOMAIN
+@@ -47,7 +52,11 @@ class LogStream
+     friend LogStream& flush (LogStream &) ;
+     friend LogStream& endl (LogStream &) ;
+     struct Priv ;
++#ifdef _LIBCPP_VERSION
++    std::shared_ptr<Priv> m_priv ;
++#else
+     std::tr1::shared_ptr<Priv> m_priv ;
++#endif
+ 
+     //forbid copy/assignation
+     LogStream (LogStream const&) ;
diff --git a/x11/gtkmm-utils/patches/patch-glibmm-utils_scope-logger.h b/x11/gtkmm-utils/patches/patch-glibmm-utils_scope-logger.h
new file mode 100644
index 00000000000..1a5e3261fee
--- /dev/null
+++ b/x11/gtkmm-utils/patches/patch-glibmm-utils_scope-logger.h
@@ -0,0 +1,30 @@
+$NetBSD: patch-glibmm-utils_scope-logger.h,v 1.1 2013/04/30 22:32:43 joerg Exp $
+
+--- glibmm-utils/scope-logger.h.orig	2013-04-30 21:39:57.000000000 +0000
++++ glibmm-utils/scope-logger.h
+@@ -22,7 +22,13 @@
+ #ifndef __GLIBMM_UTILS_SCOPE_LOGGER_H__
+ #define __GLIBMM_UTILS_SCOPE_LOGGER_H__
+ 
++#include <ciso646>
++
++#ifdef _LIBCPP_VERSION
++#include <memory>
++#else
+ #include <tr1/memory>
++#endif
+ #include "log-stream-utils.h"
+ 
+ namespace Glib {
+@@ -33,7 +39,11 @@ class ScopeLogger
+ {
+     friend struct ScopeLoggerPriv ;
+ 
++#ifdef _LIBCPP_VERSION
++    std::shared_ptr<ScopeLoggerPriv> m_priv ;
++#else
+     std::tr1::shared_ptr<ScopeLoggerPriv> m_priv ;
++#endif
+     //forbid copy/assignation
+     ScopeLogger (ScopeLogger const &) ;
+     ScopeLogger& operator= (ScopeLogger const &) ;
diff --git a/x11/gtkmm-utils/patches/patch-gtkmm-utils_tile-view.cc b/x11/gtkmm-utils/patches/patch-gtkmm-utils_tile-view.cc
new file mode 100644
index 00000000000..c92504682b3
--- /dev/null
+++ b/x11/gtkmm-utils/patches/patch-gtkmm-utils_tile-view.cc
@@ -0,0 +1,26 @@
+$NetBSD: patch-gtkmm-utils_tile-view.cc,v 1.1 2013/04/30 22:32:43 joerg Exp $
+
+--- gtkmm-utils/tile-view.cc.orig	2013-04-30 21:43:17.000000000 +0000
++++ gtkmm-utils/tile-view.cc
+@@ -25,13 +25,20 @@
+ #include "glibmm-utils/ustring.h"
+ #include "tile-view.h"
+ 
++#ifdef _LIBCPP_VERSION
++#include <memory>
++using std::shared_ptr;
++#else
++#include <tr1/memory>
++using std::tr1::shared_ptr;
++#endif
++
+ namespace Gtk {
+ 
+ namespace Util {
+ 
+ using std::auto_ptr;
+ using std::list;
+-using std::tr1::shared_ptr;
+ 
+ /* TileData */
+ 
diff --git a/x11/gtkmm-utils/patches/patch-gtkmm-utils_tile-view.h b/x11/gtkmm-utils/patches/patch-gtkmm-utils_tile-view.h
new file mode 100644
index 00000000000..02d855ff46b
--- /dev/null
+++ b/x11/gtkmm-utils/patches/patch-gtkmm-utils_tile-view.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-gtkmm-utils_tile-view.h,v 1.1 2013/04/30 22:32:43 joerg Exp $
+
+--- gtkmm-utils/tile-view.h.orig	2013-04-30 21:42:42.000000000 +0000
++++ gtkmm-utils/tile-view.h
+@@ -26,7 +26,6 @@
+ 
+ #include <list>
+ #include <memory>
+-#include <tr1/memory>
+ #include <gtkmm/adjustment.h>
+ #include <gtkmm/box.h>
+ #include <gtkmm/scrolledwindow.h>