net/wmnetmon: Expand patches fix malloc.h-less DF

While here, regenerate all the patches to put them in unified format.
Wow, that old diff format is unreadable.

1 files changed, 21 insertions, 31 deletions

diff --git a/net/wmnetmon/files/patch-tcpmonitor.c b/net/wmnetmon/files/patch-tcpmonitor.c
index 379db455096a..faff35a5a293 100644
--- a/net/wmnetmon/files/patch-tcpmonitor.c
+++ b/net/wmnetmon/files/patch-tcpmonitor.c
@@ -1,31 +1,21 @@
-*** tcpmonitor.c.orig	Fri Jul 23 16:58:24 1999
---- tcpmonitor.c	Sun Apr  1 15:32:49 2001
-***************
-*** 12,18 ****
---- 12,20 ----
-  #include <sys/time.h>
-  #include <arpa/inet.h>
-  #include <stdlib.h>
-+ #ifndef __FreeBSD__
-  #include <malloc.h>
-+ #endif
-  #include <fcntl.h>
-  #include <errno.h>
-  #include "config.h"
-***************
-*** 51,57 ****
-  	if (debug)
-  	fprintf(stderr,"trying to connect (tcp) to port %d at %s...\n", h->tcpport,
-  	    inet_ntoa(h->tcpsock->sin_addr));
-! 	if (connect(h->tcp_socket, (struct sockaddr_in*)h->tcpsock, 
-  	        sizeof(struct sockaddr_in))<0) 
-  	   switch(errno) {
-  		case EISCONN: /* Common.. reported by lots of users 
---- 53,59 ----
-  	if (debug)
-  	fprintf(stderr,"trying to connect (tcp) to port %d at %s...\n", h->tcpport,
-  	    inet_ntoa(h->tcpsock->sin_addr));
-! 	if (connect(h->tcp_socket, (struct sockaddr*)h->tcpsock, 
-  	        sizeof(struct sockaddr_in))<0) 
-  	   switch(errno) {
-  		case EISCONN: /* Common.. reported by lots of users 
+--- tcpmonitor.c.orig	1999-07-23 13:58:24 UTC
++++ tcpmonitor.c
+@@ -12,7 +12,9 @@
+ #include <sys/time.h>
+ #include <arpa/inet.h>
+ #include <stdlib.h>
++#if ! (defined __FreeBSD__ || defined __DragonFly__)
+ #include <malloc.h>
++#endif
+ #include <fcntl.h>
+ #include <errno.h>
+ #include "config.h"
+@@ -51,7 +53,7 @@ int tcp_isalive(pinger_host *h)
+ 	if (debug)
+ 	fprintf(stderr,"trying to connect (tcp) to port %d at %s...\n", h->tcpport,
+ 	    inet_ntoa(h->tcpsock->sin_addr));
+-	if (connect(h->tcp_socket, (struct sockaddr_in*)h->tcpsock, 
++	if (connect(h->tcp_socket, (struct sockaddr*)h->tcpsock, 
+ 	        sizeof(struct sockaddr_in))<0) 
+ 	   switch(errno) {
+ 		case EISCONN: /* Common.. reported by lots of users