#include <stdio.h> earlier so NULL gets defined before use

#include <iostream> instead of <iostream.h> (deprecated)
Fixes build on modern Linux.

5 files changed, 64 insertions, 9 deletions

diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo
index 6edf009eb2f..fc8aaaff9a1 100644
--- a/sysutils/fam/distinfo
+++ b/sysutils/fam/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2009/01/03 16:32:59 schwarz Exp $
+$NetBSD: distinfo,v 1.32 2009/07/19 18:14:59 tnn Exp $
 
 SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8
 RMD160 (fam-2.7.0.tar.gz) = 1895b578d6a141c36d5bee4e3fbbc2a298a91430
@@ -10,7 +10,7 @@ SHA1 (patch-ad) = 19364c8dd3f887a59f41556206c8c2d179577932
 SHA1 (patch-ae) = aa8fed958555d6870367fd202a6117ddcb5a1da9
 SHA1 (patch-af) = 5868f44d29c31533bdb012213022e814d3fc3995
 SHA1 (patch-ag) = 3300a1cd565f9edaea3c334a9e278185efbcb7a6
-SHA1 (patch-ah) = dc8ec60631b57668fcef0b296efe3e271cb7fcae
+SHA1 (patch-ah) = b8a779216cc9a780a0616eeebed8555d8db96f9a
 SHA1 (patch-ai) = b80aafbb3849fc8c828b6829d8975b910e4d0fd5
 SHA1 (patch-aj) = 39391961fd7929d6a5fb49ecb492585cb821afaa
 SHA1 (patch-ak) = 48ddfcf9b7562832402a464437ca485249d371a1
@@ -29,8 +29,10 @@ SHA1 (patch-aw) = 9e5de9617e6cd59644294695d0ea79427b521ba0
 SHA1 (patch-ax) = c63bf7f2bff7cb9e3bc4c1c6c474a398b01eafcc
 SHA1 (patch-ay) = 081b4bc7cf25a8e30b3680b6df7599570ea0db86
 SHA1 (patch-az) = 13901fdef8c13318d585e36820c5e0aa4c28f889
-SHA1 (patch-ba) = 2f41331994a56eb70364beab70d40ac0bbd1b050
+SHA1 (patch-ba) = 043e0fdc2286a74df76b207c9f1887901cd99030
 SHA1 (patch-bb) = aef31edd9715c8aa0be2f02ebe663bad30e0791a
 SHA1 (patch-bc) = 6265e9739013a5303aa98173a6792df924c4c964
 SHA1 (patch-bd) = 57aa687caedbadf021dade94f68f521ee06736e2
 SHA1 (patch-be) = feba6d8090778e47467fbfed13e78bab2eacef42
+SHA1 (patch-bf) = afb1c92194d2e32f78de6e48919ee18a6df6846d
+SHA1 (patch-bg) = 54f5bbe575b2195a8dd1d8b350e68cdb5b8939fa
diff --git a/sysutils/fam/patches/patch-ah b/sysutils/fam/patches/patch-ah
index 5784fd2fc7c..a9cbb791778 100644
--- a/sysutils/fam/patches/patch-ah
+++ b/sysutils/fam/patches/patch-ah
@@ -1,8 +1,12 @@
-$NetBSD: patch-ah,v 1.5 2004/11/19 12:35:22 sketch Exp $
+$NetBSD: patch-ah,v 1.6 2009/07/19 18:14:59 tnn Exp $
 
---- src/Interest.c++.orig	2003-01-18 08:18:12.000000000 -0600
+--- src/Interest.c++.orig	2003-01-18 15:18:12.000000000 +0100
 +++ src/Interest.c++
-@@ -23,7 +23,9 @@
+@@ -20,10 +20,13 @@
+ //  with this program; if not, write the Free Software Foundation, Inc., 59
+ //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ 
++#include <stdio.h>
  #include "Interest.h"
  
  #include <sys/param.h>
@@ -12,7 +16,7 @@ $NetBSD: patch-ah,v 1.5 2004/11/19 12:35:22 sketch Exp $
  
  #include <errno.h>
  #include <string.h>
-@@ -46,7 +48,7 @@
+@@ -46,7 +49,7 @@
  #include "Pollster.h"
  #include "timeval.h"
  
diff --git a/sysutils/fam/patches/patch-ba b/sysutils/fam/patches/patch-ba
index 4020d2ce922..9a13d269d61 100644
--- a/sysutils/fam/patches/patch-ba
+++ b/sysutils/fam/patches/patch-ba
@@ -1,6 +1,6 @@
-$NetBSD: patch-ba,v 1.1 2005/01/25 03:30:40 tv Exp $
+$NetBSD: patch-ba,v 1.2 2009/07/19 18:14:59 tnn Exp $
 
---- lib/Client.c++.orig	2005-01-24 22:29:27.000000000 -0500
+--- lib/Client.c++.orig	2003-01-18 15:18:12.000000000 +0100
 +++ lib/Client.c++
 @@ -24,6 +24,7 @@
  #include <stdlib.h>
@@ -10,3 +10,12 @@ $NetBSD: patch-ba,v 1.1 2005/01/25 03:30:40 tv Exp $
  #include <sys/un.h>
  #include <sys/socket.h>
  #include <rpc/rpc.h>
+@@ -34,7 +35,7 @@
+ #include <syslog.h>
+ #include <errno.h>
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "fam.h"
+ #include "Client.h"
diff --git a/sysutils/fam/patches/patch-bf b/sysutils/fam/patches/patch-bf
new file mode 100644
index 00000000000..6c093fca3e4
--- /dev/null
+++ b/sysutils/fam/patches/patch-bf
@@ -0,0 +1,18 @@
+$NetBSD: patch-bf,v 1.1 2009/07/19 18:14:59 tnn Exp $
+
+--- src/DirEntry.c++.orig	2003-01-18 15:18:12.000000000 +0100
++++ src/DirEntry.c++
+@@ -20,12 +20,11 @@
+ //  with this program; if not, write the Free Software Foundation, Inc., 59
+ //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ 
+-#include "DirEntry.h"
+-
+ #include <assert.h>
+ #include <stdio.h>
+ #include <sys/param.h>
+ 
++#include "DirEntry.h"
+ #include "Directory.h"
+ 
+ // A DirEntry may be polled iff its parent is not polled.
diff --git a/sysutils/fam/patches/patch-bg b/sysutils/fam/patches/patch-bg
new file mode 100644
index 00000000000..ebb25e090f2
--- /dev/null
+++ b/sysutils/fam/patches/patch-bg
@@ -0,0 +1,22 @@
+$NetBSD: patch-bg,v 1.1 2009/07/19 18:14:59 tnn Exp $
+
+--- src/TCP_Client.c++.orig	2003-01-18 15:18:12.000000000 +0100
++++ src/TCP_Client.c++
+@@ -20,8 +20,6 @@
+ //  with this program; if not, write the Free Software Foundation, Inc., 59
+ //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ 
+-#include "TCP_Client.h"
+-
+ #include <assert.h>
+ #include <ctype.h>
+ #include <stdio.h>
+@@ -29,6 +27,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++#include "TCP_Client.h"
++
+ #include "Cred.h"
+ #include "Event.h"
+ #include "Interest.h"