1 |
commit: 6672e98a25c122119d3bc45571dfabc66182304f |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 5 21:24:29 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 5 21:42:32 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6672e98a |
7 |
|
8 |
games-roguelike/moria: Drop old 5.5.2 |
9 |
|
10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
12 |
|
13 |
games-roguelike/moria/Manifest | 2 - |
14 |
games-roguelike/moria/files/5.5.2-fbsd.patch | 268 ---------------- |
15 |
.../moria/files/5.5.2-gentoo-paths.patch | 58 ---- |
16 |
games-roguelike/moria/files/5.5.2-glibc.patch | 356 --------------------- |
17 |
games-roguelike/moria/files/5.5.2-hours.patch | 30 -- |
18 |
games-roguelike/moria/files/5.5.2-warnings.patch | 12 - |
19 |
games-roguelike/moria/moria-5.5.2.ebuild | 70 ---- |
20 |
7 files changed, 796 deletions(-) |
21 |
|
22 |
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest |
23 |
index c64583a00c4..7ac29351c30 100644 |
24 |
--- a/games-roguelike/moria/Manifest |
25 |
+++ b/games-roguelike/moria/Manifest |
26 |
@@ -1,3 +1 @@ |
27 |
DIST moria-5.7.10.tar.gz 392842 BLAKE2B 6b1f372d2c5503c708428b119e2c0333d3134eab3bd76ad8453ee062764b41d9dccca31c1512bd9561b5ba48b59dac32a447bb058c26c1cd9595cdc2e06cb9fc SHA512 f81754f03ae36ab5a8737fb0ae18da422b87da8684d00c88c934afa2c0b42e429c23a475751c506b499f809a421d1d3dfcc729e0d64d901b2e6c74e444d0f06f |
28 |
-DIST moria-extras.tar.bz2 57324 BLAKE2B 7a885e5595c8c3a3d0a29c65729e03ab1d26ad514b96a1d078a436960c1245283a51544dc54c6a5f225b77da3c3a72f8c7407efeac2b0629d51330b3abf9af49 SHA512 39d04ffdbe779fc070ee72084df5c731f8db25116e9156898d4c78c86e02288cf3560849461f2081209a06a74274789a671b104dc806b63a0d955adad17fd85f |
29 |
-DIST um5.5.2.tar.Z 910536 BLAKE2B d36d5cbb45992937f8e7c2f98cf2ad568e11e2d2b1af107e77ba98d8cfc23f2f4bcdb43ab9d5a9dd05e0ec45a5ecd298a1c4c7307bc0f75ca629c9c63cf9d3bb SHA512 987bbccb9cb4870ec91704cd20cf19875320d1cfe62c4c5a0063bfc3827732a0e3334a4ea3712137f3262d7418db0ea7e803d724e2dec4d5eb41ebe741f326cc |
30 |
|
31 |
diff --git a/games-roguelike/moria/files/5.5.2-fbsd.patch b/games-roguelike/moria/files/5.5.2-fbsd.patch |
32 |
deleted file mode 100644 |
33 |
index 4f65b08f567..00000000000 |
34 |
--- a/games-roguelike/moria/files/5.5.2-fbsd.patch |
35 |
+++ /dev/null |
36 |
@@ -1,268 +0,0 @@ |
37 |
-Index: umoria/source/main.c |
38 |
-=================================================================== |
39 |
---- umoria.orig/source/main.c |
40 |
-+++ umoria/source/main.c |
41 |
-@@ -88,6 +88,7 @@ |
42 |
- #include <time.h> |
43 |
- #endif |
44 |
- |
45 |
-+#ifndef __FreeBSD__ |
46 |
- #ifndef VMS |
47 |
- #ifndef MAC |
48 |
- #ifndef GEMDOS |
49 |
-@@ -98,6 +99,9 @@ long time(); |
50 |
- char *getenv(); |
51 |
- #endif |
52 |
- #endif |
53 |
-+#else |
54 |
-+#include <stdlib.h> |
55 |
-+#endif |
56 |
- |
57 |
- #ifndef MAC |
58 |
- #ifndef AMIGA |
59 |
-@@ -360,7 +364,7 @@ char *argv[]; |
60 |
- else |
61 |
- { /* Create character */ |
62 |
- create_character(); |
63 |
--#ifdef MAC |
64 |
-+#if defined(MAC) || defined(__FreeBSD__) |
65 |
- birth_date = time ((time_t *)0); |
66 |
- #else |
67 |
- birth_date = time ((long *)0); |
68 |
-Index: umoria/source/death.c |
69 |
-=================================================================== |
70 |
---- umoria.orig/source/death.c |
71 |
-+++ umoria/source/death.c |
72 |
-@@ -123,6 +123,7 @@ static void kingly(void); |
73 |
- #include <stdlib.h> |
74 |
- #endif |
75 |
- |
76 |
-+#ifndef __FreeBSD__ |
77 |
- #ifndef VMS |
78 |
- #ifndef MAC |
79 |
- #if !defined(ATARIST_MWC) && !defined(AMIGA) |
80 |
-@@ -130,18 +131,19 @@ long time(); |
81 |
- #endif |
82 |
- #endif |
83 |
- #endif |
84 |
-+#endif |
85 |
- |
86 |
- static void date(day) |
87 |
- char *day; |
88 |
- { |
89 |
- register char *tmp; |
90 |
--#ifdef MAC |
91 |
-+#if defined(MAC) || defined(__FreeBSD__) |
92 |
- time_t clockvar; |
93 |
- #else |
94 |
- long clockvar; |
95 |
- #endif |
96 |
- |
97 |
--#ifdef MAC |
98 |
-+#if defined(MAC) || defined(__FreeBSD__) |
99 |
- clockvar = time((time_t *) 0); |
100 |
- #else |
101 |
- clockvar = time((long *) 0); |
102 |
-Index: umoria/source/io.c |
103 |
-=================================================================== |
104 |
---- umoria.orig/source/io.c |
105 |
-+++ umoria/source/io.c |
106 |
-@@ -13,6 +13,11 @@ |
107 |
- |
108 |
- #include "config.h" |
109 |
- |
110 |
-+#ifdef __FreeBSD__ |
111 |
-+#include <sys/ioctl_compat.h> |
112 |
-+#include <time.h> |
113 |
-+#endif |
114 |
-+ |
115 |
- #ifdef HPUX |
116 |
- #include <sys/bsdtty.h> |
117 |
- #endif |
118 |
-@@ -245,7 +250,9 @@ int suspend() |
119 |
- struct ltchars lcbuf; |
120 |
- struct tchars cbuf; |
121 |
- int lbuf; |
122 |
-+#ifndef __FreeBSD__ |
123 |
- long time(); |
124 |
-+#endif |
125 |
- |
126 |
- py.misc.male |= 2; |
127 |
- (void) ioctl(0, TIOCGETP, (char *)&tbuf); |
128 |
-@@ -313,7 +320,7 @@ void init_curses() |
129 |
- #endif |
130 |
- |
131 |
- /* PC curses returns ERR */ |
132 |
--#if defined(USG) && !defined(PC_CURSES) && !defined(AMIGA) |
133 |
-+#if (defined(USG) && !defined(PC_CURSES) && !defined(AMIGA)) || defined(__FreeBSD__) |
134 |
- if (initscr() == NULL) |
135 |
- #else |
136 |
- if (initscr() == ERR) |
137 |
-@@ -331,7 +338,7 @@ void init_curses() |
138 |
- #if defined(atarist) && defined(__GNUC__) |
139 |
- (void) signal (SIGTSTP, (__Sigfunc)suspend); |
140 |
- #else |
141 |
--#ifdef __386BSD__ |
142 |
-+#if defined(__386BSD__) || defined(__FreeBSD__) |
143 |
- (void) signal (SIGTSTP, (sig_t)suspend); |
144 |
- #else |
145 |
- (void) signal (SIGTSTP, suspend); |
146 |
-@@ -757,7 +764,7 @@ void shell_out() |
147 |
- msg_print("Fork failed. Try again."); |
148 |
- return; |
149 |
- } |
150 |
--#if defined(USG) || defined(__386BSD__) |
151 |
-+#if defined(USG) || defined(__386BSD__) || defined(__FreeBSD__) |
152 |
- (void) wait((int *) 0); |
153 |
- #else |
154 |
- (void) wait((union wait *) 0); |
155 |
-Index: umoria/source/misc1.c |
156 |
-=================================================================== |
157 |
---- umoria.orig/source/misc1.c |
158 |
-+++ umoria/source/misc1.c |
159 |
-@@ -28,7 +28,7 @@ |
160 |
- #endif |
161 |
- #endif |
162 |
- |
163 |
--#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA) |
164 |
-+#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA) && !defined(__FreeBSD__) |
165 |
- long time(); |
166 |
- #endif |
167 |
- struct tm *localtime(); |
168 |
-@@ -45,7 +45,7 @@ int32u seed; |
169 |
- register int32u clock_var; |
170 |
- |
171 |
- if (seed == 0) |
172 |
--#ifdef MAC |
173 |
-+#if defined(MAC) || defined(__FreeBSD__) |
174 |
- clock_var = time((time_t *)0); |
175 |
- #else |
176 |
- clock_var = time((long *)0); |
177 |
-@@ -89,10 +89,14 @@ void reset_seed() |
178 |
- int check_time() |
179 |
- { |
180 |
- #ifdef MORIA_HOU |
181 |
-+#if defined(MAC) || defined(__FreeBSD__) |
182 |
-+ time_t clock_var; |
183 |
-+#else |
184 |
- long clock_var; |
185 |
-+#endif |
186 |
- register struct tm *tp; |
187 |
- |
188 |
--#ifdef MAC |
189 |
-+#if defined(MAC) || defined(__FreeBSD__) |
190 |
- clock_var = time((time_t *)0); |
191 |
- #else |
192 |
- clock_var = time((long *)0); |
193 |
-Index: umoria/source/save.c |
194 |
-=================================================================== |
195 |
---- umoria.orig/source/save.c |
196 |
-+++ umoria/source/save.c |
197 |
-@@ -102,7 +102,7 @@ static void rd_monster(); |
198 |
- #endif |
199 |
- |
200 |
- #if !defined(ATARIST_MWC) |
201 |
--#ifdef MAC |
202 |
-+#if defined(MAC) || defined(__FreeBSD__) |
203 |
- #include <time.h> |
204 |
- #else |
205 |
- long time(); |
206 |
-@@ -331,7 +331,7 @@ static int sv_write() |
207 |
- } |
208 |
- |
209 |
- /* save the current time in the savefile */ |
210 |
--#ifdef MAC |
211 |
-+#if defined(MAC) || defined(__FreeBSD__) |
212 |
- l = time((time_t *)0); |
213 |
- #else |
214 |
- l = time((long *)0); |
215 |
-@@ -1029,7 +1029,7 @@ int *generate; |
216 |
- || (version_min == 2 && patch_level >= 2)) |
217 |
- rd_long ((int32u *)&birth_date); |
218 |
- else |
219 |
--#ifdef MAC |
220 |
-+#if defined(MAC) || defined(__FreeBSD__) |
221 |
- birth_date = time((time_t *)0); |
222 |
- #else |
223 |
- birth_date = time((long *)0); |
224 |
-@@ -1253,7 +1253,7 @@ scoreboard; it will not be scored again. |
225 |
- /* rotate store inventory, depending on how old the save file */ |
226 |
- /* is foreach day old (rounded up), call store_maint */ |
227 |
- /* calculate age in seconds */ |
228 |
--#ifdef MAC |
229 |
-+#if defined(MAC) || defined(__FreeBSD__) |
230 |
- start_time = time((time_t *)0); |
231 |
- #else |
232 |
- start_time = time((long *)0); |
233 |
-Index: umoria/source/signals.c |
234 |
-=================================================================== |
235 |
---- umoria.orig/source/signals.c |
236 |
-+++ umoria/source/signals.c |
237 |
-@@ -89,7 +89,7 @@ static int signal_count = 0; |
238 |
- |
239 |
- /*ARGSUSED*/ |
240 |
- #ifndef USG |
241 |
--#ifdef __386BSD__ |
242 |
-+#if defined(__386BSD__) || defined(__FreeBSD__) |
243 |
- static void signal_handler(sig, code, scp) |
244 |
- #else |
245 |
- static int signal_handler(sig, code, scp) |
246 |
-@@ -217,7 +217,7 @@ void signals() |
247 |
- #if defined(atarist) && defined(__GNUC__) |
248 |
- (void) signal(SIGTSTP, (__Sigfunc)suspend); |
249 |
- #else |
250 |
--#ifdef __386BSD__ |
251 |
-+#if defined(__386BSD__) || defined(__FreeBSD__) |
252 |
- (void) signal(SIGTSTP, (sig_t)suspend); |
253 |
- #else |
254 |
- (void) signal(SIGTSTP, suspend); |
255 |
-Index: umoria/source/types.h |
256 |
-=================================================================== |
257 |
---- umoria.orig/source/types.h |
258 |
-+++ umoria/source/types.h |
259 |
-@@ -6,11 +6,20 @@ |
260 |
- not for profit purposes provided that this copyright and statement are |
261 |
- included in all such copies. */ |
262 |
- |
263 |
-+#ifdef __FreeBSD__ |
264 |
-+#include <sys/types.h> |
265 |
-+typedef u_int32_t int32u; |
266 |
-+typedef int32_t int32; |
267 |
-+typedef u_int16_t int16u; |
268 |
-+typedef int16_t int16; |
269 |
-+typedef u_int8_t int8u; |
270 |
-+#else |
271 |
- typedef unsigned long int32u; |
272 |
- typedef long int32; |
273 |
- typedef unsigned short int16u; |
274 |
- typedef short int16; |
275 |
- typedef unsigned char int8u; |
276 |
-+#endif |
277 |
- /* some machines will not accept 'signed char' as a type, and some accept it |
278 |
- but still treat it like an unsigned character, let's just avoid it, |
279 |
- any variable which can ever hold a negative value must be 16 or 32 bits */ |
280 |
-Index: umoria/unix/unix.c |
281 |
-=================================================================== |
282 |
---- umoria.orig/unix/unix.c |
283 |
-+++ umoria/unix/unix.c |
284 |
-@@ -14,6 +14,10 @@ |
285 |
- /* defines TRUE and FALSE */ |
286 |
- #include <curses.h> |
287 |
- |
288 |
-+#ifdef __FreeBSD__ |
289 |
-+#include <unistd.h> |
290 |
-+#endif |
291 |
-+ |
292 |
- #include "config.h" |
293 |
- #include "constant.h" |
294 |
- #include "types.h" |
295 |
-@@ -276,7 +280,9 @@ int getuid(); |
296 |
- void user_name(buf) |
297 |
- char *buf; |
298 |
- { |
299 |
-+#ifndef __FreeBSD__ |
300 |
- extern char *getlogin(); |
301 |
-+#endif |
302 |
- struct passwd *pwline; |
303 |
- register char *p; |
304 |
- |
305 |
|
306 |
diff --git a/games-roguelike/moria/files/5.5.2-gentoo-paths.patch b/games-roguelike/moria/files/5.5.2-gentoo-paths.patch |
307 |
deleted file mode 100644 |
308 |
index 5ce4ce4d2b4..00000000000 |
309 |
--- a/games-roguelike/moria/files/5.5.2-gentoo-paths.patch |
310 |
+++ /dev/null |
311 |
@@ -1,58 +0,0 @@ |
312 |
---- umoria/unix/Makefile.orig 2003-12-31 14:52:58.583335976 -0500 |
313 |
-+++ umoria/unix/Makefile 2003-12-31 14:51:54.621059720 -0500 |
314 |
-@@ -3,6 +3,7 @@ |
315 |
- # LIBDIR must be the same directory defined in config.h |
316 |
- # OWNER is who you want the game to be chown to. |
317 |
- # GROUP is who you wnat the game to be chgrp to. |
318 |
-+STATEDIR = /var/lib |
319 |
- BINDIR = /home/zariski/grabiner/moria |
320 |
- LIBDIR = /home/zariski/grabiner/moria/files |
321 |
- OWNER = grabiner |
322 |
-@@ -65,12 +66,11 @@ |
323 |
- chmod 4711 $(BINDIR)/moria |
324 |
- chmod 711 $(LIBDIR) |
325 |
- (cd files; cp $(LIBFILES) $(LIBDIR)) |
326 |
-- (cd $(LIBDIR); chmod 444 $(LIBFILES)) |
327 |
-- (cd $(LIBDIR); touch scores; chmod 644 scores) |
328 |
-+ (cd $(STATEDIR); touch moriascores; chmod 664 moriascores; chown $(OWNER) moriascores; chgrp $(GROUP) moriascores) |
329 |
- chown $(OWNER) $(BINDIR)/moria |
330 |
- chgrp $(GROUP) $(BINDIR)/moria |
331 |
-- (cd $(LIBDIR); chown $(OWNER) $(LIBFILES) scores) |
332 |
-- (cd $(LIBDIR); chgrp $(GROUP) $(LIBFILES) scores) |
333 |
-+ (cd $(LIBDIR); chown $(OWNER) $(LIBFILES)) |
334 |
-+ (cd $(LIBDIR); chgrp $(GROUP) $(LIBFILES)) |
335 |
- # If you are short on disk space, or aren't interested in debugging moria. |
336 |
- # strip $(BINDIR)/moria |
337 |
- |
338 |
---- umoria/source/config.h.orig 2003-12-31 15:19:48.893531616 -0500 |
339 |
-+++ umoria/source/config.h 2003-12-31 15:21:09.584264760 -0500 |
340 |
-@@ -199,17 +199,18 @@ |
341 |
- #else |
342 |
- |
343 |
- /* This must be unix; change MORIA_LIB as appropriate. */ |
344 |
--#define MORIA_SAV "moria.save" |
345 |
--#define MORIA_LIB(xxx) "/home/math/grabiner/moria/files/xxx" |
346 |
--#define MORIA_HOU MORIA_LIB(hours) |
347 |
--#define MORIA_MOR MORIA_LIB(news) |
348 |
--#define MORIA_TOP MORIA_LIB(scores) |
349 |
--#define MORIA_HELP MORIA_LIB(roglcmds.hlp) |
350 |
--#define MORIA_ORIG_HELP MORIA_LIB(origcmds.hlp) |
351 |
--#define MORIA_WIZ_HELP MORIA_LIB(rwizcmds.hlp) |
352 |
--#define MORIA_OWIZ_HELP MORIA_LIB(owizcmds.hlp) |
353 |
--#define MORIA_WELCOME MORIA_LIB(welcome.hlp) |
354 |
--#define MORIA_VER MORIA_LIB(version.hlp) |
355 |
-+#define MORIA_SAV ".moria.save" |
356 |
-+#define MORIA_LIB(xxx) "GENTOO_DATADIR/" xxx |
357 |
-+#define MORIA_STATE(xxx) "GENTOO_STATEDIR/" xxx |
358 |
-+#define MORIA_HOU MORIA_LIB("hours") |
359 |
-+#define MORIA_MOR MORIA_LIB("news") |
360 |
-+#define MORIA_TOP MORIA_STATE("moriascores") |
361 |
-+#define MORIA_HELP MORIA_LIB("roglcmds.hlp") |
362 |
-+#define MORIA_ORIG_HELP MORIA_LIB("origcmds.hlp") |
363 |
-+#define MORIA_WIZ_HELP MORIA_LIB("rwizcmds.hlp") |
364 |
-+#define MORIA_OWIZ_HELP MORIA_LIB("owizcmds.hlp") |
365 |
-+#define MORIA_WELCOME MORIA_LIB("welcome.hlp") |
366 |
-+#define MORIA_VER MORIA_LIB("version.hlp") |
367 |
- |
368 |
- #endif |
369 |
- #endif |
370 |
|
371 |
diff --git a/games-roguelike/moria/files/5.5.2-glibc.patch b/games-roguelike/moria/files/5.5.2-glibc.patch |
372 |
deleted file mode 100644 |
373 |
index 55e4e5de2b1..00000000000 |
374 |
--- a/games-roguelike/moria/files/5.5.2-glibc.patch |
375 |
+++ /dev/null |
376 |
@@ -1,356 +0,0 @@ |
377 |
-diff -Naur common-orig/Makefile umoria/unix/Makefile |
378 |
---- common-orig/Makefile 2003-12-09 10:06:19.000000000 -0500 |
379 |
-+++ umoria/unix/Makefile 2003-12-09 10:07:12.000000000 -0500 |
380 |
-@@ -14,9 +14,9 @@ |
381 |
- CFLAGS = -O |
382 |
- |
383 |
- # For BSD Systems |
384 |
--CURSES = -lcurses -ltermcap |
385 |
-+# CURSES = -lcurses -ltermcap |
386 |
- # For SYS V Systems |
387 |
--# CURSES = -lcurses |
388 |
-+CURSES = `pkg-config ncurses --libs` |
389 |
- # For XENIX, some XENIX systems may need -ltinfo |
390 |
- # CURSES = -ltcap -ltermcap -lx |
391 |
- |
392 |
-diff -Naur common-orig/death.c umoria/source/death.c |
393 |
---- common-orig/death.c 2003-12-09 10:06:19.000000000 -0500 |
394 |
-+++ umoria/source/death.c 2003-12-09 10:06:56.000000000 -0500 |
395 |
-@@ -175,10 +175,12 @@ |
396 |
- /* The following code is provided especially for systems which -CJS- |
397 |
- have no flock system call. It has never been tested. */ |
398 |
- |
399 |
-+#ifndef LOCK_EX |
400 |
- #define LOCK_EX 1 |
401 |
- #define LOCK_SH 2 |
402 |
- #define LOCK_NB 4 |
403 |
- #define LOCK_UN 8 |
404 |
-+#endif |
405 |
- |
406 |
- /* An flock HACK. LOCK_SH and LOCK_EX are not distinguished. DO NOT release |
407 |
- a lock which you failed to set! ALWAYS release a lock you set! */ |
408 |
-diff -Naur common-orig/io.c umoria/source/io.c |
409 |
---- common-orig/io.c 2003-12-09 10:06:19.000000000 -0500 |
410 |
-+++ umoria/source/io.c 2003-12-09 10:06:56.000000000 -0500 |
411 |
-@@ -62,6 +62,7 @@ |
412 |
- |
413 |
- |
414 |
- #include <ctype.h> |
415 |
-+#include <termios.h> |
416 |
- |
417 |
- #if defined(SYS_V) && defined(lint) |
418 |
- /* for AIX, prevent hundreds of unnecessary lint errors, must define before |
419 |
-@@ -334,7 +335,9 @@ |
420 |
- #ifdef __386BSD__ |
421 |
- (void) signal (SIGTSTP, (sig_t)suspend); |
422 |
- #else |
423 |
-- (void) signal (SIGTSTP, suspend); |
424 |
-+ /* (void) signal (SIGTSTP, suspend); */ |
425 |
-+ /* libc6 defaults to BSD, this expects SYSV */ |
426 |
-+ (void) sysv_signal (SIGTSTP, suspend); |
427 |
- #endif |
428 |
- #endif |
429 |
- #endif |
430 |
-diff -Naur common-orig/misc3.c umoria/source/misc3.c |
431 |
---- common-orig/misc3.c 2003-12-09 10:06:19.000000000 -0500 |
432 |
-+++ umoria/source/misc3.c 2003-12-09 10:06:56.000000000 -0500 |
433 |
-@@ -1249,8 +1249,7 @@ |
434 |
- { |
435 |
- int i; |
436 |
- register inven_type *i_ptr; |
437 |
-- vtype prt2; |
438 |
-- bigvtype prt1; |
439 |
-+ bigvtype prt1, prt2; |
440 |
- #ifdef ATARIST_MWC |
441 |
- int32u holder; |
442 |
- #endif |
443 |
-diff -Naur common-orig/misc4.c umoria/source/misc4.c |
444 |
---- common-orig/misc4.c 2003-12-09 10:06:19.000000000 -0500 |
445 |
-+++ umoria/source/misc4.c 2003-12-09 10:06:56.000000000 -0500 |
446 |
-@@ -33,7 +33,7 @@ |
447 |
- void scribe_object() |
448 |
- { |
449 |
- int item_val, j; |
450 |
-- vtype out_val, tmp_str; |
451 |
-+ bigvtype out_val, tmp_str; |
452 |
- |
453 |
- if (inven_ctr > 0 || equip_ctr > 0) |
454 |
- { |
455 |
-diff -Naur common-orig/moria1.c umoria/source/moria1.c |
456 |
---- common-orig/moria1.c 2003-12-09 10:06:19.000000000 -0500 |
457 |
-+++ umoria/source/moria1.c 2003-12-09 10:06:56.000000000 -0500 |
458 |
-@@ -332,8 +332,8 @@ |
459 |
- { |
460 |
- objdes(tmp_val, &inventory[i], TRUE); |
461 |
- tmp_val[lim] = 0; /* Truncate if too long. */ |
462 |
-- (void) sprintf(out_val[i], " %c) %s", 'a'+i, tmp_val); |
463 |
-- l = strlen(out_val[i]); |
464 |
-+ (void) sprintf(out_val[i], "%c) %s", 'a'+i, tmp_val); |
465 |
-+ l = strlen(out_val[i]) + 2; |
466 |
- if (weight) |
467 |
- l += 9; |
468 |
- if (l > len) |
469 |
-@@ -352,9 +352,12 @@ |
470 |
- { |
471 |
- /* don't need first two spaces if in first column */ |
472 |
- if (col == 0) |
473 |
-- prt(&out_val[i][2], current_line, col); |
474 |
-- else |
475 |
- prt(out_val[i], current_line, col); |
476 |
-+ else |
477 |
-+ { |
478 |
-+ put_buffer(" ", current_line, col); |
479 |
-+ prt(out_val[i], current_line, col+2); |
480 |
-+ } |
481 |
- if (weight) |
482 |
- { |
483 |
- total_weight = inventory[i].weight*inventory[i].number; |
484 |
-@@ -466,9 +469,9 @@ |
485 |
- } |
486 |
- objdes(prt2, &inventory[i], TRUE); |
487 |
- prt2[lim] = 0; /* Truncate if necessary */ |
488 |
-- (void) sprintf(out_val[line], " %c) %-14s: %s", line+'a', |
489 |
-- prt1, prt2); |
490 |
-- l = strlen(out_val[line]); |
491 |
-+ (void) sprintf(out_val[line], "%c) %-14s: %s", line+'a', |
492 |
-+ prt1, prt2); |
493 |
-+ l = strlen(out_val[line]) + 2; |
494 |
- if (weight) |
495 |
- l += 9; |
496 |
- if (l > len) |
497 |
-@@ -488,9 +491,12 @@ |
498 |
- { |
499 |
- /* don't need first two spaces when using whole screen */ |
500 |
- if (col == 0) |
501 |
-- prt(&out_val[line][2], line+1, col); |
502 |
-- else |
503 |
- prt(out_val[line], line+1, col); |
504 |
-+ else |
505 |
-+ { |
506 |
-+ put_buffer(" ", line+1, col); |
507 |
-+ prt(out_val[line], line+1, col+2); |
508 |
-+ } |
509 |
- if (weight) |
510 |
- { |
511 |
- total_weight = i_ptr->weight*i_ptr->number; |
512 |
-diff -Naur common-orig/signals.c umoria/source/signals.c |
513 |
---- common-orig/signals.c 2003-12-09 10:06:19.000000000 -0500 |
514 |
-+++ umoria/source/signals.c 2003-12-09 10:06:56.000000000 -0500 |
515 |
-@@ -113,7 +113,11 @@ |
516 |
- if(error_sig >= 0) /* Ignore all second signals. */ |
517 |
- { |
518 |
- if(++signal_count > 10) /* Be safe. We will die if persistent enough. */ |
519 |
-+#ifdef __FreeBSD__ |
520 |
- (void) signal(sig, SIG_DFL); |
521 |
-+#else |
522 |
-+ (void) sysv_signal(sig, SIG_DFL); |
523 |
-+#endif |
524 |
- return; |
525 |
- } |
526 |
- error_sig = sig; |
527 |
-@@ -126,7 +126,11 @@ |
528 |
- ) |
529 |
- { |
530 |
- if (death) |
531 |
-+#ifdef __FreeBSD__ |
532 |
- (void) signal(sig, SIG_IGN); /* Can't quit after death. */ |
533 |
-+#else |
534 |
-+ (void) sysv_signal(sig, SIG_IGN); /* Can't quit after death. */ |
535 |
-+#endif |
536 |
- else if (!character_saved && character_generated) |
537 |
- { |
538 |
- if (!get_check("Really commit *Suicide*?")) |
539 |
-@@ -137,7 +137,11 @@ |
540 |
- put_qio(); |
541 |
- error_sig = -1; |
542 |
- #ifdef USG |
543 |
-+#ifdef __FreeBSD__ |
544 |
- (void) signal(sig, signal_handler);/* Have to restore handler. */ |
545 |
-+#else |
546 |
-+ (void) sysv_signal(sig, signal_handler);/* Have to restore handler. */ |
547 |
-+#endif |
548 |
- #else |
549 |
- (void) sigsetmask(smask); |
550 |
- #endif |
551 |
-@@ -179,7 +179,11 @@ |
552 |
- restore_term(); |
553 |
- #if !defined(MSDOS) && !defined(AMIGA) && !defined(ATARIST_TC) |
554 |
- /* always generate a core dump */ |
555 |
-+#ifdef __FreeBSD__ |
556 |
- (void) signal(sig, SIG_DFL); |
557 |
-+#else |
558 |
-+ (void) sysv_signal(sig, SIG_DFL); |
559 |
-+#endif |
560 |
- (void) kill(getpid(), sig); |
561 |
- (void) sleep(5); |
562 |
- #endif |
563 |
-@@ -199,7 +199,11 @@ |
564 |
- #if defined(atarist) && defined(__GNUC__) |
565 |
- (void) signal(SIGTSTP, (__Sigfunc)SIG_IGN); |
566 |
- #else |
567 |
-+#ifdef __FreeBSD__ |
568 |
- (void) signal(SIGTSTP, SIG_IGN); |
569 |
-+#else |
570 |
-+ (void) sysv_signal(SIGTSTP, SIG_IGN); |
571 |
-+#endif |
572 |
- #endif |
573 |
- #ifndef USG |
574 |
- mask = sigsetmask(0); |
575 |
-@@ -220,7 +220,11 @@ |
576 |
- #ifdef __386BSD__ |
577 |
- (void) signal(SIGTSTP, (sig_t)suspend); |
578 |
- #else |
579 |
-+#ifdef __FreeBSD__ |
580 |
- (void) signal(SIGTSTP, suspend); |
581 |
-+#else |
582 |
-+ (void) sysv_signal(SIGTSTP, suspend); |
583 |
-+#endif |
584 |
- #endif |
585 |
- #endif |
586 |
- #ifndef USG |
587 |
-@@ -237,7 +237,11 @@ |
588 |
- { |
589 |
- #if !defined(ATARIST_MWC) && !defined(ATARIST_TC) |
590 |
- /* No signals for Atari ST compiled with MWC or TC. */ |
591 |
-+#ifdef __FreeBSD__ |
592 |
- (void) signal(SIGINT, signal_handler); |
593 |
-+#else |
594 |
-+ (void) sysv_signal(SIGINT, signal_handler); |
595 |
-+#endif |
596 |
- |
597 |
- #if defined(atarist) && defined(__GNUC__) |
598 |
- /* Atari ST compiled with GNUC has most signals, but we need a cast |
599 |
-@@ -259,8 +259,13 @@ |
600 |
- |
601 |
- #else |
602 |
- /* Everybody except the atari st. */ |
603 |
-+#ifdef __FreeBSD__ |
604 |
- (void) signal(SIGINT, signal_handler); |
605 |
- (void) signal(SIGFPE, signal_handler); |
606 |
-+#else |
607 |
-+ (void) sysv_signal(SIGINT, signal_handler); |
608 |
-+ (void) sysv_signal(SIGFPE, signal_handler); |
609 |
-+#endif |
610 |
- |
611 |
- #if defined(MSDOS) |
612 |
- /* many fewer signals under MSDOS */ |
613 |
-@@ -278,30 +278,61 @@ |
614 |
- |
615 |
- /* Everybody except Atari, MSDOS, and Amiga. */ |
616 |
- /* Ignore HANGUP, and let the EOF code take care of this case. */ |
617 |
-+#ifdef __FreeBSD__ |
618 |
- (void) signal(SIGHUP, SIG_IGN); |
619 |
- (void) signal(SIGQUIT, signal_handler); |
620 |
- (void) signal(SIGILL, signal_handler); |
621 |
- (void) signal(SIGTRAP, signal_handler); |
622 |
- (void) signal(SIGIOT, signal_handler); |
623 |
-+#else |
624 |
-+ (void) sysv_signal(SIGHUP, SIG_IGN); |
625 |
-+ (void) sysv_signal(SIGQUIT, signal_handler); |
626 |
-+ (void) sysv_signal(SIGILL, signal_handler); |
627 |
-+ (void) sysv_signal(SIGTRAP, signal_handler); |
628 |
-+ (void) sysv_signal(SIGIOT, signal_handler); |
629 |
-+#endif |
630 |
- #ifdef SIGEMT /* in BSD systems */ |
631 |
- (void) signal(SIGEMT, signal_handler); |
632 |
- #endif |
633 |
- #ifdef SIGDANGER /* in SYSV systems */ |
634 |
- (void) signal(SIGDANGER, signal_handler); |
635 |
- #endif |
636 |
-+#ifdef __FreeBSD__ |
637 |
- (void) signal(SIGKILL, signal_handler); |
638 |
- (void) signal(SIGBUS, signal_handler); |
639 |
- (void) signal(SIGSEGV, signal_handler); |
640 |
-+#else |
641 |
-+ (void) sysv_signal(SIGKILL, signal_handler); |
642 |
-+ (void) sysv_signal(SIGBUS, signal_handler); |
643 |
-+ (void) sysv_signal(SIGSEGV, signal_handler); |
644 |
-+#endif |
645 |
- #ifdef SIGSYS |
646 |
-+#ifdef __FreeBSD__ |
647 |
- (void) signal(SIGSYS, signal_handler); |
648 |
-+#else |
649 |
-+ (void) sysv_signal(SIGSYS, signal_handler); |
650 |
-+#endif |
651 |
- #endif |
652 |
-+#ifdef __FreeBSD__ |
653 |
- (void) signal(SIGTERM, signal_handler); |
654 |
- (void) signal(SIGPIPE, signal_handler); |
655 |
-+#else |
656 |
-+ (void) sysv_signal(SIGTERM, signal_handler); |
657 |
-+ (void) sysv_signal(SIGPIPE, signal_handler); |
658 |
-+#endif |
659 |
- #ifdef SIGXCPU /* BSD */ |
660 |
-+#ifdef __FreeBSD__ |
661 |
- (void) signal(SIGXCPU, signal_handler); |
662 |
-+#else |
663 |
-+ (void) sysv_signal(SIGXCPU, signal_handler); |
664 |
-+#endif |
665 |
- #endif |
666 |
- #ifdef SIGPWR /* SYSV */ |
667 |
-+#ifdef __FreeBSD__ |
668 |
- (void) signal(SIGPWR, signal_handler); |
669 |
-+#else |
670 |
-+ (void) sysv_signal(SIGPWR, signal_handler); |
671 |
-+#endif |
672 |
- #endif |
673 |
- #endif |
674 |
- #endif |
675 |
-@@ -314,7 +314,11 @@ |
676 |
- #if !defined(ATARIST_MWC) |
677 |
- (void) signal(SIGINT, SIG_IGN); |
678 |
- #ifdef SIGQUIT |
679 |
-+#ifdef __FreeBSD__ |
680 |
- (void) signal(SIGQUIT, SIG_IGN); |
681 |
-+#else |
682 |
-+ (void) sysv_signal(SIGQUIT, SIG_IGN); |
683 |
-+#endif |
684 |
- #endif |
685 |
- #endif |
686 |
- } |
687 |
-@@ -324,7 +324,11 @@ |
688 |
- #if !defined(ATARIST_MWC) |
689 |
- (void) signal(SIGINT, SIG_DFL); |
690 |
- #ifdef SIGQUIT |
691 |
-+#ifdef __FreeBSD__ |
692 |
- (void) signal(SIGQUIT, SIG_DFL); |
693 |
-+#else |
694 |
-+ (void) sysv_signal(SIGQUIT, SIG_DFL); |
695 |
-+#endif |
696 |
- #endif |
697 |
- #endif |
698 |
- } |
699 |
-@@ -335,13 +335,21 @@ |
700 |
- #if defined(atarist) && defined(__GNUC__) |
701 |
- (void) signal(SIGINT, (__Sigfunc)signal_handler); |
702 |
- #else |
703 |
-+#ifdef __FreeBSD__ |
704 |
- (void) signal(SIGINT, signal_handler); |
705 |
-+#else |
706 |
-+ (void) sysv_signal(SIGINT, signal_handler); |
707 |
-+#endif |
708 |
- #endif |
709 |
- #ifdef SIGQUIT |
710 |
- #if defined(atarist) && defined(__GNUC__) |
711 |
- (void) signal(SIGQUIT, (__Sigfunc)signal_handler); |
712 |
- #else |
713 |
-+#ifdef __FreeBSD__ |
714 |
- (void) signal(SIGQUIT, signal_handler); |
715 |
-+#else |
716 |
-+ (void) sysv_signal(SIGQUIT, signal_handler); |
717 |
-+#endif |
718 |
- #endif |
719 |
- #endif |
720 |
- #endif |
721 |
-diff -Naur common-orig/unix.c umoria/unix/unix.c |
722 |
---- common-orig/unix.c 2003-12-09 10:06:19.000000000 -0500 |
723 |
-+++ umoria/unix/unix.c 2003-12-09 10:06:56.000000000 -0500 |
724 |
-@@ -261,7 +261,7 @@ |
725 |
- #endif |
726 |
- |
727 |
- #ifdef USG |
728 |
--unsigned short getuid(); |
729 |
-+/* unsigned short getuid(); */ |
730 |
- #else |
731 |
- #ifndef SECURE |
732 |
- #ifdef BSD4_3 |
733 |
|
734 |
diff --git a/games-roguelike/moria/files/5.5.2-hours.patch b/games-roguelike/moria/files/5.5.2-hours.patch |
735 |
deleted file mode 100644 |
736 |
index 3d1c329d9b9..00000000000 |
737 |
--- a/games-roguelike/moria/files/5.5.2-hours.patch |
738 |
+++ /dev/null |
739 |
@@ -1,30 +0,0 @@ |
740 |
-diff -ru umoria.orig/source/files.c umoria/source/files.c |
741 |
---- umoria.orig/source/files.c 1994-07-21 21:47:22.000000000 -0400 |
742 |
-+++ umoria/source/files.c 2010-05-05 14:51:44.334588483 -0400 |
743 |
-@@ -130,19 +130,19 @@ |
744 |
- if (strlen(in_line) > 3) |
745 |
- { |
746 |
- if (!strncmp(in_line, "SUN:", 4)) |
747 |
-- (void) strcpy(days[0], in_line); |
748 |
-+ (void) snprintf(days[0], sizeof(days[0]), "%s", in_line); |
749 |
- else if (!strncmp(in_line, "MON:", 4)) |
750 |
-- (void) strcpy(days[1], in_line); |
751 |
-+ (void) snprintf(days[1], sizeof(days[0]), "%s", in_line); |
752 |
- else if (!strncmp(in_line, "TUE:", 4)) |
753 |
-- (void) strcpy(days[2], in_line); |
754 |
-+ (void) snprintf(days[2], sizeof(days[0]), "%s", in_line); |
755 |
- else if (!strncmp(in_line, "WED:", 4)) |
756 |
-- (void) strcpy(days[3], in_line); |
757 |
-+ (void) snprintf(days[3], sizeof(days[0]), "%s", in_line); |
758 |
- else if (!strncmp(in_line, "THU:", 4)) |
759 |
-- (void) strcpy(days[4], in_line); |
760 |
-+ (void) snprintf(days[4], sizeof(days[0]), "%s", in_line); |
761 |
- else if (!strncmp(in_line, "FRI:", 4)) |
762 |
-- (void) strcpy(days[5], in_line); |
763 |
-+ (void) snprintf(days[5], sizeof(days[0]), "%s", in_line); |
764 |
- else if (!strncmp(in_line, "SAT:", 4)) |
765 |
-- (void) strcpy(days[6], in_line); |
766 |
-+ (void) snprintf(days[6], sizeof(days[0]), "%s", in_line); |
767 |
- } |
768 |
- (void) fclose(file1); |
769 |
- } |
770 |
|
771 |
diff --git a/games-roguelike/moria/files/5.5.2-warnings.patch b/games-roguelike/moria/files/5.5.2-warnings.patch |
772 |
deleted file mode 100644 |
773 |
index 33a2762b99d..00000000000 |
774 |
--- a/games-roguelike/moria/files/5.5.2-warnings.patch |
775 |
+++ /dev/null |
776 |
@@ -1,12 +0,0 @@ |
777 |
-diff -ru umoria.orig/unix/unix.c umoria/unix/unix.c |
778 |
---- umoria.orig/unix/unix.c 2014-11-01 02:45:07.375535783 -0400 |
779 |
-+++ umoria/unix/unix.c 2014-11-01 02:45:58.575820065 -0400 |
780 |
-@@ -315,7 +315,7 @@ |
781 |
- |
782 |
- user[0] = '\0'; |
783 |
- file++; |
784 |
-- while (*file != '/' && i < sizeof(user)) |
785 |
-+ while (*file != '/' && i < sizeof(user) - 1) |
786 |
- user[i++] = *file++; |
787 |
- user[i] = '\0'; |
788 |
- if (i == 0) |
789 |
|
790 |
diff --git a/games-roguelike/moria/moria-5.5.2.ebuild b/games-roguelike/moria/moria-5.5.2.ebuild |
791 |
deleted file mode 100644 |
792 |
index e135a2f7d91..00000000000 |
793 |
--- a/games-roguelike/moria/moria-5.5.2.ebuild |
794 |
+++ /dev/null |
795 |
@@ -1,70 +0,0 @@ |
796 |
-# Copyright 1999-2014 Gentoo Foundation |
797 |
-# Distributed under the terms of the GNU General Public License v2 |
798 |
- |
799 |
-EAPI=5 |
800 |
-inherit eutils toolchain-funcs games |
801 |
- |
802 |
-DESCRIPTION="Rogue-like D&D curses game similar to nethack (BUT BETTER)" |
803 |
-HOMEPAGE="http://remarque.org/~grabiner/moria.html" |
804 |
-SRC_URI="ftp://ftp.greyhelm.com/pub/Games/Moria/source/um${PV}.tar.Z |
805 |
- http://www.funet.fi/pub/unix/games/moria/source/um${PV}.tar.Z |
806 |
- http://www.piratehaven.org/~beej/moria/mirror/Games/Moria/source/um${PV}.tar.Z |
807 |
- http://alge.anart.no/ftp/pub/games/RPG/moria/um${PV}.tar.Z |
808 |
- ftp://kane.evendata.net/pub/${PN}-extras.tar.bz2" |
809 |
- |
810 |
-LICENSE="Moria" |
811 |
-SLOT="0" |
812 |
-KEYWORDS="~amd64 ~x86 ~x86-fbsd" |
813 |
-IUSE="" |
814 |
- |
815 |
-RDEPEND=">=sys-libs/ncurses-5:0" |
816 |
-DEPEND="${RDEPEND} |
817 |
- virtual/pkgconfig" |
818 |
- |
819 |
-S=${WORKDIR}/umoria |
820 |
- |
821 |
-src_prepare() { |
822 |
- local f |
823 |
- |
824 |
- epatch \ |
825 |
- "${FILESDIR}"/${PV}-gentoo-paths.patch \ |
826 |
- "${FILESDIR}"/${PV}-glibc.patch \ |
827 |
- "${FILESDIR}"/${PV}-fbsd.patch \ |
828 |
- "${FILESDIR}"/${PV}-hours.patch \ |
829 |
- "${FILESDIR}"/${PV}-warnings.patch |
830 |
- |
831 |
- for f in source/* unix/* ; do |
832 |
- ln -s ${f} $(basename ${f}) |
833 |
- done |
834 |
- |
835 |
- sed -i \ |
836 |
- -e "s:David Grabiner:root:" \ |
837 |
- -e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \ |
838 |
- -e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}:" \ |
839 |
- config.h || die |
840 |
- { |
841 |
- echo "#include <stdlib.h>" |
842 |
- echo "#include <stdio.h>" |
843 |
- } >> config.h || die |
844 |
- sed -i \ |
845 |
- -e "/^STATEDIR =/s:=.*:=\$(DESTDIR)${GAMES_STATEDIR}:" \ |
846 |
- -e "/^BINDIR = /s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \ |
847 |
- -e "/^LIBDIR = /s:=.*:=\$(DESTDIR)${GAMES_DATADIR}/${PN}:" \ |
848 |
- -e "/^CFLAGS = /s:=.*:=${CFLAGS}:" \ |
849 |
- -e "/^OWNER = /s:=.*:=${GAMES_USER}:" \ |
850 |
- -e "/^GROUP = /s:=.*:=${GAMES_GROUP}:" \ |
851 |
- -e "/^CC = /s:=.*:=$(tc-getCC):" \ |
852 |
- -e '/^LFLAGS = /s:=.*:= $(LDFLAGS):' \ |
853 |
- Makefile || die |
854 |
- mv doc/moria.6 "${S}" || die |
855 |
-} |
856 |
- |
857 |
-src_install() { |
858 |
- dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}" |
859 |
- emake DESTDIR="${D}" install |
860 |
- |
861 |
- doman moria.6 |
862 |
- dodoc README doc/* "${WORKDIR}"/${PN}-extras/* |
863 |
- |
864 |
- prepgamesdirs |
865 |
-} |