CVS commit: pkgsrc/games/vms-empire

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr 16 12:29:43 UTC 2026

Modified Files:
        pkgsrc/games/vms-empire: Makefile distinfo
        pkgsrc/games/vms-empire/patches: patch-aa patch-usermove.c

Log Message:
vms-empire: update to 1.20.

1.20: 2026-04-16::
       More code hardening.
       Fix for ancient bug: enemy satellites no longer awaken your pieces.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/games/vms-empire/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/vms-empire/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/vms-empire/patches/patch-aa
cvs rdiff -u -r1.2 -r1.3 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.19 pkgsrc/games/vms-empire/Makefile:1.20
--- pkgsrc/games/vms-empire/Makefile:1.19       Tue Mar 24 12:46:06 2026
+++ pkgsrc/games/vms-empire/Makefile    Thu Apr 16 12:29:42 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2026/03/24 12:46:06 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2026/04/16 12:29:42 wiz Exp $
 
-DISTNAME=      vms-empire-1.19
+DISTNAME=      vms-empire-1.20
 CATEGORIES=    games
 MASTER_SITES=  http://www.catb.org/~esr/vms-empire/
 

Index: pkgsrc/games/vms-empire/distinfo
diff -u pkgsrc/games/vms-empire/distinfo:1.13 pkgsrc/games/vms-empire/distinfo:1.14
--- pkgsrc/games/vms-empire/distinfo:1.13       Tue Mar 24 12:46:06 2026
+++ pkgsrc/games/vms-empire/distinfo    Thu Apr 16 12:29:42 2026
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2026/03/24 12:46:06 wiz Exp $
+$NetBSD: distinfo,v 1.14 2026/04/16 12:29:42 wiz Exp $
 
-BLAKE2s (vms-empire-1.19.tar.gz) = 9d7e6b38f13f7d9f6789929829ac35fd0e60d8a4ad483e6581dd02bfbeb9cdbe
-SHA512 (vms-empire-1.19.tar.gz) = 826197896a1b99c028fd1072370068370816600c0f96e1370eef672ae33102b618eda1d84e16d094e2182c6c4cdb7ba500064f8014824af78fd27ba3d12a9b3c
-Size (vms-empire-1.19.tar.gz) = 113348 bytes
-SHA1 (patch-aa) = ac55b4a22d2b7cde990cdbc193c75e3339d6bab2
+BLAKE2s (vms-empire-1.20.tar.gz) = 467bdfd94d2b656c4e7acc95ad462c0c1e435e3c8faa63014572a72e35d5b3bc
+SHA512 (vms-empire-1.20.tar.gz) = f8d7e44cc2a9523b978b109a9c0994874227a554cfcdd05ddee66bdd79d5e557584e0a536de03744fc3f05c866f91bdf4e29ec3b42038d7a04c7a448e2551173
+Size (vms-empire-1.20.tar.gz) = 114918 bytes
+SHA1 (patch-aa) = 1dd1269a0e9c1d368c93c9a679ad7ab8373a369c
 SHA1 (patch-edit.c) = d413719ea09eb8e92facd16be36e95020e3ee1b8
 SHA1 (patch-game.c) = b44f515a9ce4c4fa095af70e424a69afc8c48e6d
 SHA1 (patch-object.c) = ca6b0deb031389dd448100af8192346f0f00b258
 SHA1 (patch-term.c) = 7aaad65ba85040e39352ee7685889be84f9ca105
-SHA1 (patch-usermove.c) = 69176fb551b927e0f45b2de098db6425ad3c29cd
+SHA1 (patch-usermove.c) = 4892f635f633c75104ccfb3f871986b69fa9c94a

Index: pkgsrc/games/vms-empire/patches/patch-aa
diff -u pkgsrc/games/vms-empire/patches/patch-aa:1.7 pkgsrc/games/vms-empire/patches/patch-aa:1.8
--- pkgsrc/games/vms-empire/patches/patch-aa:1.7        Tue Mar 24 12:46:06 2026
+++ pkgsrc/games/vms-empire/patches/patch-aa    Thu Apr 16 12:29:43 2026
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.7 2026/03/24 12:46:06 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2026/04/16 12:29:43 wiz Exp $
 
 o Turn off optimizations present in DEBUG
 o Link against (generic) curses
 o Honors user's CFLAGS and LDFLAGS
 
