Fix build with newer GCC

5 files changed, 42 insertions, 2 deletions

diff --git a/geography/gpsdrive/distinfo b/geography/gpsdrive/distinfo
index d8204bd373e..54bb357e592 100644
--- a/geography/gpsdrive/distinfo
+++ b/geography/gpsdrive/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2011/07/03 21:42:24 jym Exp $
+$NetBSD: distinfo,v 1.5 2011/11/24 14:06:04 joerg Exp $
 
 SHA1 (gpsdrive-1.31.tar.gz) = 296a06d264c5fbb077c91f3529b4e6f122423f05
 RMD160 (gpsdrive-1.31.tar.gz) = 56ea8fb9355e0381d55aeb691757c59c9e332406
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = 78e21378bc10d4a1098827d25308f59432b180f1
 SHA1 (patch-ad) = 05d6be6ba7bd37b4b0599092ace2d5db7825c01d
 SHA1 (patch-ae) = 5ab12f3f1f94a84acac0bc47fb4ad5a3bb75b7b6
 SHA1 (patch-af) = ba047381fcf07b3797c73199f85536b2a7efb61e
+SHA1 (patch-src_garmin__application.cpp) = 8b682f5545e67ff2906cec9fc44cbf601b0bd399
diff --git a/geography/gpsdrive/patches/patch-src_garmin__application.cpp b/geography/gpsdrive/patches/patch-src_garmin__application.cpp
new file mode 100644
index 00000000000..e6c20043967
--- /dev/null
+++ b/geography/gpsdrive/patches/patch-src_garmin__application.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_garmin__application.cpp,v 1.1 2011/11/24 14:06:04 joerg Exp $
+
+--- src/garmin_application.cpp.orig	2011-11-24 01:00:09.000000000 +0000
++++ src/garmin_application.cpp
+@@ -26,6 +26,7 @@
+ #include <iostream>
+ #endif
+ 
++#include <cstring>
+ #include <cctype>
+ #include <algorithm>
+ 
diff --git a/geography/gpspoint/distinfo b/geography/gpspoint/distinfo
index 9e4fb186a7a..9b29a75afdb 100644
--- a/geography/gpspoint/distinfo
+++ b/geography/gpspoint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2007/03/17 15:34:13 rillig Exp $
+$NetBSD: distinfo,v 1.5 2011/11/24 14:05:09 joerg Exp $
 
 SHA1 (gpspoint-2.030521.tar.gz) = b65466fae17e35bed019869d66515acc388b3242
 RMD160 (gpspoint-2.030521.tar.gz) = a1be4a5230488965533254a82cf0f57fe7abbfb8
@@ -9,3 +9,5 @@ SHA1 (patch-ac) = 3ecc288bf3072c65ecf40d0b34fbccade0014f9a
 SHA1 (patch-ad) = b75ea9f79ecb22ed84d75e386c58df7f8836d448
 SHA1 (patch-ae) = 36808a9b9e211adc3c4edbb8f0bf926601274b7b
 SHA1 (patch-af) = a1ccd4d1cc9e75ef457cfbe91a8bfc7e64a1409f
+SHA1 (patch-src_main.cpp) = 3dfa8a01679360c0041367c4ba95b4bab643bfe0
+SHA1 (patch-src_posixserial.cpp) = 6240b852ccbc86f9e337aefa960bb7cdb7d39176
diff --git a/geography/gpspoint/patches/patch-src_main.cpp b/geography/gpspoint/patches/patch-src_main.cpp
new file mode 100644
index 00000000000..566b525649f
--- /dev/null
+++ b/geography/gpspoint/patches/patch-src_main.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_main.cpp,v 1.1 2011/11/24 14:05:09 joerg Exp $
+
+--- src/main.cpp.orig	2011-11-24 01:03:47.000000000 +0000
++++ src/main.cpp
+@@ -24,6 +24,7 @@
+ #include <string>
+ #include <fstream>
+ #include <signal.h>
++#include <stdlib.h>
+ 
+ 
+ using namespace std;
diff --git a/geography/gpspoint/patches/patch-src_posixserial.cpp b/geography/gpspoint/patches/patch-src_posixserial.cpp
new file mode 100644
index 00000000000..6ba60f02950
--- /dev/null
+++ b/geography/gpspoint/patches/patch-src_posixserial.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_posixserial.cpp,v 1.1 2011/11/24 14:05:09 joerg Exp $
+
+--- src/posixserial.cpp.orig	2011-11-24 01:03:16.000000000 +0000
++++ src/posixserial.cpp
+@@ -18,7 +18,7 @@
+ 
+ #ifdef HAVE_TERMIOS_H
+ 
+-
++#include <string.h>
+ #include <fstream>
+ 
+ #define V_TIME 5  //  wait V_TIME for characters on serial port