From 1bf85a33a7f0af352174332dac11865971217df5 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 Jan 2006 20:19:02 +0000 Subject: Backport a change from 1.5.22 to 1.5.18 that fixes some issues with temp dir creation when using relink-based finalization. --- games/omega/DESCR | 21 ----------- games/omega/MESSAGE | 8 ----- games/omega/Makefile | 47 ------------------------ games/omega/PLIST | 61 ------------------------------- games/omega/distinfo | 11 ------ games/omega/patches/patch-aa | 51 -------------------------- games/omega/patches/patch-ab | 14 -------- games/omega/patches/patch-ac | 86 -------------------------------------------- games/omega/patches/patch-ad | 22 ------------ games/omega/patches/patch-ae | 22 ------------ games/omega/patches/patch-af | 13 ------- 11 files changed, 356 deletions(-) delete mode 100644 games/omega/DESCR delete mode 100644 games/omega/MESSAGE delete mode 100644 games/omega/Makefile delete mode 100644 games/omega/PLIST delete mode 100644 games/omega/distinfo delete mode 100644 games/omega/patches/patch-aa delete mode 100644 games/omega/patches/patch-ab delete mode 100644 games/omega/patches/patch-ac delete mode 100644 games/omega/patches/patch-ad delete mode 100644 games/omega/patches/patch-ae delete mode 100644 games/omega/patches/patch-af (limited to 'games/omega') diff --git a/games/omega/DESCR b/games/omega/DESCR deleted file mode 100644 index 74a8329b432..00000000000 --- a/games/omega/DESCR +++ /dev/null @@ -1,21 +0,0 @@ -Omega is a complex rogue-style game of dungeon exploration. Unlike -other such games, there are a number of ways to "win", depending on -various actions taken during play. The ways you can get your name on -the hiscore board include becoming the highest ranked head of a guild, -sect, college, etc., as well as gaining the most points figured from -possessions and experience. The game (via the oracle) may impose some -structure on your exploration, but you need not follow all of the -oracle's advice. There *is* a "total winner" status, by the way. - -Omega, unlike lesser games is incredibly amusing to play. Laurence P. -Brothers (the primary author) is the Oscar Wilde of rouge-like games. -Many omega concepts, but not great sense of humor were later stolen -for use in ADOM. - -Omega offers a richness of playing detail that goes beyond a simple -game like rogue. However, the majority of gameplay is very similar to -rogue, hack, ultrarogue, larn, and other such games. The player is -represented by the highlighted "@" symbol, objects and terrain -features are represented by non-alphabetic symbols, monsters are -represented by the various upper and lower case letters, and other -humans are represented by a non-highlighted "@". diff --git a/games/omega/MESSAGE b/games/omega/MESSAGE deleted file mode 100644 index d1614bf43b1..00000000000 --- a/games/omega/MESSAGE +++ /dev/null @@ -1,8 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:01 wiz Exp $ - -Please note: - The executable for the game is called 'Omega' (with an - uppercase 'O') to avoid conflicts with TeX. - -=========================================================================== diff --git a/games/omega/Makefile b/games/omega/Makefile deleted file mode 100644 index f8f31969583..00000000000 --- a/games/omega/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# $NetBSD: Makefile,v 1.27 2005/06/16 06:57:55 jlam Exp $ - -DISTNAME= omega-0.90.4-src -PKGNAME= omega-0.90.4 -PKGREVISION= 2 -CATEGORIES= games -MASTER_SITES= http://www.alcyone.com/binaries/omega/ - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.alcyone.com/max/projects/omega/ -COMMENT= Complex rogue-like game of exploration with a sense of humor - -WRKSRC= ${WRKDIR}/omega -BUILD_TARGET= # empty - -.include "../../mk/bsd.prefs.mk" - -.if !empty(SETGIDGAME:M[yY][eE][sS]) -FILEMODE= 0660 -.else -FILEMODE= 0600 -.endif - -INSTALLATION_DIRS= bin man/man6 - -do-install: - ${INSTALL_GAME} ${WRKSRC}/omega ${PREFIX}/bin/Omega - ${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${PREFIX}/man/man6 - ${INSTALL_DATA_DIR} ${PREFIX}/share/omega - ${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/omega - ${RM} ${PREFIX}/share/omega/license.old - ${CHMOD} ${FILEMODE} ${PREFIX}/share/omega/omega.hi - ${CHMOD} ${FILEMODE} ${PREFIX}/share/omega/omega.log - ${CP} ${PREFIX}/share/omega/omega.hi ${PREFIX}/share/omega/omegahi.bak - ${CHOWN} -R ${GAMEOWN}:${GAMEGRP} ${PREFIX}/share/omega - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/omega - cd ${WRKSRC}; for f in \ - buglist.txt docs/compile.all docs/readme.1st \ - docs/omega.txt docs/readme3 docs/readme4; \ - do \ - ${INSTALL_DATA} $${f} ${PREFIX}/share/doc/omega; \ - done - -.include "../../devel/ncurses/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/games/omega/PLIST b/games/omega/PLIST deleted file mode 100644 index 8f2bd6083cd..00000000000 --- a/games/omega/PLIST +++ /dev/null @@ -1,61 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:54:51 zuntum Exp $ -bin/Omega -man/man6/omega.6 -share/omega/omega.hi -share/omega/omega.log -share/omega/omegahi.bak -share/doc/omega/buglist.txt -share/doc/omega/compile.all -share/doc/omega/omega.txt -share/doc/omega/readme.1st -share/doc/omega/readme3 -share/doc/omega/readme4 -share/omega/abyss.dat -share/omega/abyss.txt -share/omega/arena.dat -share/omega/circle.dat -share/omega/city.dat -share/omega/country.dat -share/omega/court.dat -share/omega/dlair.dat -share/omega/help1.txt -share/omega/help10.txt -share/omega/help11.txt -share/omega/help12.txt -share/omega/help13.txt -share/omega/help2.txt -share/omega/help3.txt -share/omega/help4.txt -share/omega/help5.txt -share/omega/help6.txt -share/omega/help7.txt -share/omega/help8.txt -share/omega/help9.txt -share/omega/home1.dat -share/omega/home2.dat -share/omega/home3.dat -share/omega/intro.txt -share/omega/lgpl.txt -share/omega/license.txt -share/omega/maze1.dat -share/omega/maze2.dat -share/omega/maze3.dat -share/omega/maze4.dat -share/omega/misle.dat -share/omega/motd.txt -share/omega/scroll1.txt -share/omega/scroll2.txt -share/omega/scroll3.txt -share/omega/scroll4.txt -share/omega/speak.dat -share/omega/temple.dat -share/omega/thanks.txt -share/omega/update.txt -share/omega/village1.dat -share/omega/village2.dat -share/omega/village3.dat -share/omega/village4.dat -share/omega/village5.dat -share/omega/village6.dat -@dirrm share/doc/omega -@dirrm share/omega diff --git a/games/omega/distinfo b/games/omega/distinfo deleted file mode 100644 index 079a315fadb..00000000000 --- a/games/omega/distinfo +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 23:12:01 agc Exp $ - -SHA1 (omega-0.90.4-src.tar.gz) = fb6e20565057aee1250154afbcdb562cf39586fd -RMD160 (omega-0.90.4-src.tar.gz) = 04eb5dccb753da896f3cb3cce3a515a6f5699302 -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-aa b/games/omega/patches/patch-aa deleted file mode 100644 index 2cbce25f7e4..00000000000 --- a/games/omega/patches/patch-aa +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-aa,v 1.2 1999/12/28 02:28:23 proff Exp $ - ---- Makefile.orig Fri Jan 1 20:00:06 1999 -+++ Makefile Mon Jul 5 19:51:50 1999 -@@ -1,14 +1,14 @@ - # These two definitions are used if you 'make install' - # the value of LIBDIR should be the same as OMEGALIB in defs.h --BINDIR = /home/sdossey/omega/ --LIBDIR = /home/sdossey/omega/lib/ -+BINDIR = ${PREFIX}/bin -+LIBDIR = ${PREFIX}/share/omega - - # One of these should be uncommented, as appropriate, unless your compiler - # does it for you. You can test this by simply trying to 'make' omega - - # it will fail if none of them are defined. If you do uncomment - # one, make sure you comment out the other definition of CFLAGS lower down - --CFLAGS = -DBSD -ggdb -+CFLAGS+= -DBSD -DOMEGALIB=\"${LIBDIR}/\" - #CFLAGS = -DSYSV -O - # I also had to define -cckr (K&R style C) for system V - #CFLAGS = -DMSDOS -O -@@ -17,14 +17,14 @@ - # CPP should contain the command to run the C preprocessor. - #CPP = cc -E - #CPP = /lib/cpp --CPP = gcc -E -+CPP = ${CC} -E ${CFLAGS} - - # If you have gcc and don't intend to hack around with the game, - # I recommend setting CC to gcc and using -O (as the CFLAGS). - - #CFLAGS = -O - #LDFLAGS = -s --CC = gcc -+#CC = gcc - - # comment out one of the following two, after establishing whether your - # machine uses termcap (most BSD machines) or terminfo (System-V) -@@ -48,7 +48,10 @@ - omega: $(OBJ) - $(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o omega - --install: omega $(BINDIR) $(LIBDIR) -+install: omega -+ mkdir -p $(BINDIR) -+ mkdir -p $(LIBDIR) -+ chown games:games omega - cp omega $(BINDIR) - chmod 4711 $(BINDIR)/omega - - cp lib/* $(LIBDIR) diff --git a/games/omega/patches/patch-ab b/games/omega/patches/patch-ab deleted file mode 100644 index 75a256fe23b..00000000000 --- a/games/omega/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2001/01/07 22:31:46 wiz Exp $ - ---- defs.h Fri Jan 1 03:08:19 1999 -+++ /home/andy/tmp/wrk/defs.h Fri May 14 20:51:11 1999 -@@ -45,7 +45,9 @@ - This might usually be "/usr/games/lib/omegalib/", for unix, - or something like "c:\\games\\omega\\omegalib\\" for msdos */ - -+#ifndef OMEGALIB - #define OMEGALIB "./lib/" -+#endif - - /* Comment the following line out if you want users to be able to override */ - /* the OMEGALIB define, above, by setting the environment variable OMEGALIB */ diff --git a/games/omega/patches/patch-ac b/games/omega/patches/patch-ac deleted file mode 100644 index a755569e8e9..00000000000 --- a/games/omega/patches/patch-ac +++ /dev/null @@ -1,86 +0,0 @@ -$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 \n\ --#include \n\ --#include \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 \n" -+ "#include \n" -+ "#include \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 deleted file mode 100644 index 2392ecfb4b9..00000000000 --- a/games/omega/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$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 deleted file mode 100644 index 72e569b176a..00000000000 --- a/games/omega/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$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 deleted file mode 100644 index bd212d5b253..00000000000 --- a/games/omega/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$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 -- cgit v1.2.3