diff options
author | ben <ben@pkgsrc.org> | 2003-12-31 18:07:47 +0000 |
---|---|---|
committer | ben <ben@pkgsrc.org> | 2003-12-31 18:07:47 +0000 |
commit | d6adbb904433e6bc7dfe4982c5719ff215745897 (patch) | |
tree | ac1f33e43e8d3379c27d3aceb893a96dcc3fcc81 /games/omega | |
parent | ac2924476992a71ac8014a7ce7992ba57583d0c5 (diff) | |
download | pkgsrc-d6adbb904433e6bc7dfe4982c5719ff215745897.tar.gz |
Make omega build with gcc3, patch from Richard Rauch in PR 23887.
Diffstat (limited to 'games/omega')
-rw-r--r-- | games/omega/distinfo | 6 | ||||
-rw-r--r-- | games/omega/patches/patch-ac | 86 | ||||
-rw-r--r-- | games/omega/patches/patch-ad | 22 | ||||
-rw-r--r-- | games/omega/patches/patch-ae | 22 | ||||
-rw-r--r-- | games/omega/patches/patch-af | 13 |
5 files changed, 148 insertions, 1 deletions
diff --git a/games/omega/distinfo b/games/omega/distinfo index fedaf330150..12828ea4dba 100644 --- a/games/omega/distinfo +++ b/games/omega/distinfo @@ -1,6 +1,10 @@ -$NetBSD: distinfo,v 1.3 2003/12/31 17:38:23 ben Exp $ +$NetBSD: distinfo,v 1.4 2003/12/31 18:07:47 ben Exp $ SHA1 (omega-0.90.4-src.tar.gz) = fb6e20565057aee1250154afbcdb562cf39586fd Size (omega-0.90.4-src.tar.gz) = 341346 bytes SHA1 (patch-aa) = df5933dcc7098ba00f4b3002612b3318a9b09974 SHA1 (patch-ab) = fe2960b28a3cd912c35edeb8a05087eb18d136f5 +SHA1 (patch-ac) = 546ad6d5f6f67a9a5b7cdf4827a2256f3b948dac +SHA1 (patch-ad) = 23fb55f159f084fdf31771ebd5452f2fd6ea2ddb +SHA1 (patch-ae) = 6d49ef5d16f9e6be8c97e6b945cc8d75da61e24d +SHA1 (patch-af) = 09e5ddb20071d25095ff41e685cf511f688689be diff --git a/games/omega/patches/patch-ac b/games/omega/patches/patch-ac new file mode 100644 index 00000000000..a755569e8e9 --- /dev/null +++ b/games/omega/patches/patch-ac @@ -0,0 +1,86 @@ +$NetBSD: patch-ac,v 1.4 2003/12/31 18:07:47 ben Exp $ + +--- genclr.c.orig 1998-08-08 05:53:59.000000000 -0700 ++++ genclr.c +@@ -181,13 +181,12 @@ static FILE *emitopen (char *file, char + perror (""); + exit (1); + } +- fprintf (fp, "\ +-/*\n\ +- * Do not edit this file. It was automatically generated by running:\n\ +- * %s %s %s\n\ +- */\n\ +-\n\ +-", ++ fprintf (fp, ++ "/*\n" ++ " * Do not edit this file. It was automatically generated by running:\n" ++ " * %s %s %s\n" ++ " */\n" ++ "\n", + argv[0], argv[1], argv[2]); + return fp; + } +@@ -280,31 +279,26 @@ int main (int argc, char **argv) + * Emit .c file. + */ + fp = emitopen (cfile, argv); +- fprintf (fp, "\ +-#include <curses.h>\n\ +-#include <stdio.h>\n\ +-#include <stdlib.h>\n\ +- +-#include \"%s\"\n\ +- +-void clrgen_init (void)\n\ +-""{\n\ +- if (%d > COLOR_PAIRS - 1) {\n\ +- endwin(); +- fputs (\"Too many color pairs!\\n\", stderr);\n\ +- exit (1);\n\ +- }\n\ +-", ++ fprintf (fp, ++ "#include <curses.h>\n" ++ "#include <stdio.h>\n" ++ "#include <stdlib.h>\n" ++ "\n" ++ "#include \"%s\"\n" ++ "\n" ++ "void clrgen_init (void)\n" ++ "{\n" ++ " if (%d > COLOR_PAIRS - 1) {\n" ++ " endwin();\n" ++ " fputs (\"Too many color pairs!\\n\", stderr);\n" ++ " exit (1);\n" ++ " }\n", + hfile, ncpairs); + for (i = 0; i < ncpairs; i++) +- fprintf (fp, "\ +- init_pair (%d, COLOR_%s, COLOR_%s);\n\ +-", ++ fprintf (fp, ++ " init_pair (%d, COLOR_%s, COLOR_%s);\n", + cpairs[i]->idx, cpairs[i]->cfg, cpairs[i]->cbg); +- fputs ("\ +-""}\n\ +-", +- fp); ++ fputs ("}\n", fp); + emitclose (fp, cfile); + + /* +@@ -318,10 +312,8 @@ void clrgen_init (void)\n\ + strlen (pair->ofg) + strlen (pair->obg) > 10 ? "" : "\t", + pair->idx, pair->boldfg ? "|A_BOLD" : ""); + } +- fputs ("\ +-\n\ +-extern void clrgen_init (void);\n\ +-", ++ fputs ("\n" ++ "extern void clrgen_init (void);\n", + fp); + emitclose (fp, hfile); + diff --git a/games/omega/patches/patch-ad b/games/omega/patches/patch-ad new file mode 100644 index 00000000000..2392ecfb4b9 --- /dev/null +++ b/games/omega/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.4 2003/12/31 18:07:47 ben Exp $ + +--- save.c.orig 1999-01-01 20:00:10.000000000 -0800 ++++ save.c +@@ -302,7 +302,7 @@ plv level; + } + mask >>= 1; + if (level->site[i][j].lstatus&SEEN) +- mask |= (1<<(sizeof(long int)*8 - 1)); ++ mask |= (1UL<<(sizeof(long int)*8 - 1)); + run--; + } + if (run < 8*sizeof(long int)) +@@ -442,7 +442,7 @@ FILE *fd; + } + mask >>= 1; + if (c_statusp(i, j, SEEN)) +- mask |= (1<<(sizeof(long int)*8 - 1)); ++ mask |= (1UL<<(sizeof(long int)*8 - 1)); + run--; + } + if (run < 8*sizeof(long int)) diff --git a/games/omega/patches/patch-ae b/games/omega/patches/patch-ae new file mode 100644 index 00000000000..72e569b176a --- /dev/null +++ b/games/omega/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.4 2003/12/31 18:07:47 ben Exp $ + +--- compress.c.orig 1998-08-08 03:47:56.000000000 -0700 ++++ compress.c +@@ -104,7 +104,7 @@ static char sccsid[] = "@(#)compress.c 5 + #ifdef PBITS /* Preferred BITS for this memory size */ + # ifndef BITS + # define BITS PBITS +-# endif BITS ++# endif /* BITS */ + #endif /* PBITS */ + + #if BITS == 16 +@@ -347,7 +347,7 @@ unsigned short codetab [HSIZE]; + #else + count_int htab [HSIZE]; + unsigned short codetab [HSIZE]; +-#endif sel ++#endif /* sel */ + + #define htabof(i) htab[i] + #define codetabof(i) codetab[i] diff --git a/games/omega/patches/patch-af b/games/omega/patches/patch-af new file mode 100644 index 00000000000..bd212d5b253 --- /dev/null +++ b/games/omega/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.4 2003/12/31 18:07:47 ben Exp $ + +--- omega.c.orig 1999-01-01 20:00:09.000000000 -0800 ++++ omega.c +@@ -187,7 +187,7 @@ void initrand(int environment, int level + store = RANDFUNCTION(); + /* Pseudo Random Seed */ + if (environment == E_RANDOM) +- seed = (int) time((long *)NULL); ++ seed = (int) time(NULL); + else if (environment == E_RESTORE) + seed = store; + else |