Fixed g++4 error messages.

6 files changed, 90 insertions, 1 deletions

diff --git a/geography/gpspoint/distinfo b/geography/gpspoint/distinfo
index 9a8b1b28747..9e4fb186a7a 100644
--- a/geography/gpspoint/distinfo
+++ b/geography/gpspoint/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.3 2006/03/09 14:50:31 ghen Exp $
+$NetBSD: distinfo,v 1.4 2007/03/17 15:34:13 rillig Exp $
 
 SHA1 (gpspoint-2.030521.tar.gz) = b65466fae17e35bed019869d66515acc388b3242
 RMD160 (gpspoint-2.030521.tar.gz) = a1be4a5230488965533254a82cf0f57fe7abbfb8
 Size (gpspoint-2.030521.tar.gz) = 235522 bytes
 SHA1 (patch-aa) = 0e5c2cf25fc46c923bbcb11296f24679f7e743ee
+SHA1 (patch-ab) = 14cfec0cbc2f78fa96c69492aebea888bd0a2bb0
+SHA1 (patch-ac) = 3ecc288bf3072c65ecf40d0b34fbccade0014f9a
+SHA1 (patch-ad) = b75ea9f79ecb22ed84d75e386c58df7f8836d448
+SHA1 (patch-ae) = 36808a9b9e211adc3c4edbb8f0bf926601274b7b
+SHA1 (patch-af) = a1ccd4d1cc9e75ef457cfbe91a8bfc7e64a1409f
diff --git a/geography/gpspoint/patches/patch-ab b/geography/gpspoint/patches/patch-ab
new file mode 100644
index 00000000000..18810968cea
--- /dev/null
+++ b/geography/gpspoint/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2007/03/17 15:34:13 rillig Exp $
+
+g++4 complains:
+constants.h:33: error: extra qualification 'gpspoint2::Constants::' on member 'Constants'
+
+--- src/constants.h.orig	2003-04-14 18:23:32.000000000 +0200
++++ src/constants.h	2007-03-17 16:18:14.000000000 +0100
+@@ -30,7 +30,7 @@ using namespace gpspoint2;
+ class Constants
+ {
+    public:
+-      Constants::Constants(void);
++      Constants(void);
+ 
+    protected:
+       static const g_byte
diff --git a/geography/gpspoint/patches/patch-ac b/geography/gpspoint/patches/patch-ac
new file mode 100644
index 00000000000..ba4ae006efd
--- /dev/null
+++ b/geography/gpspoint/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2007/03/17 15:34:13 rillig Exp $
+
+See patch-ab.
+
+--- src/newsymbols.h.orig	2003-05-20 11:54:34.000000000 +0200
++++ src/newsymbols.h	2007-03-17 16:19:39.000000000 +0100
+@@ -28,7 +28,7 @@ using namespace gpspoint2;
+ struct NewSymbols
+ {
+         public: 
+-                NewSymbols::NewSymbols(void);   
++                NewSymbols(void);   
+ 
+         protected:
+                 string number2symbol(g_int) const;     
diff --git a/geography/gpspoint/patches/patch-ad b/geography/gpspoint/patches/patch-ad
new file mode 100644
index 00000000000..cf25a28e17f
--- /dev/null
+++ b/geography/gpspoint/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2007/03/17 15:34:13 rillig Exp $
+
+See patch-ab.
+
+--- src/oldsymbols.h.orig	2003-05-20 11:54:34.000000000 +0200
++++ src/oldsymbols.h	2007-03-17 16:19:08.000000000 +0100
+@@ -29,7 +29,7 @@ using namespace gpspoint2;
+ struct OldSymbols
+ {
+ 	public: 
+-		OldSymbols::OldSymbols(void);	
++		OldSymbols(void);	
+ 
+ 	protected:
+ 		/// returns symbol as a string given a symbol ID
diff --git a/geography/gpspoint/patches/patch-ae b/geography/gpspoint/patches/patch-ae
new file mode 100644
index 00000000000..9248cb478ab
--- /dev/null
+++ b/geography/gpspoint/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1 2007/03/17 15:34:14 rillig Exp $
+
+See patch-ab.
+
+--- src/records_type.h.orig	2003-04-14 18:23:33.000000000 +0200
++++ src/records_type.h	2007-03-17 16:19:25.000000000 +0100
+@@ -41,10 +41,10 @@ class Records_Type : Endianmess, Constan
+    public: 
+ 
+    /// constructor 
+-   Records_Type::Records_Type(void);
++   Records_Type(void);
+ 
+    /// calls set with the given Packet
+-   Records_Type::Records_Type(Packet);
++   Records_Type(Packet);
+ 
+    /// resets internal data
+    void clear(void);
diff --git a/geography/gpspoint/patches/patch-af b/geography/gpspoint/patches/patch-af
new file mode 100644
index 00000000000..b79ded3bfaa
--- /dev/null
+++ b/geography/gpspoint/patches/patch-af
@@ -0,0 +1,19 @@
+$NetBSD: patch-af,v 1.1 2007/03/17 15:34:14 rillig Exp $
+
+See patch-ab.
+
+--- src/wpt_type.h.orig	2003-05-20 11:54:34.000000000 +0200
++++ src/wpt_type.h	2007-03-17 16:18:52.000000000 +0100
+@@ -99,10 +99,10 @@ class Wpt_Type : GPDLineTool, Constants
+  protected:
+ 
+    /// semicircle to double 
+-   double Wpt_Type::s2d(g_long sc);
++   double s2d(g_long sc);
+ 
+    /// double to semicicle 
+-   g_long Wpt_Type::d2s(double deg);
++   g_long d2s(double deg);
+ 
+    string   name;
+    string   comment;