Fix C++ usage.

7 files changed, 112 insertions, 1 deletions

diff --git a/audio/bmpx/distinfo b/audio/bmpx/distinfo
index f02804606a6..b2e77b5ee64 100644
--- a/audio/bmpx/distinfo
+++ b/audio/bmpx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2012/05/06 19:35:57 dholland Exp $
+$NetBSD: distinfo,v 1.17 2012/11/16 20:05:35 joerg Exp $
 
 SHA1 (bmpx-0.40.14.tar.bz2) = 3284843c45cab302f414663a5cb31eb4373d07c7
 RMD160 (bmpx-0.40.14.tar.bz2) = 12a9939d53b58a43ee9deefa43188ac6b33dae72
@@ -16,15 +16,21 @@ SHA1 (patch-aj) = e6a9bd43cac01df156a95a688f8fd99e1383bb63
 SHA1 (patch-ak) = 10a363145c7e9f75e07ca69fc38515413fc606f8
 SHA1 (patch-library_cc) = 26cbced97d7669081eb4ff60c062a34c258c7337
 SHA1 (patch-mcs_gtk-bind.h) = e9417364df34f8baea6b279b5bc1d1b4ba0d966a
+SHA1 (patch-plugins_vfs_container_libcontainer__folder.cc) = 0a179855b59fc382de68c6cbfc02cf3695dc7a8e
+SHA1 (patch-src_debug.cc) = f951e16a43f7d6fed4e806486bb6c8bc6f13ca89
+SHA1 (patch-src_debug.hh) = 58d86f34785d566262b95834cd784b064b47247f
 SHA1 (patch-src_dialog-progress_hh) = cfb3caa62cbca65bc6e8c70543ad20d857f45ce5
 SHA1 (patch-src_dialog-simple-progress_hh) = 990f48d7052f2fca64f1247ee475a2b40d5bd9fe
 SHA1 (patch-src_hal_hh) = cb4046f9fca8af792641fd04f86f3efd52f58929
 SHA1 (patch-src_jamendodata-libxml2-sax_cc) = 888416fd225b58f593095f3fbef1580c5064b1b8
+SHA1 (patch-src_lastfm.cc) = 8ece9937f2ef162398fdd310f5c4c04d3940e4aa
 SHA1 (patch-src_library_hh) = 3c7a220003b6a2accd0675ec223b89c1b843dc73
 SHA1 (patch-src_logger_hh) = 7ec25dc4d7b51d60e5390aef7b54d34efb66927e
 SHA1 (patch-src_playbacksource_cc) = 5dd3d47b8a0306c344bace766f60d23b9bcdc6d0
 SHA1 (patch-src_playbacksource_hh) = a79da6855f3d581aea66c5713f76a45ca014b50e
 SHA1 (patch-src_sanity_h) = 82acd300b2c0ad7eaf7f9a63bb0df19d4e71dd2c
 SHA1 (patch-src_shell_hh) = b799ea9358b182ccc40c9c104be8fd6548b4c9dc
+SHA1 (patch-src_ui-part-cdda.hh) = 748a43c39ca720009af14affac6eb0b3b658e041
 SHA1 (patch-src_ui-part-podcasts_hh) = 0b73330a4ae7e3bd7d3b6d84817482916ee291ea
 SHA1 (patch-src_urihandler_hh) = 01f4ecf27e351553ec7259deb88e91dbd1d9fd0e
