Convert gcdmaster to C++11 and fix some harmless implicit casts that are

no longer valid with C++11.

6 files changed, 59 insertions, 2 deletions

diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index 52508c7a85b..d2eedd45106 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2013/05/03 16:14:47 drochner Exp $
+$NetBSD: distinfo,v 1.27 2015/11/03 19:08:44 joerg Exp $
 
 SHA1 (cdrdao-1.2.3.tar.bz2) = 70d6547795a1342631c7ab56709fd1940c2aff9f
 RMD160 (cdrdao-1.2.3.tar.bz2) = a162bdf2bc4d65581816d3a9e3c0d3ba66bb6523
@@ -23,3 +23,7 @@ SHA1 (patch-au) = dd8d9d6b73ea662ef3e936580082f9b733c6596c
 SHA1 (patch-av) = 1053b438744ce9e64e0ab093679ed71fbce9a533
 SHA1 (patch-aw) = 152cc7d2f58b97ecbb766b9f3682884515a170a1
 SHA1 (patch-ba) = b6b7ccae9edf1e816aac76a7d94b7bf67fc1671a
+SHA1 (patch-dao_CdrDriver.cc) = b618b4521d010f4153f73a9fab33d5ed56dfb651
+SHA1 (patch-dao_CdrDriver.h) = 71113a5d536aa8eba74e141e612c91e958dadda3
+SHA1 (patch-xdao_CdDevice.cc) = fb83427cef2fc0b7afdb526664f61863cd6bc715
+SHA1 (patch-xdao_CdDevice.h) = 11b9868cc54d2b926e5e588eb467f0941deb1208
diff --git a/sysutils/cdrdao/patches/patch-dao_CdrDriver.cc b/sysutils/cdrdao/patches/patch-dao_CdrDriver.cc
new file mode 100644
index 00000000000..ee3bf2df57b
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-dao_CdrDriver.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-dao_CdrDriver.cc,v 1.1 2015/11/03 19:08:45 joerg Exp $
+
+--- dao/CdrDriver.cc.orig	2015-11-03 11:23:52.000000000 +0000
++++ dao/CdrDriver.cc
+@@ -495,7 +495,7 @@ unsigned char CdrDriver::syncPattern[12]
+   0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0
+ };
+ 
+-char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 };
++unsigned char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 };
+ 
+ 
+ /* Maps a string to the corresponding driver option value 
diff --git a/sysutils/cdrdao/patches/patch-dao_CdrDriver.h b/sysutils/cdrdao/patches/patch-dao_CdrDriver.h
new file mode 100644
index 00000000000..aafc57c6baf
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-dao_CdrDriver.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-dao_CdrDriver.h,v 1.1 2015/11/03 19:08:45 joerg Exp $
+
+--- dao/CdrDriver.h.orig	2015-11-03 11:24:08.000000000 +0000
++++ dao/CdrDriver.h
+@@ -440,7 +440,7 @@ protected:
+   bool fullBurn_;
+ 
+   static unsigned char syncPattern[12];
+-  static char REMOTE_MSG_SYNC_[4];
++  static unsigned char REMOTE_MSG_SYNC_[4];
+ 
+   static int speed2Mult(int);
+   static int mult2Speed(int);
diff --git a/sysutils/cdrdao/patches/patch-xdao_CdDevice.cc b/sysutils/cdrdao/patches/patch-xdao_CdDevice.cc
new file mode 100644
index 00000000000..2e7e97d75c0
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-xdao_CdDevice.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-xdao_CdDevice.cc,v 1.1 2015/11/03 19:08:45 joerg Exp $
+
+--- xdao/CdDevice.cc.orig	2015-11-03 11:26:42.000000000 +0000
++++ xdao/CdDevice.cc
+@@ -255,7 +255,7 @@ int CdDevice::updateStatus()
+ 
+ bool CdDevice::updateProgress(Glib::IOCondition cond, int fd)
+ {
+-  static char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 };
++  static unsigned char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 };
+   fd_set fds;
+   int state = 0;
+   char buf[10];
diff --git a/sysutils/cdrdao/patches/patch-xdao_CdDevice.h b/sysutils/cdrdao/patches/patch-xdao_CdDevice.h
new file mode 100644
index 00000000000..b9e77c19eff
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-xdao_CdDevice.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-xdao_CdDevice.h,v 1.1 2015/11/03 19:08:45 joerg Exp $
+
+--- xdao/CdDevice.h.orig	2015-11-03 11:23:29.000000000 +0000
++++ xdao/CdDevice.h
+@@ -20,7 +20,6 @@
+ #ifndef __CD_DEVICE_H__
+ #define __CD_DEVICE_H__
+ 
+-#include <sigc++/object.h>
+ #include <gdk/gdk.h>
+ #include <string>
+ 
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index a174688bd2d..ca11cda524f 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2015/04/25 14:24:51 tnn Exp $
+# $NetBSD: Makefile,v 1.78 2015/11/03 19:08:45 joerg Exp $
 
 .include "../../sysutils/cdrdao/Makefile.common"
 
@@ -18,6 +18,8 @@ USE_TOOLS+=		pkg-config
 INSTALL_DIRS=		xdao
 GCONF_SCHEMAS=		gcdmaster.schemas
 
+CXXFLAGS+=		-std=c++11
+
 .include "../../devel/libsigc++/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../devel/libgnomeuimm/buildlink3.mk"