Fix build with GCC 4.5

6 files changed, 67 insertions, 1 deletions

diff --git a/graphics/metacam/distinfo b/graphics/metacam/distinfo
index 50a7fa0b853..6dbe62a72e7 100644
--- a/graphics/metacam/distinfo
+++ b/graphics/metacam/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 08:45:10 agc Exp $
+$NetBSD: distinfo,v 1.3 2011/11/24 13:59:50 joerg Exp $
 
 SHA1 (metacam-1.2.tar.gz) = 41ae144b2b1c849aebc08568261dc49718667dbe
 RMD160 (metacam-1.2.tar.gz) = 1c0a430f73c2c42d4b5be675462c6adf5a5f0391
 Size (metacam-1.2.tar.gz) = 33657 bytes
+SHA1 (patch-datatiff.h) = a35795fe6ef9c1a954d618e6449320a367d8bb5f
+SHA1 (patch-dpyfuncs.cc) = 6d617594df8a910cdceb4433883bcb2399bfd763
+SHA1 (patch-edittiff.h) = 66c2b71b806ef5ccc9752943d368cfc5f9229d65
+SHA1 (patch-metacam.cc) = 7c01c25ec5dc593553094a768e19d3462275d4e5
+SHA1 (patch-ocontext.cc) = bbf343c53e8396cb8b907a6a31d318687ec8a596
diff --git a/graphics/metacam/patches/patch-datatiff.h b/graphics/metacam/patches/patch-datatiff.h
new file mode 100644
index 00000000000..fcd3808ed33
--- /dev/null
+++ b/graphics/metacam/patches/patch-datatiff.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-datatiff.h,v 1.1 2011/11/24 13:59:50 joerg Exp $
+
+--- datatiff.h.orig	2011-11-24 02:20:21.000000000 +0000
++++ datatiff.h
+@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #define DATATIFF_H_INCLUDED
+ 
+ #include "metatiff.h"
++#include <cstdlib>
+ 
+ class _DataIFD;
+ class _DataIFDEntry;
diff --git a/graphics/metacam/patches/patch-dpyfuncs.cc b/graphics/metacam/patches/patch-dpyfuncs.cc
new file mode 100644
index 00000000000..330bc85050a
--- /dev/null
+++ b/graphics/metacam/patches/patch-dpyfuncs.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-dpyfuncs.cc,v 1.1 2011/11/24 13:59:50 joerg Exp $
+
+--- dpyfuncs.cc.orig	2011-11-24 02:18:52.000000000 +0000
++++ dpyfuncs.cc
+@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include <math.h>
+ #include <cstdio>
+ #include <ctype.h>
++#include <cstring>
+ 
+ #include "metacam.h"
+ #include "dpyfuncs.h"
diff --git a/graphics/metacam/patches/patch-edittiff.h b/graphics/metacam/patches/patch-edittiff.h
new file mode 100644
index 00000000000..c8e76552533
--- /dev/null
+++ b/graphics/metacam/patches/patch-edittiff.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-edittiff.h,v 1.1 2011/11/24 13:59:50 joerg Exp $
+
+--- edittiff.h.orig	2011-11-24 02:20:47.000000000 +0000
++++ edittiff.h
+@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #define EDITTIFF_H_INCLUDED
+ 
+ #include "metatiff.h"
++#include <cstdlib>
+ 
+ class _EditIFD;
+ 
diff --git a/graphics/metacam/patches/patch-metacam.cc b/graphics/metacam/patches/patch-metacam.cc
new file mode 100644
index 00000000000..2ba4e6108a9
--- /dev/null
+++ b/graphics/metacam/patches/patch-metacam.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-metacam.cc,v 1.1 2011/11/24 13:59:50 joerg Exp $
+
+--- metacam.cc.orig	2011-11-24 02:18:33.000000000 +0000
++++ metacam.cc
+@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include <netinet/in.h>
+ #include <string.h>
+ #include <math.h>
++#include <cstdlib>
+ 
+ #include <map>
+ #include <vector>
diff --git a/graphics/metacam/patches/patch-ocontext.cc b/graphics/metacam/patches/patch-ocontext.cc
new file mode 100644
index 00000000000..9c9c9bed132
--- /dev/null
+++ b/graphics/metacam/patches/patch-ocontext.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-ocontext.cc,v 1.1 2011/11/24 13:59:50 joerg Exp $
+
+--- ocontext.cc.orig	2011-11-24 02:21:02.000000000 +0000
++++ ocontext.cc
+@@ -25,6 +25,8 @@ static const char *rcsid __attribute__((
+ #include "odrivers.h"
+ 
+ #include <ctype.h>
++#include <cstdlib>
++#include <cstring>
+ 
+ OutputContext::~OutputContext()
+ {