[Pkg-nethack-devel] nethack/sys/unix Makefile.src,1.1.1.1,1.2 Makefile.utl,1.1.1.1,1.2 README.linux,1.1.1.1,1.2 unixmain.c,1.1.1.1,1.2 unixunix.c,1.1.1.1,1.2

Joshua Kwan joshk-guest@quantz.debian.org
Tue, 09 Dec 2003 16:14:46 +0000 

Update of /cvsroot/pkg-nethack/nethack/sys/unix
In directory quantz:/tmp/cvs-serv9687/sys/unix

Modified Files:
	Makefile.src Makefile.utl README.linux unixmain.c unixunix.c 
Log Message:
Merge Nethack 3.4.3 upstream source.


Index: Makefile.utl
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/sys/unix/Makefile.utl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.utl	7 Oct 2003 19:00:35 -0000	1.1.1.1
+++ Makefile.utl	9 Dec 2003 16:14:44 -0000	1.2
@@ -335,6 +335,9 @@
 ppmwrite.o: ../win/share/ppmwrite.c $(CONFIG_H) ../include/tile.h
 	$(CC) $(CFLAGS) -c ../win/share/ppmwrite.c
 
+tile2bmp.o: ../win/share/tile2bmp.c $(HACK_H) ../include/tile.h
+	$(CC) $(CFLAGS) -c ../win/share/tile2bmp.c
+
 tile2x11.o: ../win/X11/tile2x11.c $(HACK_H) ../include/tile.h \
 						../include/tile2x11.h
 	$(CC) $(CFLAGS) -c ../win/X11/tile2x11.c

Index: unixmain.c
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/sys/unix/unixmain.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- unixmain.c	7 Oct 2003 19:00:35 -0000	1.1.1.1
+++ unixmain.c	9 Dec 2003 16:14:44 -0000	1.2
@@ -243,7 +243,7 @@
 		 */
 		boolean remember_wiz_mode = wizard;
 #endif
-		const char *fq_save = fqname(SAVEF, SAVEPREFIX, 0);
+		const char *fq_save = fqname(SAVEF, SAVEPREFIX, 1);
 
 		(void) chmod(fq_save,0);	/* disallow parallel restores */
 		(void) signal(SIGINT, (SIG_RET_TYPE) done1);

Index: unixunix.c
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/sys/unix/unixunix.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- unixunix.c	7 Oct 2003 19:00:35 -0000	1.1.1.1
+++ unixunix.c	9 Dec 2003 16:14:44 -0000	1.2
@@ -22,6 +22,10 @@
 extern void NDECL(linux_mapoff);
 #endif
 
+#ifndef NHSTDC
+extern int errno;
+#endif
+
 static struct stat buf;
 
 /* see whether we should throw away this xlock file */
