clean up patches

3 files changed, 12 insertions, 23 deletions

diff --git a/www/mMosaic/distinfo b/www/mMosaic/distinfo
index 8bc9b285614..4a932b479a6 100644
--- a/www/mMosaic/distinfo
+++ b/www/mMosaic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/10/06 19:15:09 schwarz Exp $
+$NetBSD: distinfo,v 1.9 2006/10/06 19:29:17 schwarz Exp $
 
 SHA1 (mMosaic-3.7.2.tar.gz) = f26d4fd115a0fb7fc09947506b59e1a3790b6ac7
 RMD160 (mMosaic-3.7.2.tar.gz) = 9c7f2e2f00beaef474e53e25a91aeb604584dd06
@@ -6,7 +6,7 @@ Size (mMosaic-3.7.2.tar.gz) = 507612 bytes
 SHA1 (patch-aa) = ad7d97c9c0c7edda1aab5dc4413e43bde114f031
 SHA1 (patch-ab) = 64cb25fda5e4100251072184dec9f50e8de4be97
 SHA1 (patch-ac) = 98479482a48a19b3f64ce4ed7a33cec04c90d070
-SHA1 (patch-ad) = 995b630412892a2a7bd32da3d95c2ecd31e9a71d
+SHA1 (patch-ad) = 890c6ee44f7bbe9fb5c4418f67c72b49df601e38
 SHA1 (patch-ae) = 41eb6cccefb77f720bba0885993c453bc25dc14e
 SHA1 (patch-af) = 0cba2c49579f6631d7e7d4f1068c00c22401d879
 SHA1 (patch-ag) = 51a1021eda3d92bc8bea7dacda510b24ee8ae7ef
@@ -18,4 +18,3 @@ SHA1 (patch-al) = 5dba5394bc2e3c84504ff741d82c5e1677c9454c
 SHA1 (patch-am) = 9205dc1b78eb69fbff9866d2cd48e6e6f4f88e4b
 SHA1 (patch-an) = 3e03f847457166662da82162144a417d316a6508
 SHA1 (patch-ao) = 46430e4821335d84568d04186c91e097fd2c4447
-SHA1 (patch-ap) = e69d9299dd8a3a61e23a9772e39ae848c20dde67
diff --git a/www/mMosaic/patches/patch-ad b/www/mMosaic/patches/patch-ad
index dfe33179ddf..e89f06f4aae 100644
--- a/www/mMosaic/patches/patch-ad
+++ b/www/mMosaic/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 2006/01/19 22:44:27 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2006/10/06 19:29:17 schwarz Exp $
 
---- src/www-con.c.orig	Fri Dec  8 09:20:47 2000
-+++ src/www-con.c
+--- src/www-con.c.orig	2006-10-06 21:22:43.000000000 +0200
++++ src/www-con.c	2006-10-06 21:23:04.000000000 +0200
 @@ -15,6 +15,7 @@
  #include <dirent.h>
  #include <sys/time.h>
@@ -10,9 +10,12 @@ $NetBSD: patch-ad,v 1.2 2006/01/19 22:44:27 joerg Exp $
  
  
  /* From seanm@storm.ca  Fri Dec  8 04:44:43 2000 */
-@@ -31,14 +32,13 @@
+@@ -29,16 +30,15 @@
+ #include <stdlib.h>
+ #endif
  
- #if defined(NETBSD) || defined(FreeBSD)
+-#if defined(NETBSD) || defined(FreeBSD)
++#if defined(NETBSD) || defined(FreeBSD) || defined(__APPLE__)
  #include <sys/filio.h>
 +#include <sys/ioctl.h>
  #endif
@@ -26,7 +29,7 @@ $NetBSD: patch-ad,v 1.2 2006/01/19 22:44:27 joerg Exp $
  #include "../libnut/mosaic-types.h"
  #include "../libnut/system.h"
  #include "../libhtmlw/HTML.h"
-@@ -225,8 +225,11 @@ static enum InIpV HTParseInet (SockA4 *s
+@@ -225,8 +225,11 @@
  	}
  /* manage only non numeric adresses for IPV6 */
  /* RFC 2133 */
@@ -39,7 +42,7 @@ $NetBSD: patch-ad,v 1.2 2006/01/19 22:44:27 joerg Exp $
  
  	if (phost) {			/* try IPV6 */
  #ifdef DEBUG_IPV6
-@@ -270,9 +273,12 @@ static enum InIpV HTParseInet (SockA4 *s
+@@ -270,9 +273,12 @@
  			if (cached4_host && (strcmp (cached4_host, host) == 0)){
  				memcpy(&sin4->sin_addr, cached4_phost_h_addr, cached4_phost_h_length);
  			} else {
diff --git a/www/mMosaic/patches/patch-ap b/www/mMosaic/patches/patch-ap
deleted file mode 100644
index 4adbad37ee3..00000000000
--- a/www/mMosaic/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/10/06 19:15:09 schwarz Exp $
-
---- src/www-con.c.orig	2006-10-04 22:05:07.000000000 +0200
-+++ src/www-con.c	2006-10-04 22:06:46.000000000 +0200
-@@ -30,7 +30,7 @@
- #include <stdlib.h>
- #endif
- 
--#if defined(NETBSD) || defined(FreeBSD)
-+#if defined(NETBSD) || defined(FreeBSD) || defined(__APPLE__)
- #include <sys/filio.h>
- #include <sys/ioctl.h>
- #endif