From d39bd83d1ac1621bd5811774fd99e4fa60fb2798 Mon Sep 17 00:00:00 2001
From: Willer Moreira <willer.moreira@openbossa.org>
Date: Tue, 2 Feb 2010 13:34:07 -0400
Subject: [PATCH 041/118] fam: fix build

* Fix wrong include
* add missing headers

Signed-off-by: Willer Moreira <willer.moreira@openbossa.org>
---
 recipes/fam/fam-2.7.0/include-fix.patch |   50 +++++++++++++++++++++++++++++++
 recipes/fam/fam_2.7.0.bb                |    4 ++-
 2 files changed, 53 insertions(+), 1 deletions(-)
 create mode 100644 recipes/fam/fam-2.7.0/include-fix.patch

diff --git a/recipes/fam/fam-2.7.0/include-fix.patch b/recipes/fam/fam-2.7.0/include-fix.patch
new file mode 100644
index 0000000..ae94954
--- /dev/null
+++ b/recipes/fam/fam-2.7.0/include-fix.patch
@@ -0,0 +1,50 @@
+diff --git a/include/BTree.h b/include/BTree.h
+index 29ea94f..329d78a 100644
+--- a/include/BTree.h
++++ b/include/BTree.h
+@@ -24,6 +24,7 @@
+ #define BTree_included
+ 
+ #include "Boolean.h"
++#include <cstdlib> // for NULL
+ 
+ //  This is an in-core B-Tree implementation.
+ //
+diff --git a/lib/Client.c++ b/lib/Client.c++
+index fa62eb4..c3c4631 100644
+--- a/lib/Client.c++
++++ b/lib/Client.c++
+@@ -34,7 +34,7 @@
+ #include <syslog.h>
+ #include <errno.h>
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "fam.h"
+ #include "Client.h"
+diff --git a/src/IMon.c++ b/src/IMon.c++
+index ea53a49..fd3b05e 100644
+--- a/src/IMon.c++
++++ b/src/IMon.c++
+@@ -40,7 +40,6 @@
+ #include "Interest.h"
+ #include "Log.h"
+ #include "Scheduler.h"
+-#include "alloc.h"
+ 
+ int		   IMon::imonfd = -2;
+ IMon::EventHandler IMon::ehandler = NULL;
+diff --git a/src/Interest.h b/src/Interest.h
+index af95256..4c410b6 100644
+--- a/src/Interest.h
++++ b/src/Interest.h
+@@ -28,6 +28,8 @@
+ #include <sys/time.h>
+ #include <netinet/in.h>  //  for in_addr
+ 
++#include <cstdlib> // for NULL
++
+ #include "Boolean.h"
+ 
+ class Event;
diff --git a/recipes/fam/fam_2.7.0.bb b/recipes/fam/fam_2.7.0.bb
index 653aea6..cbb4ffe 100644
--- a/recipes/fam/fam_2.7.0.bb
+++ b/recipes/fam/fam_2.7.0.bb
@@ -2,9 +2,11 @@ DESCRIPTION = "File Alteration Monitor"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL"
+PR = "r1"
 
 SRC_URI = "ftp://oss.sgi.com/projects/fam/download/stable/fam-${PV}.tar.gz \
-	   file://compile-fix.patch;patch=1"
+          file://include-fix.patch;patch=1 \
+          file://compile-fix.patch;patch=1"
 
 inherit autotools
 
-- 
1.6.3.3