Update to newest version 0.94.1

Make port PREFIX clean
solve gettimeofday compile problem (patch-ao)
sanitize order of header file inclusion in common/porting.c
	so that MIN and MAX don't get redefined (patch-ap)
updated PLIST
added dirrm statements in PLIST to allow proper removal of package

1 files changed, 31 insertions, 17 deletions

diff --git a/games/crossfire-client/files/patch-aa b/games/crossfire-client/files/patch-aa
index 8035616be51c..dab90bcd9ff2 100644
--- a/games/crossfire-client/files/patch-aa
+++ b/games/crossfire-client/files/patch-aa
@@ -1,5 +1,5 @@
---- config/crosssite.def.orig	Sun Jan  5 19:59:48 1997
-+++ config/crosssite.def	Wed Sep 17 15:55:13 1997
+--- config/crosssite.def.orig	Thu Apr 16 04:07:49 1998
++++ config/crosssite.def	Fri May  8 14:51:14 1998
 @@ -36,10 +36,8 @@
   * (mwedel@pyramid.com)
   */
@@ -8,58 +8,72 @@
  #define XPM_PIX
 -#define Xpm_LibDir /usr/local/lib/
 -*/
-+#define Xpm_LibDir /usr/X11R6/lib/
++#define Xpm_LibDir !!X11BASE!!/lib/
  /* If your include files are someplace odd */
  /*#define Xpm_Include	/usr/local/include*/
  
-@@ -70,13 +68,13 @@
+@@ -51,13 +49,13 @@
   * This is a top root directory of all game staff as in UNIX-style
   * overall. 
   */
--#define CTop /home/sleipner/a/crossfire/crossfire
-+#define CTop /usr/local/crossfire
+-#define CTop /home/hugin/a/crossfire/crossfire
++#define CTop !!LOCALBASE!!/lib/crossfire
  /* #define CTop /net/contrib/crossfire */
  /*#define CTop /usr/local/games/crossfire*/
  
  /* Binaries location If this is undefined, it default to the
     standard location for X binaries on your machine. */
 -#define CBinDir Concat(CTop,/bin)
-+#define CBinDir /usr/local/bin
++#define CBinDir !!LOCALBASE!!/bin
  
  /* Libraries location If this is undefined it defaults to the
    standard location for X lib files/crossfire on your machine */
-@@ -95,7 +93,8 @@
+@@ -76,7 +74,8 @@
  /* Crossfire manual location If this is undefined it defaults to the
     standard location for manual pages on your machine.*/
  /* #define CManPath Concat(CTop,/man) */
 -#define CManSuffix 6
-+#define CManPath /usr/local/man
++#define CManPath !!LOCALBASE!!/man
 +/* #define CManSuffix 6 */
  
  
  /* Force CC to use the specified options instead of the default
-@@ -104,7 +103,7 @@
+@@ -85,7 +84,7 @@
   * any of the default compiler options for your machine.
   */
  /*define ForceCCOPTIONS -O -g -Wall */
 -#undef ForceCCOPTIONS
-+#define ForceCCOPTIONS -O -pipe -Wall -Werror
++#define ForceCCOPTIONS -pipe -O
  
  /* Extra_Flags are added onto the compilers default options.  Can be
   * quite useful if you just want to add another flag or two, and not
-@@ -165,11 +164,9 @@
-  * Default: Sound support off.
+@@ -102,9 +101,8 @@
+ /* Add any extra/special libraries that you may need.  Make sure you 
+  * use the -l form or put in the complete path name.
+  */
+-/*
+-#define Extra_Libraries -lcrypt
+-*/
++
++#define Extra_Libraries -lcrypt -lcompat
+ 
+ /* Force CC to be a specific compilator? Define this to be the
+  * actual compiler (see example).  If defined, the default
+@@ -160,11 +158,9 @@
+  * too distant future, it probably isn't worth fixing here.
   */
  
 -/*
- #define SoundEffects
- #define RPlayLibDir /usr/local/lib
- #define RPlayIncDir /usr/local/include
+ #define Rplay_Sound
+-#define RPlayLibDir /usr/local/lib
+-#define RPlayIncDir /usr/local/include
 -*/
++#define RPlayLibDir !!LOCALBASE!!/lib
++#define RPlayIncDir !!LOCALBASE!!/include
  
  /* define this if using OpenWindows as your enviroment. This only
   * needs to be set if the openwindows server you use is
-@@ -207,7 +204,7 @@
+@@ -202,7 +198,7 @@
   * awk on most other systems will be OK.
   */