+SHA1 (patch-src_util-file.cc) = e5a6eb49dc26670fae6388d8ad8476afb9d56f90
diff --git a/audio/bmpx/patches/patch-plugins_vfs_container_libcontainer__folder.cc b/audio/bmpx/patches/patch-plugins_vfs_container_libcontainer__folder.cc
new file mode 100644
index 00000000000..d775f905d58
--- /dev/null
+++ b/audio/bmpx/patches/patch-plugins_vfs_container_libcontainer__folder.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_vfs_container_libcontainer__folder.cc,v 1.1 2012/11/16 20:05:35 joerg Exp $
+
+--- plugins/vfs/container/libcontainer_folder.cc.orig	2012-11-16 13:51:32.000000000 +0000
++++ plugins/vfs/container/libcontainer_folder.cc
+@@ -56,8 +56,8 @@ namespace Bmp
+                 Bmp::URI u (uri);
+                 if (u.get_protocol () != Bmp::URI::PROTOCOL_FILE) return false;
+                 u.unescape ();
+-                ustring uri ((u));
+-                std::string path = filename_from_uri (uri);
++                ustring uri2 ((u));
++                std::string path = filename_from_uri (uri2);
+                 return file_test (path, FILE_TEST_IS_DIR);
+               }
+             catch (...) { return false; }
diff --git a/audio/bmpx/patches/patch-src_debug.cc b/audio/bmpx/patches/patch-src_debug.cc
new file mode 100644
index 00000000000..99a4f749e07
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_debug.cc
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_debug.cc,v 1.1 2012/11/16 20:05:35 joerg Exp $
+
+--- src/debug.cc.orig	2012-11-16 14:01:18.000000000 +0000
++++ src/debug.cc
+@@ -76,8 +76,7 @@ namespace Bmp
+ 
+   void
+   debug (const std::string &domain,
+-         const std::string &format,
+-         ...)
++         const char *format, ...)
+   {
+       if( !use_debug )
+         return;
+@@ -88,7 +87,7 @@ namespace Bmp
+ 
+           va_start (args, format);
+           std::string domain_full = std::string("bmpx-") + domain;
+-          g_logv (domain_full.c_str (), G_LOG_LEVEL_INFO, format.c_str (), args);
++          g_logv (domain_full.c_str (), G_LOG_LEVEL_INFO, format, args);
+           va_end (args);
+       }
+   }
diff --git a/audio/bmpx/patches/patch-src_debug.hh b/audio/bmpx/patches/patch-src_debug.hh
new file mode 100644
index 00000000000..ec1dadce77b
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_debug.hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_debug.hh,v 1.1 2012/11/16 20:05:35 joerg Exp $
+
+--- src/debug.hh.orig	2012-11-16 14:00:54.000000000 +0000
++++ src/debug.hh
+@@ -37,9 +37,7 @@ namespace Bmp
+   debug_init ();
+ 
+   void
+-  debug (const std::string &domain,
+-         const std::string &format,
+-         ...);
++  debug (const std::string &domain, const char *format, ...);
+ }
+ 
+ #endif // BMP_DEBUG_HPP
diff --git a/audio/bmpx/patches/patch-src_lastfm.cc b/audio/bmpx/patches/patch-src_lastfm.cc
new file mode 100644
index 00000000000..a393e41bf3f
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_lastfm.cc
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_lastfm.cc,v 1.1 2012/11/16 20:05:35 joerg Exp $
+
+--- src/lastfm.cc.orig	2012-11-16 15:11:53.000000000 +0000
++++ src/lastfm.cc
+@@ -811,12 +811,12 @@ namespace Bmp
+ 
+         xmlDocSetRootElement (doc, lqm);
+ 
+-        for (LQM::size_type n = 0 ; n < m_queue.size(); ++n)
++        for (LQM::size_type n2 = 0 ; n2 < m_queue.size(); ++n2)
+         {
+           static boost::format uint64_f ("%llu");
+           static boost::format uint_f ("%u");
+ 
+-          TrackQueueItem const& i (m_queue[n]);
++          TrackQueueItem const& i (m_queue[n2]);
+ 
+           xmlNodePtr n = xmlNewChild (q, bmp, BAD_CAST N_LQM_TRACK, 0);
+ 
diff --git a/audio/bmpx/patches/patch-src_ui-part-cdda.hh b/audio/bmpx/patches/patch-src_ui-part-cdda.hh
new file mode 100644
index 00000000000..1de044a05a9
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_ui-part-cdda.hh
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_ui-part-cdda.hh,v 1.1 2012/11/16 20:05:35 joerg Exp $
+
+--- src/ui-part-cdda.hh.orig	2012-11-16 15:04:58.000000000 +0000
++++ src/ui-part-cdda.hh
+@@ -209,7 +209,7 @@ namespace Bmp
+ 
+         struct LabelT
+         {
+-          Gtk::Label  * Album,;
++          Gtk::Label  * Album;
+           Gtk::Label  * Artist;
+           Gtk::Label  * Date;
+         };
diff --git a/audio/bmpx/patches/patch-src_util-file.cc b/audio/bmpx/patches/patch-src_util-file.cc
new file mode 100644
index 00000000000..f829a34ca7b
--- /dev/null
+++ b/audio/bmpx/patches/patch-src_util-file.cc
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_util-file.cc,v 1.1 2012/11/16 20:05:35 joerg Exp $
+
+--- src/util-file.cc.orig	2012-11-16 14:36:30.000000000 +0000
++++ src/util-file.cc
+@@ -270,12 +270,12 @@ namespace Bmp
+         if (!Audio::typefind (*i, type))
+           return false;
+ 
+-        Library::TaglibPluginsMap::const_iterator i (plugins.find (type));
++        Library::TaglibPluginsMap::const_iterator i2 (plugins.find (type));
+ 
+-        if (i == plugins.end())
++        if (i2 == plugins.end())
+           return false;
+ 
+-        if (!i->second->set)
++        if (!i2->second->set)
+           return false;
+       }
+       return true;