diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
commit | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch) | |
tree | cee0a97398040001220ece3cd48c3d568bcddb4a /games-roguelike/moria | |
parent | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff) |
gentoo resync : 10.02.2019
Diffstat (limited to 'games-roguelike/moria')
-rw-r--r-- | games-roguelike/moria/Manifest | 14 | ||||
-rw-r--r-- | games-roguelike/moria/files/5.5.2-fbsd.patch | 268 | ||||
-rw-r--r-- | games-roguelike/moria/files/5.5.2-gentoo-paths.patch | 58 | ||||
-rw-r--r-- | games-roguelike/moria/files/5.5.2-glibc.patch | 356 | ||||
-rw-r--r-- | games-roguelike/moria/files/5.5.2-hours.patch | 30 | ||||
-rw-r--r-- | games-roguelike/moria/files/5.5.2-warnings.patch | 12 | ||||
-rw-r--r-- | games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch | 33 | ||||
-rw-r--r-- | games-roguelike/moria/files/moria.6 | 108 | ||||
-rw-r--r-- | games-roguelike/moria/metadata.xml | 11 | ||||
-rw-r--r-- | games-roguelike/moria/moria-5.5.2.ebuild | 70 | ||||
-rw-r--r-- | games-roguelike/moria/moria-5.7.10.ebuild | 61 |
11 files changed, 214 insertions, 807 deletions
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest index ddb722625a7f..d7d997b0dd72 100644 --- a/games-roguelike/moria/Manifest +++ b/games-roguelike/moria/Manifest @@ -1,9 +1,5 @@ -AUX 5.5.2-fbsd.patch 6904 BLAKE2B 15e6da2c394bc57e93757fed0e4a4e908a688a6b715993162cd7c8ef09cff6dd912980a157fc65fb030d9733e6e7d490f00078b9ff60e35b4bcce6fd3353afd8 SHA512 ec1c0428bd5223ee2bd5408b482941911fab6650cde1c49ff0c93262ea4203d09502a5bb5fda1ee66588935faccc9c1f0a738c337f8af92a63467238d91f6d8d -AUX 5.5.2-gentoo-paths.patch 2363 BLAKE2B 415de0a817ed6bac0ee4a260722576b99bccb69176ea8f46d2c21d01488d8000916580b3ca435e9cd7b9be1c066111a3033ab2767578640abd01613539d14a65 SHA512 41789167d9e624e0ca2d800bb87851a5e9628b51cc80cc84ca15c974f394d99101ea9cc6bde361b1c2187a3983b5d2291ca15cdbae04499687fd9785e017c32c -AUX 5.5.2-glibc.patch 9796 BLAKE2B 73349021d2ebeff5ad946548ab320df211b73d62edefe42a3004a6d1dae103247939274ec7ae5b02ec36af24f8ac7b38ea2cb7eab1e0d4045d76f650ff46bab2 SHA512 834e3b4521ac00e8367abd3c5e5eefe7859f36f0182794911936006224c9fac94b6e4beae1da73c228e1e434d02cf870fc69f6102b981c78916c204a6eea101d -AUX 5.5.2-hours.patch 1343 BLAKE2B ca82cb17fad83c3be5cf063e0f13c3c635e63c6d8de7777ee454d4057f26ededfcec03aa7115c61a52242f01afc187fe0cfcb7f0b1de2064ea0602804011c3b3 SHA512 2b59e37741664dcfc095a5ae9ac482d6899d71f8221ca0f7d9d1caee594f05ac2ef043a6ff983e5266b904afa725876210d07b02352921066271f35e2efe7047 -AUX 5.5.2-warnings.patch 386 BLAKE2B aabef11e0c2b2869a9f45c538cdbc84389a6a3cbdceb6a6e9697ffe7a010483e740dc5c192ded489620ff7049baf4b58b6a560c75b9843bc63812e00c79c7615 SHA512 64bd3e7a0c613ca3043ea0a4aa4aab83281132af16d73e9ed70f1d5ff979b48cf1f085a030c56f0c17be01bbabb2dd4d9dcbd02d4a204993adec3fd01f03ab5c -DIST moria-extras.tar.bz2 57324 BLAKE2B 7a885e5595c8c3a3d0a29c65729e03ab1d26ad514b96a1d078a436960c1245283a51544dc54c6a5f225b77da3c3a72f8c7407efeac2b0629d51330b3abf9af49 SHA512 39d04ffdbe779fc070ee72084df5c731f8db25116e9156898d4c78c86e02288cf3560849461f2081209a06a74274789a671b104dc806b63a0d955adad17fd85f -DIST um5.5.2.tar.Z 910536 BLAKE2B d36d5cbb45992937f8e7c2f98cf2ad568e11e2d2b1af107e77ba98d8cfc23f2f4bcdb43ab9d5a9dd05e0ec45a5ecd298a1c4c7307bc0f75ca629c9c63cf9d3bb SHA512 987bbccb9cb4870ec91704cd20cf19875320d1cfe62c4c5a0063bfc3827732a0e3334a4ea3712137f3262d7418db0ea7e803d724e2dec4d5eb41ebe741f326cc -EBUILD moria-5.5.2.ebuild 1932 BLAKE2B 3fd63796fddf7bd31bb29b3357b3f30979d41bcac3cdcc561292483d831efa77f1ecacee65588e08ccd6649901b7c15b6d0aa4e8af20c989ff38b3ab16acec9d SHA512 b883196bf18634f9b576e7bb147a0fcaf0fb77823b74ee0ed04a39e7172a97e0d3ada1db9d9f3228f7a59d7b9510b3df73fc04448782834e53b005a69fd7391e -MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 +AUX moria-5.7.10-gentoo-paths.patch 1823 BLAKE2B 74ae8ba961a1dbd0ee42426d0cbae960a35175e5dea792ac5930524e78b6382f9e52c629bb30c02c64e31a42374b7c0c20f7ab6fb5cea9045eb0bf9f04c384d8 SHA512 8c03251777e230fe60751a107864da5c06aea6a4aa4fe8daf4373bc18dce672d1e798163837587992ef85107dd3e838d38e2d033bb7eec85be8a928cd74beed0 +AUX moria.6 2996 BLAKE2B ee20dc08b849eccf3860736b401a500f50598c340c0098d6cd820eb65ecbe13467b09ef23ab4982204b394ca8e0ef644bfbff4c8dd9df07ff15cb2b635d6af5e SHA512 54d4914f4c9bf364ef8539079d0a3cf91257309a479818e106c5ee41bbf2dab608074988d12529fd726e4cafd5c48baed4793f32a2a254593a928c5b6d1b9bd5 +DIST moria-5.7.10.tar.gz 392842 BLAKE2B 6b1f372d2c5503c708428b119e2c0333d3134eab3bd76ad8453ee062764b41d9dccca31c1512bd9561b5ba48b59dac32a447bb058c26c1cd9595cdc2e06cb9fc SHA512 f81754f03ae36ab5a8737fb0ae18da422b87da8684d00c88c934afa2c0b42e429c23a475751c506b499f809a421d1d3dfcc729e0d64d901b2e6c74e444d0f06f +EBUILD moria-5.7.10.ebuild 1355 BLAKE2B b4907bc61114ce79205100f46669969349bef1e5becd8309ceb6eac04d33b4c06f4490da09415d0bee01abbaea957f664c36a4b166808472735ca5945cae00f8 SHA512 c6cca8b8ff08e96fa33257740cd79898f9b52f40a32ed8f39e219752a836303bbfb7bac3946a4d5d6a4d882c59dba790d509528a0a5b66e60b183f4bb2e4a61e +MISC metadata.xml 342 BLAKE2B f53651879ccf3a26ac770d9746a76f5d59eb4403db9bdd4ae5f222f1a8e26c8a0c1ff86c47f087381d49229c1bc9473c7415072fd716ba0ba57f88c21198e5f2 SHA512 f6c4db0374588d0ba1070fdba2e38d647de66378fccc6a59e96c27cd50b4e2f9071259202cb1b33fe99d57332230dc68d450df2017ee1124f6b505d40f9f9843 diff --git a/games-roguelike/moria/files/5.5.2-fbsd.patch b/games-roguelike/moria/files/5.5.2-fbsd.patch deleted file mode 100644 index 4f65b08f567d..000000000000 --- a/games-roguelike/moria/files/5.5.2-fbsd.patch +++ /dev/null @@ -1,268 +0,0 @@ -Index: umoria/source/main.c -=================================================================== ---- umoria.orig/source/main.c -+++ umoria/source/main.c -@@ -88,6 +88,7 @@ - #include <time.h> - #endif - -+#ifndef __FreeBSD__ - #ifndef VMS - #ifndef MAC - #ifndef GEMDOS -@@ -98,6 +99,9 @@ long time(); - char *getenv(); - #endif - #endif -+#else -+#include <stdlib.h> -+#endif - - #ifndef MAC - #ifndef AMIGA -@@ -360,7 +364,7 @@ char *argv[]; - else - { /* Create character */ - create_character(); --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - birth_date = time ((time_t *)0); - #else - birth_date = time ((long *)0); -Index: umoria/source/death.c -=================================================================== ---- umoria.orig/source/death.c -+++ umoria/source/death.c -@@ -123,6 +123,7 @@ static void kingly(void); - #include <stdlib.h> - #endif - -+#ifndef __FreeBSD__ - #ifndef VMS - #ifndef MAC - #if !defined(ATARIST_MWC) && !defined(AMIGA) -@@ -130,18 +131,19 @@ long time(); - #endif - #endif - #endif -+#endif - - static void date(day) - char *day; - { - register char *tmp; --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - time_t clockvar; - #else - long clockvar; - #endif - --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - clockvar = time((time_t *) 0); - #else - clockvar = time((long *) 0); -Index: umoria/source/io.c -=================================================================== ---- umoria.orig/source/io.c -+++ umoria/source/io.c -@@ -13,6 +13,11 @@ - - #include "config.h" - -+#ifdef __FreeBSD__ -+#include <sys/ioctl_compat.h> -+#include <time.h> -+#endif -+ - #ifdef HPUX - #include <sys/bsdtty.h> - #endif -@@ -245,7 +250,9 @@ int suspend() - struct ltchars lcbuf; - struct tchars cbuf; - int lbuf; -+#ifndef __FreeBSD__ - long time(); -+#endif - - py.misc.male |= 2; - (void) ioctl(0, TIOCGETP, (char *)&tbuf); -@@ -313,7 +320,7 @@ void init_curses() - #endif - - /* PC curses returns ERR */ --#if defined(USG) && !defined(PC_CURSES) && !defined(AMIGA) -+#if (defined(USG) && !defined(PC_CURSES) && !defined(AMIGA)) || defined(__FreeBSD__) - if (initscr() == NULL) - #else - if (initscr() == ERR) -@@ -331,7 +338,7 @@ void init_curses() - #if defined(atarist) && defined(__GNUC__) - (void) signal (SIGTSTP, (__Sigfunc)suspend); - #else --#ifdef __386BSD__ -+#if defined(__386BSD__) || defined(__FreeBSD__) - (void) signal (SIGTSTP, (sig_t)suspend); - #else - (void) signal (SIGTSTP, suspend); -@@ -757,7 +764,7 @@ void shell_out() - msg_print("Fork failed. Try again."); - return; - } --#if defined(USG) || defined(__386BSD__) -+#if defined(USG) || defined(__386BSD__) || defined(__FreeBSD__) - (void) wait((int *) 0); - #else - (void) wait((union wait *) 0); -Index: umoria/source/misc1.c -=================================================================== ---- umoria.orig/source/misc1.c -+++ umoria/source/misc1.c -@@ -28,7 +28,7 @@ - #endif - #endif - --#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA) -+#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA) && !defined(__FreeBSD__) - long time(); - #endif - struct tm *localtime(); -@@ -45,7 +45,7 @@ int32u seed; - register int32u clock_var; - - if (seed == 0) --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - clock_var = time((time_t *)0); - #else - clock_var = time((long *)0); -@@ -89,10 +89,14 @@ void reset_seed() - int check_time() - { - #ifdef MORIA_HOU -+#if defined(MAC) || defined(__FreeBSD__) -+ time_t clock_var; -+#else - long clock_var; -+#endif - register struct tm *tp; - --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - clock_var = time((time_t *)0); - #else - clock_var = time((long *)0); -Index: umoria/source/save.c -=================================================================== ---- umoria.orig/source/save.c -+++ umoria/source/save.c -@@ -102,7 +102,7 @@ static void rd_monster(); - #endif - - #if !defined(ATARIST_MWC) --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - #include <time.h> - #else - long time(); -@@ -331,7 +331,7 @@ static int sv_write() - } - - /* save the current time in the savefile */ --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - l = time((time_t *)0); - #else - l = time((long *)0); -@@ -1029,7 +1029,7 @@ int *generate; - || (version_min == 2 && patch_level >= 2)) - rd_long ((int32u *)&birth_date); - else --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - birth_date = time((time_t *)0); - #else - birth_date = time((long *)0); -@@ -1253,7 +1253,7 @@ scoreboard; it will not be scored again. - /* rotate store inventory, depending on how old the save file */ - /* is foreach day old (rounded up), call store_maint */ - /* calculate age in seconds */ --#ifdef MAC -+#if defined(MAC) || defined(__FreeBSD__) - start_time = time((time_t *)0); - #else - start_time = time((long *)0); -Index: umoria/source/signals.c -=================================================================== ---- umoria.orig/source/signals.c -+++ umoria/source/signals.c -@@ -89,7 +89,7 @@ static int signal_count = 0; - - /*ARGSUSED*/ - #ifndef USG --#ifdef __386BSD__ -+#if defined(__386BSD__) || defined(__FreeBSD__) - static void signal_handler(sig, code, scp) - #else - static int signal_handler(sig, code, scp) -@@ -217,7 +217,7 @@ void signals() - #if defined(atarist) && defined(__GNUC__) - (void) signal(SIGTSTP, (__Sigfunc)suspend); - #else --#ifdef __386BSD__ -+#if defined(__386BSD__) || defined(__FreeBSD__) - (void) signal(SIGTSTP, (sig_t)suspend); - #else - (void) signal(SIGTSTP, suspend); -Index: umoria/source/types.h -=================================================================== ---- umoria.orig/source/types.h -+++ umoria/source/types.h -@@ -6,11 +6,20 @@ - not for profit purposes provided that this copyright and statement are - included in all such copies. */ - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+typedef u_int32_t int32u; -+typedef int32_t int32; -+typedef u_int16_t int16u; -+typedef int16_t int16; -+typedef u_int8_t int8u; -+#else - typedef unsigned long int32u; - typedef long int32; - typedef unsigned short int16u; - typedef short int16; - typedef unsigned char int8u; -+#endif - /* 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 */ -Index: umoria/unix/unix.c -=================================================================== ---- umoria.orig/unix/unix.c -+++ umoria/unix/unix.c -@@ -14,6 +14,10 @@ - /* defines TRUE and FALSE */ - #include <curses.h> - -+#ifdef __FreeBSD__ -+#include <unistd.h> -+#endif -+ - #include "config.h" - #include "constant.h" - #include "types.h" -@@ -276,7 +280,9 @@ int getuid(); - void user_name(buf) - char *buf; - { -+#ifndef __FreeBSD__ - extern char *getlogin(); -+#endif - struct passwd *pwline; - register char *p; - diff --git a/games-roguelike/moria/files/5.5.2-gentoo-paths.patch b/games-roguelike/moria/files/5.5.2-gentoo-paths.patch deleted file mode 100644 index 5ce4ce4d2b4d..000000000000 --- a/games-roguelike/moria/files/5.5.2-gentoo-paths.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- umoria/unix/Makefile.orig 2003-12-31 14:52:58.583335976 -0500 -+++ umoria/unix/Makefile 2003-12-31 14:51:54.621059720 -0500 -@@ -3,6 +3,7 @@ - # LIBDIR must be the same directory defined in config.h - # OWNER is who you want the game to be chown to. - # GROUP is who you wnat the game to be chgrp to. -+STATEDIR = /var/lib - BINDIR = /home/zariski/grabiner/moria - LIBDIR = /home/zariski/grabiner/moria/files - OWNER = grabiner -@@ -65,12 +66,11 @@ - chmod 4711 $(BINDIR)/moria - chmod 711 $(LIBDIR) - (cd files; cp $(LIBFILES) $(LIBDIR)) -- (cd $(LIBDIR); chmod 444 $(LIBFILES)) -- (cd $(LIBDIR); touch scores; chmod 644 scores) -+ (cd $(STATEDIR); touch moriascores; chmod 664 moriascores; chown $(OWNER) moriascores; chgrp $(GROUP) moriascores) - chown $(OWNER) $(BINDIR)/moria - chgrp $(GROUP) $(BINDIR)/moria -- (cd $(LIBDIR); chown $(OWNER) $(LIBFILES) scores) -- (cd $(LIBDIR); chgrp $(GROUP) $(LIBFILES) scores) -+ (cd $(LIBDIR); chown $(OWNER) $(LIBFILES)) -+ (cd $(LIBDIR); chgrp $(GROUP) $(LIBFILES)) - # If you are short on disk space, or aren't interested in debugging moria. - # strip $(BINDIR)/moria - ---- umoria/source/config.h.orig 2003-12-31 15:19:48.893531616 -0500 -+++ umoria/source/config.h 2003-12-31 15:21:09.584264760 -0500 -@@ -199,17 +199,18 @@ - #else - - /* 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_SAV ".moria.save" -+#define MORIA_LIB(xxx) "GENTOO_DATADIR/" xxx -+#define MORIA_STATE(xxx) "GENTOO_STATEDIR/" xxx -+#define MORIA_HOU MORIA_LIB("hours") -+#define MORIA_MOR MORIA_LIB("news") -+#define MORIA_TOP MORIA_STATE("moriascores") -+#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 diff --git a/games-roguelike/moria/files/5.5.2-glibc.patch b/games-roguelike/moria/files/5.5.2-glibc.patch deleted file mode 100644 index 55e4e5de2b14..000000000000 --- a/games-roguelike/moria/files/5.5.2-glibc.patch +++ /dev/null @@ -1,356 +0,0 @@ -diff -Naur common-orig/Makefile umoria/unix/Makefile ---- common-orig/Makefile 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/unix/Makefile 2003-12-09 10:07:12.000000000 -0500 -@@ -14,9 +14,9 @@ - CFLAGS = -O - - # For BSD Systems --CURSES = -lcurses -ltermcap -+# CURSES = -lcurses -ltermcap - # For SYS V Systems --# CURSES = -lcurses -+CURSES = `pkg-config ncurses --libs` - # For XENIX, some XENIX systems may need -ltinfo - # CURSES = -ltcap -ltermcap -lx - -diff -Naur common-orig/death.c umoria/source/death.c ---- common-orig/death.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/death.c 2003-12-09 10:06:56.000000000 -0500 -@@ -175,10 +175,12 @@ - /* The following code is provided especially for systems which -CJS- - have no flock system call. It has never been tested. */ - -+#ifndef LOCK_EX - #define LOCK_EX 1 - #define LOCK_SH 2 - #define LOCK_NB 4 - #define LOCK_UN 8 -+#endif - - /* An flock HACK. LOCK_SH and LOCK_EX are not distinguished. DO NOT release - a lock which you failed to set! ALWAYS release a lock you set! */ -diff -Naur common-orig/io.c umoria/source/io.c ---- common-orig/io.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/io.c 2003-12-09 10:06:56.000000000 -0500 -@@ -62,6 +62,7 @@ - - - #include <ctype.h> -+#include <termios.h> - - #if defined(SYS_V) && defined(lint) - /* for AIX, prevent hundreds of unnecessary lint errors, must define before -@@ -334,7 +335,9 @@ - #ifdef __386BSD__ - (void) signal (SIGTSTP, (sig_t)suspend); - #else -- (void) signal (SIGTSTP, suspend); -+ /* (void) signal (SIGTSTP, suspend); */ -+ /* libc6 defaults to BSD, this expects SYSV */ -+ (void) sysv_signal (SIGTSTP, suspend); - #endif - #endif - #endif -diff -Naur common-orig/misc3.c umoria/source/misc3.c ---- common-orig/misc3.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/misc3.c 2003-12-09 10:06:56.000000000 -0500 -@@ -1249,8 +1249,7 @@ - { - int i; - register inven_type *i_ptr; -- vtype prt2; -- bigvtype prt1; -+ bigvtype prt1, prt2; - #ifdef ATARIST_MWC - int32u holder; - #endif -diff -Naur common-orig/misc4.c umoria/source/misc4.c ---- common-orig/misc4.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/misc4.c 2003-12-09 10:06:56.000000000 -0500 -@@ -33,7 +33,7 @@ - void scribe_object() - { - int item_val, j; -- vtype out_val, tmp_str; -+ bigvtype out_val, tmp_str; - - if (inven_ctr > 0 || equip_ctr > 0) - { -diff -Naur common-orig/moria1.c umoria/source/moria1.c ---- common-orig/moria1.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/moria1.c 2003-12-09 10:06:56.000000000 -0500 -@@ -332,8 +332,8 @@ - { - objdes(tmp_val, &inventory[i], TRUE); - tmp_val[lim] = 0; /* Truncate if too long. */ -- (void) sprintf(out_val[i], " %c) %s", 'a'+i, tmp_val); -- l = strlen(out_val[i]); -+ (void) sprintf(out_val[i], "%c) %s", 'a'+i, tmp_val); -+ l = strlen(out_val[i]) + 2; - if (weight) - l += 9; - if (l > len) -@@ -352,9 +352,12 @@ - { - /* don't need first two spaces if in first column */ - if (col == 0) -- prt(&out_val[i][2], current_line, col); -- else - prt(out_val[i], current_line, col); -+ else -+ { -+ put_buffer(" ", current_line, col); -+ prt(out_val[i], current_line, col+2); -+ } - if (weight) - { - total_weight = inventory[i].weight*inventory[i].number; -@@ -466,9 +469,9 @@ - } - objdes(prt2, &inventory[i], TRUE); - prt2[lim] = 0; /* Truncate if necessary */ -- (void) sprintf(out_val[line], " %c) %-14s: %s", line+'a', -- prt1, prt2); -- l = strlen(out_val[line]); -+ (void) sprintf(out_val[line], "%c) %-14s: %s", line+'a', -+ prt1, prt2); -+ l = strlen(out_val[line]) + 2; - if (weight) - l += 9; - if (l > len) -@@ -488,9 +491,12 @@ - { - /* don't need first two spaces when using whole screen */ - if (col == 0) -- prt(&out_val[line][2], line+1, col); -- else - prt(out_val[line], line+1, col); -+ else -+ { -+ put_buffer(" ", line+1, col); -+ prt(out_val[line], line+1, col+2); -+ } - if (weight) - { - total_weight = i_ptr->weight*i_ptr->number; -diff -Naur common-orig/signals.c umoria/source/signals.c ---- common-orig/signals.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/source/signals.c 2003-12-09 10:06:56.000000000 -0500 -@@ -113,7 +113,11 @@ - if(error_sig >= 0) /* Ignore all second signals. */ - { - if(++signal_count > 10) /* Be safe. We will die if persistent enough. */ -+#ifdef __FreeBSD__ - (void) signal(sig, SIG_DFL); -+#else -+ (void) sysv_signal(sig, SIG_DFL); -+#endif - return; - } - error_sig = sig; -@@ -126,7 +126,11 @@ - ) - { - if (death) -+#ifdef __FreeBSD__ - (void) signal(sig, SIG_IGN); /* Can't quit after death. */ -+#else -+ (void) sysv_signal(sig, SIG_IGN); /* Can't quit after death. */ -+#endif - else if (!character_saved && character_generated) - { - if (!get_check("Really commit *Suicide*?")) -@@ -137,7 +137,11 @@ - put_qio(); - error_sig = -1; - #ifdef USG -+#ifdef __FreeBSD__ - (void) signal(sig, signal_handler);/* Have to restore handler. */ -+#else -+ (void) sysv_signal(sig, signal_handler);/* Have to restore handler. */ -+#endif - #else - (void) sigsetmask(smask); - #endif -@@ -179,7 +179,11 @@ - restore_term(); - #if !defined(MSDOS) && !defined(AMIGA) && !defined(ATARIST_TC) - /* always generate a core dump */ -+#ifdef __FreeBSD__ - (void) signal(sig, SIG_DFL); -+#else -+ (void) sysv_signal(sig, SIG_DFL); -+#endif - (void) kill(getpid(), sig); - (void) sleep(5); - #endif -@@ -199,7 +199,11 @@ - #if defined(atarist) && defined(__GNUC__) - (void) signal(SIGTSTP, (__Sigfunc)SIG_IGN); - #else -+#ifdef __FreeBSD__ - (void) signal(SIGTSTP, SIG_IGN); -+#else -+ (void) sysv_signal(SIGTSTP, SIG_IGN); -+#endif - #endif - #ifndef USG - mask = sigsetmask(0); -@@ -220,7 +220,11 @@ - #ifdef __386BSD__ - (void) signal(SIGTSTP, (sig_t)suspend); - #else -+#ifdef __FreeBSD__ - (void) signal(SIGTSTP, suspend); -+#else -+ (void) sysv_signal(SIGTSTP, suspend); -+#endif - #endif - #endif - #ifndef USG -@@ -237,7 +237,11 @@ - { - #if !defined(ATARIST_MWC) && !defined(ATARIST_TC) - /* No signals for Atari ST compiled with MWC or TC. */ -+#ifdef __FreeBSD__ - (void) signal(SIGINT, signal_handler); -+#else -+ (void) sysv_signal(SIGINT, signal_handler); -+#endif - - #if defined(atarist) && defined(__GNUC__) - /* Atari ST compiled with GNUC has most signals, but we need a cast -@@ -259,8 +259,13 @@ - - #else - /* Everybody except the atari st. */ -+#ifdef __FreeBSD__ - (void) signal(SIGINT, signal_handler); - (void) signal(SIGFPE, signal_handler); -+#else -+ (void) sysv_signal(SIGINT, signal_handler); -+ (void) sysv_signal(SIGFPE, signal_handler); -+#endif - - #if defined(MSDOS) - /* many fewer signals under MSDOS */ -@@ -278,30 +278,61 @@ - - /* Everybody except Atari, MSDOS, and Amiga. */ - /* Ignore HANGUP, and let the EOF code take care of this case. */ -+#ifdef __FreeBSD__ - (void) signal(SIGHUP, SIG_IGN); - (void) signal(SIGQUIT, signal_handler); - (void) signal(SIGILL, signal_handler); - (void) signal(SIGTRAP, signal_handler); - (void) signal(SIGIOT, signal_handler); -+#else -+ (void) sysv_signal(SIGHUP, SIG_IGN); -+ (void) sysv_signal(SIGQUIT, signal_handler); -+ (void) sysv_signal(SIGILL, signal_handler); -+ (void) sysv_signal(SIGTRAP, signal_handler); -+ (void) sysv_signal(SIGIOT, signal_handler); -+#endif - #ifdef SIGEMT /* in BSD systems */ - (void) signal(SIGEMT, signal_handler); - #endif - #ifdef SIGDANGER /* in SYSV systems */ - (void) signal(SIGDANGER, signal_handler); - #endif -+#ifdef __FreeBSD__ - (void) signal(SIGKILL, signal_handler); - (void) signal(SIGBUS, signal_handler); - (void) signal(SIGSEGV, signal_handler); -+#else -+ (void) sysv_signal(SIGKILL, signal_handler); -+ (void) sysv_signal(SIGBUS, signal_handler); -+ (void) sysv_signal(SIGSEGV, signal_handler); -+#endif - #ifdef SIGSYS -+#ifdef __FreeBSD__ - (void) signal(SIGSYS, signal_handler); -+#else -+ (void) sysv_signal(SIGSYS, signal_handler); -+#endif - #endif -+#ifdef __FreeBSD__ - (void) signal(SIGTERM, signal_handler); - (void) signal(SIGPIPE, signal_handler); -+#else -+ (void) sysv_signal(SIGTERM, signal_handler); -+ (void) sysv_signal(SIGPIPE, signal_handler); -+#endif - #ifdef SIGXCPU /* BSD */ -+#ifdef __FreeBSD__ - (void) signal(SIGXCPU, signal_handler); -+#else -+ (void) sysv_signal(SIGXCPU, signal_handler); -+#endif - #endif - #ifdef SIGPWR /* SYSV */ -+#ifdef __FreeBSD__ - (void) signal(SIGPWR, signal_handler); -+#else -+ (void) sysv_signal(SIGPWR, signal_handler); -+#endif - #endif - #endif - #endif -@@ -314,7 +314,11 @@ - #if !defined(ATARIST_MWC) - (void) signal(SIGINT, SIG_IGN); - #ifdef SIGQUIT -+#ifdef __FreeBSD__ - (void) signal(SIGQUIT, SIG_IGN); -+#else -+ (void) sysv_signal(SIGQUIT, SIG_IGN); -+#endif - #endif - #endif - } -@@ -324,7 +324,11 @@ - #if !defined(ATARIST_MWC) - (void) signal(SIGINT, SIG_DFL); - #ifdef SIGQUIT -+#ifdef __FreeBSD__ - (void) signal(SIGQUIT, SIG_DFL); -+#else -+ (void) sysv_signal(SIGQUIT, SIG_DFL); -+#endif - #endif - #endif - } -@@ -335,13 +335,21 @@ - #if defined(atarist) && defined(__GNUC__) - (void) signal(SIGINT, (__Sigfunc)signal_handler); - #else -+#ifdef __FreeBSD__ - (void) signal(SIGINT, signal_handler); -+#else -+ (void) sysv_signal(SIGINT, signal_handler); -+#endif - #endif - #ifdef SIGQUIT - #if defined(atarist) && defined(__GNUC__) - (void) signal(SIGQUIT, (__Sigfunc)signal_handler); - #else -+#ifdef __FreeBSD__ - (void) signal(SIGQUIT, signal_handler); -+#else -+ (void) sysv_signal(SIGQUIT, signal_handler); -+#endif - #endif - #endif - #endif -diff -Naur common-orig/unix.c umoria/unix/unix.c ---- common-orig/unix.c 2003-12-09 10:06:19.000000000 -0500 -+++ umoria/unix/unix.c 2003-12-09 10:06:56.000000000 -0500 -@@ -261,7 +261,7 @@ - #endif - - #ifdef USG --unsigned short getuid(); -+/* unsigned short getuid(); */ - #else - #ifndef SECURE - #ifdef BSD4_3 diff --git a/games-roguelike/moria/files/5.5.2-hours.patch b/games-roguelike/moria/files/5.5.2-hours.patch deleted file mode 100644 index 3d1c329d9b9b..000000000000 --- a/games-roguelike/moria/files/5.5.2-hours.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru umoria.orig/source/files.c umoria/source/files.c ---- umoria.orig/source/files.c 1994-07-21 21:47:22.000000000 -0400 -+++ umoria/source/files.c 2010-05-05 14:51:44.334588483 -0400 -@@ -130,19 +130,19 @@ - if (strlen(in_line) > 3) - { - if (!strncmp(in_line, "SUN:", 4)) -- (void) strcpy(days[0], in_line); -+ (void) snprintf(days[0], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "MON:", 4)) -- (void) strcpy(days[1], in_line); -+ (void) snprintf(days[1], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "TUE:", 4)) -- (void) strcpy(days[2], in_line); -+ (void) snprintf(days[2], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "WED:", 4)) -- (void) strcpy(days[3], in_line); -+ (void) snprintf(days[3], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "THU:", 4)) -- (void) strcpy(days[4], in_line); -+ (void) snprintf(days[4], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "FRI:", 4)) -- (void) strcpy(days[5], in_line); -+ (void) snprintf(days[5], sizeof(days[0]), "%s", in_line); - else if (!strncmp(in_line, "SAT:", 4)) -- (void) strcpy(days[6], in_line); -+ (void) snprintf(days[6], sizeof(days[0]), "%s", in_line); - } - (void) fclose(file1); - } diff --git a/games-roguelike/moria/files/5.5.2-warnings.patch b/games-roguelike/moria/files/5.5.2-warnings.patch deleted file mode 100644 index 33a2762b99d0..000000000000 --- a/games-roguelike/moria/files/5.5.2-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru umoria.orig/unix/unix.c umoria/unix/unix.c ---- umoria.orig/unix/unix.c 2014-11-01 02:45:07.375535783 -0400 -+++ umoria/unix/unix.c 2014-11-01 02:45:58.575820065 -0400 -@@ -315,7 +315,7 @@ - - user[0] = '\0'; - file++; -- while (*file != '/' && i < sizeof(user)) -+ while (*file != '/' && i < sizeof(user) - 1) - user[i++] = *file++; - user[i] = '\0'; - if (i == 0) diff --git a/games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch b/games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch new file mode 100644 index 000000000000..0d17c549e773 --- /dev/null +++ b/games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch @@ -0,0 +1,33 @@ +diff --git a/src/config.cpp b/src/config.cpp +index 09528f7..1c299ed 100644 +--- a/src/config.cpp ++++ b/src/config.cpp +@@ -12,17 +12,17 @@ namespace config { + // Data files used by Umoria + // NOTE: use relative paths to the executable binary. + namespace files { +- const std::string splash_screen = "data/splash.txt"; +- const std::string welcome_screen = "data/welcome.txt"; +- const std::string license = "LICENSE"; +- const std::string versions_history = "data/versions.txt"; +- const std::string help = "data/help.txt"; +- const std::string help_wizard = "data/help_wizard.txt"; +- const std::string help_roguelike = "data/rl_help.txt"; +- const std::string help_roguelike_wizard = "data/rl_help_wizard.txt"; +- const std::string death_tomb = "data/death_tomb.txt"; +- const std::string death_royal = "data/death_royal.txt"; +- const std::string scores = "scores.dat"; ++ const std::string splash_screen = "/usr/share/moria/splash.txt"; ++ const std::string welcome_screen = "/usr/share/moria/welcome.txt"; ++ const std::string license = "/usr/share/doc/@PF@/LICENSE"; ++ const std::string versions_history = "/usr/share/moria/versions.txt"; ++ const std::string help = "/usr/share/moria/help.txt"; ++ const std::string help_wizard = "/usr/share/moria/help_wizard.txt"; ++ const std::string help_roguelike = "/usr/share/moria/rl_help.txt"; ++ const std::string help_roguelike_wizard = "/usr/share/moria/rl_help_wizard.txt"; ++ const std::string death_tomb = "/usr/share/moria/death_tomb.txt"; ++ const std::string death_royal = "/usr/share/moria/death_royal.txt"; ++ const std::string scores = "/var/lib/moria/scores.dat"; + std::string save_game = "game.sav"; + } + diff --git a/games-roguelike/moria/files/moria.6 b/games-roguelike/moria/files/moria.6 new file mode 100644 index 000000000000..be1fc7cc353b --- /dev/null +++ b/games-roguelike/moria/files/moria.6 @@ -0,0 +1,108 @@ +.TH MORIA 6 "" +.SH NAME +moria \- a dungeon game +.SH SYNOPSIS +.B +moria +[ +.B \-o +] [ +.B \-r +] [ +.B \-s +] [ +.B \-S +] [ +.B \-n +] [ +.B \-w +] [ savefile ] +.SH DESCRIPTION +.I Moria\^ +plays a dungeon game with you. +It lets you generate a character, +lets you buy equipment, +and lets you wander in a fathomless dungeon +while finding treasure and being attacked by monsters +and fellow adventurers. +Typing +.B ? +gives you a list of commands. +.PP +The ultimate object of +.I moria +is to kill the Balrog, +which dwells on the 50th level of the +dungeon, 2,500 feet underground. +Most players never even reach the Balrog, +and those that do seldom live to tell about it. +.PP +For a more complete description of the game, +read the document +.I The Dungeons of Moria. +.PP +By default, +.I moria +will save and restore games from a file +called moria.save in your home directory. If the environment +variable MORIA_SAV is defined, then +.I moria +will use that +file name instead of the default. If MORIA_SAV is not a complete +path name, then the savefile will be created or restored from the +current directory. You can also explicitly specify a savefile +on the command line. +.PP +If you use the \fB\-n\fP option, +.I moria +will create a new game, +ignoring any savefile which may already exist. +This works best when a savefile name is specified on the +command line, as this will prevent +.I moria +from trying to overwrite the default savefile +(if it exists) when you try to save your game. +.PP +You move in various directions +by pressing the numeric keypad keys, VMS-style. +If you specify +\fB\-r\fP, you move the same way you do in \fIrogue\fP(6). +You can also specify +\fB\-o\fP to force the VMS-style command set. +These options will override defaults stored in the savefile. If these +options are given multiple times, only the last one will take effect. +.PP +If you specify +.BR \-s , +.I moria +prints all of the scores in the score file and exits. +On a multiuser system, if you specify +.BR \-S , +.I moria +prints prints only those scores belonging to you and then exits. +.PP +If you specify \fB\-w\fP, +.I moria +will start up in wizard mode. +You can resurrect a dead character by using this option when starting +the game. Resurrected characters are teleported to the town level +and given zero hitpoints. +Wizard mode is intended for debugging the game, and for experimenting +with new features. Any other use is considered cheating. +Games played with wizard mode are not scored. +.SH AUTHORS +The original version of Moria was written in VMS/Pascal by Robert +Alan Koeneke, Jimmey Wayne Todd, +Gary McAdoo, and others at the University of Oklahoma. +This version was written by Jim Wilson at the University of California, +Berkeley, and released with minor revisions by David Grabiner at Harvard +University. +.SH BUGS +.PP +A suspended game that gets a hangup signal will die without creating a +save file. + +Rerolling with a % at the class prompt not implemented. + +For a more comprehensive list, see the ERRORS file in the source +distribution. diff --git a/games-roguelike/moria/metadata.xml b/games-roguelike/moria/metadata.xml index 78274e0fa550..51c540e92f83 100644 --- a/games-roguelike/moria/metadata.xml +++ b/games-roguelike/moria/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> -</maintainer> + <maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> + </maintainer> + <upstream> + <remote-id type="github">dungeons-of-moria/umoria</remote-id> + </upstream> </pkgmetadata> diff --git a/games-roguelike/moria/moria-5.5.2.ebuild b/games-roguelike/moria/moria-5.5.2.ebuild deleted file mode 100644 index e135a2f7d915..000000000000 --- a/games-roguelike/moria/moria-5.5.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs games - -DESCRIPTION="Rogue-like D&D curses game similar to nethack (BUT BETTER)" -HOMEPAGE="http://remarque.org/~grabiner/moria.html" -SRC_URI="ftp://ftp.greyhelm.com/pub/Games/Moria/source/um${PV}.tar.Z - http://www.funet.fi/pub/unix/games/moria/source/um${PV}.tar.Z - http://www.piratehaven.org/~beej/moria/mirror/Games/Moria/source/um${PV}.tar.Z - http://alge.anart.no/ftp/pub/games/RPG/moria/um${PV}.tar.Z - ftp://kane.evendata.net/pub/${PN}-extras.tar.bz2" - -LICENSE="Moria" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=sys-libs/ncurses-5:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/umoria - -src_prepare() { - local f - - epatch \ - "${FILESDIR}"/${PV}-gentoo-paths.patch \ - "${FILESDIR}"/${PV}-glibc.patch \ - "${FILESDIR}"/${PV}-fbsd.patch \ - "${FILESDIR}"/${PV}-hours.patch \ - "${FILESDIR}"/${PV}-warnings.patch - - for f in source/* unix/* ; do - ln -s ${f} $(basename ${f}) - done - - sed -i \ - -e "s:David Grabiner:root:" \ - -e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \ - -e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}:" \ - config.h || die - { - echo "#include <stdlib.h>" - echo "#include <stdio.h>" - } >> config.h || die - sed -i \ - -e "/^STATEDIR =/s:=.*:=\$(DESTDIR)${GAMES_STATEDIR}:" \ - -e "/^BINDIR = /s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \ - -e "/^LIBDIR = /s:=.*:=\$(DESTDIR)${GAMES_DATADIR}/${PN}:" \ - -e "/^CFLAGS = /s:=.*:=${CFLAGS}:" \ - -e "/^OWNER = /s:=.*:=${GAMES_USER}:" \ - -e "/^GROUP = /s:=.*:=${GAMES_GROUP}:" \ - -e "/^CC = /s:=.*:=$(tc-getCC):" \ - -e '/^LFLAGS = /s:=.*:= $(LDFLAGS):' \ - Makefile || die - mv doc/moria.6 "${S}" || die -} - -src_install() { - dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}" - emake DESTDIR="${D}" install - - doman moria.6 - dodoc README doc/* "${WORKDIR}"/${PN}-extras/* - - prepgamesdirs -} diff --git a/games-roguelike/moria/moria-5.7.10.ebuild b/games-roguelike/moria/moria-5.7.10.ebuild new file mode 100644 index 000000000000..77fadf27a040 --- /dev/null +++ b/games-roguelike/moria/moria-5.7.10.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_IN_SOURCE_BUILD="yes" +inherit cmake-utils prefix user + +DESCRIPTION="The Dungeons of Moria, a single player roguelike game, also known as Umoria" +HOMEPAGE="https://umoria.org/" +SRC_URI="https://github.com/dungeons-of-moria/umoria/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~m68k ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=sys-libs/ncurses-6.0:0=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/umoria-${PV}" + +PATCHES=( "${FILESDIR}/${P}-gentoo-paths.patch" ) + +pkg_setup(){ + enewgroup gamestat 36 +} + +src_prepare() { + cmake-utils_src_prepare + sed -i "s/@PF@/${PF}/" src/config.cpp || die + hprefixify src/config.cpp +} + +src_install() { + newbin umoria/umoria moria + + insinto /usr/share/moria + doins data/*.txt + + insinto /var/lib/moria + doins data/scores.dat + fowners root:gamestat /var/lib/moria/scores.dat + fperms g+w /var/lib/moria/scores.dat + + doman "${FILESDIR}"/${PN}.6 + dodoc -r AUTHORS README.md docs + + # The game binary will look for plain text LICENSE + insinto /usr/share/doc/${PF} + doins LICENSE + docompress -x /usr/share/doc/${PF}/LICENSE +} + +pkg_postinst() { + elog + elog "Please add users to the 'gamestat' group, so they can run Moria:" + elog " usermod -aG gamestat <user>" + elog +} |