[120631] trunk/dports/games/moria
mf2k at macports.org
mf2k at macports.org
Tue Jun 3 15:34:01 PDT 2014
Revision: 120631
https://trac.macports.org/changeset/120631
Author: mf2k at macports.org
Date: 2014-06-03 15:34:01 -0700 (Tue, 03 Jun 2014)
Log Message:
-----------
moria: Spacing fixes. Lint fixes. Use modern checksums.
Modified Paths:
--------------
trunk/dports/games/moria/Portfile
Added Paths:
-----------
trunk/dports/games/moria/files/patch-signals.c.diff
trunk/dports/games/moria/files/patch-source_config.h.diff
trunk/dports/games/moria/files/patch-types.h.diff
Removed Paths:
-------------
trunk/dports/games/moria/files/patch-signals.c
trunk/dports/games/moria/files/patch-source_config.h
trunk/dports/games/moria/files/patch-types.h
Modified: trunk/dports/games/moria/Portfile
===================================================================
--- trunk/dports/games/moria/Portfile 2014-06-03 22:26:46 UTC (rev 120630)
+++ trunk/dports/games/moria/Portfile 2014-06-03 22:34:01 UTC (rev 120631)
@@ -2,24 +2,30 @@
# $Id$
PortSystem 1.0
+
name moria
version 5.5.2
revision 2
categories games
platforms darwin
maintainers nomaintainer
+
description Moria is a Rogue-like dungeon exploration game
long_description Moria is a Rogue-like dungeon exploration game similar to Angband.
+
homepage http://www-math.bgsu.edu/~grabine/moria.html
master_sites http://www.nic.funet.fi/pub/unix/games/${name}/source/
-checksums md5 04a2852864302c702e82992023d97184
+
+checksums rmd160 1556c76f151d7ea29da79071a57398f63d0b138b \
+ sha256 fffab65703c77058a1aadd8647cc1f44bd4349065af0b334702986f36007b2ed
+
extract.suffix .tar.Z
distname um${version}
worksrcdir umoria
-patchfiles patch-source_config.h \
- patch-signals.c \
- patch-types.h
+patchfiles patch-source_config.h.diff \
+ patch-signals.c.diff \
+ patch-types.h.diff
build.dir ${worksrcpath}/source
build.target
@@ -65,7 +71,7 @@
xinstall -m 644 -c ${worksrcpath}/files/welcome.hlp ${destroot}${prefix}/var/games/moria
}
-post-activate {
+post-activate {
if {![file exists ${prefix}/var/games/moria/scores]} {
if {![variant_isset singleuser]} {
xinstall -m 464 -g games -c ${worksrcpath}/files/scores ${prefix}/var/games/moria/scores
Deleted: trunk/dports/games/moria/files/patch-signals.c
===================================================================
--- trunk/dports/games/moria/files/patch-signals.c 2014-06-03 22:26:46 UTC (rev 120630)
+++ trunk/dports/games/moria/files/patch-signals.c 2014-06-03 22:34:01 UTC (rev 120631)
@@ -1,20 +0,0 @@
---- 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");
- }
Copied: trunk/dports/games/moria/files/patch-signals.c.diff (from rev 120629, trunk/dports/games/moria/files/patch-signals.c)
===================================================================
--- trunk/dports/games/moria/files/patch-signals.c.diff (rev 0)
+++ trunk/dports/games/moria/files/patch-signals.c.diff 2014-06-03 22:34:01 UTC (rev 120631)
@@ -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");
+ }
Deleted: trunk/dports/games/moria/files/patch-source_config.h
===================================================================
--- trunk/dports/games/moria/files/patch-source_config.h 2014-06-03 22:26:46 UTC (rev 120630)
+++ trunk/dports/games/moria/files/patch-source_config.h 2014-06-03 22:34:01 UTC (rev 120631)
@@ -1,40 +0,0 @@
---- source/config.h.orig 2006-09-12 20:34:36.000000000 -0400
-+++ source/config.h 2006-09-12 20:41:56.000000000 -0400
-@@ -6,6 +6,10 @@
- not for profit purposes provided that this copyright and statement are
- included in all such copies. */
-
-+#define unix
-+#include <sys/ioctl_compat.h>
-+#include <unistd.h>
-+
- #define CONFIG_H_INCLUDED
- #ifdef CONSTANT_H_INCLUDED
- Constant.h should always be included after config.h, because it uses
-@@ -200,16 +204,16 @@
-
- /* This must be unix; change MORIA_LIB as appropriate. */
- #define MORIA_SAV "moria.save"
--#define MORIA_LIB(xxx) "/home/math/grabiner/moria/files/xxx"
--#define MORIA_HOU MORIA_LIB(hours)
--#define MORIA_MOR MORIA_LIB(news)
--#define MORIA_TOP MORIA_LIB(scores)
--#define MORIA_HELP MORIA_LIB(roglcmds.hlp)
--#define MORIA_ORIG_HELP MORIA_LIB(origcmds.hlp)
--#define MORIA_WIZ_HELP MORIA_LIB(rwizcmds.hlp)
--#define MORIA_OWIZ_HELP MORIA_LIB(owizcmds.hlp)
--#define MORIA_WELCOME MORIA_LIB(welcome.hlp)
--#define MORIA_VER MORIA_LIB(version.hlp)
-+
-+#define MORIA_HOU "/home/math/grabiner/moria/files/hours"
-+#define MORIA_MOR "home/math/grabiner/moria/files/news"
-+#define MORIA_TOP "/home/math/grabiner/moria/files/scores"
-+#define MORIA_HELP "/home/math/grabiner/moria/files/roglcmds.hlp"
-+#define MORIA_ORIG_HELP "/home/math/grabiner/moria/files/origcmds.hlp"
-+#define MORIA_WIZ_HELP "/home/math/grabiner/moria/files/rwizcmds.hlp"
-+#define MORIA_OWIZ_HELP "/home/math/grabiner/moria/files/owizcmds.hlp"
-+#define MORIA_WELCOME "/home/math/grabiner/moria/files/welcome.hlp"
-+#define MORIA_VER "/home/math/grabiner/moria/files/version.hlp"
-
- #endif
- #endif
Copied: trunk/dports/games/moria/files/patch-source_config.h.diff (from rev 120629, trunk/dports/games/moria/files/patch-source_config.h)
===================================================================
--- trunk/dports/games/moria/files/patch-source_config.h.diff (rev 0)
+++ trunk/dports/games/moria/files/patch-source_config.h.diff 2014-06-03 22:34:01 UTC (rev 120631)
@@ -0,0 +1,40 @@
+--- source/config.h.orig 2006-09-12 20:34:36.000000000 -0400
++++ source/config.h 2006-09-12 20:41:56.000000000 -0400
+@@ -6,6 +6,10 @@
+ not for profit purposes provided that this copyright and statement are
+ included in all such copies. */
+
++#define unix
++#include <sys/ioctl_compat.h>
++#include <unistd.h>
++
+ #define CONFIG_H_INCLUDED
+ #ifdef CONSTANT_H_INCLUDED
+ Constant.h should always be included after config.h, because it uses
+@@ -200,16 +204,16 @@
+
+ /* This must be unix; change MORIA_LIB as appropriate. */
+ #define MORIA_SAV "moria.save"
+-#define MORIA_LIB(xxx) "/home/math/grabiner/moria/files/xxx"
+-#define MORIA_HOU MORIA_LIB(hours)
+-#define MORIA_MOR MORIA_LIB(news)
+-#define MORIA_TOP MORIA_LIB(scores)
+-#define MORIA_HELP MORIA_LIB(roglcmds.hlp)
+-#define MORIA_ORIG_HELP MORIA_LIB(origcmds.hlp)
+-#define MORIA_WIZ_HELP MORIA_LIB(rwizcmds.hlp)
+-#define MORIA_OWIZ_HELP MORIA_LIB(owizcmds.hlp)
+-#define MORIA_WELCOME MORIA_LIB(welcome.hlp)
+-#define MORIA_VER MORIA_LIB(version.hlp)
++
++#define MORIA_HOU "/home/math/grabiner/moria/files/hours"
++#define MORIA_MOR "home/math/grabiner/moria/files/news"
++#define MORIA_TOP "/home/math/grabiner/moria/files/scores"
++#define MORIA_HELP "/home/math/grabiner/moria/files/roglcmds.hlp"
++#define MORIA_ORIG_HELP "/home/math/grabiner/moria/files/origcmds.hlp"
++#define MORIA_WIZ_HELP "/home/math/grabiner/moria/files/rwizcmds.hlp"
++#define MORIA_OWIZ_HELP "/home/math/grabiner/moria/files/owizcmds.hlp"
++#define MORIA_WELCOME "/home/math/grabiner/moria/files/welcome.hlp"
++#define MORIA_VER "/home/math/grabiner/moria/files/version.hlp"
+
+ #endif
+ #endif
Deleted: trunk/dports/games/moria/files/patch-types.h
===================================================================
--- trunk/dports/games/moria/files/patch-types.h 2014-06-03 22:26:46 UTC (rev 120630)
+++ trunk/dports/games/moria/files/patch-types.h 2014-06-03 22:34:01 UTC (rev 120631)
@@ -1,20 +0,0 @@
---- 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 */
Copied: trunk/dports/games/moria/files/patch-types.h.diff (from rev 120629, trunk/dports/games/moria/files/patch-types.h)
===================================================================
--- trunk/dports/games/moria/files/patch-types.h.diff (rev 0)
+++ trunk/dports/games/moria/files/patch-types.h.diff 2014-06-03 22:34:01 UTC (rev 120631)
@@ -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: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140603/717b913f/attachment.html>
More information about the macports-changes
mailing list