--- ../../fortune-mod_1.99.1-1.diff	Sat Aug  7 04:45:08 2004
+++ ../../fortune-mod_1.99.1-1.diff-patched	Fri Dec 10 15:50:52 2004
@@ -1153,5 +1153,5 @@
 +
 +Should fortunes be found in the main fortunes database which fail the
-+criteria found in the document /usr/share/doc/fortunes/Offensive, I will gladly
++criteria found in the document @PREFIX@/share/doc/fortune-mod/Offensive, I will gladly
 +move them into the fortunes-off package given the following:
 +
diff -ru2N --exclude=.DS_Store fortune-mod-1.99.1/Notes fortune-mod-1.99.1-patched/Notes
--- fortune-mod-1.99.1/Notes	Fri Mar  5 08:29:56 2004
+++ fortune-mod-1.99.1-patched/Notes	Fri Dec 10 18:32:28 2004
@@ -17,7 +17,7 @@
 ==> GENERAL INFORMATION
 	By default, fortune retrieves its fortune files from the directory
-/usr/local/share/games/fortune.  A fortune file has two parts: the source file
+@PREFIX@/share/fortunes.  A fortune file has two parts: the source file
 (which contains the fortunes themselves) and the data file which describes
-the fortunes.  The data fil always has the same name as the fortune file
+the fortunes.  The data file always has the same name as the fortune file
 with the string ".dat" concatenated, e.g. if "fort" is a standard fortune
 database, then "fort.dat" is the data file which describes it.  See
@@ -26,5 +26,5 @@
 offensive parts.  The offensive version of a file has the same name as the
 non-offensive version but exists in the offensive fortunes directory 
-(/usr/local/share/games/fortune/off by default).  The fortune program
+(@PREFIX@/share/fortunes/off by default).  The fortune program
 automatically assumes that any file in the offensive fortune directory
 is potentially offensive, and should therefore only be displayed if
diff -ru2N --exclude=.DS_Store fortune-mod-1.99.1/README fortune-mod-1.99.1-patched/README
--- fortune-mod-1.99.1/README	Fri Mar  5 08:29:56 2004
+++ fortune-mod-1.99.1-patched/README	Fri Dec 10 19:20:26 2004
@@ -6,5 +6,5 @@
 a look at the changes that have come in, and the new features.
 
-Fortune-mod now leaves at http://www.redellipse.net/code/fortune. You
+Fortune-mod now lives at http://www.redellipse.net/code/fortune. You
 can find the CVS repository at
 http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/fortune/?cvsroot=fortune
diff -ru2N --exclude=.DS_Store fortune-mod-1.99.1/datfiles/Makefile fortune-mod-1.99.1-patched/datfiles/Makefile
--- fortune-mod-1.99.1/datfiles/Makefile	Fri Mar  5 08:29:56 2004
+++ fortune-mod-1.99.1-patched/datfiles/Makefile	Sat Dec 11 23:20:46 2004
@@ -59,5 +59,5 @@
 	for i in $(COOKIES) ; do \
 		install -m 0644 $$i $$i.dat $(COOKIEDIR) || exit $? ; \
-		cp -d $$i.u8 $(COOKIEDIR) ; \
+		cp -R $$i.u8 $(COOKIEDIR) ; \
 		done
 
diff -ru2N --exclude=.DS_Store fortune-mod-1.99.1/datfiles/off/Makefile fortune-mod-1.99.1-patched/datfiles/off/Makefile
--- fortune-mod-1.99.1/datfiles/off/Makefile	Fri Mar  5 08:29:56 2004
+++ fortune-mod-1.99.1-patched/datfiles/off/Makefile	Sat Dec 11 23:20:59 2004
@@ -39,5 +39,5 @@
 	for i in $(OCOOKIES) ; \
 	    do install -m 0644 $$i $$i.dat $(OCOOKIEDIR) || exit $$? ; \
-	    cp -d $$i.u8 $(OCOOKIEDIR) ; \
+	    cp -R $$i.u8 $(OCOOKIEDIR) ; \
 	done
 
diff -ru2N --exclude=.DS_Store fortune-mod-1.99.1/fortune/fortune.c fortune-mod-1.99.1-patched/fortune/fortune.c
--- fortune-mod-1.99.1/fortune/fortune.c	Fri Mar  5 08:29:56 2004
+++ fortune-mod-1.99.1-patched/fortune/fortune.c	Fri Dec 10 16:22:22 2004
@@ -98,5 +98,5 @@
 
 #define		PROGRAM_NAME		"fortune-mod"
-#define		PROGRAM_VERSION		"9708"
+#define		PROGRAM_VERSION		"1.99.1"
 
 #ifdef HAVE_STDBOOL_H
@@ -258,4 +258,5 @@
 int add_dir(register FILEDESC *);
 
+const char *program_name;
 char *program_version(void)
 {
@@ -1676,4 +1677,5 @@
     char *ctype, *crequest;
     getargs(ac, av);
+    program_name = (char *const) av[0];
 
     outer = recode_new_outer(true);
@@ -1682,6 +1682,9 @@
     setlocale(LC_ALL,"");
     ctype = nl_langinfo(CODESET);
-    if(strcmp(ctype,"ANSI_X3.4-1968") == 0)
-        ctype="ISO-8859-1";
+    if (!ctype || !*ctype)
+        ctype="C"; /* revert to C if no valid envvars! */
+    else
+        if(strcmp(ctype,"ANSI_X3.4-1968") == 0)
+            ctype="ISO-8859-1";
 	
     crequest = malloc(strlen(ctype) + 7 + 1);
diff -ru2N --exclude=.DS_Store fortune-mod-1.99.1/util/rot.c fortune-mod-1.99.1-patched/util/rot.c
--- fortune-mod-1.99.1/util/rot.c	Fri Mar  5 08:29:57 2004
+++ fortune-mod-1.99.1-patched/util/rot.c	Fri Dec 10 13:29:00 2004
@@ -6,4 +6,5 @@
 #include <stdio.h>
 #include <ctype.h>
+#include <stdlib.h>
 
 int main(void)
diff -ru2N --exclude=.DS_Store fortune-mod-1.99.1/util/unstr.c fortune-mod-1.99.1-patched/util/unstr.c
--- fortune-mod-1.99.1/util/unstr.c	Fri Mar  5 08:29:57 2004
+++ fortune-mod-1.99.1-patched/util/unstr.c	Fri Dec 10 13:28:45 2004
@@ -97,4 +97,5 @@
 #include	<string.h>
 #include	<unistd.h>
+#include	<stdlib.h>
 
 #ifndef MAXPATHLEN