Update to TOME 2.2.5

4 files changed, 29 insertions, 193 deletions

diff --git a/games/tome/files/patch-aa b/games/tome/files/patch-aa
index 5a492b7bfa2a..b9f075807690 100644
--- a/games/tome/files/patch-aa
+++ b/games/tome/files/patch-aa
@@ -1,5 +1,5 @@
---- makefile.std.orig	Mon Apr 21 15:44:23 2003
-+++ makefile.std	Sat Jul  5 18:53:04 2003
+--- makefile.std.orig	Thu Dec 11 12:32:41 2003
++++ makefile.std	Fri Dec 12 11:53:31 2003
 @@ -81,18 +81,19 @@
  # Sysadmins of commercial Unix and/or BSD might prefer this
  #LIBDIR = /usr/local/lib/tome/
@@ -32,7 +32,7 @@
  
  # Profiling options
  # PROFILECOPTS = -pg
-@@ -152,14 +153,12 @@
+@@ -152,12 +153,12 @@
  # including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
  # attempt to "guess" at many of these flags based on your system.
  #
@@ -40,17 +40,15 @@
 -INCLUDES = -I/usr/X11R6/include
 +COPTS = -Wall -g
 +INCLUDES = -I$(X11BASE)/include
- DEFINES = -DUSE_X11 -DUSE_GCU \
+ DEFINES = -DUSE_X11 \
  	-DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY -DSUPPORT_GAMMA \
  	-DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK
--LIBS = -lX11 -lcurses -L/usr/X11R6/lib
--
--
+-LIBS = -lX11 -L/usr/X11R6/lib
 +LIBS = -lX11 -lcurses -L$(X11BASE)/lib
  
- ##
- ## Variation -- Only support "main-gtk.c" (not "main-gcu.c, main-x11.c")
-@@ -383,7 +382,7 @@
+ 
+ 
+@@ -383,7 +384,7 @@
  # Compiler options
  #
  
@@ -59,7 +57,7 @@
  
  
  #
-@@ -457,10 +456,12 @@
+@@ -457,10 +458,12 @@
  	[ -d $(DESTDIR)$(LIBDIR) ] || mkdir -p $(DESTDIR)$(LIBDIR)
  	[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
  	cp -r ../lib/* $(DESTDIR)$(LIBDIR)
diff --git a/games/tome/files/patch-ab b/games/tome/files/patch-ab
deleted file mode 100644
index 611071801815..000000000000
--- a/games/tome/files/patch-ab
+++ /dev/null
@@ -1,182 +0,0 @@
---- init2.c.orig	Sat Jun  7 22:36:23 2003
-+++ init2.c	Sat Jul  5 18:54:23 2003
-@@ -428,7 +428,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -711,7 +711,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -1150,7 +1150,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -1374,7 +1374,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -1600,7 +1600,7 @@
- 
- 	/* int i; */
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -1822,7 +1822,7 @@
- 
- 	/* int i; */
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -2102,7 +2102,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -2368,7 +2368,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -3073,7 +3073,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -3297,7 +3297,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -3514,7 +3514,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -3740,7 +3740,7 @@
- 
- 	int i;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -4094,7 +4094,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -4311,7 +4311,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -4528,7 +4528,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -4745,7 +4745,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -5027,7 +5027,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err = 0;
- 
-@@ -5291,7 +5291,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err;
- 
-@@ -5579,7 +5579,7 @@
- {
- 	int fd;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	errr err;
- 
-@@ -6545,7 +6545,7 @@
- {
- 	int fd = -1;
- 
--	int mode = 0644;
-+	int mode = 0664;
- 
- 	FILE *fp;
- 
diff --git a/games/tome/files/patch-ac b/games/tome/files/patch-ac
new file mode 100644
index 000000000000..14daefacd144
--- /dev/null
+++ b/games/tome/files/patch-ac
@@ -0,0 +1,9 @@
+--- config.h.orig	Thu Dec 11 12:32:40 2003
++++ config.h	Fri Dec 12 11:54:58 2003
+@@ -582,5 +582,5 @@
+  * Allow makefiles to override the default file mode
+  */
+ #ifndef FILE_MODE
+-#define FILE_MODE 0644
++#define FILE_MODE 0664
+ #endif
diff --git a/games/tome/files/patch-ad b/games/tome/files/patch-ad
new file mode 100644
index 000000000000..50aa2470856b
--- /dev/null
+++ b/games/tome/files/patch-ad
@@ -0,0 +1,11 @@
+--- loadsave.c.orig	Thu Dec 11 12:32:40 2003
++++ loadsave.c	Fri Dec 12 11:54:55 2003
+@@ -853,7 +853,7 @@
+ {
+ 	bool ok = FALSE;
+ 	int fd = -1;
+-	int mode = 0644;
++	int mode = 0664;
+ 
+ 	/* No file yet */
+ 	fff = NULL;