Fix build on Linux. Use ncurses instead of termlib. Defined SYSV

instead of BSD.  This addresses PR#29424

3 files changed, 23 insertions, 11 deletions

diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common
index 523f5710d8d..c0ce075b4af 100644
--- a/games/nethack-lib/Makefile.common
+++ b/games/nethack-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2006/08/28 23:03:14 ben Exp $
+# $NetBSD: Makefile.common,v 1.20 2006/10/09 02:06:58 ben Exp $
 #
 
 NETHACK_BASEVER=	3.4.3
@@ -21,7 +21,7 @@ USE_TOOLS+=		gzip
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
 SUBST_CLASSES+=		ttylib
 SUBST_MESSAGE.ttylib=	Configuring to use ncurses
 SUBST_STAGE.ttylib=	post-patch
@@ -29,6 +29,17 @@ SUBST_FILES.ttylib=	sys/unix/Makefile.src
 SUBST_SED.ttylib=	-e 's,^WINTTYLIB = -ltermlib,WINTTYLIB = -lncurses,'
 .endif
 
+.if ${OPSYS} == "Linux"
+NETHACK_OS=		SYSV
+.endif
+NETHACK_OS?=		BSD
+
+SUBST_CLASSES+=		os
+SUBST_MESSAGE.os=	Configuring for $(NETHACK_OS)
+SUBST_STAGE.os=		post-patch
+SUBST_FILES.os=		include/unixconf.h
+SUBST_SED.os=		-e 's,__NETHACK_OS__,${NETHACK_OS},'
+
 NETHACK_GROUP=		games
 PKG_GROUPS=             ${NETHACK_GROUP}
 
diff --git a/games/nethack-lib/distinfo b/games/nethack-lib/distinfo
index b5140953d26..d8a8578ce3b 100644
--- a/games/nethack-lib/distinfo
+++ b/games/nethack-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2006/06/19 17:07:45 minskim Exp $
+$NetBSD: distinfo,v 1.13 2006/10/09 02:06:58 ben Exp $
 
 SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd
 RMD160 (nethack-343-src.tgz) = 42f600d24715a0b7e631b357c135761410b3ca95
@@ -8,5 +8,5 @@ SHA1 (patch-ab) = 73a1ac287ded70f371bb38c82cdbcd36182ce3a5
 SHA1 (patch-ac) = e447b4c60ef7db7cfcd35a9be8b8d2f86fc0c27b
 SHA1 (patch-ad) = 16ec579732beba4b2cb4ab3ea06d20d4f6b191a4
 SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db
-SHA1 (patch-af) = c7640150409d97a7930fef476191d34c08c6f741
+SHA1 (patch-af) = e4723716f326df242279953b6091e528eb7e0007
 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
diff --git a/games/nethack-lib/patches/patch-af b/games/nethack-lib/patches/patch-af
index bcd9be75bf0..f115607979b 100644
--- a/games/nethack-lib/patches/patch-af
+++ b/games/nethack-lib/patches/patch-af
@@ -1,13 +1,14 @@
-$NetBSD: patch-af,v 1.5 2004/03/05 15:21:01 pooka Exp $
+$NetBSD: patch-af,v 1.6 2006/10/09 02:06:58 ben Exp $
 
---- include/unixconf.h.orig	2003-12-08 01:39:13.000000000 +0200
-+++ include/unixconf.h	2004-03-05 15:47:53.000000000 +0200
-@@ -19,20 +19,20 @@
+--- include/unixconf.h.orig	2003-12-07 18:39:13.000000000 -0500
++++ include/unixconf.h
+@@ -19,20 +19,21 @@
   */
  
  /* define exactly one of the following four choices */
 -/* #define BSD 1 */	/* define for 4.n/Free/Open/Net BSD  */
-+#define BSD 1		/* define for 4.n/Free/Open/Net BSD  */
++#define __NETHACK_OS__ 1
++/* #define BSD */	/* define for 4.n/Free/Open/Net BSD  */
  			/* also for relatives like SunOS 4.x, DG/UX, and */
  			/* older versions of Linux */
  /* #define ULTRIX */	/* define for Ultrix v3.0 or higher (but not lower) */
@@ -26,7 +27,7 @@ $NetBSD: patch-af,v 1.5 2004/03/05 15:21:01 pooka Exp $
  			/* including Solaris 2+ */
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
-@@ -47,7 +47,7 @@
+@@ -47,7 +48,7 @@
  			 * job control (note that AIX is SYSV otherwise)
  			 * Also define this for AIX 3.2 */
  
@@ -35,7 +36,7 @@ $NetBSD: patch-af,v 1.5 2004/03/05 15:21:01 pooka Exp $
  			/* Should be defined for most SYSV, SVR4 (including
  			 * Solaris 2+), HPUX, and Linux systems.  In
  			 * particular, it should NOT be defined for the UNIXPC
-@@ -171,7 +171,7 @@
+@@ -171,7 +172,7 @@
  #  ifdef AMS
  #define AMS_MAILBOX	"/Mailbox"
  #  else