diff -ru nethack-3.6.1/include/config.h nethack-3.6.1.new/include/config.h --- nethack-3.6.1/include/config.h 2018-04-27 14:07:22.000000000 +0200 +++ nethack-3.6.1.new/include/config.h 2019-04-02 14:18:00.186648000 +0200 @@ -30,7 +30,7 @@ try this define, used in pager.c and termcap.c */ /* #define ULTRIX_CC20 */ /* define only if using cc v2.0 on a DECstation */ -/* #define ULTRIX_PROTO */ +#define ULTRIX_PROTO /* define for Ultrix 4.0 (or higher) on a DECstation; * if you get compiler errors, don't define this. */ /* Hint: if you're not developing code, don't define @@ -195,10 +195,10 @@ #endif #ifndef GDBPATH -#define GDBPATH "/usr/bin/gdb" +#define GDBPATH "/usr/local/bin/gdb" #endif #ifndef GREPPATH -#define GREPPATH "/bin/grep" +#define GREPPATH "/usr/ucb/grep" #endif /* note: "larger" is in comparison with 'record', the high-scores file @@ -256,11 +256,11 @@ #if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS) /* path and file name extension for compression program */ -#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */ -#define COMPRESS_EXTENSION ".Z" /* compress's extension */ +/* #define COMPRESS "/usr/bin/compress" */ /* Lempel-Ziv compression */ +/* #define COMPRESS_EXTENSION ".Z" */ /* compress's extension */ /* An example of one alternative you might want to use: */ -/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */ -/* #define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */ +#define COMPRESS "/usr/local/bin/gzip" /* FSF gzip compression */ +#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ #endif #ifndef COMPRESS diff -ru nethack-3.6.1/include/system.h nethack-3.6.1.new/include/system.h --- nethack-3.6.1/include/system.h 2018-04-27 14:07:22.000000000 +0200 +++ nethack-3.6.1.new/include/system.h 2019-04-01 14:55:57.000000000 +0200 @@ -284,9 +284,6 @@ E void bcopy(); #ifdef ULTRIX E int FDECL(system, (const char *)); -#ifndef _UNISTD_H_ -E int FDECL(execl, (const char *, ...)); -#endif #endif #endif #ifdef MICRO diff -ru nethack-3.6.1/src/mail.c nethack-3.6.1.new/src/mail.c --- nethack-3.6.1/src/mail.c 2018-04-27 14:07:22.000000000 +0200 +++ nethack-3.6.1.new/src/mail.c 2019-04-01 15:09:45.000000000 +0200 @@ -51,7 +51,7 @@ #include #include /* DON'T trust all Unices to declare getpwuid() in */ -#if !defined(_BULL_SOURCE) && !defined(__sgi) && !defined(_M_UNIX) +#if !defined(_BULL_SOURCE) && !defined(__sgi) && !defined(_M_UNIX) && !defined(ULTRIX) #if !defined(SUNOS4) && !(defined(ULTRIX) && defined(__GNUC__)) /* DO trust all SVR4 to typedef uid_t in (probably to a long) */ #if defined(POSIX_TYPES) || defined(SVR4) || defined(HPUX) diff -ru nethack-3.6.1/sys/share/unixtty.c nethack-3.6.1.new/sys/share/unixtty.c --- nethack-3.6.1/sys/share/unixtty.c 2018-04-27 14:07:22.000000000 +0200 +++ nethack-3.6.1.new/sys/share/unixtty.c 2019-04-01 17:10:38.000000000 +0200 @@ -129,8 +129,9 @@ #endif short ospeed; /* terminal baudrate; set by gettty */ #else -short ospeed = 0; /* gets around "not defined" error message */ #endif + +short ospeed = 0; /* gets around "not defined" error message */ #if defined(POSIX_TYPES) && defined(BSD) unsigned diff -ru nethack-3.6.1/sys/unix/Makefile.doc nethack-3.6.1.new/sys/unix/Makefile.doc --- nethack-3.6.1/sys/unix/Makefile.doc 2018-04-27 14:07:22.000000000 +0200 +++ nethack-3.6.1.new/sys/unix/Makefile.doc 2019-04-02 14:21:21.125224000 +0200 @@ -33,7 +33,7 @@ # Single page. Might need adjustment to .pl value # GUIDECMD= $(GUIDE_PREFORMAT) | perl -pe 's/^(.mt)$$/.pl 4720v\n.in 0\n.po 8\n.ll 64m\n$$1/' | nroff -c -Tascii | $(COLCMD) # -GUIDECMD = $(GUIDE_PREFORMAT) | nroff -c -Tascii | $(COLCMD) +GUIDECMD = $(GUIDE_PREFORMAT) | groff -Tascii | $(COLCMD) # Only generate output for the current configuration: NHGREP = $(MAKEDEFS) --grep --input - --output - diff -ru nethack-3.6.1/sys/unix/Makefile.top nethack-3.6.1.new/sys/unix/Makefile.top --- nethack-3.6.1/sys/unix/Makefile.top 2018-04-27 14:07:22.000000000 +0200 +++ nethack-3.6.1.new/sys/unix/Makefile.top 2019-04-02 14:21:46.619735000 +0200 @@ -94,7 +94,7 @@ $(GAME): ( cd src ; $(MAKE) ) -all: $(GAME) recover Guidebook $(VARDAT) dungeon spec_levs check-dlb +all: $(GAME) recover $(VARDAT) dungeon spec_levs check-dlb true; $(MOREALL) @echo "Done." diff -ru nethack-3.6.1/sys/unix/Makefile.utl nethack-3.6.1.new/sys/unix/Makefile.utl --- nethack-3.6.1/sys/unix/Makefile.utl 2018-04-27 14:07:22.000000000 +0200 +++ nethack-3.6.1.new/sys/unix/Makefile.utl 2019-04-02 14:20:18.469262000 +0200 @@ -112,10 +112,10 @@ # yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c. # if, instead of yacc/lex you have bison/flex, comment/uncomment the following. YACC = yacc -LEX = lex +# LEX = lex # YACC = bison -y # YACC = byacc -# LEX = flex +LEX = flex # these are the names of the output files from YACC/LEX. Under MS-DOS # and similar systems, they may differ diff -ru /dev/null nethack-3.6.1.new/sys/unix/hints/ultrix --- /dev/null 2019-04-02 14:15:41.502420000 +0200 +++ nethack-3.6.1.new/sys/unix/hints/ultrix 2019-04-02 14:05:02.000000000 +0200 @@ -0,0 +1,36 @@ +# +# NetHack 3.6 unix $NHDT-Date: 1432512813 2015/05/25 00:13:33 $ $NHDT-Branch: master $:$NHDT-Revision: 1.8 $ +# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007. +# NetHack may be freely redistributed. See license for details. +# +#-PRE +# unix hints file +# This hints file provides the legacy configuration that NetHack has shipped +# with historically - this means you will most likely need to hand edit .h +# and Makefiles. + + +PREFIX=$(HOME) +HACKDIR=$(PREFIX)/games/lib/$(GAME)dir +INSTDIR=$(HACKDIR) +VARDIR=$(HACKDIR) +SHELLDIR=$(PREFIX)/games + +CFLAGS=-O2 -Olimit 1024 -I../include -DULTRIX +LINK=$(CC) + +WINSRC = $(WINTTYSRC) +WINOBJ = $(WINTTYOBJ) +WINLIB = $(WINTTYLIB) + +WINTTYLIB=-lcursesX + +CHOWN=chown +CHGRP=chgrp + +GAMEUID = games +GAMEGRP = bin + +GAMEPERM = 04755 +VARFILEPERM = 0644 +VARDIRPERM = 0755 diff -ru nethack-3.6.1/sys/unix/unixmain.c nethack-3.6.1.new/sys/unix/unixmain.c --- nethack-3.6.1/sys/unix/unixmain.c 2018-04-27 14:07:22.000000000 +0200 +++ nethack-3.6.1.new/sys/unix/unixmain.c 2019-04-01 15:54:19.000000000 +0200 @@ -16,7 +16,7 @@ #include #endif -#if !defined(_BULL_SOURCE) && !defined(__sgi) && !defined(_M_UNIX) +#if !defined(_BULL_SOURCE) && !defined(__sgi) && !defined(_M_UNIX) && !defined(ULTRIX) #if !defined(SUNOS4) && !(defined(ULTRIX) && defined(__GNUC__)) #if defined(POSIX_TYPES) || defined(SVR4) || defined(HPUX) extern struct passwd *FDECL(getpwuid, (uid_t)); diff -ru nethack-3.6.1/util/dgn_comp.y nethack-3.6.1.new/util/dgn_comp.y --- nethack-3.6.1/util/dgn_comp.y 2016-09-04 13:53:42.000000000 +0200 +++ nethack-3.6.1.new/util/dgn_comp.y 2019-04-01 19:10:24.000000000 +0200 @@ -26,6 +26,8 @@ #include "date.h" #include "dgn_file.h" +#define YYMAXDEPTH 250 /* extra stack depth to avoid overflow */ + void FDECL(yyerror, (const char *)); void FDECL(yywarning, (const char *)); int NDECL(yylex); diff -ru nethack-3.6.1/util/lev_comp.y nethack-3.6.1.new/util/lev_comp.y --- nethack-3.6.1/util/lev_comp.y 2017-09-08 11:19:31.000000000 +0200 +++ nethack-3.6.1.new/util/lev_comp.y 2019-04-01 19:10:04.000000000 +0200 @@ -21,6 +21,8 @@ #pragma alloca /* keep leading space! */ #endif +#define YYMAXDEPTH 250 + #define SPEC_LEV /* for USE_OLDARGS (sp_lev.h) */ #include "hack.h" #include "sp_lev.h" diff -ru nethack-3.6.1/win/tty/termcap.c nethack-3.6.1.new/win/tty/termcap.c --- nethack-3.6.1/win/tty/termcap.c 2018-04-27 14:07:22.000000000 +0200 +++ nethack-3.6.1.new/win/tty/termcap.c 2019-04-01 17:11:04.000000000 +0200 @@ -330,6 +330,8 @@ error("TERMCAP entry too big...\n"); free((genericptr_t) tptr); #endif /* TERMLIB */ + + ospeed = cfgetospeed(); } /* note: at present, this routine is not part of the formal window interface