CVS commit: pkgsrc/games/vms-empire

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 21 05:12:14 UTC 2026

Modified Files:
        pkgsrc/games/vms-empire: Makefile PLIST distinfo
        pkgsrc/games/vms-empire/patches: patch-aa
Removed Files:
        pkgsrc/games/vms-empire/patches: patch-edit.c patch-game.c
            patch-object.c patch-term.c patch-usermove.c

Log Message:
vms-empire: update to 1.21.

Yet more code hardening.
Documentation fully cobveted to asciidoc.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/games/vms-empire/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/vms-empire/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/games/vms-empire/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/vms-empire/patches/patch-aa
cvs rdiff -u -r1.4 -r0 pkgsrc/games/vms-empire/patches/patch-edit.c \
    pkgsrc/games/vms-empire/patches/patch-usermove.c
cvs rdiff -u -r1.3 -r0 pkgsrc/games/vms-empire/patches/patch-game.c \
    pkgsrc/games/vms-empire/patches/patch-object.c \
    pkgsrc/games/vms-empire/patches/patch-term.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.20 pkgsrc/games/vms-empire/Makefile:1.21
--- pkgsrc/games/vms-empire/Makefile:1.20       Thu Apr 16 12:29:42 2026
+++ pkgsrc/games/vms-empire/Makefile    Tue Apr 21 05:12:14 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2026/04/16 12:29:42 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2026/04/21 05:12:14 wiz Exp $
 
-DISTNAME=      vms-empire-1.20
+DISTNAME=      vms-empire-1.21
 CATEGORIES=    games
 MASTER_SITES=  http://www.catb.org/~esr/vms-empire/
 
@@ -9,17 +9,20 @@ HOMEPAGE=     http://www.catb.org/~esr/vms-e
 COMMENT=       Solitaire Empire (sometimes called "VMS Empire")
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
+
 USE_TOOLS+=    gmake
 
+MAKE_FLAGS+=   PREFIX=${PREFIX}
 MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}
 
 SUBST_CLASSES+=                makefile
-SUBST_STAGE.makefile=  pre-configure
-SUBST_MESSAGE.makefile=        Fixing hardcoded paths
+SUBST_SED.makefile+=   -e "s,asciidoctor,asciidoctor${RUBY_SUFFIX},"
+SUBST_STAGE.makefile=  pre-build
 SUBST_FILES.makefile=  Makefile
-SUBST_SED.makefile=    -e 's,/usr,${PREFIX},g'
-SUBST_SED.makefile+=   -e 's,share/man,${PKGMANDIR},g'
+SUBST_MESSAGE.makefile=        Fixing asciidoctor name.
 
+.include "../../lang/ruby/rubyversion.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/curses.buildlink3.mk"

Index: pkgsrc/games/vms-empire/PLIST
diff -u pkgsrc/games/vms-empire/PLIST:1.2 pkgsrc/games/vms-empire/PLIST:1.3
--- pkgsrc/games/vms-empire/PLIST:1.2   Mon Jan 11 19:37:43 2016
+++ pkgsrc/games/vms-empire/PLIST       Tue Apr 21 05:12:14 2026
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2016/01/11 19:37:43 leot Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/04/21 05:12:14 wiz Exp $
 bin/vms-empire
 man/man6/vms-empire.6
-share/appdata/vms-empire.xml
 share/applications/vms-empire.desktop
 share/icons/hicolor/48x48/apps/vms-empire.png

Index: pkgsrc/games/vms-empire/distinfo
diff -u pkgsrc/games/vms-empire/distinfo:1.15 pkgsrc/games/vms-empire/distinfo:1.16
--- pkgsrc/games/vms-empire/distinfo:1.15       Thu Apr 16 12:34:46 2026
+++ pkgsrc/games/vms-empire/distinfo    Tue Apr 21 05:12:14 2026
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.15 2026/04/16 12:34:46 wiz Exp $
+$NetBSD: distinfo,v 1.16 2026/04/21 05:12:14 wiz Exp $
 
-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) = d046511e799b13c6c0914bf127fe81280155308e
-SHA1 (patch-game.c) = 4476aab0b21392c4853fe72d7a362b62cb7eb7db
-SHA1 (patch-object.c) = e5c0b67ac0f6bbc255168ed5eb7e9066bac8a576
-SHA1 (patch-term.c) = e80c76c44847b0181500baa8d7ea4d0ea28b41a7
-SHA1 (patch-usermove.c) = 279ea76ef7602a2f46627d32233d58587b928c83
+BLAKE2s (vms-empire-1.21.tar.gz) = 50333a75f5083f842796be1071e1edd22213296049d0ec947bf081272c4152cc
+SHA512 (vms-empire-1.21.tar.gz) = 889f96548e4a7d3b4e14bbc05dc793f7546a98482078b243f8282b4bbfe104faf68fe15ee9e748bcbacfceab5e1399401c5f3963fe6d4e2acb17b7db33ce331d
+Size (vms-empire-1.21.tar.gz) = 113309 bytes
+SHA1 (patch-aa) = 5b5649521dd9ee8a0b25468f4c0bd97f0fbc99a6

