5 files changed, 35 insertions, 36 deletions

diff --git a/devel/libassa/files/patch-assa:Address.h b/devel/libassa/files/patch-assa:Address.h
index 3b3e679bf477..814c06ce1a1b 100644
--- a/devel/libassa/files/patch-assa:Address.h
+++ b/devel/libassa/files/patch-assa:Address.h
@@ -1,10 +1,10 @@
---- assa/Address.h.orig	Thu Jan 29 00:58:13 2004
-+++ assa/Address.h	Thu Jan 29 01:11:14 2004
-@@ -12,7 +12,6 @@
- #ifndef ADDRESS_H
+--- assa/Address.h.orig	Wed Sep  6 16:13:45 2006
++++ assa/Address.h	Wed Sep  6 16:13:57 2006
+@@ -13,7 +13,6 @@
  #define ADDRESS_H
  
--#include <netinet/in.h>
- #include <netdb.h>
- #include <sys/types.h>
- #include <sys/socket.h>
+ #if !defined (WIN32)
+-#  include <netinet/in.h>
+ #  include <netdb.h>
+ #  include <sys/types.h>
+ #  include <sys/socket.h>
diff --git a/devel/libassa/files/patch-assa:INETAddress.cpp b/devel/libassa/files/patch-assa:INETAddress.cpp
index 7f4de7d28d45..70f1de7231cc 100644
--- a/devel/libassa/files/patch-assa:INETAddress.cpp
+++ b/devel/libassa/files/patch-assa:INETAddress.cpp
@@ -1,10 +1,10 @@
---- assa/INETAddress.cpp.orig	Thu Jan 22 23:53:34 2004
-+++ assa/INETAddress.cpp	Thu Jan 22 23:53:45 2004
-@@ -14,6 +14,7 @@
- 
- #include <netdb.h>				// gethostbyname(3)
+--- assa/INETAddress.cpp.orig	Thu Jul 20 06:13:13 2006
++++ assa/INETAddress.cpp	Wed Sep  6 16:13:15 2006
+@@ -17,6 +17,7 @@
+ #else
+ #   include <netdb.h>				// gethostbyname(3)
  extern int h_errno;				// gethostbyname(3)
-+#include <sys/types.h>
- #include <sys/socket.h>			// for AF_INET
- #include <unistd.h>
- #include <sys/utsname.h>
++#   include <sys/types.h>			// for AF_INET
+ #   include <sys/socket.h>			// for AF_INET
+ #   include <unistd.h>
+ #   include <sys/utsname.h>
diff --git a/devel/libassa/files/patch-assa:Logger_Impl.cpp b/devel/libassa/files/patch-assa:Logger_Impl.cpp
index 62fbbd030455..fdd6da34d6c1 100644
--- a/devel/libassa/files/patch-assa:Logger_Impl.cpp
+++ b/devel/libassa/files/patch-assa:Logger_Impl.cpp
@@ -1,10 +1,10 @@
---- assa/Logger_Impl.cpp.orig	Thu Jan 29 01:12:05 2004
-+++ assa/Logger_Impl.cpp	Thu Jan 29 01:12:37 2004
+--- assa/Logger_Impl.cpp.orig	Thu Jul 20 06:30:54 2006
++++ assa/Logger_Impl.cpp	Wed Sep  6 16:20:05 2006
 @@ -14,6 +14,7 @@
  
  #include <iostream>
  #include <iomanip>
 +#include <cstdio>
+ #include <string.h>				// strerror(3)
  
  #include "assa/TimeVal.h"
- #include "assa/Logger_Impl.h"
diff --git a/devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp b/devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp
index 81e49e4c600c..6bfc2a1c9763 100644
--- a/devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp
+++ b/devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp
@@ -1,12 +1,11 @@
---- examples/logserver/server/MonitorConn.cpp.orig	Thu Jan 29 08:53:46 2004
-+++ examples/logserver/server/MonitorConn.cpp	Thu Jan 29 08:54:16 2004
-@@ -19,6 +19,9 @@
- #include "Conn.h"
- #include "LogServer-main.h"
- #include "LogServer.h"
-+#include <algorithm>
-+
-+using namespace std;
- 
- /** Convert user input to upper case
-  */
+--- examples/logserver/server/MonitorConn.cpp.orig	Thu Jul 20 10:30:55 2006
++++ examples/logserver/server/MonitorConn.cpp	Thu Sep  7 16:18:01 2006
+@@ -20,6 +20,8 @@
+ #include "LogServer-main.h"

+ #include "LogServer.h"

+ 

++#include <algorithm>

++

+ /** Convert user input to upper case

+  */

+ template <class T>

diff --git a/devel/libassa/files/patch-tests:semaphore_test.cpp b/devel/libassa/files/patch-tests:semaphore_test.cpp
index 145bc7bcf88d..1e703fa9103d 100644
--- a/devel/libassa/files/patch-tests:semaphore_test.cpp
+++ b/devel/libassa/files/patch-tests:semaphore_test.cpp
@@ -1,10 +1,10 @@
---- tests/semaphore_test.cpp.orig	Thu Jan 29 08:42:17 2004
-+++ tests/semaphore_test.cpp	Thu Jan 29 08:42:43 2004
+--- tests/semaphore_test.cpp.orig	Thu Jul 20 06:30:56 2006
++++ tests/semaphore_test.cpp	Wed Sep  6 16:30:11 2006
 @@ -16,6 +16,7 @@
  using namespace std;
  
  #include <assert.h>
 +#include <sys/types.h>
- #include <sys/ipc.h>		// ftok(2)
  
- #include "assa/Assert.h"
+ #if !defined (WIN32)
+ #   include <sys/ipc.h>		// ftok(2)