@@ -41,9 +45,6 @@
 	(void) time(&date);
 #endif
 	if(date - buf.st_mtime < 3L*24L*60L*60L) {	/* recent */
-#ifndef NETWORK
-		extern int errno;
-#endif
 		int lockedpid;	/* should be the same size as hackpid */
 
 		if(read(fd, (genericptr_t)&lockedpid, sizeof(lockedpid)) !=
@@ -88,7 +89,6 @@
 void
 getlock()
 {
-	extern int errno;
 	register int i = 0, fd, c;
 	const char *fq_lock;
 
@@ -197,7 +197,7 @@
 
 	while((lp=index(s, '.')) || (lp=index(s, '/')) || (lp=index(s,' ')))
 		*lp = '_';
-#if defined(SYSV) && !defined(AIX_31) && !defined(SVR4) && !defined(LINUX)
+#if defined(SYSV) && !defined(AIX_31) && !defined(SVR4) && !defined(LINUX) && !defined(__APPLE__)
 	/* avoid problems with 14 character file name limit */
 # ifdef COMPRESS
 	/* leave room for .e from error and .Z from compress appended to

Index: README.linux
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/sys/unix/README.linux,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- README.linux	7 Oct 2003 19:00:35 -0000	1.1.1.1
+++ README.linux	9 Dec 2003 16:14:44 -0000	1.2
@@ -1,4 +1,4 @@
-NetHack 3.4.2 Linux Elf
+NetHack 3.4.3 Linux Elf
 
 This README provides the instructions for using the official Linux binary,
 system platform requirements, as well as steps used to create that binary.
@@ -20,11 +20,13 @@
 home directory you might perform these steps.
     % su
     # cd /
-    # gunzip -c ~yourlogin/nh342lin.tgz | tar xpvf -
+    # tar xpvzf ~yourlogin/nethack-343-linux-X11.tgz
 
-(If you have old record and logfile entries from a previous NetHack version,
+If you have old record and logfile entries from a previous NetHack version,
 you might want to save copies before they get overwritten by the new empty
-files; old saved games and bones files from 3.4.x will work with 3.4.2).
+files; old saved games and bones files from 3.4.x will work with 3.4.3.
+If you are installing from the RPM, there is no need to save the old record
+and logfile; they are automatically preserved.
 
 In addition to data files for running the game, you will find other useful
 things in /usr/games/lib/nethackdir (such as a copy of this README :-).
@@ -62,7 +64,7 @@
 instructions found in sys/unix/Install.unx.  The step numbers below
 correspond to the step numbers in sys/unix/Install.unx.
 
-System:  gcc-3.2, XFree86-libs-4.2.0, ncurses-5.2, glibc-2.2.93 (GLIBC_2.3)
+System:  gcc-3.2, XFree86-libs-4.2.1, ncurses-5.2, glibc-2.3.2 (GLIBC_2.3)
 
 3.  Edit include/config.h and include/unixconf.h
     config.h: define X11_GRAPHICS window support.
@@ -71,6 +73,7 @@
               seems to reside on newer Linux's.
               define COMPRESS_EXTENSION as ".gz"
               define DLB
+	      define AUTOPICKUP_EXCEPTIONS
 
     unixconf.h: define LINUX
                 define TIMED_DELAY
@@ -96,7 +99,7 @@
 		  FILEPERM = 0664
 		  EXEPERM = 0755
 		  DIRPERM = 0775
-		  VARDATND = x11tiles pet_mark.xbm rip.xpm
+		  VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
 
     make all; su; make install
 

Index: Makefile.src
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/sys/unix/Makefile.src,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.src	7 Oct 2003 19:00:35 -0000	1.1.1.1
+++ Makefile.src	9 Dec 2003 16:14:44 -0000	1.2
@@ -635,7 +635,8 @@
 		../win/gnome/gnmain.h
 	$(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnaskstr.c
 gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnmain.h \
-		../win/gnome/gnaskstr.h ../win/gnome/gnyesno.h
+		../win/gnome/gnmenu.h ../win/gnome/gnaskstr.h \
+		../win/gnome/gnyesno.h
 	$(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnbind.c
 gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h ../include/tile2x11.h
 	$(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnglyph.c
@@ -647,7 +648,7 @@
 		../win/gnome/gnsignal.h $(HACK_H)
 	$(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnmap.c
 gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h ../win/gnome/gnmain.h \
-		../win/gnome/gnbind.h
+		../win/gnome/gnbind.h ../include/func_tab.h
 	$(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnmenu.c
 gnmesg.o: ../win/gnome/gnmesg.c ../win/gnome/gnmesg.h ../win/gnome/gnsignal.h
 	$(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnmesg.c
@@ -667,11 +668,11 @@
 gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h ../win/gnome/gnmain.h \
 		../win/gnome/gn_rip.h
 	$(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gntext.c
+gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h
+	$(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnyesno.c
 gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h ../win/gnome/gnglyph.h \
 		../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h
 	$(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnworn.c
-gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h
-	$(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnyesno.c
 wingem.o: ../win/gem/wingem.c $(HACK_H) ../include/func_tab.h ../include/dlb.h \
 		../include/patchlevel.h ../include/wingem.h
 	$(CC) $(CFLAGS) -c ../win/gem/wingem.c
@@ -715,7 +716,7 @@
 dog.o: dog.c $(HACK_H) ../include/edog.h
 dogmove.o: dogmove.c $(HACK_H) ../include/mfndpos.h ../include/edog.h
 dokick.o: dokick.c $(HACK_H) ../include/eshk.h
-dothrow.o: dothrow.c $(HACK_H)
+dothrow.o: dothrow.c $(HACK_H) ../include/edog.h
 drawing.o: drawing.c $(HACK_H) ../include/tcap.h
 dungeon.o: dungeon.c $(HACK_H) ../include/dgn_file.h ../include/dlb.h
 eat.o: eat.c $(HACK_H)