CVS commit: pkgsrc/games/7kaa

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov 21 13:58:03 UTC 2023

Modified Files:
        pkgsrc/games/7kaa: Makefile PLIST distinfo
        pkgsrc/games/7kaa/patches: patch-src_LocaleRes.cpp

Log Message:
7kaa: Update to 2.15.6

Seven Kingdoms v2.15.6

   Here it is! A release long in the making, which tackles issues with the
   AI, such as smarter management, continuing assaults, and actually going on
   sea based missions. Perhaps the AI will no longer be as easily tricked.

   There has been some more quality of code improvements and testing to
   ensure stability. Thanks to all the testers the past few weeks. Now on to
   the next round of improvements. :)


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/games/7kaa/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/7kaa/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/7kaa/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/7kaa/patches/patch-src_LocaleRes.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/7kaa/Makefile
diff -u pkgsrc/games/7kaa/Makefile:1.32 pkgsrc/games/7kaa/Makefile:1.33
--- pkgsrc/games/7kaa/Makefile:1.32     Wed Nov  8 13:19:10 2023
+++ pkgsrc/games/7kaa/Makefile  Tue Nov 21 13:58:03 2023
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2023/11/08 13:19:10 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2023/11/21 13:58:03 nia Exp $
 
-DISTNAME=      7kaa-2.15.4p1
-PKGREVISION=   13
+DISTNAME=      7kaa-2.15.6
 CATEGORIES=    games
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=the3dfxdude/}
-EXTRACT_SUFX=  .tar.xz
-GITHUB_RELEASE=        v${PKGVERSION_NOREV}
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=skfans/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://7kfans.com/

Index: pkgsrc/games/7kaa/PLIST
diff -u pkgsrc/games/7kaa/PLIST:1.4 pkgsrc/games/7kaa/PLIST:1.5
--- pkgsrc/games/7kaa/PLIST:1.4 Tue Jul  7 13:09:04 2020
+++ pkgsrc/games/7kaa/PLIST     Tue Nov 21 13:58:03 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2020/07/07 13:09:04 nia Exp $
+@comment $NetBSD: PLIST,v 1.5 2023/11/21 13:58:03 nia Exp $
 bin/7kaa
 share/7kaa/ENCYC/FIRM/FACTORY.COL
 share/7kaa/ENCYC/FIRM/FACTORY.ICN
@@ -141,6 +141,8 @@ share/7kaa/IMAGE/CREDITS3.COL
 share/7kaa/IMAGE/CREDITS3.ICN
 share/7kaa/IMAGE/CREDITS4.COL
 share/7kaa/IMAGE/CREDITS4.ICN
+share/7kaa/IMAGE/CREDITS6.COL
+share/7kaa/IMAGE/CREDITS6.ICN
 share/7kaa/IMAGE/EGYPTIAN.COL
 share/7kaa/IMAGE/EGYPTIAN.ICN
 share/7kaa/IMAGE/GREEK.COL
@@ -175,22 +177,28 @@ share/7kaa/RESOURCE/EXPREMAP.BIN
 share/7kaa/RESOURCE/FNT_BARD.RES
 share/7kaa/RESOURCE/FNT_CASA.RES
 share/7kaa/RESOURCE/FNT_CASA_88592.RES
+share/7kaa/RESOURCE/FNT_CASA_88593.RES
 share/7kaa/RESOURCE/FNT_CASA_88595.RES
 share/7kaa/RESOURCE/FNT_HITP.RES
 share/7kaa/RESOURCE/FNT_MID.RES
 share/7kaa/RESOURCE/FNT_MID_88592.RES
+share/7kaa/RESOURCE/FNT_MID_88593.RES
 share/7kaa/RESOURCE/FNT_MID_88595.RES
 share/7kaa/RESOURCE/FNT_NEWS.RES
 share/7kaa/RESOURCE/FNT_NEWS_88592.RES
+share/7kaa/RESOURCE/FNT_NEWS_88593.RES
 share/7kaa/RESOURCE/FNT_NEWS_88595.RES
 share/7kaa/RESOURCE/FNT_SAN.RES
 share/7kaa/RESOURCE/FNT_SAN_88592.RES
+share/7kaa/RESOURCE/FNT_SAN_88593.RES
 share/7kaa/RESOURCE/FNT_SAN_88595.RES
 share/7kaa/RESOURCE/FNT_SMAL.RES
 share/7kaa/RESOURCE/FNT_SMAL_88592.RES
+share/7kaa/RESOURCE/FNT_SMAL_88593.RES
 share/7kaa/RESOURCE/FNT_SMAL_88595.RES
 share/7kaa/RESOURCE/FNT_STD.RES
 share/7kaa/RESOURCE/FNT_STD_88592.RES
