summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorseb <seb@pkgsrc.org>2004-04-26 10:55:27 +0000
committerseb <seb@pkgsrc.org>2004-04-26 10:55:27 +0000
commita1df2b36889255ec757c93d99e52c16395b60212 (patch)
tree09853e75af056946a2435212432ab591af9e3152 /games
parentd574e01134f8aa4bfbde30134a177566c6b009da (diff)
downloadpkgsrc-a1df2b36889255ec757c93d99e52c16395b60212.tar.gz
Fix build with gcc 3.3.3 by using simpler cpp macros.
Diffstat (limited to 'games')
-rw-r--r--games/moria/distinfo4
-rw-r--r--games/moria/patches/patch-ac42
2 files changed, 29 insertions, 17 deletions
diff --git a/games/moria/distinfo b/games/moria/distinfo
index 7269cc27388..2514bbb84dd 100644
--- a/games/moria/distinfo
+++ b/games/moria/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2002/09/21 04:24:03 simonb Exp $
+$NetBSD: distinfo,v 1.6 2004/04/26 10:55:27 seb Exp $
SHA1 (um5.5.2.tar.Z) = 69c7a7bf4e2c5be123ee7a82f5ad12ad5d0f5b08
Size (um5.5.2.tar.Z) = 910536 bytes
SHA1 (patch-aa) = 90dd341c52e322ce7a9cacc706e9f0db49c9253b
SHA1 (patch-ab) = b06d9f1b8445865823fc01e2345be48b4f6eb999
-SHA1 (patch-ac) = 471ecd0bdaf53044f4e35e4be17db33aa0b07446
+SHA1 (patch-ac) = ea9e23de0a147f317a579a4a04502cb165b4c4bd
SHA1 (patch-ad) = cba23f2ab9e6bfe8d665475fa30342486997f57c
SHA1 (patch-ae) = 5cf8ad7c6e5d87856a31a5456ba9ed2422075988
SHA1 (patch-af) = f8a9f32dffa2123512e36c774ca75e0b28a053cc
diff --git a/games/moria/patches/patch-ac b/games/moria/patches/patch-ac
index c18c34dabe1..3d4568fa364 100644
--- a/games/moria/patches/patch-ac
+++ b/games/moria/patches/patch-ac
@@ -1,21 +1,33 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/01/23 17:00:15 simonb Exp $
---- source/config.h.orig Fri Jul 22 11:47:13 1994
-+++ source/config.h Thu Dec 3 14:50:58 1998
-@@ -200,10 +200,16 @@
+$NetBSD: patch-ac,v 1.2 2004/04/26 10:55:27 seb Exp $
+
+--- source/config.h.orig 1994-07-22 01:47:13.000000000 +0000
++++ source/config.h
+@@ -200,16 +200,18 @@ some of the system defines set up here.
/* This must be unix; change MORIA_LIB as appropriate. */
#define MORIA_SAV "moria.save"
-#define MORIA_LIB(xxx) "/home/math/grabiner/moria/files/xxx"
-+#ifdef __STDC__
-+#define MORIA_LIB(xxx) LIBDIR ## "/" ## #xxx
-+#else
-+#define MORIA_LIB(xxx) LIBDIR/**/"/xxx"
-+#endif
- #define MORIA_HOU MORIA_LIB(hours)
- #define MORIA_MOR MORIA_LIB(news)
+-#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_LIB(xxx) LIBDIR "/" xxx
++#define MORIA_HOU MORIA_LIB("hours")
++#define MORIA_MOR MORIA_LIB("news")
+#ifndef MORIA_TOP
- #define MORIA_TOP MORIA_LIB(scores)
++#define MORIA_TOP MORIA_LIB("scores")
+#endif
- #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_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")
+
+ #endif
+ #endif