Add a number of includes hidden by libstdc++'s name space pollution.

38 files changed, 281 insertions, 28 deletions

diff --git a/audio/chromaprint/distinfo b/audio/chromaprint/distinfo
index fab3e6f7433..c6d74ebb04f 100644
--- a/audio/chromaprint/distinfo
+++ b/audio/chromaprint/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2013/04/02 10:44:41 drochner Exp $
+$NetBSD: distinfo,v 1.2 2013/04/29 21:31:09 joerg Exp $
 
 SHA1 (chromaprint-0.7.tar.gz) = 6a961585e82d26d357eb792216becc0864ddcdb2
 RMD160 (chromaprint-0.7.tar.gz) = e1304ec6c408b7760f9363c9b6549b5683991e58
 Size (chromaprint-0.7.tar.gz) = 543811 bytes
+SHA1 (patch-src_utils.h) = 121edd7b50f2a00ad2ab6629a4c2e86c4b00963a
diff --git a/audio/chromaprint/patches/patch-src_utils.h b/audio/chromaprint/patches/patch-src_utils.h
new file mode 100644
index 00000000000..58601e9be1b
--- /dev/null
+++ b/audio/chromaprint/patches/patch-src_utils.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_utils.h,v 1.1 2013/04/29 21:31:09 joerg Exp $
+
+--- src/utils.h.orig	2013-04-28 13:38:52.000000000 +0000
++++ src/utils.h
+@@ -28,6 +28,7 @@
+ #include <math.h>
+ #include <stddef.h>
+ #include <stdint.h>
++#include <algorithm>
+ #include <limits>
+ #include <iterator>
+ 
diff --git a/audio/libtunepimp/distinfo b/audio/libtunepimp/distinfo
index d040ba8dc01..d7386f38a40 100644
--- a/audio/libtunepimp/distinfo
+++ b/audio/libtunepimp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2011/07/02 21:33:09 markd Exp $
+$NetBSD: distinfo,v 1.14 2013/04/29 21:31:09 joerg Exp $
 
 SHA1 (libtunepimp-0.5.3.tar.gz) = 1b904cd97ce009588fe57336f40e79b6edf9947e
 RMD160 (libtunepimp-0.5.3.tar.gz) = 6bc312591b98a5b74824fc3103137cbf60d4b012
@@ -20,3 +20,5 @@ SHA1 (patch-an) = cbd5466e85dbfd38974759033b59a6147a2e62ba
 SHA1 (patch-ao) = 589faf81480e89c310fe1ae199e15657723923dc
 SHA1 (patch-ap) = cbbdc7d28ca083ec51720370bf4cbe81ec475609
 SHA1 (patch-configure) = c7dad50002b3bf8460e5c5bf5c708dc32f3dd38d
+SHA1 (patch-lib_write.cpp) = a5bddad371c85055dd40be0cb9a0e385b0065d9c
+SHA1 (patch-plugins_vorbis_vorbis__meta.cpp) = 3dd73ce8802177f5e2862335f8e09093091333ec
diff --git a/audio/libtunepimp/patches/patch-lib_write.cpp b/audio/libtunepimp/patches/patch-lib_write.cpp
new file mode 100644
index 00000000000..57d5f9b03cf
--- /dev/null
+++ b/audio/libtunepimp/patches/patch-lib_write.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_write.cpp,v 1.1 2013/04/29 21:31:09 joerg Exp $
+
+--- lib/write.cpp.orig	2013-04-28 12:27:41.000000000 +0000
++++ lib/write.cpp
+@@ -35,6 +35,7 @@
+ #  include <sys/stat.h>
+ #  include <sys/types.h>
+ #  include <fcntl.h>
++#  include <stdlib.h>
+ #  if defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #    include <sys/param.h>
+ #    include <sys/mount.h>
diff --git a/audio/libtunepimp/patches/patch-plugins_vorbis_vorbis__meta.cpp b/audio/libtunepimp/patches/patch-plugins_vorbis_vorbis__meta.cpp
new file mode 100644
index 00000000000..bcd2f342cc7
--- /dev/null
+++ b/audio/libtunepimp/patches/patch-plugins_vorbis_vorbis__meta.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-plugins_vorbis_vorbis__meta.cpp,v 1.1 2013/04/29 21:31:09 joerg Exp $
+
+--- plugins/vorbis/vorbis_meta.cpp.orig	2013-04-28 12:32:18.000000000 +0000
++++ plugins/vorbis/vorbis_meta.cpp
+@@ -40,6 +40,7 @@
+ #	include <unistd.h>
+ #endif
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
+ #include <assert.h>
diff --git a/biology/clustalw/distinfo b/biology/clustalw/distinfo
index 23a17aaae23..71d5142ccb0 100644
--- a/biology/clustalw/distinfo
+++ b/biology/clustalw/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/12/13 13:27:13 wen Exp $
+$NetBSD: distinfo,v 1.7 2013/04/29 21:31:09 joerg Exp $
 
 SHA1 (clustalw-2.1.tar.gz) = f29784f68585544baa77cbeca6392e533d4cf433
 RMD160 (clustalw-2.1.tar.gz) = e193769955a6270797fcb039ca398a4b59d9248d
 Size (clustalw-2.1.tar.gz) = 350761 bytes
