Fix build with modern GCC.

4 files changed, 59 insertions, 1 deletions

diff --git a/ham/fl_logbook/distinfo b/ham/fl_logbook/distinfo
index 89bfebc40ae..fab04a3e185 100644
--- a/ham/fl_logbook/distinfo
+++ b/ham/fl_logbook/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/21 16:49:23 obache Exp $
+$NetBSD: distinfo,v 1.2 2011/11/25 21:59:57 joerg Exp $
 
 SHA1 (fl_logbook.121.src.tar.gz) = 739338598cce81c9c3cb5776a126ad21354352ca
 RMD160 (fl_logbook.121.src.tar.gz) = 90353a34238ede39024df4cabafcbceada7895ae
 Size (fl_logbook.121.src.tar.gz) = 54496 bytes
 SHA1 (patch-aa) = 4763255390f3bd3acc003a9fe65d47bf8713bf3e
+SHA1 (patch-src_date.h) = 9583276b68ca4c4e0edc725229ee4fba8cdc11d3
+SHA1 (patch-src_qso__db.cpp) = 1b8c616f689ec68daf47220c9dc28bfc8b19c715
+SHA1 (patch-src_qso__db.h) = 4cc3ddee3055edb4a50c98926a588e06a6e58ca4
diff --git a/ham/fl_logbook/patches/patch-src_date.h b/ham/fl_logbook/patches/patch-src_date.h
new file mode 100644
index 00000000000..441b6b59836
--- /dev/null
+++ b/ham/fl_logbook/patches/patch-src_date.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_date.h,v 1.1 2011/11/25 21:59:57 joerg Exp $
+
+--- src/date.h.orig	2011-11-25 17:49:57.000000000 +0000
++++ src/date.h
+@@ -25,13 +25,15 @@
+ #ifndef DATE_H
+ #define DATE_H
+ 
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
+ #include <time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
++using namespace std;
++
+ typedef enum {
+   SUNDAY,
+   MONDAY,
diff --git a/ham/fl_logbook/patches/patch-src_qso__db.cpp b/ham/fl_logbook/patches/patch-src_qso__db.cpp
new file mode 100644
index 00000000000..4f023c47fab
--- /dev/null
+++ b/ham/fl_logbook/patches/patch-src_qso__db.cpp
@@ -0,0 +1,9 @@
+$NetBSD: patch-src_qso__db.cpp,v 1.1 2011/11/25 21:59:57 joerg Exp $
+
+--- src/qso_db.cpp.orig	2011-11-25 17:52:09.000000000 +0000
++++ src/qso_db.cpp
+@@ -1,3 +1,4 @@
++#include <cstring>
+ #include <stdlib.h>

+ #include <ctype.h>

+ #include "qso_db.h"

diff --git a/ham/fl_logbook/patches/patch-src_qso__db.h b/ham/fl_logbook/patches/patch-src_qso__db.h
new file mode 100644
index 00000000000..b8f832aab4f
--- /dev/null
+++ b/ham/fl_logbook/patches/patch-src_qso__db.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_qso__db.h,v 1.1 2011/11/25 21:59:57 joerg Exp $
+
+--- src/qso_db.h.orig	2011-11-25 17:49:53.000000000 +0000
++++ src/qso_db.h
+@@ -1,8 +1,8 @@
+ #ifndef QSO_DB

+ #define QSO_DB

+ 

+-#include <iostream.h>

+-#include <fstream.h>

++#include <iostream>

++#include <fstream>

+ //#include <istream>

+ //#include <ostream>

+ //#include <fstream>

+@@ -12,6 +12,8 @@
+ 

+ #include "adif_def.h"

+ //#include "myprofile.h"

++
++using namespace std;
+ 

+ #ifndef TRUE

+ #define TRUE 1