Fix build with modern GCC

11 files changed, 111 insertions, 11 deletions

diff --git a/databases/krecipes/distinfo b/databases/krecipes/distinfo
index 852f2c59ac1..d6db246cf4f 100644
--- a/databases/krecipes/distinfo
+++ b/databases/krecipes/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/07/31 12:02:45 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/11/24 14:15:41 joerg Exp $
 
 SHA1 (krecipes-1.0-beta1.tar.gz) = c1274f035476778d9b3f85bc007752ba0af841e3
 RMD160 (krecipes-1.0-beta1.tar.gz) = c32732255bbf530932fa3183581be72e12e7a2d2
 Size (krecipes-1.0-beta1.tar.gz) = 8682447 bytes
 SHA1 (patch-aa) = 073893dcf03798122eaa0161100d7b56e35e4715
+SHA1 (patch-krecipes_src_importers_kreimporter.h) = e875275b530ec7246d1276d67854506780586a80
+SHA1 (patch-krecipes_src_importers_recipemlimporter.h) = 004385da2f3104f5ea72a02fa866577a2e4d82ca
diff --git a/databases/krecipes/patches/patch-krecipes_src_importers_kreimporter.h b/databases/krecipes/patches/patch-krecipes_src_importers_kreimporter.h
new file mode 100644
index 00000000000..3f310e707c7
--- /dev/null
+++ b/databases/krecipes/patches/patch-krecipes_src_importers_kreimporter.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-krecipes_src_importers_kreimporter.h,v 1.1 2011/11/24 14:15:41 joerg Exp $
+
+--- krecipes/src/importers/kreimporter.h.orig	2011-11-24 00:04:33.000000000 +0000
++++ krecipes/src/importers/kreimporter.h
+@@ -46,7 +46,7 @@ private:
+ 	void readCategoryStructure( const QDomNodeList& l, CategoryTree *tree );
+ 	void readDescription( const QDomNodeList& l, Recipe* );
+ 	void readIngredients( const QDomNodeList& l, Recipe*, const QString &header = QString::null, Ingredient *ing = 0 );
+-	void readAmount( const QDomElement& amount, double &amount, double &amount_offset );
++	void readAmount( const QDomElement& amount, double &amount2, double &amount_offset );
+ 	void readRatings( const QDomNodeList&, Recipe * );
+ 	void readCriterion( const QDomNodeList&, RatingCriteriaList &r );
+ };
diff --git a/databases/krecipes/patches/patch-krecipes_src_importers_recipemlimporter.h b/databases/krecipes/patches/patch-krecipes_src_importers_recipemlimporter.h
new file mode 100644
index 00000000000..f485b22f782
--- /dev/null
+++ b/databases/krecipes/patches/patch-krecipes_src_importers_recipemlimporter.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-krecipes_src_importers_recipemlimporter.h,v 1.1 2011/11/24 14:15:41 joerg Exp $
+
+--- krecipes/src/importers/recipemlimporter.h.orig	2011-11-24 00:06:44.000000000 +0000
++++ krecipes/src/importers/recipemlimporter.h
+@@ -38,14 +38,14 @@ protected:
+ private:
+ 	void readRecipemlDirections( const QDomElement& dirs );
+ 	void readRecipemlHead( const QDomElement& head );
+-	void readRecipemlIng( const QDomElement& ing, Ingredient *ing = 0, const QString &header = QString::null );
++	void readRecipemlIng( const QDomElement& ing, Ingredient *ing2 = 0, const QString &header = QString::null );
+ 	void readRecipemlIngs( const QDomElement& ings );
+ 	void readRecipemlMenu( const QDomElement& menu );
+ 	void readRecipemlSrcItems( const QDomElement& sources );
+ 	void readRecipemlRecipe( const QDomElement& recipe );
+ 	void readRecipemlPreptime( const QDomElement &preptime );
+ 	void readRecipemlQty( const QDomElement &qty, Ingredient &ing );
+-	void readRecipemlRange( const QDomElement& range, double &range, double &range_offset );
++	void readRecipemlRange( const QDomElement& range, double &range2, double &range_offset );
+ 
+ 	Recipe recipe;
+ };
diff --git a/databases/libpqxx/distinfo b/databases/libpqxx/distinfo
index 469a538117c..fffa9b18c5c 100644
--- a/databases/libpqxx/distinfo
+++ b/databases/libpqxx/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.5 2006/08/23 11:45:26 ghen Exp $
+$NetBSD: distinfo,v 1.6 2011/11/24 14:14:57 joerg Exp $
 
 SHA1 (libpqxx-2.5.5.tar.gz) = e7ee3d9ea5acfccf2779bf39fe29d0228bd6479a
 RMD160 (libpqxx-2.5.5.tar.gz) = 28d05558982f0c1b2df9eac3ca01a47b5bdee832
 Size (libpqxx-2.5.5.tar.gz) = 1566887 bytes
 SHA1 (patch-aa) = fbf80bd805bedf094a79e0ab76e9a7f543e67117
-SHA1 (patch-ab) = dbfd4f1769d428edeb43a64346f150daf0352924
+SHA1 (patch-ab) = 22dbd7aa70f082cf20fd99843a5a2811505722f8
+SHA1 (patch-src_binarystring.cxx) = 98b46c3bf806fd0689126729a211c71b132969bd
+SHA1 (patch-src_largeobject.cxx) = d293ece542785cdcca20eda1722392cd2d8bacc8
+SHA1 (patch-src_result.cxx) = 698f74c603d8c3ffb066f16755ee8de6da6fae39
+SHA1 (patch-src_util.cxx) = 70a78a8db2e78842b6aa5cb4d23eb73f4bd87c55
diff --git a/databases/libpqxx/patches/patch-ab b/databases/libpqxx/patches/patch-ab
index d64f5f283f5..a7abf3315a2 100644
--- a/databases/libpqxx/patches/patch-ab
+++ b/databases/libpqxx/patches/patch-ab
@@ -1,9 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2006/01/02 17:20:18 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2011/11/24 14:14:58 joerg Exp $
 
