pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/vms-empire
Module Name: pkgsrc
Committed By: triaxx
Date: Sat Feb 8 10:49:45 UTC 2025
Modified Files:
pkgsrc/games/vms-empire: Makefile distinfo
pkgsrc/games/vms-empire/patches: patch-aa patch-edit.c patch-game.c
patch-object.c patch-term.c patch-usermove.c
Log Message:
vms-empire: Update to 1.18
upstream changes:
-----------------
1.18: 2024-10-03::
Port changes for GCC 10.
1.17: 2024-02-11::
Remove unnecessary delays.
Fix a defective sort in the fame AI.
1.16: 2021-02-25 20:52:1Z
Minor documentation fixes and code cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/games/vms-empire/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/vms-empire/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/vms-empire/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/vms-empire/patches/patch-edit.c \
pkgsrc/games/vms-empire/patches/patch-game.c \
pkgsrc/games/vms-empire/patches/patch-object.c \
pkgsrc/games/vms-empire/patches/patch-term.c \
pkgsrc/games/vms-empire/patches/patch-usermove.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/games/vms-empire/Makefile
diff -u pkgsrc/games/vms-empire/Makefile:1.17 pkgsrc/games/vms-empire/Makefile:1.18
--- pkgsrc/games/vms-empire/Makefile:1.17 Tue Nov 24 12:18:46 2020
+++ pkgsrc/games/vms-empire/Makefile Sat Feb 8 10:49:45 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2020/11/24 12:18:46 nia Exp $
+# $NetBSD: Makefile,v 1.18 2025/02/08 10:49:45 triaxx Exp $
#
-DISTNAME= vms-empire-1.15
+DISTNAME= vms-empire-1.18
CATEGORIES= games
MASTER_SITES= http://www.catb.org/~esr/vms-empire/
@@ -10,8 +10,10 @@ HOMEPAGE= http://www.catb.org/~esr/vms-e
COMMENT= Solitaire Empire (sometimes called "VMS Empire")
LICENSE= gnu-gpl-v2
+USE_TOOLS+= gmake
+
SUBST_CLASSES+= makefile
-SUBST_STAGE.makefile= pre-patch
+SUBST_STAGE.makefile= pre-configure
SUBST_MESSAGE.makefile= Fixing hardcoded paths
SUBST_FILES.makefile= Makefile
SUBST_SED.makefile= -e 's,/usr,${PREFIX},g'
Index: pkgsrc/games/vms-empire/distinfo
diff -u pkgsrc/games/vms-empire/distinfo:1.11 pkgsrc/games/vms-empire/distinfo:1.12
--- pkgsrc/games/vms-empire/distinfo:1.11 Tue Oct 26 10:44:29 2021
+++ pkgsrc/games/vms-empire/distinfo Sat Feb 8 10:49:45 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:44:29 nia Exp $
+$NetBSD: distinfo,v 1.12 2025/02/08 10:49:45 triaxx Exp $
-BLAKE2s (vms-empire-1.15.tar.gz) = 02a375604cf012be01e10dcc5df2bfa1c2779d14a686b4f173fad088aef07fe1
-SHA512 (vms-empire-1.15.tar.gz) = 18430b2f40ab293ae52ce7287eaac6a944199935b7b433d1c37343ba7ab178199310bc1f887b21dc6509e885b545c324a1f3de8f477d288d38a7c11b0a184085
-Size (vms-empire-1.15.tar.gz) = 110220 bytes
-SHA1 (patch-aa) = 4898d433cb15bf8321bbfc1a8bf612838f9a2bdc
-SHA1 (patch-edit.c) = 9d30f6dc22928b6e63a8e16f7630716f5b7bf410
-SHA1 (patch-game.c) = ea3bdb6db9daa6620d1d433066d6a5763e49313b
-SHA1 (patch-object.c) = 7a9bea57bcf57e80142041605464cd6c84509da3
-SHA1 (patch-term.c) = 0427a7a616e97b5be17ca532cdb2ff140c4f0015
-SHA1 (patch-usermove.c) = 8bd7127cdc4b2a156ae9937f637829a6edccd76e
+BLAKE2s (vms-empire-1.18.tar.gz) = 907c6b8e672f0e829f77626b51afc5a76a42c525d6d90e510015b8e6c8c697ab
+SHA512 (vms-empire-1.18.tar.gz) = 0e191c1e88d5c144040d7dfd7db81d51ae09feee3a7571e2db940813dafa858ee8f23bfcc1f7796a6ddff82562970d0be5006f9422eb17009c70acc4f467c914
+Size (vms-empire-1.18.tar.gz) = 111335 bytes
+SHA1 (patch-aa) = 7b436863cd3148af5ca720a5ffde052323d2db30
+SHA1 (patch-edit.c) = 1543bd36d879cf06c773010d8b92320d63b41ca7
+SHA1 (patch-game.c) = b44f515a9ce4c4fa095af70e424a69afc8c48e6d
+SHA1 (patch-object.c) = ca6b0deb031389dd448100af8192346f0f00b258
+SHA1 (patch-term.c) = 7aaad65ba85040e39352ee7685889be84f9ca105
+SHA1 (patch-usermove.c) = 69176fb551b927e0f45b2de098db6425ad3c29cd
Index: pkgsrc/games/vms-empire/patches/patch-aa
diff -u pkgsrc/games/vms-empire/patches/patch-aa:1.5 pkgsrc/games/vms-empire/patches/patch-aa:1.6
--- pkgsrc/games/vms-empire/patches/patch-aa:1.5 Mon Jan 11 19:37:43 2016
+++ pkgsrc/games/vms-empire/patches/patch-aa Sat Feb 8 10:49:45 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2016/01/11 19:37:43 leot Exp $
+$NetBSD: patch-aa,v 1.6 2025/02/08 10:49:45 triaxx Exp $
o Turn off optimizations present in DEBUG
o Link against (generic) curses
@@ -6,7 +6,7 @@ o Honors user's CFLAGS and LDFLAGS
--- Makefile.orig 2016-01-11 18:19:51.000000000 +0000
+++ Makefile
-@@ -8,18 +8,18 @@ VERS=1.14
+@@ -9,18 +9,18 @@ VERS=1.14
# Use -g to compile the program for debugging.
#DEBUG = -g -DDEBUG
@@ -28,7 +28,7 @@ o Honors user's CFLAGS and LDFLAGS
FILES = \
attack.c \
-@@ -58,7 +58,7 @@ OFILES = \
+@@ -59,7 +59,7 @@ OFILES = \
all: vms-empire
vms-empire: $(OFILES)
Index: pkgsrc/games/vms-empire/patches/patch-edit.c
diff -u pkgsrc/games/vms-empire/patches/patch-edit.c:1.1 pkgsrc/games/vms-empire/patches/patch-edit.c:1.2
--- pkgsrc/games/vms-empire/patches/patch-edit.c:1.1 Mon Jan 11 19:37:43 2016
+++ pkgsrc/games/vms-empire/patches/patch-edit.c Sat Feb 8 10:49:45 2025
@@ -1,33 +1,33 @@
-$NetBSD: patch-edit.c,v 1.1 2016/01/11 19:37:43 leot Exp $
+$NetBSD: patch-edit.c,v 1.2 2025/02/08 10:49:45 triaxx Exp $
Fix ctype(3) functions usage.
---- edit.c.orig 2014-12-15 00:46:31.000000000 +0000
+--- edit.c.orig 2024-02-11 16:53:28.000000000 +0000
+++ edit.c
-@@ -316,7 +316,7 @@ static char dirs[] = "WEDCXZAQ";
- void
- e_stasis(loc_t loc)
- {
-- if (!isupper (user_map[loc].contents))
-+ if (!isupper ((unsigned char)user_map[loc].contents))
- huh (); /* no object here */
- else if (user_map[loc].contents == 'X')
- huh ();
-@@ -437,7 +437,7 @@ Beginning of move to location.
- void
- e_move(loc_t *path_start, loc_t loc)
- {
-- if (!isupper(user_map[loc].contents)) huh (); /* nothing there? */
-+ if (!isupper((unsigned char)user_map[loc].contents)) huh (); /* nothing there? */
- else if (user_map[loc].contents == 'X') huh (); /* enemy city? */
- else *path_start = loc;
- }
-@@ -509,7 +509,7 @@ e_piece_info(loc_t edit_cursor, char ab)
- int type;
- char *p;
+@@ -305,7 +305,7 @@ Set object to move in a direction.
+ static char dirs[] = "WEDCXZAQ";
-- ab = toupper (ab);
-+ ab = toupper ((unsigned char)ab);
- p = strchr (type_chars, ab);
- type = p - type_chars;
+ void e_stasis(loc_t loc) {
+- if (!isupper(game.user_map[loc].contents)) {
++ if (!isupper((unsigned char)game.user_map[loc].contents)) {
+ huh(); /* no object here */
+ } else if (game.user_map[loc].contents == 'X') {
+ huh();
+@@ -421,7 +421,7 @@ Beginning of move to location.
+ */
+
+ void e_move(loc_t *path_start, loc_t loc) {
+- if (!isupper(game.user_map[loc].contents)) {
++ if (!isupper((unsigned char)game.user_map[loc].contents)) {
+ huh(); /* nothing there? */
+ } else if (game.user_map[loc].contents == 'X') {
+ huh(); /* enemy city? */
+@@ -493,7 +493,7 @@ void e_piece_info(loc_t edit_cursor, cha
+ int type;
+ char *p;
+
+- ab = toupper(ab);
++ ab = toupper((unsigned char)ab);
+ p = strchr(type_chars, ab);
+ type = p - type_chars;
Index: pkgsrc/games/vms-empire/patches/patch-game.c
diff -u pkgsrc/games/vms-empire/patches/patch-game.c:1.1 pkgsrc/games/vms-empire/patches/patch-game.c:1.2
--- pkgsrc/games/vms-empire/patches/patch-game.c:1.1 Mon Jan 11 19:37:43 2016
+++ pkgsrc/games/vms-empire/patches/patch-game.c Sat Feb 8 10:49:45 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-game.c,v 1.1 2016/01/11 19:37:43 leot Exp $
+$NetBSD: patch-game.c,v 1.2 2025/02/08 10:49:45 triaxx Exp $
Fix ctype(3) functions usage.
---- game.c.orig 2014-12-15 16:36:24.000000000 +0000
+--- game.c.orig 2024-09-23 21:39:24.000000000 +0000
+++ game.c
-@@ -745,7 +745,7 @@ save_movie_screen(void)
- if (!p) mapbuf[i] = map[i].contents;
- else if (p->owner == USER)
- mapbuf[i] = piece_attr[p->type].sname;
-- else mapbuf[i] = tolower (piece_attr[p->type].sname);
-+ else mapbuf[i] = tolower ((unsigned char)piece_attr[p->type].sname);
+@@ -783,7 +783,7 @@ void save_movie_screen(void) {
+ } else if (p->owner == USER) {
+ mapbuf[i] = piece_attr[p->type].sname;
+ } else {
+- mapbuf[i] = tolower(piece_attr[p->type].sname);
++ mapbuf[i] = tolower((unsigned char)piece_attr[p->type].sname);
+ }
+ }
}
- }
- wbuf (mapbuf);
Index: pkgsrc/games/vms-empire/patches/patch-object.c
diff -u pkgsrc/games/vms-empire/patches/patch-object.c:1.1 pkgsrc/games/vms-empire/patches/patch-object.c:1.2
--- pkgsrc/games/vms-empire/patches/patch-object.c:1.1 Mon Jan 11 19:37:43 2016
+++ pkgsrc/games/vms-empire/patches/patch-object.c Sat Feb 8 10:49:45 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-object.c,v 1.1 2016/01/11 19:37:43 leot Exp $
+$NetBSD: patch-object.c,v 1.2 2025/02/08 10:49:45 triaxx Exp $
Fix ctype(3) functions usage.
---- object.c.orig 2014-12-15 00:57:48.000000000 +0000
+--- object.c.orig 2024-02-11 15:57:48.000000000 +0000
+++ object.c
-@@ -568,7 +568,7 @@ update(view_map_t vmap[], loc_t loc)
- else if (p->owner == USER)
- vmap[loc].contents = piece_attr[p->type].sname;
- else
-- vmap[loc].contents = tolower (piece_attr[p->type].sname);
-+ vmap[loc].contents = tolower ((unsigned char)piece_attr[p->type].sname);
- }
- if (vmap == comp_map)
- display_locx (COMP, comp_map, loc);
+@@ -552,7 +552,7 @@ void update(view_map_t vmap[], loc_t loc
+ else if (p->owner == USER)
+ vmap[loc].contents = piece_attr[p->type].sname;
+ else
+- vmap[loc].contents = tolower(piece_attr[p->type].sname);
++ vmap[loc].contents = tolower((unsigned char)piece_attr[p->type].sname);
+ }
+ if (vmap == game.comp_map)
+ display_locx(COMP, game.comp_map, loc);
Index: pkgsrc/games/vms-empire/patches/patch-term.c
diff -u pkgsrc/games/vms-empire/patches/patch-term.c:1.1 pkgsrc/games/vms-empire/patches/patch-term.c:1.2
--- pkgsrc/games/vms-empire/patches/patch-term.c:1.1 Mon Jan 11 19:37:43 2016
+++ pkgsrc/games/vms-empire/patches/patch-term.c Sat Feb 8 10:49:45 2025
@@ -1,26 +1,26 @@
-$NetBSD: patch-term.c,v 1.1 2016/01/11 19:37:43 leot Exp $
+$NetBSD: patch-term.c,v 1.2 2025/02/08 10:49:45 triaxx Exp $
Fix ctype(3) functions usage.
---- term.c.orig 2014-12-15 16:26:35.000000000 +0000
+--- term.c.orig 2024-02-11 16:53:28.000000000 +0000
+++ term.c
-@@ -249,8 +249,8 @@ get_chx(void)
+@@ -219,8 +219,8 @@ char get_chx(void) {
- c = get_cq ();
+ c = get_cq();
-- if (islower(c))
-- return (toupper(c));
-+ if (islower((unsigned char)c))
-+ return (toupper((unsigned char)c));
- else
- return (c);
- }
-@@ -390,7 +390,7 @@ help(char **text, int nlines)
- pos_str (r + text_lines + NUMTOPS + 3, c,"%-12s%c %c%6d%5d%6d",
- piece_attr[i].nickname,
- piece_attr[i].sname,
-- tolower (piece_attr[i].sname),
-+ tolower ((unsigned char)piece_attr[i].sname),
- piece_attr[i].speed,
- piece_attr[i].max_hits,
- piece_attr[i].build_time,0,0); //FLAG
+- if (islower(c)) {
+- return (toupper(c));
++ if (islower((unsigned char)c)) {
++ return (toupper((unsigned char)c));
+ } else {
+ return (c);
+ }
+@@ -362,7 +362,7 @@ void help(char **text, int nlines) {
+ }
+ pos_str(r + text_lines + NUMTOPS + 3, c,
+ "%-12s%c %c%6d%5d%6d", piece_attr[i].nickname,
+- piece_attr[i].sname, tolower(piece_attr[i].sname),
++ piece_attr[i].sname, tolower((unsigned char)piece_attr[i].sname),
+ piece_attr[i].speed, piece_attr[i].max_hits,
+ piece_attr[i].build_time, 0, 0); // FLAG
+ }
Index: pkgsrc/games/vms-empire/patches/patch-usermove.c
diff -u pkgsrc/games/vms-empire/patches/patch-usermove.c:1.1 pkgsrc/games/vms-empire/patches/patch-usermove.c:1.2
--- pkgsrc/games/vms-empire/patches/patch-usermove.c:1.1 Mon Jan 11 19:37:43 2016
+++ pkgsrc/games/vms-empire/patches/patch-usermove.c Sat Feb 8 10:49:45 2025
@@ -1,60 +1,60 @@
-$NetBSD: patch-usermove.c,v 1.1 2016/01/11 19:37:43 leot Exp $
+$NetBSD: patch-usermove.c,v 1.2 2025/02/08 10:49:45 triaxx Exp $
Fix ctype(3) functions usage.
---- usermove.c.orig 2014-12-15 16:26:35.000000000 +0000
+--- usermove.c.orig 2024-02-11 16:53:28.000000000 +0000
+++ usermove.c
-@@ -878,7 +878,7 @@ user_dir_army(piece_info_t *obj, loc_t l
- ksend ("Your army marched dutifully into the sea and drowned.\n");
- }
- else { /* attack something at sea */
-- enemy_killed = islower (user_map[loc].contents);
-+ enemy_killed = islower ((unsigned char)user_map[loc].contents);
- attack (obj, loc);
-
- if (obj->hits > 0) /* ship won? */
-@@ -894,7 +894,7 @@ user_dir_army(piece_info_t *obj, loc_t l
- }
- }
-
-- else if (isupper (user_map[loc].contents)
-+ else if (isupper ((unsigned char)user_map[loc].contents)
- && user_map[loc].contents != 'X') { /* attacking self */
- if (!getyn (
- "Sir, those are our men! Do you really want to attack them? "))
-@@ -919,7 +919,7 @@ user_dir_fighter(piece_info_t *obj, loc_
- "That's never worked before, sir. Do you really want to try? ",
- "Your fighter was shot down.");
-
-- else if (isupper (user_map[loc].contents)) {
-+ else if (isupper ((unsigned char)user_map[loc].contents)) {
- if (!getyn ("Sir, those are our men! "
- "Do you really want to attack them? "))
- return;
-@@ -959,7 +959,7 @@ user_dir_ship(piece_info_t *obj, loc_t l
- ksend ("Your %s broke up on shore.", piece_attr[obj->type].name);
+@@ -997,7 +997,7 @@ void user_dir_army(piece_info_t *obj, lo
+ ksend("Your army marched dutifully into the sea and "
+ "drowned.\n");
+ } else { /* attack something at sea */
+- enemy_killed = islower(game.user_map[loc].contents);
++ enemy_killed = islower((unsigned char)game.user_map[loc].contents);
+ attack(obj, loc);
+
+ if (obj->hits > 0) /* ship won? */
+@@ -1016,7 +1016,7 @@ void user_dir_army(piece_info_t *obj, lo
+ }
}
- else { /* attack something on shore */
-- enemy_killed = islower (user_map[loc].contents);
-+ enemy_killed = islower ((unsigned char)user_map[loc].contents);
- attack (obj, loc);
- if (obj->hits > 0) /* ship won? */
-@@ -975,7 +975,7 @@ user_dir_ship(piece_info_t *obj, loc_t l
+- else if (isupper(game.user_map[loc].contents) &&
++ else if (isupper((unsigned char)game.user_map[loc].contents) &&
+ game.user_map[loc].contents != 'X') { /* attacking self */
+ if (!getyn("Sir, those are our men! Do you really want to "
+ "attack them? ")) {
+@@ -1044,7 +1044,7 @@ void user_dir_fighter(piece_info_t *obj,
+ "Your fighter was shot down.");
}
- }
-
-- else if (isupper (user_map[loc].contents)) { /* attacking self */
-+ else if (isupper ((unsigned char)user_map[loc].contents)) { /* attacking self */
- if (!getyn (
- "Sir, those are our men! Do you really want to attack them? "))
- return;
-@@ -1062,7 +1062,7 @@ awake(piece_info_t *obj)
- for (i = 0; i < 8; i++) { /* for each surrounding cell */
- char c = user_map[obj->loc+dir_offset[i]].contents;
-
-- if (islower (c) || c == MAP_CITY || c == 'X') {
-+ if (islower ((unsigned char)c) || c == MAP_CITY || c == 'X') {
- if (obj->func < 0) obj->func = NOFUNC; /* awaken */
- return (true);
+
+- else if (isupper(game.user_map[loc].contents)) {
++ else if (isupper((unsigned char)game.user_map[loc].contents)) {
+ if (!getyn("Sir, those are our men! "
+ "Do you really want to attack them? ")) {
+ return;
+@@ -1089,7 +1089,7 @@ void user_dir_ship(piece_info_t *obj, lo
+ ksend("Your %s broke up on shore.",
+ piece_attr[obj->type].name);
+ } else { /* attack something on shore */
+- enemy_killed = islower(game.user_map[loc].contents);
++ enemy_killed = islower((unsigned char)game.user_map[loc].contents);
+ attack(obj, loc);
+
+ if (obj->hits > 0) /* ship won? */
+@@ -1110,7 +1110,7 @@ void user_dir_ship(piece_info_t *obj, lo
+ }
}
+
+- else if (isupper(game.user_map[loc].contents)) { /* attacking self */
++ else if (isupper((unsigned char)game.user_map[loc].contents)) { /* attacking self */
+ if (!getyn("Sir, those are our men! Do you really want to "
+ "attack them? ")) {
+ return;
+@@ -1196,7 +1196,7 @@ bool awake(piece_info_t *obj) {
+ for (i = 0; i < 8; i++) { /* for each surrounding cell */
+ char c = game.user_map[obj->loc + dir_offset[i]].contents;
+
+- if (islower(c) || c == MAP_CITY || c == 'X') {
++ if (islower((unsigned char)c) || c == MAP_CITY || c == 'X') {
+ if (obj->func < 0) {
+ obj->func = NOFUNC; /* awaken */
+ }
Home |
Main Index |
Thread Index |
Old Index