Fix errno.

5 files changed, 80 insertions, 6 deletions

diff --git a/www/mMosaic/distinfo b/www/mMosaic/distinfo
index eaaf417a788..dbf872bbb30 100644
--- a/www/mMosaic/distinfo
+++ b/www/mMosaic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/03/06 16:56:17 fredb Exp $
+$NetBSD: distinfo,v 1.6 2006/01/19 22:44:27 joerg Exp $
 
 SHA1 (mMosaic-3.7.2.tar.gz) = f26d4fd115a0fb7fc09947506b59e1a3790b6ac7
 RMD160 (mMosaic-3.7.2.tar.gz) = 9c7f2e2f00beaef474e53e25a91aeb604584dd06
@@ -6,4 +6,7 @@ Size (mMosaic-3.7.2.tar.gz) = 507612 bytes
 SHA1 (patch-aa) = c18e1cc90ea3a3843c514944c8c597d660555387
 SHA1 (patch-ab) = 64cb25fda5e4100251072184dec9f50e8de4be97
 SHA1 (patch-ac) = 98479482a48a19b3f64ce4ed7a33cec04c90d070
-SHA1 (patch-ad) = d0da529ed866a9295010419882a004997bba17a7
+SHA1 (patch-ad) = 995b630412892a2a7bd32da3d95c2ecd31e9a71d
+SHA1 (patch-ae) = 41eb6cccefb77f720bba0885993c453bc25dc14e
+SHA1 (patch-af) = 0cba2c49579f6631d7e7d4f1068c00c22401d879
+SHA1 (patch-ag) = 51a1021eda3d92bc8bea7dacda510b24ee8ae7ef
diff --git a/www/mMosaic/patches/patch-ad b/www/mMosaic/patches/patch-ad
index 776ccf7a499..dfe33179ddf 100644
--- a/www/mMosaic/patches/patch-ad
+++ b/www/mMosaic/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/08/20 00:39:55 fredb Exp $
+$NetBSD: patch-ad,v 1.2 2006/01/19 22:44:27 joerg Exp $
 
 --- src/www-con.c.orig	Fri Dec  8 09:20:47 2000
 +++ src/www-con.c
-@@ -31,6 +31,7 @@
+@@ -15,6 +15,7 @@
+ #include <dirent.h>
+ #include <sys/time.h>
+ #include <assert.h>
++#include <errno.h>
+ 
+ 
+ /* From seanm@storm.ca  Fri Dec  8 04:44:43 2000 */
+@@ -31,14 +32,13 @@
  
  #if defined(NETBSD) || defined(FreeBSD)
  #include <sys/filio.h>
@@ -10,7 +18,15 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/08/20 00:39:55 fredb Exp $
  #endif
  
  #ifndef FD_SETSIZE
-@@ -225,8 +226,11 @@
+ #define FD_SETSIZE 256
+ #endif
+ 
+-extern int errno;
+-
+ #include "../libnut/mosaic-types.h"
+ #include "../libnut/system.h"
+ #include "../libhtmlw/HTML.h"
+@@ -225,8 +225,11 @@ static enum InIpV HTParseInet (SockA4 *s
  	}
  /* manage only non numeric adresses for IPV6 */
  /* RFC 2133 */
@@ -23,7 +39,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/08/20 00:39:55 fredb Exp $
  
  	if (phost) {			/* try IPV6 */
  #ifdef DEBUG_IPV6
-@@ -270,9 +274,12 @@
+@@ -270,9 +273,12 @@ static enum InIpV HTParseInet (SockA4 *s
  			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-ae b/www/mMosaic/patches/patch-ae
new file mode 100644
index 00000000000..0dae3518186
--- /dev/null
+++ b/www/mMosaic/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/01/19 22:44:27 joerg Exp $
+
+--- libnut/system.c.orig	2006-01-19 22:18:10.000000000 +0000
++++ libnut/system.c
+@@ -24,8 +24,6 @@
+ 
+ #include "system.h"
+ 
+-extern int errno;
+-
+ int sleep_interrupt=0;
+ 
+ int my_system(char *cmd, char *retBuf, int bufsize);
diff --git a/www/mMosaic/patches/patch-af b/www/mMosaic/patches/patch-af
new file mode 100644
index 00000000000..a846e9d9fab
--- /dev/null
+++ b/www/mMosaic/patches/patch-af
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1 2006/01/19 22:44:27 joerg Exp $
+
+--- src/gui-dialogs.c.orig	2006-01-19 22:19:53.000000000 +0000
++++ src/gui-dialogs.c
+@@ -1,6 +1,8 @@
+ /* Please read copyright.ncsa. Don't remove next line */
+ #include "../Copyrights/copyright.ncsa"
+ 
++#include <errno.h>
++
+ #include "libhtmlw/HTML.h"
+ #include "mosaic.h"
+ #include "gui-dialogs.h" 
+@@ -29,7 +31,6 @@
+ extern int HTML_Print_Paper_Size_A4;
+ 
+ /*swp -- for ~ expansion*/
+-extern int errno;
+ #define __MAX_HOME_LEN__ 256
+ int pathEval(char *dest, char *src);
+ char *getFileName(char *file_src);
diff --git a/www/mMosaic/patches/patch-ag b/www/mMosaic/patches/patch-ag
new file mode 100644
index 00000000000..2a84a005c8f
--- /dev/null
+++ b/www/mMosaic/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1 2006/01/19 22:44:27 joerg Exp $
+
+--- src/file-proto.c.orig	2006-01-19 22:34:36.000000000 +0000
++++ src/file-proto.c
+@@ -11,6 +11,7 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <assert.h>
++#include <errno.h>
+ 
+ /* From seanm@storm.ca  Fri Dec  8 04:44:43 2000 *
+ /* old: #if defined(SVR4) && !defined(SCO) && !defined(linux) */
+@@ -21,8 +22,6 @@
+ #include <unistd.h>
+ #endif
+ 
+-extern int errno;
+-
+ #include "../libnut/system.h"
+ #include "../libhtmlw/HTML.h"
+ #include "mosaic.h"