4 files changed, 15 insertions, 68 deletions
diff --git a/net/Sockets/files/extra-patch-SocketHandler.h b/net/Sockets/files/extra-patch-SocketHandler.h
deleted file mode 100644
index 5fe04cf4ecd6..000000000000
--- a/net/Sockets/files/extra-patch-SocketHandler.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- SocketHandler.h.orig	2008-11-30 02:32:59.000000000 -0200
-+++ SocketHandler.h	2008-11-30 02:33:51.000000000 -0200
-@@ -36,6 +36,7 @@
- 
- class SocketHandler
- {
-+protected:
- 	/** Map type for holding file descriptors/socket object pointers. */
- 	typedef std::map<SOCKET,Socket *> socket_m;
- 
diff --git a/net/Sockets/files/patch-Makefile b/net/Sockets/files/patch-Makefile
index b43c5c0e39e6..63e1a7ab321e 100644
--- a/net/Sockets/files/patch-Makefile
+++ b/net/Sockets/files/patch-Makefile
@@ -1,20 +1,25 @@
---- Makefile.orig	Sun Sep 25 02:39:49 2005
-+++ Makefile	Sun Sep 25 02:40:28 2005
-@@ -75,13 +75,11 @@
- 		ranlib $@
+--- Makefile.orig	2010-01-12 15:22:03.000000000 +0800
++++ Makefile	2010-01-12 15:24:19.000000000 +0800
+@@ -70,18 +70,17 @@
  
- install:	all
--		@mkdir -p $(PREFIX)/lib
+ 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
 -		cp -a *.h $(PREFIX)/include/Sockets
++		@${BSD_INSTALL_DATA} *.h $(PREFIX)/include/Sockets
+ 		@rm -f $(PREFIX)/include/Sockets/SSLSocket.*
+ 		@rm -f $(PREFIX)/include/Sockets/HttpsGetSocket.*
+ 		@rm -f $(PREFIX)/include/Sockets/HttpsSocket.*
+ 		@rm -f $(PREFIX)/include/Sockets/EventSocket.*
+ 		@rm -f $(PREFIX)/include/Sockets/PoolSocket.*
+ 		@rm -f $(PREFIX)/include/Sockets/SocketThread.*
 -		@mkdir -p $(PREFIX)/bin
 -		install Sockets-config $(PREFIX)/bin
-+		@${BSD_INSTALL_DATA} *.h $(PREFIX)/include/Sockets
-+		@${BSD_INSTALL_PROGRAM} Sockets-config $(PREFIX)/bin
++		@${BSD_INSTALL_DATA} Sockets-config $(PREFIX)/bin
  
- clean:
- 		rm -f *.o *~ slask *.d $(PROGS) *.a */*~
+ # no binary files, zip will translate lf to cr lf
+ FILES =		*.h *.cpp Makefile Makefile.* Project/*.ds* \
diff --git a/net/Sockets/files/patch-MinderHandler.cpp b/net/Sockets/files/patch-MinderHandler.cpp
deleted file mode 100644
index e0a6732bb40d..000000000000
--- a/net/Sockets/files/patch-MinderHandler.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- MinderHandler.cpp.orig	Sun Sep 25 02:40:57 2005
-+++ MinderHandler.cpp	Sun Sep 25 02:41:49 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.
- */
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #ifdef _WIN32
- #pragma warning(disable:4786)
- #endif
-@@ -428,6 +432,8 @@
- 	msg += ":" + tmp;
- #ifdef _WIN32
- 	msg += ":Win32";
-+#elif defined __FreeBSD__
-+        msg += ":FreeBSD";
- #else
- 	msg += ":Linux";
- #endif
diff --git a/net/Sockets/files/patch-Sockets-config.cpp b/net/Sockets/files/patch-Sockets-config.cpp
deleted file mode 100644
index f6362cf7c538..000000000000
--- a/net/Sockets/files/patch-Sockets-config.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- Sockets-config.cpp.orig	Sun Sep 25 02:42:19 2005
-+++ Sockets-config.cpp	Sun Sep 25 02:44:08 2005
-@@ -1,8 +1,12 @@
- #include <stdio.h>
- /*
--CFLAGS =	-Wall -g -O2 $(INCLUDE) -MD -D_VERSION='"$(VERSION)"' 
-+CFLAGS =	-Wall -g $(INCLUDE) -MD -D_VERSION='"$(VERSION)"' 
- # manual autoconf ....
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- # uncomment if your operating system is linux, mac os x, or solaris
- #CFLAGS +=	-DLINUX
- #CFLAGS +=	-DMACOSX 
-@@ -19,6 +23,9 @@
- 	printf(" -D_VERSION='\"%s\"'", _VERSION);
- #ifdef LINUX
- 	printf(" -DLINUX");
-+#endif
-+#if defined __FreeBSD__
-+	printf(" -DFREEBSD");
- #endif
- #ifdef MACOSX
- 	printf(" -DMACOSX");