fix compile with gcc4 (bug #149079) with patch from Alexander Graf; avoid prestripped binaries; tidy

(Portage version: 2.1.2_pre1-r4)

3 files changed, 60 insertions, 4 deletions

diff --git a/games-mud/tf/files/digest-tf-40-r2 b/games-mud/tf/files/digest-tf-40-r2
index 6addb20e5c07..28a8c36cab35 100644
--- a/games-mud/tf/files/digest-tf-40-r2
+++ b/games-mud/tf/files/digest-tf-40-r2
@@ -1,2 +1,6 @@
-MD5 db6fa9a1aac0b7f199567d81c4b5c81d tf-40s1.tar.gz 349239
 MD5 59b5a3dee0aacabc5472cc041e71961d tf-40s1-help.tar.gz 121936
+RMD160 847833d010f82869e411a87294fa3dd53f2c59ba tf-40s1-help.tar.gz 121936
+SHA256 057668bdbe63e7cd1b5121343ebbfc182956e75feb9e273dd42fe22ce0d45a48 tf-40s1-help.tar.gz 121936
+MD5 db6fa9a1aac0b7f199567d81c4b5c81d tf-40s1.tar.gz 349239
+RMD160 2852daa3363bb134f29cc25d3177e9599ecacc1f tf-40s1.tar.gz 349239
+SHA256 488715d3c75ff05c08a518b0e1cd4518245842fbc1e4178c6da515e415101beb tf-40s1.tar.gz 349239
diff --git a/games-mud/tf/files/tf-40-gcc4.patch b/games-mud/tf/files/tf-40-gcc4.patch
new file mode 100644
index 000000000000..2b96ac03bdd0
--- /dev/null
+++ b/games-mud/tf/files/tf-40-gcc4.patch
@@ -0,0 +1,44 @@
+diff -urpN tf-40s1.orig/src/history.c tf-40s1/src/history.c
+--- tf-40s1.orig/src/history.c	1999-03-06 23:43:24.000000000 +0100
++++ tf-40s1/src/history.c	2006-09-30 18:16:43.000000000 +0200
+@@ -38,18 +38,6 @@
+ #define LOCALSIZE      100	/* local history size */
+ #define INPUTSIZE      100	/* command history buffer size */
+ 
+-typedef struct History {	/* circular list of Alines, and logfile */
+-    struct Aline **alines;
+-    int size;			/* actual number of lines currently saved */
+-    int maxsize;		/* maximum number of lines that can be saved */
+-    int first;			/* position of first line in circular array */
+-    int last;			/* position of last line in circular array */
+-    int index;			/* current recall position */
+-    int total;			/* total number of lines ever saved */
+-    TFILE *logfile;
+-    CONST char *logname;
+-} History;
+-
+ #define empty(hist) (!(hist)->alines || !(hist)->size)
+ 
+ static void     FDECL(alloc_history,(History *hist, int maxsize));
+diff -urpN tf-40s1.orig/src/history.h tf-40s1/src/history.h
+--- tf-40s1.orig/src/history.h	1999-03-06 23:43:24.000000000 +0100
++++ tf-40s1/src/history.h	2006-09-30 18:16:39.000000000 +0200
+@@ -31,6 +31,18 @@ extern void   NDECL(free_histories);
+ #define record_global(aline)  recordline(globalhist, (aline))
+ #define record_local(aline)   recordline(localhist, (aline))
+ 
++typedef struct History {	/* circular list of Alines, and logfile */
++    struct Aline **alines;
++    int size;			/* actual number of lines currently saved */
++    int maxsize;		/* maximum number of lines that can be saved */
++    int first;			/* position of first line in circular array */
++    int last;			/* position of last line in circular array */
++    int index;			/* current recall position */
++    int total;			/* total number of lines ever saved */
++    TFILE *logfile;
++    CONST char *logname;
++} History;
++
+ extern struct History globalhist[], localhist[];
+ extern int log_count, norecord, nolog;
+ 
diff --git a/games-mud/tf/files/tf-40-gentoo.diff b/games-mud/tf/files/tf-40-gentoo.diff
index 6fc7739c3339..e980f9d1c202 100644
--- a/games-mud/tf/files/tf-40-gentoo.diff
+++ b/games-mud/tf/files/tf-40-gentoo.diff
@@ -1,6 +1,5 @@
-diff -Nur tf-40s1/unix/Config tf-40s1-new/unix/Config
---- tf-40s1/unix/Config	Sat Mar  6 16:43:28 1999
-+++ tf-40s1-new/unix/Config	Tue Jul  3 15:04:45 2001
+--- unix/Config.orig	2006-10-01 00:13:05.000000000 -0400
++++ unix/Config	2006-10-01 00:14:11.000000000 -0400
 @@ -33,9 +33,9 @@
  #   even if an old version is currently in use.  You can remove
  #   the old version manually later when it is no longer in use.
@@ -34,3 +33,12 @@ diff -Nur tf-40s1/unix/Config tf-40s1-new/unix/Config
  # CCFLAGS="-g"
  
  
+@@ -117,7 +117,7 @@
+ # tfconfig will use "strip" on the tf binary unless you tell it otherwise.
+ # Set STRIP='' to disable stripping.
+ 
+-# STRIP=''
++STRIP=''
+ 
+ 
+ ### Other Compiler Libraries.