+SHA1 (patch-src_general_VectorOutOfRange.h) = 8c1d3df314efba8afa88410542e26881951e7193
diff --git a/biology/clustalw/patches/patch-src_general_VectorOutOfRange.h b/biology/clustalw/patches/patch-src_general_VectorOutOfRange.h
new file mode 100644
index 00000000000..f075b151a64
--- /dev/null
+++ b/biology/clustalw/patches/patch-src_general_VectorOutOfRange.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_general_VectorOutOfRange.h,v 1.1 2013/04/29 21:31:10 joerg Exp $
+
+--- src/general/VectorOutOfRange.h.orig	2013-04-29 20:21:11.000000000 +0000
++++ src/general/VectorOutOfRange.h
+@@ -4,6 +4,7 @@
+  * Copyright (c) 2007 Des Higgins, Julie Thompson and Toby Gibson.  
+  */
+ #include <stdexcept>
++#include <string>
+ #include <exception>
+ namespace clustalw
+ {
diff --git a/devel/libebml/distinfo b/devel/libebml/distinfo
index 85d691e07cd..21017b63847 100644
--- a/devel/libebml/distinfo
+++ b/devel/libebml/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.21 2013/04/12 13:35:20 drochner Exp $
+$NetBSD: distinfo,v 1.22 2013/04/29 21:31:10 joerg Exp $
 
 SHA1 (libebml-1.3.0.tar.bz2) = 5a49ae3fddfe4b514f76d5743b29b23e0ecbc935
 RMD160 (libebml-1.3.0.tar.bz2) = 76f945a96e9950c25ccdb6c9e5cc4225dd6bd163
 Size (libebml-1.3.0.tar.bz2) = 59359 bytes
 SHA1 (patch-aa) = 11d3321c11196354ab4a761876e7d4364c242084
+SHA1 (patch-ebml_EbmlBinary.h) = f2253fd395dad676a494c388dfaca742c57098a8
diff --git a/devel/libebml/patches/patch-ebml_EbmlBinary.h b/devel/libebml/patches/patch-ebml_EbmlBinary.h
new file mode 100644
index 00000000000..70a0fce4859
--- /dev/null
+++ b/devel/libebml/patches/patch-ebml_EbmlBinary.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-ebml_EbmlBinary.h,v 1.1 2013/04/29 21:31:10 joerg Exp $
+
+--- ebml/EbmlBinary.h.orig	2013-04-28 06:51:13.000000000 +0000
++++ ebml/EbmlBinary.h
+@@ -37,6 +37,7 @@
+ #ifndef LIBEBML_BINARY_H
+ #define LIBEBML_BINARY_H
+ 
++#include <cstdlib>
+ #include <cstring>
+ 
+ #include "EbmlTypes.h"
diff --git a/devel/pcre++/distinfo b/devel/pcre++/distinfo
index c4adde074f9..b5f971b7ba6 100644
--- a/devel/pcre++/distinfo
+++ b/devel/pcre++/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2008/06/12 02:14:27 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/04/29 21:31:10 joerg Exp $
 
 SHA1 (pcre++-0.9.5.tar.gz) = 7cb640555c6adf34bf366139b22f6d1a66bd1fb0
 RMD160 (pcre++-0.9.5.tar.gz) = 1aa3c933f271caacaeec08af02c7903dd4405c41
 Size (pcre++-0.9.5.tar.gz) = 381589 bytes
 SHA1 (patch-aa) = f891907a81b636acaeda22a415fab9e236bee48f
+SHA1 (patch-libpcre++_pcre++.cc) = 7405a823df0e7a33df0103d6a98ac251e44e6744
diff --git a/devel/pcre++/patches/patch-libpcre++_pcre++.cc b/devel/pcre++/patches/patch-libpcre++_pcre++.cc
new file mode 100644
index 00000000000..cf1c4c6610b
--- /dev/null
+++ b/devel/pcre++/patches/patch-libpcre++_pcre++.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-libpcre++_pcre++.cc,v 1.1 2013/04/29 21:31:10 joerg Exp $
+
+--- libpcre++/pcre++.cc.orig	2013-04-28 14:34:06.000000000 +0000
++++ libpcre++/pcre++.cc
+@@ -40,6 +40,7 @@
+ 
+ 
+ #include "pcre++.h"
++#include <clocale>
+ 
+ using namespace std;
+ using namespace pcrepp;
diff --git a/games/warmux/distinfo b/games/warmux/distinfo
index d2912a5cb48..eff050f51e4 100644
--- a/games/warmux/distinfo
+++ b/games/warmux/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2012/04/01 14:41:17 wiz Exp $
+$NetBSD: distinfo,v 1.3 2013/04/29 21:31:10 joerg Exp $
 
 SHA1 (warmux-11.01.tar.bz2) = 18e5d5bf144f069405c75ff8fe51296d9a7871a5
 RMD160 (warmux-11.01.tar.bz2) = 85a7bbfed5ca2ccbd793a12d7ea548948a747a88
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = 163449e2cc6fadede8ce1a77bee08fcda59a0f0f
 SHA1 (patch-ab) = 48893791c36ae88b3fc5f565a39d3de786bc88d4
 SHA1 (patch-ac) = 24179b2ccdc2dc2dc6c95c33f12b7e55bb6f5a6e
 SHA1 (patch-lib_warmux_action_action.cpp) = 8a1138902c4fb8fbff4fddac4975fe352b532eca
+SHA1 (patch-lib_warmux_base_i18n.cpp) = 130fa3617f5549e9c47dcd907c33a54f0b19fcda
+SHA1 (patch-tools_list__games_main.cpp) = 0577d2e2cc073ba7d8efdce567138eb43bc535f4
diff --git a/games/warmux/patches/patch-lib_warmux_base_i18n.cpp b/games/warmux/patches/patch-lib_warmux_base_i18n.cpp
new file mode 100644
index 00000000000..50db3626250
--- /dev/null
+++ b/games/warmux/patches/patch-lib_warmux_base_i18n.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_warmux_base_i18n.cpp,v 1.1 2013/04/29 21:31:10 joerg Exp $
+
+--- lib/warmux/base/i18n.cpp.orig	2013-04-29 19:41:28.000000000 +0000
++++ lib/warmux/base/i18n.cpp
+@@ -23,6 +23,7 @@
+ #include <WARMUX_i18n.h>
+ #include <WARMUX_error.h>
+ #include <string>
++#include <locale.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
diff --git a/games/warmux/patches/patch-tools_list__games_main.cpp b/games/warmux/patches/patch-tools_list__games_main.cpp
new file mode 100644
index 00000000000..83e90847bc9
--- /dev/null
+++ b/games/warmux/patches/patch-tools_list__games_main.cpp
@@ -0,0 +1,10 @@
+$NetBSD: patch-tools_list__games_main.cpp,v 1.1 2013/04/29 21:31:10 joerg Exp $
+
+--- tools/list_games/main.cpp.orig	2013-04-29 19:45:36.000000000 +0000
++++ tools/list_games/main.cpp
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <unistd.h>
+ #include <WARMUX_types.h>
+ #include <WARMUX_network.h>
+ #include <WARMUX_index_server.h>
diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo
index ebbe8b50e86..432dc61d47d 100644
--- a/games/warzone2100/distinfo
+++ b/games/warzone2100/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/04/03 11:27:24 wiz Exp $
+$NetBSD: distinfo,v 1.6 2013/04/29 21:31:11 joerg Exp $
 
 SHA1 (warzone2100-2.2.2.tar.gz) = d61bd1a87f0a6c1184c640987f759b1ac702b9e1
 RMD160 (warzone2100-2.2.2.tar.gz) = d7af614267acdb548fcbe5f78ed46e8c4d6f33de
@@ -10,4 +10,5 @@ SHA1 (patch-ad) = af29beef3b2014bf1b3d1068b2b3caa7d948de80
 SHA1 (patch-ae) = 9a5f2fccd93100e87968d2dc9d783acc595ad5d3
 SHA1 (patch-af) = 46ea523fb72ed0f081d85dfea0813fde79087c82
 SHA1 (patch-ag) = 2604a894e8579377f4b3ac8eae7250ed2c73a21c
+SHA1 (patch-build__tools_autorevision_autorevision.cpp) = b68854d02ee6d0fe1b4293c6b1b5c0e1e36fb3a6
 SHA1 (patch-lib_ivis__common_png__util.c) = 6a0ac9f5a29d431041af01c1d5acbb6fdbb919fe
diff --git a/games/warzone2100/patches/patch-build__tools_autorevision_autorevision.cpp b/games/warzone2100/patches/patch-build__tools_autorevision_autorevision.cpp
new file mode 100644
index 00000000000..2047c35ec22
--- /dev/null
+++ b/games/warzone2100/patches/patch-build__tools_autorevision_autorevision.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-build__tools_autorevision_autorevision.cpp,v 1.1 2013/04/29 21:31:11 joerg Exp $
+
+--- build_tools/autorevision/autorevision.cpp.orig	2013-04-29 19:35:21.000000000 +0000
++++ build_tools/autorevision/autorevision.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include <cstring>
+ #include <cstdlib>
++#include <unistd.h>
+ 
+ using namespace std;
+ 
diff --git a/games/xu4/distinfo b/games/xu4/distinfo
index 5908567a15f..ae217931651 100644
--- a/games/xu4/distinfo
+++ b/games/xu4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2012/12/24 06:28:16 dholland Exp $
+$NetBSD: distinfo,v 1.4 2013/04/29 21:31:11 joerg Exp $
 
 SHA1 (xu4-1.0beta3.tar.gz) = baf1bbdc18088096ae11ea31aa497532b7e7124c
 RMD160 (xu4-1.0beta3.tar.gz) = f758fea4bc3034b19122651cfb725a88e0684960
@@ -8,6 +8,7 @@ SHA1 (patch-src_armor.cpp) = 1cc4ad07efaa70c5764b910d055939e22b4287d5
 SHA1 (patch-src_codex.cpp) = 706aa3a6854b72ae6ada927cc1bd1c71f7c4959e
 SHA1 (patch-src_conversation.cpp) = 15ea5eed4abe11e7afb58359b6cd732b1e84b458
 SHA1 (patch-src_creature.cpp) = 9479f075c95b481bae073011c72672b383a5f7e4
+SHA1 (patch-src_debug.h) = 7c5e021bbc0edd355146440b57eea30ca87d77a7
 SHA1 (patch-src_dialogueloader.cpp) = 10b46af20241f6571a7656b577f42dfca39f74cc
 SHA1 (patch-src_dialogueloader__tlk.cpp) = e4f69fc103836a15800b9f76ae742555a686ad34
 SHA1 (patch-src_direction.cpp) = 412950b32b43dbfd7081733c94b4365ee85a3fdd
diff --git a/games/xu4/patches/patch-src_debug.h b/games/xu4/patches/patch-src_debug.h
new file mode 100644
index 00000000000..1296d5260fe
--- /dev/null
+++ b/games/xu4/patches/patch-src_debug.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_debug.h,v 1.1 2013/04/29 21:31:11 joerg Exp $
+
+--- src/debug.h.orig	2013-04-29 19:01:20.000000000 +0000
++++ src/debug.h
+@@ -22,6 +22,7 @@
+ 
+ #include <string>
+ #include <cstdio>
++#include <cstdlib>
+ 
+ using std::string;
+ 
diff --git a/games/xye/distinfo b/games/xye/distinfo
index 8f572b81ec3..4ca1ff0f646 100644
--- a/games/xye/distinfo
+++ b/games/xye/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/09/15 11:43:02 drochner Exp $
+$NetBSD: distinfo,v 1.4 2013/04/29 21:31:11 joerg Exp $
 
 SHA1 (xye-0.9.1.tar.gz) = f10386fb8553b3377ec3592652c96fcb7827b857
 RMD160 (xye-0.9.1.tar.gz) = 5bc45c2595a9179c7bf77582d6d254f60e652dc0
 Size (xye-0.9.1.tar.gz) = 1217636 bytes
 SHA1 (patch-aa) = 5992b8785b3db457785809a8e4dc684117461f28
+SHA1 (patch-src_gen.cpp) = 8cf75045e7931fe4ea12309311cbc73ba371861b
diff --git a/games/xye/patches/patch-src_gen.cpp b/games/xye/patches/patch-src_gen.cpp
new file mode 100644
index 00000000000..e5b9675321f
--- /dev/null
+++ b/games/xye/patches/patch-src_gen.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_gen.cpp,v 1.1 2013/04/29 21:31:11 joerg Exp $
+
+--- src/gen.cpp.orig	2013-04-29 18:55:25.000000000 +0000
++++ src/gen.cpp
+@@ -19,6 +19,7 @@ Permission is granted to anyone to use t
+ #include "gen.h"

+ #include "vxsdl.h"

+ #include<cstdio>

++#include<ctime>

+ 

+ const float F_RAND_MAX = (float)(RAND_MAX);

+ 

diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index f91f074d2a9..76bcc4d84f8 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.17 2013/02/26 23:38:08 joerg Exp $
+$NetBSD: distinfo,v 1.18 2013/04/29 21:31:11 joerg Exp $
 
 SHA1 (OpenCV-2.4.3.tar.bz2) = 982be2c3e52dfc3e9d14692c60bc856b2b766be2
 RMD160 (OpenCV-2.4.3.tar.bz2) = b862ddd9e7fefd885d78835660a9f5c9320889c2
 Size (OpenCV-2.4.3.tar.bz2) = 67240491 bytes
 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = c056068c01c417dc262f21c00324da7f86c0cd8e
+SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580
 SHA1 (patch-modules_legacy_src_dpstereo.cpp) = da9955fb6cc81054427b69efb97a58160b64f262
 SHA1 (patch-modules_ts_include_opencv2_ts_ts__perf.hpp) = 8a7f08b176cedec85fd613e715d7b12d666a3e45
diff --git a/graphics/opencv/patches/patch-modules_core_src_system.cpp b/graphics/opencv/patches/patch-modules_core_src_system.cpp
new file mode 100644
index 00000000000..71c370a7e25
--- /dev/null
+++ b/graphics/opencv/patches/patch-modules_core_src_system.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-modules_core_src_system.cpp,v 1.1 2013/04/29 21:31:12 joerg Exp $
+
+--- modules/core/src/system.cpp.orig	2013-04-28 15:15:06.000000000 +0000
++++ modules/core/src/system.cpp
+@@ -79,6 +79,7 @@
+ #include <pthread.h>
+ #include <sys/time.h>
+ #include <time.h>
++#include <unistd.h>
+ 
+ #if defined __MACH__ && defined __APPLE__
+ #include <mach/mach.h>
diff --git a/graphics/tesseract/distinfo b/graphics/tesseract/distinfo
index be73ee4f7dd..bd25163a58c 100644
--- a/graphics/tesseract/distinfo
+++ b/graphics/tesseract/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2012/11/23 23:52:33 marino Exp $
+$NetBSD: distinfo,v 1.10 2013/04/29 21:31:12 joerg Exp $
 
 SHA1 (tesseract-2.00.deu.tar.gz) = d8d89e2681421a144f3a1ec61ee0c530686f5096
 RMD160 (tesseract-2.00.deu.tar.gz) = c7e6755e94084114fb1a1be8e9308c8dddd2fdda
@@ -21,4 +21,5 @@ Size (tesseract-2.00.spa.tar.gz) = 1365863 bytes
 SHA1 (tesseract-2.04.tar.gz) = 850c42c92a4471c5f41d4384c57045e812fde26a
 RMD160 (tesseract-2.04.tar.gz) = 826718ddf491c8b925b02c343d4a4992fd4631d8
 Size (tesseract-2.04.tar.gz) = 1118386 bytes
+SHA1 (patch-viewer_scrollview.cpp) = 05a9ff5d2a9e302b3a682144db54c612fd4eccc2
 SHA1 (patch-viewer_svutil_cpp) = ec6f8b79c66993e5272a4f2a13aa92f2432cbea0
diff --git a/graphics/tesseract/patches/patch-viewer_scrollview.cpp b/graphics/tesseract/patches/patch-viewer_scrollview.cpp
new file mode 100644
index 00000000000..b635da6ecc8
--- /dev/null
+++ b/graphics/tesseract/patches/patch-viewer_scrollview.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-viewer_scrollview.cpp,v 1.1 2013/04/29 21:31:12 joerg Exp $
+
+--- viewer/scrollview.cpp.orig	2013-04-29 19:49:57.000000000 +0000
++++ viewer/scrollview.cpp
+@@ -39,6 +39,7 @@ const int kMaxIntPairSize = 45;  // Hold
+ #include <algorithm>
+ #include <vector>
+ #include <string>
++#include <cstdlib>
+ #include <cstring>
+ #include <climits>
+ 
diff --git a/net/libnipper/distinfo b/net/libnipper/distinfo
index 03f760559cb..d52355b3c81 100644
--- a/net/libnipper/distinfo
+++ b/net/libnipper/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2008/09/17 12:36:38 joerg Exp $
+$NetBSD: distinfo,v 1.3 2013/04/29 21:31:12 joerg Exp $
 
 SHA1 (libnipper-0.12.1.tgz) = 0999540d127588d1be1b9f3baecb25603511e448
 RMD160 (libnipper-0.12.1.tgz) = 3ff9bdae5e41a1b1549103c6bea030f662d0d19c
 Size (libnipper-0.12.1.tgz) = 450651 bytes
 SHA1 (patch-aa) = c4d245196cd901b9f11826bd163df701e1b447a2
 SHA1 (patch-ab) = a4b62f536cceb0814d3bf5b658605a5ff0cc2be5
+SHA1 (patch-report_report-text.cpp) = e686920acc8fa665eb65e69977421e7d50b459df
diff --git a/net/libnipper/patches/patch-report_report-text.cpp b/net/libnipper/patches/patch-report_report-text.cpp
new file mode 100644
index 00000000000..5b22ffc0b66
--- /dev/null
+++ b/net/libnipper/patches/patch-report_report-text.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-report_report-text.cpp,v 1.1 2013/04/29 21:31:12 joerg Exp $
+
+--- report/report-text.cpp.orig	2013-04-28 14:42:20.000000000 +0000
++++ report/report-text.cpp
+@@ -33,7 +33,7 @@
+ #include "../globaldefs.h"
+ #include "../device/general/general.h"
+ #include "report.h"
+-
++#include <ctime>
+ 
+ int Report::writeText(const char *theText, Device::paragraphStruct *paragraph, bool expandAbbreviations)
+ {
diff --git a/security/CoolKey/distinfo b/security/CoolKey/distinfo
index d254661cd22..e57368ffe21 100644
--- a/security/CoolKey/distinfo
+++ b/security/CoolKey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2012/12/15 01:07:17 pettai Exp $
+$NetBSD: distinfo,v 1.4 2013/04/29 21:31:12 joerg Exp $
 
 SHA1 (coolkey-1.1.0.tar.gz) = 54136decf9dfd091c8b231cb77dac97db95e1866
 RMD160 (coolkey-1.1.0.tar.gz) = 1873e85aecb30c5311444c76fd85ba79633dce23
@@ -8,6 +8,7 @@ SHA1 (patch-ab) = 6aed241ec856b7b826e7c9953e286088d8960feb
 SHA1 (patch-ac) = 8b7604ea677471a7ee5c1d7c9f4f6f4c03468350
 SHA1 (patch-src_coolkey_log.cpp) = 2e9fe538236496a924eb3a12a43a4336e814aabb
 SHA1 (patch-src_coolkey_object.cpp) = a28c9a56e4a184bcdf73be9d64ef133b691ccf0e
+SHA1 (patch-src_coolkey_params.h) = 21b7ae6a872a7d79d884d7a380f131839d867aff
 SHA1 (patch-src_coolkey_slot.cpp) = a797e9e2dcc04598fb3e322fe7f78326c9ea1de6
 SHA1 (patch-src_libckyapplet_cky_card.c) = 7c662083d622b464a74322aef883f211b8ac9420
 SHA1 (patch-src_libckyapplet_cky_card.h) = 94067de1f656ef85eec7f13614f55760bf5fe338
diff --git a/security/CoolKey/patches/patch-src_coolkey_params.h b/security/CoolKey/patches/patch-src_coolkey_params.h
new file mode 100644
index 00000000000..a879798501e
--- /dev/null
+++ b/security/CoolKey/patches/patch-src_coolkey_params.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_coolkey_params.h,v 1.1 2013/04/29 21:31:12 joerg Exp $
+
+--- src/coolkey/params.h.orig	2013-04-29 20:24:44.000000000 +0000
++++ src/coolkey/params.h
+@@ -20,6 +20,7 @@
+ #ifndef COOLKEY_PARAMS_H
+ #define COOLKEY_PARAMS_H
+ 
++#include <cstdlib>
+ 
+ class Params {
+ 
diff --git a/security/zoneminder/distinfo b/security/zoneminder/distinfo
index c21c79ea8f4..8b8f31961f1 100644
--- a/security/zoneminder/distinfo
+++ b/security/zoneminder/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: distinfo,v 1.3 2013/04/29 21:31:12 joerg Exp $
 
 SHA1 (ZoneMinder-1.25.0.tar.gz) = a93a976a5cd82f1e197f4d7bd626d3f0387c4231
 RMD160 (ZoneMinder-1.25.0.tar.gz) = 32a4f503770103e55bfe592864c1cab82e7395a6
@@ -7,14 +7,14 @@ SHA1 (patch-Makefile_am) = 09b3ba7f9c292ef672506219be66f059290b6405
 SHA1 (patch-configure_ac) = 87410ce8bc8fe42e08bf0e32e40b59619f7db90d
 SHA1 (patch-scripts_zm_in) = 91809c9a179a0135c432a0ffad7c2d2ddfd512de
 SHA1 (patch-src_Makefile_am) = 84999df8b7c80b049e2dd9cb308e12f50ed8285f
-SHA1 (patch-src_zm__thread.h) = 51b2868f6de36e6713f6f0a0cd5a40e8cfc7b943
+SHA1 (patch-src_zm__thread.h) = 8313d3294592fd08c775f612d70cc935e4f64d9a
 SHA1 (patch-src_zm__timer.h) = 38dae4f8573c7ae6d459adddf05260ce4b6e2088
 SHA1 (patch-src_zm__utils.cpp) = f6a109296146822014d57d39094390adcc5df760
 SHA1 (patch-src_zm__utils.h) = 361a69dfd4e2c3e46cf6fea3e1470df2e5cfa446
 SHA1 (patch-src_zm_comms_cpp) = d40932a3d0ae4375a649f200d973995d56aa71c7
-SHA1 (patch-src_zm_comms_h) = 69992d44e17d5c8e15cd4431f2fcb313e4891852
-SHA1 (patch-src_zm_logger_cpp) = 879077d2961ee735dd3e150aaf18a81117dc98db
-SHA1 (patch-src_zm_remote_camera_h) = 9df0e7f0eaab171b50560eb3490a4c5f44d066dc
+SHA1 (patch-src_zm_comms_h) = baeb73040ff3ba862f23ad6301de7daba182456e
+SHA1 (patch-src_zm_logger_cpp) = 3b0373e9d648d25ef4e3e09429199f654f876ccb
+SHA1 (patch-src_zm_remote_camera_h) = c86b6267c295caba71ca72df02c24e6b6cba981f
 SHA1 (patch-src_zm_signal_h) = 226e96d4771921a8ad23fbe130a80a43550062d3
 SHA1 (patch-src_zm_thread_cpp) = c5f64697c3024c6c382f9ae2c5dbe9c21b529b6e
 SHA1 (patch-src_zmc_cpp) = d1046ddfad3a88bdd30501237834ec9e9fbc4c83
diff --git a/security/zoneminder/patches/patch-src_zm__thread.h b/security/zoneminder/patches/patch-src_zm__thread.h
index dc1fc4f0c4b..5a3e5d6cc32 100644
--- a/security/zoneminder/patches/patch-src_zm__thread.h
+++ b/security/zoneminder/patches/patch-src_zm__thread.h
@@ -1,8 +1,16 @@
-$NetBSD: patch-src_zm__thread.h,v 1.1 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-src_zm__thread.h,v 1.2 2013/04/29 21:31:13 joerg Exp $
 
 --- src/zm_thread.h.orig	2009-06-08 09:20:17.000000000 +0000
 +++ src/zm_thread.h
-@@ -27,7 +27,7 @@
+@@ -20,6 +20,7 @@
+ #ifndef ZM_THREAD_H
+ #define ZM_THREAD_H
+ 
++#include <unistd.h>
+ #include <pthread.h>
+ #include "zm_exception.h"
+ #include "zm_utils.h"
+@@ -27,7 +28,7 @@
  class ThreadException : public Exception
  {
  public:
diff --git a/security/zoneminder/patches/patch-src_zm_comms_h b/security/zoneminder/patches/patch-src_zm_comms_h
index f5a85e75cfb..c19488bd77c 100644
--- a/security/zoneminder/patches/patch-src_zm_comms_h
+++ b/security/zoneminder/patches/patch-src_zm_comms_h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_zm_comms_h,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-src_zm_comms_h,v 1.3 2013/04/29 21:31:13 joerg Exp $
 
 extern "C" system headers.
 
@@ -6,7 +6,7 @@ Include missing system headers for NetBSD.
 
 --- src/zm_comms.h.orig	2009-10-14 13:08:49.000000000 +0000
 +++ src/zm_comms.h
-@@ -22,10 +22,17 @@
+@@ -22,10 +22,18 @@
  
  #include "zm_exception.h"
  
@@ -20,6 +20,7 @@ Include missing system headers for NetBSD.
 +#include <netinet/in.h>
 +#include <stdlib.h>
 +#include <string.h>
++#include <time.h>
 +}
  
  #include <set>
diff --git a/security/zoneminder/patches/patch-src_zm_logger_cpp b/security/zoneminder/patches/patch-src_zm_logger_cpp
index 4d2a47fdf25..94d8fb6b442 100644
--- a/security/zoneminder/patches/patch-src_zm_logger_cpp
+++ b/security/zoneminder/patches/patch-src_zm_logger_cpp
@@ -1,11 +1,19 @@
-$NetBSD: patch-src_zm_logger_cpp,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-src_zm_logger_cpp,v 1.3 2013/04/29 21:31:13 joerg Exp $
 
 If the system has syscall() but not SYS_gettid [E.g. NetBSD], don't attempt
 to use SYS_gettid.
 
 --- src/zm_logger.cpp.orig	2011-06-28 11:07:35.000000000 +0000
 +++ src/zm_logger.cpp
-@@ -515,7 +515,7 @@ void Logger::logPrint( bool hex, const c
+@@ -33,6 +33,7 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ bool Logger::smInitialised = false;
+ Logger *Logger::smInstance = 0;
+@@ -515,7 +516,7 @@ void Logger::logPrint( bool hex, const c
      #endif
  
          pid_t tid;
diff --git a/security/zoneminder/patches/patch-src_zm_remote_camera_h b/security/zoneminder/patches/patch-src_zm_remote_camera_h
index 8de4bb61a46..b68c6d005bf 100644
--- a/security/zoneminder/patches/patch-src_zm_remote_camera_h
+++ b/security/zoneminder/patches/patch-src_zm_remote_camera_h
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_zm_remote_camera_h,v 1.2 2013/03/24 16:47:47 joerg Exp $
+$NetBSD: patch-src_zm_remote_camera_h,v 1.3 2013/04/29 21:31:13 joerg Exp $
 
 Declare sockaddr_in.
 
 --- src/zm_remote_camera.h.orig	2009-06-02 07:59:26.000000000 +0000
 +++ src/zm_remote_camera.h
-@@ -22,6 +22,8 @@
+@@ -22,8 +22,11 @@
  
  #include "zm_camera.h"
  
@@ -12,4 +12,7 @@ Declare sockaddr_in.
 +
  #include <string>
  #include <netdb.h>
++#include <time.h>
  
+ //
+ // Class representing 'remote' cameras, i.e. those which are
diff --git a/textproc/uncrustify/distinfo b/textproc/uncrustify/distinfo
index dd7435bcd6b..b1526b44294 100644
--- a/textproc/uncrustify/distinfo
+++ b/textproc/uncrustify/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2013/01/13 04:22:34 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2013/04/29 21:31:13 joerg Exp $
 
 SHA1 (uncrustify-0.59.tar.gz) = 233e4f6cb34ef7020ce49e5b5d14f0d46f277e31
 RMD160 (uncrustify-0.59.tar.gz) = 433a04ddd3d477173fa31f16d05fd0a264436e64
 Size (uncrustify-0.59.tar.gz) = 983822 bytes
+SHA1 (patch-src_uncrustify.cpp) = efbf6c9856bad5cf3130e00a25fe2bf7b73ef16c
diff --git a/textproc/uncrustify/patches/patch-src_uncrustify.cpp b/textproc/uncrustify/patches/patch-src_uncrustify.cpp
new file mode 100644
index 00000000000..48f5379dd9f
--- /dev/null
+++ b/textproc/uncrustify/patches/patch-src_uncrustify.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_uncrustify.cpp,v 1.1 2013/04/29 21:31:13 joerg Exp $
+
+--- src/uncrustify.cpp.orig	2013-04-29 19:04:36.000000000 +0000
++++ src/uncrustify.cpp
+@@ -25,6 +25,7 @@
+ #include <cstring>
+ #include <cerrno>
+ #include <fcntl.h>
++#include <unistd.h>
+ #include "unc_ctype.h"
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
diff --git a/wm/bsetroot/distinfo b/wm/bsetroot/distinfo
index 013a0abd1fe..a606f89e40b 100644
--- a/wm/bsetroot/distinfo
+++ b/wm/bsetroot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2011/11/25 22:23:15 joerg Exp $
+$NetBSD: distinfo,v 1.7 2013/04/29 21:31:13 joerg Exp $
 
 SHA1 (blackbox-0.65.0.tar.gz) = 903a35526b1c29912ca500b7f8c205368e60fc38
 RMD160 (blackbox-0.65.0.tar.gz) = d88d9c5d9375274da149c77d3c63bb9c92470f26
@@ -7,4 +7,6 @@ SHA1 (patch-aa) = 134f628eef5cec1e9d7ce4b95a57c7e35a2307d9
 SHA1 (patch-ab) = 0654be7d1465d0adc331714377f17e6e6bd459da
 SHA1 (patch-ac) = 5f249a2e6d75e5d88605d6d8a1675d003b1cb52f
 SHA1 (patch-ad) = a39dee423ea041f8c72c0c9144ffda06c20242eb
+SHA1 (patch-src_GCCache.cc) = 22ac3c1a0870d72f6e94f77f8a4f18900ff09d7c
 SHA1 (patch-src_Image.cc) = 5da031ec0ed1ddd45369698eb36e4bb0c0cfe06c
+SHA1 (patch-src_ImageControl.cc) = 5af35715f1da30a1b073a10798a8103823617a4a
diff --git a/wm/bsetroot/patches/patch-src_GCCache.cc b/wm/bsetroot/patches/patch-src_GCCache.cc
new file mode 100644
index 00000000000..8d7fea5e8e0
--- /dev/null
+++ b/wm/bsetroot/patches/patch-src_GCCache.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_GCCache.cc,v 1.1 2013/04/29 21:31:13 joerg Exp $
+
+--- src/GCCache.cc.orig	2013-04-29 20:12:40.000000000 +0000
++++ src/GCCache.cc
+@@ -27,6 +27,7 @@
+ 
+ extern "C" {
+ #include <stdio.h>
++#include <stdlib.h>
+ }
+ 
+ #include "GCCache.hh"
diff --git a/wm/bsetroot/patches/patch-src_ImageControl.cc b/wm/bsetroot/patches/patch-src_ImageControl.cc
new file mode 100644
index 00000000000..cae774cd234
--- /dev/null
+++ b/wm/bsetroot/patches/patch-src_ImageControl.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_ImageControl.cc,v 1.1 2013/04/29 21:31:13 joerg Exp $
+
+--- src/ImageControl.cc.orig	2013-04-29 20:13:00.000000000 +0000
++++ src/ImageControl.cc
+@@ -34,6 +34,7 @@ extern "C" {
+ #  include <ctype.h>
+ #endif // HAVE_CTYPE_H
+ 
++#include <stdlib.h>
+ #include <X11/Xlib.h>
+ }
+