diff options
Diffstat (limited to 'games/nethack-lib')
| -rw-r--r-- | games/nethack-lib/Makefile.common | 8 | ||||
| -rw-r--r-- | games/nethack-lib/distinfo | 14 | ||||
| -rw-r--r-- | games/nethack-lib/patches/patch-ab | 16 | ||||
| -rw-r--r-- | games/nethack-lib/patches/patch-ac | 14 | ||||
| -rw-r--r-- | games/nethack-lib/patches/patch-ad | 8 | ||||
| -rw-r--r-- | games/nethack-lib/patches/patch-af | 25 |
6 files changed, 43 insertions, 42 deletions
diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common index e6626223345..9b0ca7db8cf 100644 --- a/games/nethack-lib/Makefile.common +++ b/games/nethack-lib/Makefile.common @@ -1,15 +1,15 @@ -# $NetBSD: Makefile.common,v 1.12 2003/07/17 21:39:04 grant Exp $ +# $NetBSD: Makefile.common,v 1.13 2003/09/02 00:30:54 pooka Exp $ # -NETHACK_BASEVER= 3.4.1 +NETHACK_BASEVER= 3.4.2 NETHACK_VERSION= ${NETHACK_BASEVER} -NETHACK_DISTVER= 341 +NETHACK_DISTVER= 342 NETHACK_DIR= nethackdir340 DISTNAME= nethack-${NETHACK_DISTVER} WRKSRC= ${WRKDIR}/nethack-${NETHACK_BASEVER} CATEGORIES= games -MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh${NETHACK_DISTVER}/src/ +MASTER_SITES= ftp://ftp.sourceforge.net/pub/sourceforge/nethack/ EXTRACT_SUFX= .tgz MAINTAINER= pooka@NetBSD.org diff --git a/games/nethack-lib/distinfo b/games/nethack-lib/distinfo index 3e12a012912..c1cd08dc610 100644 --- a/games/nethack-lib/distinfo +++ b/games/nethack-lib/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.7 2003/06/25 14:14:30 pooka Exp $ +$NetBSD: distinfo,v 1.8 2003/09/02 00:30:54 pooka Exp $ -SHA1 (nethack-341.tgz) = 91eec5d20fb0fe676f92e1149e3b0360470aef77 -Size (nethack-341.tgz) = 3492419 bytes +SHA1 (nethack-342.tgz) = a630f8e1ecdc0c957dd6707acbb99dac450a57ba +Size (nethack-342.tgz) = 3475583 bytes SHA1 (patch-aa) = 5eba647b7017f87a9f332970f6ef7c66cb1c0117 -SHA1 (patch-ab) = fa217d8540a550d669a9037c5861ac4d685941ee -SHA1 (patch-ac) = c6af5a68e834f9707bdf15d79279074ecc023237 -SHA1 (patch-ad) = c5e86cda66b36bfdd3d6460ec5b3c65706692dba +SHA1 (patch-ab) = 6c42d5c4c12e70651f14b08658169f6c00b420db +SHA1 (patch-ac) = 4181ec1186abd65b72400a56a6062e04d1783f81 +SHA1 (patch-ad) = 16ec579732beba4b2cb4ab3ea06d20d4f6b191a4 SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db -SHA1 (patch-af) = 20c37fd62b05121d834d3c42cf3aa48b018b362d +SHA1 (patch-af) = 6e1acdc2ab68c4fe72819a75cf84c58ea382b29e SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674 diff --git a/games/nethack-lib/patches/patch-ab b/games/nethack-lib/patches/patch-ab index 382305152c8..54ffe1f909b 100644 --- a/games/nethack-lib/patches/patch-ab +++ b/games/nethack-lib/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.9 2003/03/01 21:12:50 pooka Exp $ +$NetBSD: patch-ab,v 1.10 2003/09/02 00:30:54 pooka Exp $ ---- sys/unix/Makefile.top.orig 2003-02-23 16:43:39.000000000 +0200 -+++ sys/unix/Makefile.top 2003-03-01 22:06:45.000000000 +0200 +--- sys/unix/Makefile.top.orig 2003-08-30 03:08:04.000000000 +0300 ++++ sys/unix/Makefile.top 2003-09-02 02:42:07.000000000 +0300 @@ -14,18 +14,17 @@ # MAKE = make @@ -39,8 +39,8 @@ $NetBSD: patch-ab,v 1.9 2003/03/01 21:12:50 pooka Exp $ # per discussion in Install.X11 and Install.Qt -VARDATND = +VARDATND = pet_mark.xbm rip.xpm - # VARDATND = x11tiles pet_mark.xbm - # VARDATND = x11tiles pet_mark.xbm rip.xpm + # VARDATND = x11tiles NetHack.ad pet_mark.xbm + # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm # for Atari/Gem @@ -87,9 +86,12 @@ $(GAME): @@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.9 2003/03/01 21:12:50 pooka Exp $ # Note: many of the dependencies below are here to allow parallel make # to generate valid output -@@ -180,18 +182,15 @@ +@@ -183,18 +185,15 @@ -e '}' \ -e '$$s/.*/nodlb/p' < dat/options` ; \ $(MAKE) dofiles-$${target-nodlb} @@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.9 2003/03/01 21:12:50 pooka Exp $ -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME) $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME) chmod $(EXEPERM) $(SHELLDIR)/$(GAME) -@@ -227,16 +226,16 @@ +@@ -230,16 +229,16 @@ # and a reminder @echo You may also want to install the man pages via the doc Makefile. @@ -98,7 +98,7 @@ $NetBSD: patch-ab,v 1.9 2003/03/01 21:12:50 pooka Exp $ # set up the game files ( $(MAKE) dofiles ) # set up some additional files -@@ -244,9 +243,20 @@ +@@ -247,9 +246,20 @@ -( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \ $(CHGRP) $(GAMEGRP) perm record logfile ; \ chmod $(FILEPERM) perm record logfile ) diff --git a/games/nethack-lib/patches/patch-ac b/games/nethack-lib/patches/patch-ac index 43920193e3a..c2e9874302a 100644 --- a/games/nethack-lib/patches/patch-ac +++ b/games/nethack-lib/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.5 2003/06/25 14:14:30 pooka Exp $ +$NetBSD: patch-ac,v 1.6 2003/09/02 00:30:54 pooka Exp $ ---- include/system.h.orig 2003-02-23 16:43:22.000000000 +0200 -+++ include/system.h 2003-03-01 16:34:46.000000000 +0200 +--- include/system.h.orig 2003-08-30 03:07:23.000000000 +0300 ++++ include/system.h 2003-09-02 02:49:23.000000000 +0300 @@ -79,10 +79,10 @@ # if !defined(__SC__) && !defined(LINUX) E long NDECL(random); # endif --# if !defined(SUNOS4) || defined(RANDOM) -+# if !defined(SUNOS4) && !defined(__NetBSD__) && !defined(__FreeBSD__) || defined(RANDOM) +-# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM) ++# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__)) || defined(RANDOM) E void FDECL(srandom, (unsigned int)); # else -# if !defined(bsdi) && !defined(__FreeBSD__) -+# if !defined(bsdi) && !defined(__FreeBSD__) && !defined(__NetBSD__) ++# if !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) E int FDECL(srandom, (unsigned int)); # endif # endif @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.5 2003/06/25 14:14:30 pooka Exp $ # endif +#ifndef __NetBSD__ - # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) + # if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) E time_t FDECL(time, (time_t *)); # else E long FDECL(time, (time_t *)); diff --git a/games/nethack-lib/patches/patch-ad b/games/nethack-lib/patches/patch-ad index 4a8c5553903..baccd379ce3 100644 --- a/games/nethack-lib/patches/patch-ad +++ b/games/nethack-lib/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.4 2002/03/25 20:32:26 pooka Exp $ +$NetBSD: patch-ad,v 1.5 2003/09/02 00:30:55 pooka Exp $ ---- sys/unix/nethack.sh.orig Thu Mar 21 01:43:54 2002 -+++ sys/unix/nethack.sh Fri Mar 22 17:39:00 2002 +--- sys/unix/nethack.sh.orig 2003-08-30 03:08:04.000000000 +0300 ++++ sys/unix/nethack.sh 2003-09-02 02:52:31.000000000 +0300 @@ -1,9 +1,15 @@ #!/bin/sh # SCCS Id: @(#)nethack.sh 3.4 1990/02/26 @@ -19,4 +19,4 @@ $NetBSD: patch-ad,v 1.4 2002/03/25 20:32:26 pooka Exp $ +HACK=XXXPREFIXXXX/bin/nethack-$TTY MAXNROFPLAYERS=4 - # see if we can find the full path name of PAGER, so help files work properly + # Since Nethack.ad is installed in HACKDIR, add it to XUSERFILESEARCHPATH diff --git a/games/nethack-lib/patches/patch-af b/games/nethack-lib/patches/patch-af index c9259679f4c..34bd25c80b0 100644 --- a/games/nethack-lib/patches/patch-af +++ b/games/nethack-lib/patches/patch-af @@ -1,20 +1,20 @@ -$NetBSD: patch-af,v 1.3 2002/03/22 17:26:25 pooka Exp $ +$NetBSD: patch-af,v 1.4 2003/09/02 00:30:55 pooka Exp $ ---- include/unixconf.h.orig Thu Mar 21 01:42:56 2002 -+++ include/unixconf.h Fri Mar 22 17:42:50 2002 +--- include/unixconf.h.orig 2003-08-30 03:07:24.000000000 +0300 ++++ include/unixconf.h 2003-09-02 02:55:54.000000000 +0300 @@ -19,20 +19,20 @@ */ /* define exactly one of the following four choices */ --/* #define BSD 1 */ /* define for 4.n BSD */ -+#define BSD 1 /* define for 4.n BSD */ +-/* #define BSD 1 */ /* define for 4.n/Free/Open/Net BSD */ ++#define BSD 1 /* 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) */ /* Use BSD for < v3.0 */ /* "ULTRIX" not to be confused with "ultrix" */ -#define SYSV /* define for System V, Solaris 2.x, newer versions */ -+/* #define SYSV /* define for System V, Solaris 2.x, newer versions */ ++/* #define SYSV */ /* define for System V, Solaris 2.x, newer versions */ /* of Linux */ /* #define HPUX */ /* Hewlett-Packard's Unix, version 6.5 or higher */ /* use SYSV for < v6.5 */ @@ -22,7 +22,7 @@ $NetBSD: patch-af,v 1.3 2002/03/22 17:26:25 pooka Exp $ /* define any of the following that are appropriate */ -#define SVR4 /* use in addition to SYSV for System V Release 4 */ -+/* #define SVR4 /* use in addition to SYSV for System V Release 4 */ ++/* #define SVR4 */ /* use in addition to SYSV for System V Release 4 */ /* including Solaris 2+ */ #define NETWORK /* if running on a networked system */ /* e.g. Suns sharing a playground through NFS */ @@ -35,7 +35,7 @@ $NetBSD: patch-af,v 1.3 2002/03/22 17:26:25 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 -@@ -168,11 +168,15 @@ +@@ -168,6 +168,9 @@ #ifdef MAIL # if defined(BSD) || defined(ULTRIX) @@ -45,10 +45,11 @@ $NetBSD: patch-af,v 1.3 2002/03/22 17:26:25 pooka Exp $ # ifdef AMS #define AMS_MAILBOX "/Mailbox" # else +@@ -177,6 +180,7 @@ #define DEF_MAILREADER "/usr/ucb/Mail" --# endif -+# endif -+# endif + # endif + # endif ++#endif #else # if (defined(SYSV) || defined(DGUX) || defined(HPUX)) && !defined(LINUX) - # if defined(M_XENIX) || defined(__FreeBSD__) + # if defined(M_XENIX) |