From 930e963ab78e75ec1699cc964d139cdd6764d8ef Mon Sep 17 00:00:00 2001
From: Ying-Chieh Liao <ijliao@FreeBSD.org>
Date: Thu, 29 Jan 2004 02:08:34 +0000
Subject: [PATCH] fix build on -stable

Noticed by:	bento via kris
---
 devel/libassa/files/patch-assa:Address.h            | 10 ++++++++++
 devel/libassa/files/patch-assa:INETAddress.cpp      | 10 ++++++++++
 devel/libassa/files/patch-assa:IniFile.h            | 11 +++++++++++
 devel/libassa/files/patch-assa:Logger_Impl.cpp      | 10 ++++++++++
 devel/libassa/files/patch-assa:Logger_Impl.h        | 11 +++++++++++
 .../patch-examples:logserver:server:MonitorConn.cpp | 12 ++++++++++++
 devel/libassa/files/patch-tests:pq_test.cpp         | 13 +++++++++++++
 devel/libassa/files/patch-tests:semaphore_test.cpp  | 10 ++++++++++
 8 files changed, 87 insertions(+)
 create mode 100644 devel/libassa/files/patch-assa:Address.h
 create mode 100644 devel/libassa/files/patch-assa:INETAddress.cpp
 create mode 100644 devel/libassa/files/patch-assa:IniFile.h
 create mode 100644 devel/libassa/files/patch-assa:Logger_Impl.cpp
 create mode 100644 devel/libassa/files/patch-assa:Logger_Impl.h
 create mode 100644 devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp
 create mode 100644 devel/libassa/files/patch-tests:pq_test.cpp
 create mode 100644 devel/libassa/files/patch-tests:semaphore_test.cpp

diff --git a/devel/libassa/files/patch-assa:Address.h b/devel/libassa/files/patch-assa:Address.h
new file mode 100644
index 000000000000..3b3e679bf477
--- /dev/null
+++ b/devel/libassa/files/patch-assa:Address.h
@@ -0,0 +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
+ #define ADDRESS_H
+ 
+-#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
new file mode 100644
index 000000000000..7f4de7d28d45
--- /dev/null
+++ b/devel/libassa/files/patch-assa:INETAddress.cpp
@@ -0,0 +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)
+ extern int h_errno;				// gethostbyname(3)
++#include <sys/types.h>
+ #include <sys/socket.h>			// for AF_INET
+ #include <unistd.h>
+ #include <sys/utsname.h>
diff --git a/devel/libassa/files/patch-assa:IniFile.h b/devel/libassa/files/patch-assa:IniFile.h
new file mode 100644
index 000000000000..d9aacc1cc179
--- /dev/null
+++ b/devel/libassa/files/patch-assa:IniFile.h
@@ -0,0 +1,11 @@
+--- assa/IniFile.h.orig	Sat Sep 13 19:01:00 2003
++++ assa/IniFile.h	Thu Jan 29 09:05:01 2004
+@@ -171,7 +171,7 @@
+ 
+ 		/** Return iterator past the last section.
+ 		 */
+-		const_config_iterator sect_end () const { return m_config.end (); }
++		config_iterator sect_end () { return m_config.end (); }
+ 
+ 		/** Return number of sections in the cache
+ 		 */
diff --git a/devel/libassa/files/patch-assa:Logger_Impl.cpp b/devel/libassa/files/patch-assa:Logger_Impl.cpp
new file mode 100644
index 000000000000..62fbbd030455
--- /dev/null
+++ b/devel/libassa/files/patch-assa:Logger_Impl.cpp
@@ -0,0 +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
+@@ -14,6 +14,7 @@
+ 
+ #include <iostream>
+ #include <iomanip>
++#include <cstdio>
+ 
+ #include "assa/TimeVal.h"
+ #include "assa/Logger_Impl.h"
diff --git a/devel/libassa/files/patch-assa:Logger_Impl.h b/devel/libassa/files/patch-assa:Logger_Impl.h
new file mode 100644
index 000000000000..8fa82d5a1364
--- /dev/null
+++ b/devel/libassa/files/patch-assa:Logger_Impl.h
@@ -0,0 +1,11 @@
+--- assa/Logger_Impl.h.orig	Mon Oct 13 11:30:18 2003
++++ assa/Logger_Impl.h	Thu Jan 29 00:28:19 2004
+@@ -16,6 +16,8 @@
+ 
+ #include <errno.h>
+ #include <string>
++#include <stdarg.h>
++#include <sys/types.h>
+ 
+ using std::string;
+ using std::ostream;
diff --git a/devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp b/devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp
new file mode 100644
index 000000000000..81e49e4c600c
--- /dev/null
+++ b/devel/libassa/files/patch-examples:logserver:server:MonitorConn.cpp
@@ -0,0 +1,12 @@
+--- 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
+  */
diff --git a/devel/libassa/files/patch-tests:pq_test.cpp b/devel/libassa/files/patch-tests:pq_test.cpp
new file mode 100644
index 000000000000..c28cac2838be
--- /dev/null
+++ b/devel/libassa/files/patch-tests:pq_test.cpp
@@ -0,0 +1,13 @@
+--- tests/pq_test.cpp.orig	Thu Jan 29 08:39:07 2004
++++ tests/pq_test.cpp	Thu Jan 29 08:40:48 2004
+@@ -23,10 +23,6 @@
+ #include <iostream>
+ using namespace std;
+ 
+-#include <getopt.h>
+-extern char *optarg;
+-extern int optind, opterr, optopt;
+-
+ // ASSA
+ #include "assa/PriorityQueue.h"
+ using namespace ASSA;
diff --git a/devel/libassa/files/patch-tests:semaphore_test.cpp b/devel/libassa/files/patch-tests:semaphore_test.cpp
new file mode 100644
index 000000000000..145bc7bcf88d
--- /dev/null
+++ b/devel/libassa/files/patch-tests:semaphore_test.cpp
@@ -0,0 +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
+@@ -16,6 +16,7 @@
+ using namespace std;
+ 
+ #include <assert.h>
++#include <sys/types.h>
+ #include <sys/ipc.h>		// ftok(2)
+ 
+ #include "assa/Assert.h"