Received: by mail.netbsd.org (Postfix, from userid 605) id 8EA4D84E1B; Wed, 11 Mar 2020 15:01:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 18E6484E19 for ; Wed, 11 Mar 2020 15:01:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id zEJ1J-L3K79r for ; Wed, 11 Mar 2020 15:01:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3E9CF84D5A for ; Wed, 11 Mar 2020 15:01:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 387DDFB27; Wed, 11 Mar 2020 15:01:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158393891431140" MIME-Version: 1.0 Date: Wed, 11 Mar 2020 15:01:54 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/games/hengband To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20200311150154.387DDFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158393891431140 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Wed Mar 11 15:01:54 UTC 2020 Modified Files: pkgsrc/games/hengband: Makefile PLIST distinfo pkgsrc/games/hengband/patches: patch-src_Makefile.am patch-src_cmd3.c Removed Files: pkgsrc/games/hengband/patches: patch-src_h-type.h patch-src_main-gcu.c Log Message: Update to hengband-2.2.1r The game is supposed to be able to automatically convert old save files, although the converter may not be fully tested. The list of changes from 1.6.2 is too long to paste here: * 1.7.2: https://hengband.osdn.jp/history/history1.7.2.html * 2.0.0: https://hengband.osdn.jp/history/history2.0.0.html * 2.1.0: https://hengband.osdn.jp/history/history2.1.0.html * 2.1.1: https://hengband.osdn.jp/history/history2.1.1.html * 2.1.2: https://hengband.osdn.jp/history/history2.1.2.html * 2.1.3: https://hengband.osdn.jp/history/history2.1.3.html * 2.1.4: https://hengband.osdn.jp/history/history2.1.4.html * 2.1.5: https://hengband.osdn.jp/history/history2.1.5.html * 2.2.0: https://hengband.osdn.jp/history/history2.2.0.html * 2.2.1: https://hengband.osdn.jp/history/history2.2.1.html To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/hengband/Makefile \ pkgsrc/games/hengband/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/hengband/PLIST cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/hengband/patches/patch-src_Makefile.am \ pkgsrc/games/hengband/patches/patch-src_cmd3.c cvs rdiff -u -r1.1 -r0 pkgsrc/games/hengband/patches/patch-src_h-type.h \ pkgsrc/games/hengband/patches/patch-src_main-gcu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158393891431140 Content-Disposition: inline Content-Length: 7558 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=utf-8 Modified files: Index: pkgsrc/games/hengband/Makefile diff -u pkgsrc/games/hengband/Makefile:1.2 pkgsrc/games/hengband/Makefile:1.3 --- pkgsrc/games/hengband/Makefile:1.2 Thu Jan 30 13:56:12 2020 +++ pkgsrc/games/hengband/Makefile Wed Mar 11 15:01:53 2020 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2020/01/30 13:56:12 pho Exp $ +# $NetBSD: Makefile,v 1.3 2020/03/11 15:01:53 pho Exp $ -DISTNAME= hengband-1.6.2 -PKGREVISION= 1 +DISTNAME= hengband-2.2.1r CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_OSDN:=hengband/10331/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_OSDN:=hengband/72520/} +EXTRACT_SUFX= .tar.gz + +EXTRACT_DIR= ${WRKSRC} MAINTAINER= pho@cielonegro.org HOMEPAGE= http://hengband.sourceforge.jp/en/index.html Index: pkgsrc/games/hengband/distinfo diff -u pkgsrc/games/hengband/distinfo:1.2 pkgsrc/games/hengband/distinfo:1.3 --- pkgsrc/games/hengband/distinfo:1.2 Thu Jan 30 13:56:12 2020 +++ pkgsrc/games/hengband/distinfo Wed Mar 11 15:01:53 2020 @@ -1,17 +1,15 @@ -$NetBSD: distinfo,v 1.2 2020/01/30 13:56:12 pho Exp $ +$NetBSD: distinfo,v 1.3 2020/03/11 15:01:53 pho Exp $ SHA1 (heng-graf-16x16.tar.gz) = 27166a215209f3ec0f2c4a61761fce5d802cddc1 RMD160 (heng-graf-16x16.tar.gz) = eb2e8034d43709b9b7e06b69eac4b6a84d026cc1 SHA512 (heng-graf-16x16.tar.gz) = 4641e12122b13015d03f8a7f3dcba72797495451f15c04eab2d6ea1fd57d082e11eea3115056c2a2203032db973bea01476ecb2389a7a730e98e972c41756dfa Size (heng-graf-16x16.tar.gz) = 381027 bytes -SHA1 (hengband-1.6.2.tar.bz2) = 32156fe9363309ba75273d6c8ebb8f2043c97129 -RMD160 (hengband-1.6.2.tar.bz2) = 59f41666dd1724f03739d5fa078e537467dbf36e -SHA512 (hengband-1.6.2.tar.bz2) = 24c67f00556d7899b4f18f3071c4bd50bc754566c4c4736c18248ced243b1332e6c84381250c1a59358e7a914e5d62db05c47ab0921bcf40fbd6cfe4b6717520 -Size (hengband-1.6.2.tar.bz2) = 2029169 bytes +SHA1 (hengband-2.2.1r.tar.gz) = 9267909474496e180adf799c59cada62eeea0753 +RMD160 (hengband-2.2.1r.tar.gz) = 5d8d13da739bbe8bbc0da6d654331e6fb986aac8 +SHA512 (hengband-2.2.1r.tar.gz) = ac92922ed193498fd2020bb5c543b118b1f670e03a5af7718328ab86a667cf8273ddd693966026cba328ec767efdc1ac81ec66ac392328cc16dec469828af9f9 +Size (hengband-2.2.1r.tar.gz) = 2976734 bytes 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_Makefile.am) = b71e0e4cc828c98d5bd4d89e3b263a406c0c8620 +SHA1 (patch-src_cmd3.c) = d2e4e61524b125069a5709462add001a7e7388ff SHA1 (patch-src_init2.c) = fe7064f23bce494ced5a524f2a60117ac0ef56ff -SHA1 (patch-src_main-gcu.c) = 8bffb440de8beb18a45b9257a95e33e033260036 Index: pkgsrc/games/hengband/PLIST diff -u pkgsrc/games/hengband/PLIST:1.1 pkgsrc/games/hengband/PLIST:1.2 --- pkgsrc/games/hengband/PLIST:1.1 Fri Jan 24 13:33:32 2020 +++ pkgsrc/games/hengband/PLIST Wed Mar 11 15:01:53 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2020/01/24 13:33:32 pho Exp $ +@comment $NetBSD: PLIST,v 1.2 2020/03/11 15:01:53 pho Exp $ bin/hengband libdata/hengband/edit/a_info.txt libdata/hengband/edit/d_info.txt @@ -117,6 +117,7 @@ libdata/hengband/help/defend.hlp libdata/hengband/help/defend.txt libdata/hengband/help/dungeon.hlp libdata/hengband/help/dungeon.txt +libdata/hengband/help/editor.txt libdata/hengband/help/gambling.txt libdata/hengband/help/general.hlp libdata/hengband/help/general.txt @@ -139,6 +140,7 @@ libdata/hengband/help/jdefend.hlp libdata/hengband/help/jdefend.txt libdata/hengband/help/jdungeon.hlp libdata/hengband/help/jdungeon.txt +libdata/hengband/help/jeditor.txt libdata/hengband/help/jgambling.txt libdata/hengband/help/jgeneral.hlp libdata/hengband/help/jgeneral.txt Index: pkgsrc/games/hengband/patches/patch-src_Makefile.am diff -u pkgsrc/games/hengband/patches/patch-src_Makefile.am:1.1 pkgsrc/games/hengband/patches/patch-src_Makefile.am:1.2 --- pkgsrc/games/hengband/patches/patch-src_Makefile.am:1.1 Fri Jan 24 13:33:33 2020 +++ pkgsrc/games/hengband/patches/patch-src_Makefile.am Wed Mar 11 15:01:54 2020 @@ -1,13 +1,13 @@ -$NetBSD: patch-src_Makefile.am,v 1.1 2020/01/24 13:33:33 pho Exp $ +$NetBSD: patch-src_Makefile.am,v 1.2 2020/03/11 15:01:54 pho Exp $ Support user-destdir build ---- src/Makefile.am.orig 2003-11-03 02:56:44.000000000 +0000 +--- src/Makefile.am.orig 2020-03-11 14:25:21.422460504 +0000 +++ src/Makefile.am -@@ -29,9 +29,3 @@ EXTRA_hengband_SOURCES = \ - main-dos.c main-ibm.c \ - makefile.bcc makefile.std makefile.dos makefile.ibm \ - readdib.c wall.bmp +@@ -33,9 +33,3 @@ EXTRA_hengband_SOURCES = \ + + COMPILE = ./gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - -install-exec-hook: -if SET_GID Index: pkgsrc/games/hengband/patches/patch-src_cmd3.c diff -u pkgsrc/games/hengband/patches/patch-src_cmd3.c:1.1 pkgsrc/games/hengband/patches/patch-src_cmd3.c:1.2 --- pkgsrc/games/hengband/patches/patch-src_cmd3.c:1.1 Thu Jan 30 13:56:12 2020 +++ pkgsrc/games/hengband/patches/patch-src_cmd3.c Wed Mar 11 15:01:54 2020 @@ -1,40 +1,15 @@ -$NetBSD: patch-src_cmd3.c,v 1.1 2020/01/30 13:56:12 pho Exp $ +$NetBSD: patch-src_cmd3.c,v 1.2 2020/03/11 15:01:54 pho Exp $ -Use the correct format specifier. +Fix an error on 64-bits platforms. -Local Variables: -coding: euc-jp -End: - ---- src/cmd3.c.orig 2004-03-28 05:05:36.000000000 +0000 +--- src/cmd3.c.orig 2020-03-11 14:36:27.328921818 +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)); +@@ -53,7 +53,7 @@ void do_cmd_inven(void) #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: ", + sprintf(out_val, "Inventory: carrying %d.%d pounds (%ld%% 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)); +- (p_ptr->total_weight * 100) / weight_limit()); ++ (long int)((p_ptr->total_weight * 100) / weight_limit())); #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 + --_----------=_158393891431140--