CVS commit: pkgsrc/games/hengband

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Jan 30 13:56:12 UTC 2020

Modified Files:
        pkgsrc/games/hengband: Makefile distinfo
Added Files:
        pkgsrc/games/hengband/patches: patch-src_cmd3.c

Log Message:
Fix an error on 64-bits platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/hengband/Makefile \
    pkgsrc/games/hengband/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/hengband/patches/patch-src_cmd3.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/hengband/Makefile
diff -u pkgsrc/games/hengband/Makefile:1.1 pkgsrc/games/hengband/Makefile:1.2
--- pkgsrc/games/hengband/Makefile:1.1  Fri Jan 24 13:33:32 2020
+++ pkgsrc/games/hengband/Makefile      Thu Jan 30 13:56:12 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2020/01/24 13:33:32 pho Exp $
+# $NetBSD: Makefile,v 1.2 2020/01/30 13:56:12 pho Exp $
 
 DISTNAME=      hengband-1.6.2
+PKGREVISION=   1
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_OSDN:=hengband/10331/}
 EXTRACT_SUFX=  .tar.bz2
Index: pkgsrc/games/hengband/distinfo
diff -u pkgsrc/games/hengband/distinfo:1.1 pkgsrc/games/hengband/distinfo:1.2
--- pkgsrc/games/hengband/distinfo:1.1  Fri Jan 24 13:33:32 2020
+++ pkgsrc/games/hengband/distinfo      Thu Jan 30 13:56:12 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2020/01/24 13:33:32 pho Exp $
+$NetBSD: distinfo,v 1.2 2020/01/30 13:56:12 pho Exp $
 
 SHA1 (heng-graf-16x16.tar.gz) = 27166a215209f3ec0f2c4a61761fce5d802cddc1
 RMD160 (heng-graf-16x16.tar.gz) = eb2e8034d43709b9b7e06b69eac4b6a84d026cc1
@@ -11,6 +11,7 @@ Size (hengband-1.6.2.tar.bz2) = 2029169 
 SHA1 (patch-lib_Makefile.am) = 35a066930834f9ea23c6ce9fb2a088c7ec86c28a
 SHA1 (patch-lib_xtra_graf_Makefile.am) = 71d8e17bfc39a689ab30f3a02b5f052687bcf1db
 SHA1 (patch-src_Makefile.am) = 57f08de8ecbd8083917fe36436286b7b1aef307c
+SHA1 (patch-src_cmd3.c) = a573a317663133bbbd0b6119736d7c27ae67c1a3
 SHA1 (patch-src_h-type.h) = b9327f3110d831a2b5ce711450fe73e0d093e5ad
 SHA1 (patch-src_init2.c) = fe7064f23bce494ced5a524f2a60117ac0ef56ff
 SHA1 (patch-src_main-gcu.c) = 8bffb440de8beb18a45b9257a95e33e033260036

Added files:

Index: pkgsrc/games/hengband/patches/patch-src_cmd3.c
diff -u /dev/null pkgsrc/games/hengband/patches/patch-src_cmd3.c:1.1
--- /dev/null   Thu Jan 30 13:56:12 2020
+++ pkgsrc/games/hengband/patches/patch-src_cmd3.c      Thu Jan 30 13:56:12 2020
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_cmd3.c,v 1.1 2020/01/30 13:56:12 pho Exp $
+
+Use the correct format specifier.
+
+Local Variables:
+coding: euc-jp
+End:
+
+--- src/cmd3.c.orig    2004-03-28 05:05:36.000000000 +0000
++++ src/cmd3.c
+@@ -45,12 +45,12 @@ void do_cmd_inven(void)
+       item_tester_full = FALSE;
+ 
+ #ifdef JP
+-      sprintf(out_val, "���ʪ�� ��� %3d.%1d kg (�³���%ld%%) ���ޥ��: ",
++      sprintf(out_val, "���ʪ�� ��� %3d.%1d kg (�³���%d%%) ���ޥ��: ",
+           lbtokg1(p_ptr->total_weight) , lbtokg2(p_ptr->total_weight) ,
+           (p_ptr->total_weight * 100) / ((adj_str_wgt[p_ptr->stat_ind[A_STR]] * (p_ptr->pclass == CLASS_BERSERKER ? 150 : 100)) 
+ / 2));
+ #else
+-      sprintf(out_val, "Inventory: carrying %d.%d pounds (%ld%% of capacity). Command: ",
++      sprintf(out_val, "Inventory: carrying %d.%d pounds (%d%% of capacity). Command: ",
+           (int)(p_ptr->total_weight / 10), (int)(p_ptr->total_weight % 10),
+           (p_ptr->total_weight * 100) / ((adj_str_wgt[p_ptr->stat_ind[A_STR]] * (p_ptr->pclass == CLASS_BERSERKER ? 150 : 100)) / 2));
+ #endif
+@@ -120,12 +120,12 @@ void do_cmd_equip(void)
+ 
+       /* Build a prompt */
+ #ifdef JP
+-      sprintf(out_val, "���� ��� %3d.%1d kg (�³���%ld%%) ���ޥ��: ",
++      sprintf(out_val, "���� ��� %3d.%1d kg (�³���%d%%) ���ޥ��: ",
+           lbtokg1(p_ptr->total_weight) , lbtokg2(p_ptr->total_weight) ,
+           (p_ptr->total_weight * 100) / ((adj_str_wgt[p_ptr->stat_ind[A_STR]] * (p_ptr->pclass == CLASS_BERSERKER ? 150 : 100)) 
+ / 2));
+ #else
+-      sprintf(out_val, "Equipment: carrying %d.%d pounds (%ld%% of capacity). Command: ",
++      sprintf(out_val, "Equipment: carrying %d.%d pounds (%d%% of capacity). Command: ",
+           (int)(p_ptr->total_weight / 10), (int)(p_ptr->total_weight % 10),
+           (p_ptr->total_weight * 100) / ((adj_str_wgt[p_ptr->stat_ind[A_STR]] * (p_ptr->pclass == CLASS_BERSERKER ? 150 : 100)) / 2));
+ #endif