---- src/connection_base.cxx.orig	2006-01-02 17:01:56.000000000 +0000
+--- src/connection_base.cxx.orig	2005-06-28 08:53:14.000000000 +0000
 +++ src/connection_base.cxx
-@@ -21,6 +21,7 @@
+@@ -19,8 +19,10 @@
+ 
+ #include <algorithm>
  #include <cstdio>
++#include <cstring>
  #include <ctime>
  #include <stdexcept>
 +#include <sys/time.h>
diff --git a/databases/libpqxx/patches/patch-src_binarystring.cxx b/databases/libpqxx/patches/patch-src_binarystring.cxx
new file mode 100644
index 00000000000..36a2acb9511
--- /dev/null
+++ b/databases/libpqxx/patches/patch-src_binarystring.cxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_binarystring.cxx,v 1.1 2011/11/24 14:14:58 joerg Exp $
+
+--- src/binarystring.cxx.orig	2011-11-24 00:12:09.000000000 +0000
++++ src/binarystring.cxx
+@@ -18,6 +18,7 @@
+ 
+ #include <new>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #include "libpq-fe.h"
+ 
diff --git a/databases/libpqxx/patches/patch-src_largeobject.cxx b/databases/libpqxx/patches/patch-src_largeobject.cxx
new file mode 100644
index 00000000000..30a0f795012
--- /dev/null
+++ b/databases/libpqxx/patches/patch-src_largeobject.cxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_largeobject.cxx,v 1.1 2011/11/24 14:14:58 joerg Exp $
+
+--- src/largeobject.cxx.orig	2011-11-24 00:12:56.000000000 +0000
++++ src/largeobject.cxx
+@@ -18,6 +18,7 @@
+ #include "pqxx/compiler.h"
+ 
+ #include <cerrno>
++#include <cstring>
+ #include <stdexcept>
+ 
+ #include "libpq-fe.h"
diff --git a/databases/libpqxx/patches/patch-src_result.cxx b/databases/libpqxx/patches/patch-src_result.cxx
new file mode 100644
index 00000000000..ffd5295e968
--- /dev/null
+++ b/databases/libpqxx/patches/patch-src_result.cxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_result.cxx,v 1.1 2011/11/24 14:14:58 joerg Exp $
+
+--- src/result.cxx.orig	2011-11-24 00:13:16.000000000 +0000
++++ src/result.cxx
+@@ -18,6 +18,7 @@
+ #include "pqxx/compiler.h"
+ 
+ #include <stdexcept>
++#include <cstdlib>
+ 
+ #include "libpq-fe.h"
+ 
diff --git a/databases/libpqxx/patches/patch-src_util.cxx b/databases/libpqxx/patches/patch-src_util.cxx
new file mode 100644
index 00000000000..9130b917c1a
--- /dev/null
+++ b/databases/libpqxx/patches/patch-src_util.cxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_util.cxx,v 1.1 2011/11/24 14:14:58 joerg Exp $
+
+--- src/util.cxx.orig	2011-11-24 00:13:51.000000000 +0000
++++ src/util.cxx
+@@ -25,6 +25,7 @@
+ #endif
+ 
+ #include <cerrno>
++#include <cstring>
+ #include <new>
+ #include <sstream>
+ 
diff --git a/devel/astyle/distinfo b/devel/astyle/distinfo
index adada722b10..522ba8fb2ad 100644
--- a/devel/astyle/distinfo
+++ b/devel/astyle/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2009/08/25 11:56:34 wiz Exp $
+$NetBSD: distinfo,v 1.9 2011/11/24 14:14:14 joerg Exp $
 
 SHA1 (astyle_1.13.6.1.zip) = 4e0172fe30986d68c61b4a7c1638a1fc42ea0675
 RMD160 (astyle_1.13.6.1.zip) = 74030324515be84e0e7499edc2503d0e549673ba
 Size (astyle_1.13.6.1.zip) = 61422 bytes
 SHA1 (patch-aa) = 67bb1b1802e74bc264cb951a55075982c566d463
 SHA1 (patch-ab) = c9b21d45f53331411425a734971f003d415b11e7
-SHA1 (patch-ac) = d143f2cd5ef3d15317d8dbe01be98f3a9a862ec6
+SHA1 (patch-ac) = 42b568e4bb8f6a9748c1ec73db641739ce14e673
diff --git a/devel/astyle/patches/patch-ac b/devel/astyle/patches/patch-ac
index d4ca4cd3ed4..22c244d8bbc 100644
--- a/devel/astyle/patches/patch-ac
+++ b/devel/astyle/patches/patch-ac
@@ -1,8 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2006/01/02 18:05:11 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2011/11/24 14:14:15 joerg Exp $
 
---- astyle_main.cpp.orig	2006-01-02 17:58:40.000000000 +0000
+--- astyle_main.cpp.orig	2001-01-20 17:02:14.000000000 +0000
 +++ astyle_main.cpp
-@@ -149,7 +149,7 @@ void error(const char *why, const char* 
+@@ -29,6 +29,8 @@
+ #include <fstream>
+ #include <string>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ 
+ #define IS_OPTION(arg,op)          ((arg).compare(op)==0)
+@@ -149,7 +151,7 @@ void error(const char *why, const char* 
      exit(1);
  }