Fix build with newer GCC

13 files changed, 165 insertions, 3 deletions

diff --git a/security/MyPasswordSafe/distinfo b/security/MyPasswordSafe/distinfo
index bbd993373c5..3b788a6d10c 100644
--- a/security/MyPasswordSafe/distinfo
+++ b/security/MyPasswordSafe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/08/02 17:09:21 joerg Exp $
+$NetBSD: distinfo,v 1.10 2011/11/22 20:05:25 joerg Exp $
 
 SHA1 (MyPasswordSafe-20061216.src.tgz) = 37bb3f7491b42c8aac5d71cc6546ced018a15119
 RMD160 (MyPasswordSafe-20061216.src.tgz) = b61f1525aed3160b88c1ef6c6922ff131ad2248c
@@ -8,3 +8,7 @@ SHA1 (patch-ab) = 41f42aa0fa4f9d97431a9a01807a0a2cc838a753
 SHA1 (patch-ac) = b6bd898a248da7052087a233e7aac215ad1196e2
 SHA1 (patch-ad) = 56179239b4ab92ee83f792432bc07c1501e1cdad
 SHA1 (patch-ae) = e5dca33f49895f5b30d757fd41dc58d6e8bb55a0
+SHA1 (patch-src-crypto-bfproxy.cpp) = cb84b4c5f474f057f0b702ff541d0587369a21e8
+SHA1 (patch-src-encryptedstring.cpp) = 715f7918fce45d3c4516acbcadd99e87f58a6492
+SHA1 (patch-src-pwsafe-Util.cpp) = 81b660bfbaa1472071c2ff6d859e5489b133596e
+SHA1 (patch-src-safeserializer.cpp) = e63997bc2ebb452056831bf5c147435a3edb2a14
diff --git a/security/MyPasswordSafe/patches/patch-src-crypto-bfproxy.cpp b/security/MyPasswordSafe/patches/patch-src-crypto-bfproxy.cpp
new file mode 100644
index 00000000000..817e94bdb8f
--- /dev/null
+++ b/security/MyPasswordSafe/patches/patch-src-crypto-bfproxy.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src-crypto-bfproxy.cpp,v 1.1 2011/11/22 20:05:25 joerg Exp $
+
+--- src/crypto/bfproxy.cpp.orig	2011-11-22 19:21:27.000000000 +0000
++++ src/crypto/bfproxy.cpp
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ #include "bfproxy.hpp"
++#include <string.h>
+ 
+ BFProxy::BFProxy(const unsigned char *key, int len)
+ {
diff --git a/security/MyPasswordSafe/patches/patch-src-encryptedstring.cpp b/security/MyPasswordSafe/patches/patch-src-encryptedstring.cpp
new file mode 100644
index 00000000000..720948503bd
--- /dev/null
+++ b/security/MyPasswordSafe/patches/patch-src-encryptedstring.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src-encryptedstring.cpp,v 1.1 2011/11/22 20:05:25 joerg Exp $
+
+--- src/encryptedstring.cpp.orig	2011-11-22 19:06:44.000000000 +0000
++++ src/encryptedstring.cpp
+@@ -15,6 +15,8 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
++#include <stdlib.h>
++#include <string.h>
+ #include <time.h>
+ #include <iostream>
+ #include "pwsafe/Util.h"
diff --git a/security/MyPasswordSafe/patches/patch-src-pwsafe-Util.cpp b/security/MyPasswordSafe/patches/patch-src-pwsafe-Util.cpp
new file mode 100644
index 00000000000..4a5ad94c73a
--- /dev/null
+++ b/security/MyPasswordSafe/patches/patch-src-pwsafe-Util.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src-pwsafe-Util.cpp,v 1.1 2011/11/22 20:05:25 joerg Exp $
+
+--- src/pwsafe/Util.cpp.orig	2011-11-22 19:15:04.000000000 +0000
++++ src/pwsafe/Util.cpp
+@@ -5,7 +5,10 @@
+ #include "PW_BlowFish.h"
+ //#include "PwsPlatform.h"
+ 
++#include <limits.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <iostream>
+ using std::cout;
+ using std::endl;
diff --git a/security/MyPasswordSafe/patches/patch-src-safeserializer.cpp b/security/MyPasswordSafe/patches/patch-src-safeserializer.cpp
new file mode 100644
index 00000000000..57167b1cd32
--- /dev/null
+++ b/security/MyPasswordSafe/patches/patch-src-safeserializer.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src-safeserializer.cpp,v 1.1 2011/11/22 20:05:25 joerg Exp $
+
+--- src/safeserializer.cpp.orig	2011-11-22 18:59:13.000000000 +0000
++++ src/safeserializer.cpp
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ #include <qstring.h>
++#include <algorithm>
+ #include "safe.hpp"
+ #include "safeserializer.hpp"
+ #include "plaintextlizer.hpp"
diff --git a/sysutils/zidrav/distinfo b/sysutils/zidrav/distinfo
index 398bcb6d455..e87a5f2e63b 100644
--- a/sysutils/zidrav/distinfo
+++ b/sysutils/zidrav/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/21 04:00:56 minskim Exp $
+$NetBSD: distinfo,v 1.2 2011/11/22 20:04:40 joerg Exp $
 
 SHA1 (zidrav4unix-1.2.0.tar.gz) = e8e2e6574831509669bae3976748baec713243c6
 RMD160 (zidrav4unix-1.2.0.tar.gz) = 7043b122e8e1f394d6fe62ea81ed08d0052a199b
 Size (zidrav4unix-1.2.0.tar.gz) = 18448 bytes
 SHA1 (patch-aa) = 7e1c6bcb375d38a1aa7f3eaa4fa00e779465860a
+SHA1 (patch-core.h) = f5497f376545fe24554a3ecb7f7f12c59b30e3f9
diff --git a/sysutils/zidrav/patches/patch-core.h b/sysutils/zidrav/patches/patch-core.h
new file mode 100644
index 00000000000..6511bb4741c
--- /dev/null
+++ b/sysutils/zidrav/patches/patch-core.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-core.h,v 1.1 2011/11/22 20:04:40 joerg Exp $
+
+--- core.h.orig	2011-11-22 19:25:48.000000000 +0000
++++ core.h
+@@ -22,6 +22,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <string>
++#include <string.h>
+ 
+ using namespace std;
+ 
diff --git a/time/ptimetracker/distinfo b/time/ptimetracker/distinfo
index b9db96732d2..2a9c41c837b 100644
--- a/time/ptimetracker/distinfo
+++ b/time/ptimetracker/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 19:14:55 wiz Exp $
+$NetBSD: distinfo,v 1.3 2011/11/22 20:03:56 joerg Exp $
 
 SHA1 (ptimetracker-1.7.3.tar.gz) = f5a3fddab046b36d3c96a4f8572ec3f0509883f1
 RMD160 (ptimetracker-1.7.3.tar.gz) = ab1d0cfe90ee715d005b002ab8bc20e47b040862
 Size (ptimetracker-1.7.3.tar.gz) = 36992 bytes
+SHA1 (patch-src-sucker.cc) = 7fa071ff585354e3c3c5174b4b3379e782b12e3f
+SHA1 (patch-src-sucker.hh) = de174699ebae69842bb1e9e61bf7031b18f5626c
+SHA1 (patch-src-weeport.cc) = 48506b9339df00e986c30f9d935ee00971428b60
+SHA1 (patch-src-weeport.hh) = 2376e84a07837f56f3fbcd3c03ef629a03b63264
+SHA1 (patch-src-widgets.hh) = a3a2ceab676bddb4ab3c113b337b86d4444dcb98
diff --git a/time/ptimetracker/patches/patch-src-sucker.cc b/time/ptimetracker/patches/patch-src-sucker.cc
new file mode 100644
index 00000000000..1c433aecad9
--- /dev/null
+++ b/time/ptimetracker/patches/patch-src-sucker.cc
@@ -0,0 +1,22 @@
+$NetBSD: patch-src-sucker.cc,v 1.1 2011/11/22 20:03:56 joerg Exp $
+
+--- src/sucker.cc.orig	2011-11-22 19:09:34.000000000 +0000
++++ src/sucker.cc
+@@ -24,7 +24,7 @@
+ #include "sucker.hh"
+ 
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <qtable.h>
+ #include <qfile.h>
+ #include <qtextstream.h>
+@@ -33,6 +33,8 @@
+ #include <qmessagebox.h>
+ #include <assert.h>
+ 
++using namespace std;
++
+ /********************************************************************
+    class for handling projects
+ */
diff --git a/time/ptimetracker/patches/patch-src-sucker.hh b/time/ptimetracker/patches/patch-src-sucker.hh
new file mode 100644
index 00000000000..b8bd9c5485f
--- /dev/null
+++ b/time/ptimetracker/patches/patch-src-sucker.hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-src-sucker.hh,v 1.1 2011/11/22 20:03:56 joerg Exp $
+
+--- src/sucker.hh.orig	2011-11-22 19:09:36.000000000 +0000
++++ src/sucker.hh
+@@ -29,8 +29,9 @@
+ #include <qstring.h>
+ #include <qtable.h>
+ #include <qdatetime.h>
+-#include <vector.h>
++#include <vector>
+ 
++using namespace std;
+ 
+ /********************************************************************
+    class for handling projects
diff --git a/time/ptimetracker/patches/patch-src-weeport.cc b/time/ptimetracker/patches/patch-src-weeport.cc
new file mode 100644
index 00000000000..38dd5f40748
--- /dev/null
+++ b/time/ptimetracker/patches/patch-src-weeport.cc
@@ -0,0 +1,18 @@
+$NetBSD: patch-src-weeport.cc,v 1.1 2011/11/22 20:03:56 joerg Exp $
+
+--- src/weeport.cc.orig	2011-11-22 19:09:39.000000000 +0000
++++ src/weeport.cc
+@@ -24,5 +24,5 @@
+ ****************************************************************************/
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include <stdlib.h>
+@@ -49,4 +49,6 @@
+ #include "weeport.hh"
+ 
++using namespace std;
++
+ /*--------------------------------------------------------------------
+   Class : Weeport
diff --git a/time/ptimetracker/patches/patch-src-weeport.hh b/time/ptimetracker/patches/patch-src-weeport.hh
new file mode 100644
index 00000000000..13a1761ba2d
--- /dev/null
+++ b/time/ptimetracker/patches/patch-src-weeport.hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-src-weeport.hh,v 1.1 2011/11/22 20:03:56 joerg Exp $
+
+--- src/weeport.hh.orig	2011-11-22 19:09:45.000000000 +0000
++++ src/weeport.hh
+@@ -31,7 +31,9 @@
+ #include <qfont.h>
+ #include <qtextview.h>
+ 
+-#include <vector.h>
++#include <vector>
++
++using namespace std;
+ 
+ class QListBox;
+ class QPopupMenu;
diff --git a/time/ptimetracker/patches/patch-src-widgets.hh b/time/ptimetracker/patches/patch-src-widgets.hh
new file mode 100644
index 00000000000..9eb10b7b482
--- /dev/null
+++ b/time/ptimetracker/patches/patch-src-widgets.hh
@@ -0,0 +1,18 @@
+$NetBSD: patch-src-widgets.hh,v 1.1 2011/11/22 20:03:56 joerg Exp $
+
+--- src/widgets.hh.orig	2011-11-22 19:09:42.000000000 +0000
++++ src/widgets.hh
+@@ -31,10 +31,12 @@
+ #include <qcombobox.h>
+ #include <qspinbox.h>
+ #include <qpopupmenu.h>
+-#include <vector.h>
++#include <vector>
+ #include <qcheckbox.h>
+ #include <qlistbox.h>
+ 
++using namespace std;
++
+ class QToolBar;
+ class QToolButton;
+ class Sucker;