---- Makefile.orig      2026-03-24 12:40:47.000000000 +0000
+--- Makefile.orig      2026-04-16 12:16:09.000000000 +0000
 +++ Makefile
-@@ -14,18 +14,18 @@ VERSION=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head
+@@ -12,20 +12,20 @@ MANDIR      ?= $(DATADIR)/man
  
  # Use -g to compile the program for debugging.
  #DEBUG = -g -DDEBUG
@@ -22,6 +22,8 @@ o Honors user's CFLAGS and LDFLAGS
  
  # You shouldn't have to modify anything below this line.
  
+ VERSION=$(shell sed -n <NEWS '/^[0-9]/s/:.*//p' | head -1)
+ 
  # There's a dynamic format in the object-display routines; suppress the warning
 -CFLAGS = $(DEBUG) $(PROFILE) -Wall -Wextra -Werror -Wno-format-security -Wno-unused-parameter
 +CFLAGS += $(DEBUG) $(PROFILE) -Wall -Wextra -Wno-format-security -Wno-unused-parameter

Index: pkgsrc/games/vms-empire/patches/patch-usermove.c
diff -u pkgsrc/games/vms-empire/patches/patch-usermove.c:1.2 pkgsrc/games/vms-empire/patches/patch-usermove.c:1.3
--- pkgsrc/games/vms-empire/patches/patch-usermove.c:1.2        Sat Feb  8 10:49:45 2025
+++ pkgsrc/games/vms-empire/patches/patch-usermove.c    Thu Apr 16 12:29:43 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-usermove.c,v 1.2 2025/02/08 10:49:45 triaxx Exp $
+$NetBSD: patch-usermove.c,v 1.3 2026/04/16 12:29:43 wiz Exp $
 
 Fix ctype(3) functions usage.
 
---- usermove.c.orig    2024-02-11 16:53:28.000000000 +0000
+--- usermove.c.orig    2026-04-16 12:16:09.000000000 +0000
 +++ usermove.c
-@@ -997,7 +997,7 @@ void user_dir_army(piece_info_t *obj, lo
+@@ -997,7 +997,7 @@ void user_dir_army(piece_info_t *obj, loc_t loc) {
                        ksend("Your army marched dutifully into the sea and "
                              "drowned.\n");
                } else { /* attack something at sea */
@@ -13,7 +13,7 @@ Fix ctype(3) functions usage.
                        attack(obj, loc);
  
                        if (obj->hits > 0) /* ship won? */
-@@ -1016,7 +1016,7 @@ void user_dir_army(piece_info_t *obj, lo
+@@ -1016,7 +1016,7 @@ void user_dir_army(piece_info_t *obj, loc_t loc) {
                }
        }
  
@@ -22,7 +22,7 @@ Fix ctype(3) functions usage.
                 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,
+@@ -1044,7 +1044,7 @@ void user_dir_fighter(piece_info_t *obj, loc_t loc) {
                      "Your fighter was shot down.");
        }
  
@@ -31,7 +31,7 @@ Fix ctype(3) functions usage.
                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
+@@ -1092,7 +1092,7 @@ void user_dir_ship(piece_info_t *obj, loc_t loc) {
                        ksend("Your %s broke up on shore.",
                              piece_attr[obj->type].name);
                } else { /* attack something on shore */
@@ -40,7 +40,7 @@ Fix ctype(3) functions usage.
                        attack(obj, loc);
  
                        if (obj->hits > 0) /* ship won? */
-@@ -1110,7 +1110,7 @@ void user_dir_ship(piece_info_t *obj, lo
+@@ -1113,7 +1113,7 @@ void user_dir_ship(piece_info_t *obj, loc_t loc) {
                }
        }
  
@@ -49,12 +49,12 @@ Fix ctype(3) functions usage.
                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') {
+@@ -1201,7 +1201,7 @@ bool awake(piece_info_t *obj) {
+               char c = game.user_map[loc].contents;
+               const piece_info_t *enemy = find_obj_at_loc(loc);
+ 
+-              if ((islower(c) && (enemy == NULL || enemy->type != SATELLITE)) ||
++              if ((islower((unsigned char)c) && (enemy == NULL || enemy->type != SATELLITE)) ||
+                   c == MAP_CITY || c == 'X') {
                        if (obj->func < 0) {
                                obj->func = NOFUNC; /* awaken */
-                       }