All the world is a VAX -- really, for errno that is a good assumption.

Fix errno.

3 files changed, 51 insertions, 8 deletions

diff --git a/games/moria/distinfo b/games/moria/distinfo
index a46fc46d90d..2cc6f4519b3 100644
--- a/games/moria/distinfo
+++ b/games/moria/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 23:12:00 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/12/18 23:27:29 joerg Exp $
 
 SHA1 (um5.5.2.tar.Z) = 69c7a7bf4e2c5be123ee7a82f5ad12ad5d0f5b08
 RMD160 (um5.5.2.tar.Z) = 1556c76f151d7ea29da79071a57398f63d0b138b
 Size (um5.5.2.tar.Z) = 910536 bytes
 SHA1 (patch-aa) = 90dd341c52e322ce7a9cacc706e9f0db49c9253b
-SHA1 (patch-ab) = b06d9f1b8445865823fc01e2345be48b4f6eb999
+SHA1 (patch-ab) = bc306021460994bce5f88ea0d828bb8c704f4c6f
 SHA1 (patch-ac) = ea9e23de0a147f317a579a4a04502cb165b4c4bd
 SHA1 (patch-ad) = cba23f2ab9e6bfe8d665475fa30342486997f57c
 SHA1 (patch-ae) = 5cf8ad7c6e5d87856a31a5456ba9ed2422075988
@@ -15,3 +15,4 @@ SHA1 (patch-ai) = ab8de35dad1870edb8549966aca60d0f5bdf2187
 SHA1 (patch-aj) = f0ac2b33ce021f3c2757bb37e9a5749842901556
 SHA1 (patch-ak) = 3b39f9bd883cae5cd0a8a2561fcb1bcdbfa0bc1b
 SHA1 (patch-al) = da8992fc3b7a57fdf78d5656a8a8f01b8628c8fd
+SHA1 (patch-am) = b5d250e9b870e3540c382c7e7c588e1f1c5a4910
diff --git a/games/moria/patches/patch-ab b/games/moria/patches/patch-ab
index 988c53e7e87..704edc2f53a 100644
--- a/games/moria/patches/patch-ab
+++ b/games/moria/patches/patch-ab
@@ -1,7 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/01/23 17:00:15 simonb Exp $
---- unix/unix.c.orig	Fri Jul 22 08:37:08 1994
-+++ unix/unix.c	Wed Dec  2 23:17:35 1998
-@@ -43,6 +43,11 @@
+$NetBSD: patch-ab,v 1.2 2005/12/18 23:27:29 joerg Exp $
+
+--- unix/unix.c.orig	1994-07-21 22:37:08.000000000 +0000
++++ unix/unix.c
+@@ -43,6 +43,11 @@ typedef struct { int stuff; } fpvmach;
  #include <sys/param.h>
  #endif
  
@@ -13,7 +14,16 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/01/23 17:00:15 simonb Exp $
  #ifdef __linux__
  #include <sys/time.h>
  #include <sys/types.h>
-@@ -276,7 +281,9 @@
+@@ -73,7 +78,7 @@ typedef struct { int stuff; } fpvmach;
+ #include "externs.h"
+ 
+ #include <pwd.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ 
+ #ifdef USG
+ struct passwd *getpwuid();
+@@ -276,7 +281,9 @@ int getuid();
  void user_name(buf)
  char *buf;
  {
@@ -23,7 +33,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/01/23 17:00:15 simonb Exp $
    struct passwd *pwline;
    register char *p;
  
-@@ -314,7 +321,10 @@
+@@ -314,7 +321,10 @@ char *file, *exp;
  	  user[i] = '\0';
  	  if (i == 0)
  	    {
@@ -35,3 +45,19 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/01/23 17:00:15 simonb Exp $
  
  	      if (login != NULL)
  		(void) strcpy (user, login);
+@@ -342,7 +352,6 @@ char *file;
+ char *mode;
+ {
+   char buf[1024];
+-  extern int errno;
+ 
+   if (tilde(file, buf))
+     return (fopen(buf, mode));
+@@ -357,7 +366,6 @@ char *file;
+ int flags, mode;
+ {
+   char buf[1024];
+-  extern int errno;
+ 
+   if (tilde(file, buf))
+     return (open(buf, flags, mode));
diff --git a/games/moria/patches/patch-am b/games/moria/patches/patch-am
new file mode 100644
index 00000000000..109b5cd1fca
--- /dev/null
+++ b/games/moria/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.1 2005/12/18 23:27:29 joerg Exp $
+
+--- source/externs.h.orig	2005-12-18 23:18:45.000000000 +0000
++++ source/externs.h
+@@ -35,11 +35,6 @@ extern char *sprintf();
+ #endif
+ #endif
+ 
+-/* to avoid 'psect' problem with VMS declaration of errno */
+-#ifndef VMS
+-extern int errno;
+-#endif
+-
+ extern char *copyright[5];
+ 
+ /* horrible hack: needed because compact_monster() can be called from deep