Index: pkgsrc/games/vms-empire/patches/patch-aa
diff -u pkgsrc/games/vms-empire/patches/patch-aa:1.8 pkgsrc/games/vms-empire/patches/patch-aa:1.9
--- pkgsrc/games/vms-empire/patches/patch-aa:1.8        Thu Apr 16 12:29:43 2026
+++ pkgsrc/games/vms-empire/patches/patch-aa    Tue Apr 21 05:12:14 2026
@@ -1,12 +1,20 @@
-$NetBSD: patch-aa,v 1.8 2026/04/16 12:29:43 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2026/04/21 05:12:14 wiz Exp $
 
 o Turn off optimizations present in DEBUG
 o Link against (generic) curses
 o Honors user's CFLAGS and LDFLAGS
 
---- Makefile.orig      2026-04-16 12:16:09.000000000 +0000
+--- Makefile.orig      2026-04-21 01:49:16.000000000 +0000
 +++ Makefile
-@@ -12,20 +12,20 @@ MANDIR      ?= $(DATADIR)/man
+@@ -5,20 +5,20 @@
+ # See the file COPYING, distributed with empire, for restriction
+ # and warranty information.
+ 
+-PREFIX      ?= /usr/local
++PREFIX      ?= $(PREFIX)/local
+ BINDIR      ?= $(PREFIX)/bin
+ DATADIR     ?= $(PREFIX)/share
+ MANDIR      ?= $(DATADIR)/man
  
  # Use -g to compile the program for debugging.
  #DEBUG = -g -DDEBUG
@@ -22,7 +30,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)
+@@ -43,7 +43,7 @@ VERSION=$(shell sed -n <NEWS.adoc '/^[0-9]/s/:.*//p' |
+ # Build
  
  # 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
@@ -30,8 +39,8 @@ o Honors user's CFLAGS and LDFLAGS
  
  FILES = \
        attack.c \
-@@ -66,7 +66,7 @@ vms-empire: $(OFILES)
- all: vms-empire
+@@ -82,7 +82,7 @@ vms-empire: $(OFILES)
+ all: vms-empire vms-empire.1
  
  vms-empire: $(OFILES)
 -      $(CC) $(PROFILE) -o vms-empire $(OFILES) $(LIBS)
@@ -39,3 +48,31 @@ o Honors user's CFLAGS and LDFLAGS
  
  attack.o:: extern.h empire.h
  compmove.o:: extern.h empire.h
+@@ -126,20 +126,18 @@ install: empire.6 uninstall
+ install: empire.6 uninstall
+       install -m 0755 -d $(DESTDIR)$(BINDIR)
+       install -m 0755 -d $(DESTDIR)$(MANDIR)/man6
+-      install -m 0755 -d $(DESTDIR)/usr/share/applications/
+-      install -m 0755 -d $(DESTDIR)/usr/share/icons/hicolor/48x48/apps/
+-      install -m 0755 -d $(DESTDIR)/usr/share/appdata
++      install -m 0755 -d $(DESTDIR)$(PREFIX)/share/applications/
++      install -m 0755 -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
++      install -m 0755 -d $(DESTDIR)$(PREFIX)/share/appdata
+       install -m 0755 vms-empire $(DESTDIR)$(BINDIR)/
+       install -m 0644 empire.6 $(DESTDIR)$(MANDIR)/man6/vms-empire.6
+-      install -m 0644 vms-empire.desktop $(DESTDIR)/usr/share/applications/
+-      install -m 0644 vms-empire.png $(DESTDIR)/usr/share/icons/hicolor/48x48/apps/
+-      install -m 0644 vms-empire.xml $(DESTDIR)/usr/share/appdata/
++      install -m 0644 vms-empire.desktop $(DESTDIR)$(PREFIX)/share/applications/
++      install -m 0644 vms-empire.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
+ 
+ uninstall:
+       rm -f $(BINDIR)/vms-empire $(MANDIR)/man6/vms-empire.6
+-      rm -f /usr/share/applications/vms-empire.desktop
+-      rm -f /usr/share/icons/hicolor/48x48/apps/vms-empire.png
+-      rm -f /usr/share/appdata/vms-empire.xml
++      rm -f $(PREFIX)/share/applications/vms-empire.desktop
++      rm -f $(PREFIX)/share/icons/hicolor/48x48/apps/vms-empire.png
+ 
+ # Export
+