5 files changed, 9 insertions, 78 deletions

diff --git a/net/Sockets/files/patch-ListenSocket.h b/net/Sockets/files/patch-ListenSocket.h
index e0468c1f10de..0c32e99b29b8 100644
--- a/net/Sockets/files/patch-ListenSocket.h
+++ b/net/Sockets/files/patch-ListenSocket.h
@@ -1,5 +1,5 @@
---- ListenSocket.h.orig	Sat Jan 15 23:40:23 2005
-+++ ListenSocket.h	Sat Jan 15 23:41:10 2005
+--- ListenSocket.h.orig	Sun Apr  3 18:43:45 2005
++++ ListenSocket.h	Sun Apr  3 18:44:30 2005
 @@ -31,6 +31,7 @@
  
  #include "Socket.h"
diff --git a/net/Sockets/files/patch-Makefile b/net/Sockets/files/patch-Makefile
index e3f8911db7a0..6b3be9c245d9 100644
--- a/net/Sockets/files/patch-Makefile
+++ b/net/Sockets/files/patch-Makefile
@@ -1,14 +1,15 @@
---- Makefile.orig	Sat Jan 15 23:06:28 2005
-+++ Makefile	Sat Jan 15 23:07:15 2005
-@@ -59,11 +59,11 @@
+--- Makefile.orig	Sun Apr  3 18:39:23 2005
++++ Makefile	Sun Apr  3 18:41:20 2005
+@@ -69,12 +69,11 @@
  		ranlib $@
  
  install:	all
+-		@mkdir -p $(PREFIX)/lib
 -		cp libSockets.a $(PREFIX)/lib
 -		cp libSocketsEx.a $(PREFIX)/lib
 +		@${BSD_INSTALL_DATA} libSockets.a $(PREFIX)/lib
 +		@${BSD_INSTALL_DATA} libSocketsEx.a $(PREFIX)/lib
- 		mkdir -p $(PREFIX)/include/Sockets
+ 		@mkdir -p $(PREFIX)/include/Sockets
 -		cp -a *.h $(PREFIX)/include/Sockets
 -		install Sockets-config $(PREFIX)/bin
 +		@${BSD_INSTALL_DATA} *.h $(PREFIX)/include/Sockets
diff --git a/net/Sockets/files/patch-MinderHandler.cpp b/net/Sockets/files/patch-MinderHandler.cpp
index ec527d254b23..cf080fa1c4e7 100644
--- a/net/Sockets/files/patch-MinderHandler.cpp
+++ b/net/Sockets/files/patch-MinderHandler.cpp
@@ -1,5 +1,5 @@
---- MinderHandler.cpp.orig	Sun Jan 16 02:22:51 2005
-+++ MinderHandler.cpp	Sun Jan 16 02:26:52 2005
+--- MinderHandler.cpp.orig	Sun Apr  3 18:42:07 2005
++++ MinderHandler.cpp	Sun Apr  3 18:43:09 2005
 @@ -20,6 +20,10 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/net/Sockets/files/patch-Uid.cpp b/net/Sockets/files/patch-Uid.cpp
deleted file mode 100644
index 6066b39928ea..000000000000
--- a/net/Sockets/files/patch-Uid.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
---- Uid.cpp.orig	Sat Jan 15 21:36:02 2005
-+++ Uid.cpp	Sat Jan 15 22:41:30 2005
-@@ -20,12 +20,22 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #include <stdio.h>
- #include <assert.h>
- #ifdef _WIN32
- #include <objbase.h>
- #elif defined MACOSX
- #include "uuid.h"
-+#elif defined __FreeBSD__
-+# if __FreeBSD_version >= 500000
-+#  include <uuid.h>
-+# else
-+#  error FreeBSD versions prior to 500000 does not support uuid(3)
-+# endif
- #else
- #include <uuid/uuid.h>
- #endif
-@@ -49,6 +59,10 @@
- 		exit(-1);
- 	}
- 	memcpy(m_bufuid, &randomGuid, 16);
-+#elif defined __FreeBSD__
-+	uuid_t uid;
-+	uuid_create(&uid, NULL);
-+	memcpy(m_bufuid, &uid, 16);
- #else
- 	uuid_t uid;
- 	uuid_generate(uid);
diff --git a/net/Sockets/files/patch-socket_include.h b/net/Sockets/files/patch-socket_include.h
deleted file mode 100644
index 87aa06ecb7cc..000000000000
--- a/net/Sockets/files/patch-socket_include.h
+++ /dev/null
@@ -1,34 +0,0 @@
---- socket_include.h.orig	Sat Jan 15 14:48:57 2005
-+++ socket_include.h	Sat Jan 15 22:31:09 2005
-@@ -1,10 +1,31 @@
- #ifndef _SOCKET_INCLUDE_H
- #define _SOCKET_INCLUDE_H
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #ifdef SOLARIS 
- // ----------------------------------------
- // Solaris
- typedef unsigned short port_t;
-+
-+#elif defined __FreeBSD__
-+// ----------------------------------------
-+// FreeBSD
-+# if __FreeBSD_version >= 400014
-+#  define s6_addr16 __u6_addr.__u6_addr16
-+#  if !defined(MSG_NOSIGNAL)
-+#    define MSG_NOSIGNAL 0
-+#  endif
-+#  include <netinet/in.h>
-+typedef	in_addr_t ipaddr_t;
-+typedef	in_port_t port_t;
-+#  define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-+#  define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
-+# else
-+#  error FreeBSD versions prior to 400014 does not support ipv6
-+# endif
- 
- #elif defined MACOSX 
- // ----------------------------------------