[88398] trunk/dports/games/moria

[aschenke at macports.org]

Revision: 88398
          http://trac.macports.org/changeset/88398
Author:   aschenke at macports.org
Date:     2011-12-30 14:49:41 -0800 (Fri, 30 Dec 2011)
Log Message:
-----------
moria: fix for #32701 (64-bit errors); fix for compilation errors

Modified Paths:
--------------
    trunk/dports/games/moria/Portfile

Added Paths:
-----------
    trunk/dports/games/moria/files/patch-signals.c
    trunk/dports/games/moria/files/patch-types.h

Modified: trunk/dports/games/moria/Portfile
===================================================================
--- trunk/dports/games/moria/Portfile	2011-12-30 17:38:37 UTC (rev 88397)
+++ trunk/dports/games/moria/Portfile	2011-12-30 22:49:41 UTC (rev 88398)
@@ -3,7 +3,7 @@
 PortSystem       1.0
 name		     moria
 version		     5.5.2
-revision		 1
+revision		 2
 categories	     games
 platforms	     darwin
 maintainers	     aschenke
@@ -16,7 +16,9 @@
 distname         um${version}
 worksrcdir       umoria
 
-patchfiles       patch-source_config.h
+patchfiles       patch-source_config.h \
+				 patch-signals.c \
+				 patch-types.h
 
 build.dir        ${worksrcpath}/source
 build.target

Added: trunk/dports/games/moria/files/patch-signals.c
===================================================================
--- trunk/dports/games/moria/files/patch-signals.c	                        (rev 0)
+++ trunk/dports/games/moria/files/patch-signals.c	2011-12-30 22:49:41 UTC (rev 88398)
@@ -0,0 +1,20 @@
+--- source/signals.c	1994-07-21 21:47:42.000000000 -0400
++++ source/signals.c	2011-12-30 17:19:16.000000000 -0500
+@@ -114,7 +114,7 @@
+     {
+       if(++signal_count > 10)	/* Be safe. We will die if persistent enough. */
+ 	(void) signal(sig, SIG_DFL);
+-      return;
++      return 0;
+     }
+   error_sig = sig;
+ 
+@@ -145,7 +145,7 @@
+ 	      if (wait_for_more)
+ 		put_buffer(" -more-", MSG_LINE, 0);
+ 	      put_qio();
+-	      return;		/* OK. We don't quit. */
++	      return 0;		/* OK. We don't quit. */
+ 	    }
+ 	  (void) strcpy(died_from, "Interrupting");
+ 	}

Added: trunk/dports/games/moria/files/patch-types.h
===================================================================
--- trunk/dports/games/moria/files/patch-types.h	                        (rev 0)
+++ trunk/dports/games/moria/files/patch-types.h	2011-12-30 22:49:41 UTC (rev 88398)
@@ -0,0 +1,20 @@
+--- source/types.h	1994-07-21 21:47:49.000000000 -0400
++++ source/types.h	2011-12-30 17:25:47.000000000 -0500
+@@ -6,11 +6,12 @@
+    not for profit purposes provided that this copyright and statement are
+    included in all such copies. */
+ 
+-typedef unsigned long  int32u;
+-typedef long	       int32;
+-typedef unsigned short int16u;
+-typedef short	       int16;
+-typedef unsigned char  int8u;
++#include <inttypes.h>
++typedef uint32_t  	int32u;
++typedef int32_t		int32;
++typedef uint16_t	int16u;
++typedef int16_t		int16;
++typedef uint8_t		int8u;
+ /* some machines will not accept 'signed char' as a type, and some accept it
+    but still treat it like an unsigned character, let's just avoid it,
+    any variable which can ever hold a negative value must be 16 or 32 bits */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111230/3d618d0e/attachment.html>