+share/7kaa/RESOURCE/FNT_STD_88593.RES
 share/7kaa/RESOURCE/FNT_STD_88595.RES
 share/7kaa/RESOURCE/HELP.RES
 share/7kaa/RESOURCE/HILL1.RES
@@ -507,7 +515,9 @@ share/applications/7kaa.desktop
 share/doc/7kaa/COPYING
 share/doc/7kaa/README
 share/locale/de/LC_MESSAGES/7kaa.mo
+share/locale/eo/LC_MESSAGES/7kaa.mo
 share/locale/es/LC_MESSAGES/7kaa.mo
+share/locale/fr/LC_MESSAGES/7kaa.mo
 share/locale/pl/LC_MESSAGES/7kaa.mo
 share/locale/pt_BR/LC_MESSAGES/7kaa.mo
 share/locale/ru/LC_MESSAGES/7kaa.mo

Index: pkgsrc/games/7kaa/distinfo
diff -u pkgsrc/games/7kaa/distinfo:1.8 pkgsrc/games/7kaa/distinfo:1.9
--- pkgsrc/games/7kaa/distinfo:1.8      Tue Oct 26 10:43:43 2021
+++ pkgsrc/games/7kaa/distinfo  Tue Nov 21 13:58:03 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:43:43 nia Exp $
+$NetBSD: distinfo,v 1.9 2023/11/21 13:58:03 nia Exp $
 
-BLAKE2s (7kaa-2.15.4p1.tar.xz) = a9cd48642ac86ddbdb0b8fa09940ddf62d64cb58694ae5b2b696c77ae425284a
-SHA512 (7kaa-2.15.4p1.tar.xz) = eac0ca91755f828cfc8b0ea07ad1d0c08030c60ac236473992cc7887f8da43a3246a1f375f569e4fc71afaf7c5797ae6911b8b617217077429e5f5c51af4f4b6
-Size (7kaa-2.15.4p1.tar.xz) = 46927880 bytes
-SHA1 (patch-src_LocaleRes.cpp) = c1e8f370d0add3ef744aa430fab2ce11424dcdec
+BLAKE2s (7kaa-2.15.6.tar.gz) = 330a3f5c91311060cebbc458d2c18c0dd5812b8e967c2eb8f75c83bcce81dc3e
+SHA512 (7kaa-2.15.6.tar.gz) = 8387680b39a203a50bcf466424a4401416d9f60aa00078e4e78a44b89e7afc722a62e81a1f3b5cdb20e323983e4a6506919340261fb6b2829e3ca275e648a64f
+Size (7kaa-2.15.6.tar.gz) = 73334247 bytes
+SHA1 (patch-src_LocaleRes.cpp) = 68300c0f60535ce5360d48a93ea65bd2f5795a84

Index: pkgsrc/games/7kaa/patches/patch-src_LocaleRes.cpp
diff -u pkgsrc/games/7kaa/patches/patch-src_LocaleRes.cpp:1.4 pkgsrc/games/7kaa/patches/patch-src_LocaleRes.cpp:1.5
--- pkgsrc/games/7kaa/patches/patch-src_LocaleRes.cpp:1.4       Wed Jan  8 16:59:07 2020
+++ pkgsrc/games/7kaa/patches/patch-src_LocaleRes.cpp   Tue Nov 21 13:58:03 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_LocaleRes.cpp,v 1.4 2020/01/08 16:59:07 nia Exp $
+$NetBSD: patch-src_LocaleRes.cpp,v 1.5 2023/11/21 13:58:03 nia Exp $
 
 Support NetBSD and SunOS iconv being special.
 
---- src/LocaleRes.cpp.orig     2019-12-22 22:27:28.000000000 +0000
+--- src/LocaleRes.cpp.orig     2023-07-24 23:02:38.000000000 +0000
 +++ src/LocaleRes.cpp
-@@ -31,6 +31,15 @@
- #include <ConfigAdv.h>
+@@ -31,6 +31,14 @@
+ #include <ODB.h>
  #include <LocaleRes.h>
  
 +#if defined(__NetBSD__)
@@ -16,11 +16,10 @@ Support NetBSD and SunOS iconv being spe
 +#define NETBSD_POSIX_ICONV 0
 +#endif
 +#endif
-+
- //------------- End of function Constructor -------//
- //
- LocaleRes::LocaleRes()
-@@ -191,7 +200,11 @@ const char *LocaleRes::conv_str(iconv_t 
+ 
+ #ifndef HAVE_SETENV
+ static String lc_all_str;
+@@ -226,7 +234,11 @@ const char *LocaleRes::conv_str(iconv_t 
        size_t c;
        while( in_left>0 )
        {