Fixed PR 29425.

4 files changed, 54 insertions, 20 deletions

diff --git a/games/moria/Makefile b/games/moria/Makefile
index 741579ec07b..4976b921c65 100644
--- a/games/moria/Makefile
+++ b/games/moria/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.10 2007/03/06 23:25:47 rillig Exp $
 
 DISTNAME=		um5.5.2
 PKGNAME=		moria-5.5.2
@@ -13,6 +13,7 @@ HOMEPAGE=		http://www-math.bgsu.edu/~grabine/moria.html
 COMMENT=		Rogue-like game with a different sense of scale than Rogue
 
 WRKSRC=			${WRKDIR}/umoria
+MAKE_FLAGS+=		CURSES=-lncurses
 
 do-configure:
 	@${RM} -f ${WRKSRC}/*.[ch] ${WRKSRC}/Makefile
@@ -24,4 +25,5 @@ post-install:
 			/var/games/moria.scores ; \
 	fi
 
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/moria/distinfo b/games/moria/distinfo
index 2cc6f4519b3..45b0561d365 100644
--- a/games/moria/distinfo
+++ b/games/moria/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2005/12/18 23:27:29 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/03/06 23:25:47 rillig 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) = bc306021460994bce5f88ea0d828bb8c704f4c6f
+SHA1 (patch-ab) = 21418a69d7a694894dd9408513693f87fff91953
 SHA1 (patch-ac) = ea9e23de0a147f317a579a4a04502cb165b4c4bd
-SHA1 (patch-ad) = cba23f2ab9e6bfe8d665475fa30342486997f57c
+SHA1 (patch-ad) = f83f4596677b8d37493145f82a4d2d5cb489b53a
 SHA1 (patch-ae) = 5cf8ad7c6e5d87856a31a5456ba9ed2422075988
 SHA1 (patch-af) = f8a9f32dffa2123512e36c774ca75e0b28a053cc
 SHA1 (patch-ag) = af425b9a48c17f170fc780909b7287264a053cc4
diff --git a/games/moria/patches/patch-ab b/games/moria/patches/patch-ab
index 704edc2f53a..3f6f9e2263c 100644
--- a/games/moria/patches/patch-ab
+++ b/games/moria/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2005/12/18 23:27:29 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2007/03/06 23:25:48 rillig Exp $
 
---- unix/unix.c.orig	1994-07-21 22:37:08.000000000 +0000
-+++ unix/unix.c
+--- unix/unix.c.orig	1994-07-22 00:37:08.000000000 +0200
++++ unix/unix.c	2007-03-07 00:08:23.142229936 +0100
 @@ -43,6 +43,11 @@ typedef struct { int stuff; } fpvmach;
  #include <sys/param.h>
  #endif
@@ -23,7 +23,21 @@ $NetBSD: patch-ab,v 1.2 2005/12/18 23:27:29 joerg Exp $
  
  #ifdef USG
  struct passwd *getpwuid();
-@@ -276,7 +281,9 @@ int getuid();
+@@ -260,6 +265,7 @@ char *p;
+ }
+ #endif
+ 
++#if 0
+ #ifdef USG
+ unsigned short getuid();
+ #else
+@@ -271,12 +277,15 @@ int getuid();
+ #endif
+ #endif
+ #endif
++#endif
+ 
+ /* Find a default user name from the system. */
  void user_name(buf)
  char *buf;
  {
@@ -33,7 +47,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/18 23:27:29 joerg Exp $
    struct passwd *pwline;
    register char *p;
  
-@@ -314,7 +321,10 @@ char *file, *exp;
+@@ -314,7 +323,10 @@ char *file, *exp;
  	  user[i] = '\0';
  	  if (i == 0)
  	    {
@@ -45,7 +59,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/18 23:27:29 joerg Exp $
  
  	      if (login != NULL)
  		(void) strcpy (user, login);
-@@ -342,7 +352,6 @@ char *file;
+@@ -342,7 +354,6 @@ char *file;
  char *mode;
  {
    char buf[1024];
@@ -53,7 +67,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/18 23:27:29 joerg Exp $
  
    if (tilde(file, buf))
      return (fopen(buf, mode));
-@@ -357,7 +366,6 @@ char *file;
+@@ -357,7 +368,6 @@ char *file;
  int flags, mode;
  {
    char buf[1024];
diff --git a/games/moria/patches/patch-ad b/games/moria/patches/patch-ad
index edc7eacf489..3ddba32b3f1 100644
--- a/games/moria/patches/patch-ad
+++ b/games/moria/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 1999/08/30 02:35:10 simonb Exp $
---- source/io.c.orig	Fri Jul 22 11:47:26 1994
-+++ source/io.c	Sun Aug 29 09:08:13 1999
-@@ -90,6 +90,10 @@
+$NetBSD: patch-ad,v 1.3 2007/03/06 23:25:48 rillig Exp $
+--- source/io.c.orig	1994-07-22 03:47:26.000000000 +0200
++++ source/io.c	2007-03-07 00:06:06.234247718 +0100
+@@ -90,12 +90,19 @@ typedef struct { int stuff; } fpvmach;
  #include <sys/types.h>
  #endif
  
@@ -12,7 +12,16 @@ $NetBSD: patch-ad,v 1.2 1999/08/30 02:35:10 simonb Exp $
  #ifdef USG
  #ifndef ATARI_ST
  #include <string.h>
-@@ -245,7 +249,7 @@
+ #else
+ #include "string.h"
+ #endif
++#if defined(__linux)
++#  include <termios.h>
++#endif
+ #if 0
+ /* Used to include termio.h here, but that caused problems on some systems,
+    as curses.h includes it also above.  */
+@@ -245,7 +252,7 @@ int suspend()
    struct ltchars lcbuf;
    struct tchars cbuf;
    int lbuf;
@@ -21,7 +30,7 @@ $NetBSD: patch-ad,v 1.2 1999/08/30 02:35:10 simonb Exp $
  
    py.misc.male |= 2;
    (void) ioctl(0, TIOCGETP, (char *)&tbuf);
-@@ -331,7 +335,7 @@
+@@ -331,7 +338,7 @@ void init_curses()
  #if defined(atarist) && defined(__GNUC__)
    (void) signal (SIGTSTP, (__Sigfunc)suspend);
  #else
@@ -30,7 +39,16 @@ $NetBSD: patch-ad,v 1.2 1999/08/30 02:35:10 simonb Exp $
    (void) signal (SIGTSTP, (sig_t)suspend);
  #else
    (void) signal (SIGTSTP, suspend);
-@@ -527,6 +531,7 @@
+@@ -419,7 +426,7 @@ void moriaterm()
+   init_color (3,1000, 500,   0);	/* pen 3 - orange */
+ #else
+ #if !defined(ATARI_ST) && !defined(VMS)
+-#ifdef USG
++#if defined(USG) && defined(VINTR)
+   (void) ioctl(0, TCGETA, (char *)&tbuf);
+   /* disable all of the normal special control characters */
+   tbuf.c_cc[VINTR] = (char)3; /* control-C */
+@@ -527,6 +534,7 @@ void restore_term()
  }
  #else
  {
@@ -38,7 +56,7 @@ $NetBSD: patch-ad,v 1.2 1999/08/30 02:35:10 simonb Exp $
  #ifdef AMIGA
    closetimer ();
  #endif
-@@ -542,7 +547,8 @@
+@@ -542,7 +550,8 @@ void restore_term()
    pause_line(15);
  #endif
    /* this moves curses to bottom right corner */
@@ -48,7 +66,7 @@ $NetBSD: patch-ad,v 1.2 1999/08/30 02:35:10 simonb Exp $
    endwin();  /* exit curses */
    (void) fflush (stdout);
  #ifdef MSDOS
-@@ -757,7 +763,7 @@
+@@ -757,7 +766,7 @@ void shell_out()
        msg_print("Fork failed. Try again.");
        return;
      }