Received: by mail.netbsd.org (Postfix, from userid 605) id C95FD84EC9; Fri, 27 Aug 2021 10:47:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0EA4E84EC4 for ; Fri, 27 Aug 2021 10:47:41 +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 g2vqGTMQXDDi for ; Fri, 27 Aug 2021 10:47:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7712984CDC for ; Fri, 27 Aug 2021 10:47:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 70593FA97; Fri, 27 Aug 2021 10:47:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_163006126032400" MIME-Version: 1.0 Date: Fri, 27 Aug 2021 10:47:40 +0000 From: "Michael Baeuerle" Subject: CVS commit: pkgsrc/games/woof To: pkgsrc-changes@NetBSD.org Reply-To: micha@netbsd.org X-Mailer: log_accum Message-Id: <20210827104740.70593FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_163006126032400 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: micha Date: Fri Aug 27 10:47:40 UTC 2021 Modified Files: pkgsrc/games/woof: distinfo pkgsrc/games/woof/patches: patch-Source_d__iwad.c patch-Source_wi__stuff.c Log Message: games/woof: Update comment section of patches. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 pkgsrc/games/woof/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/woof/patches/patch-Source_d__iwad.c \ pkgsrc/games/woof/patches/patch-Source_wi__stuff.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_163006126032400 Content-Disposition: inline Content-Length: 2558 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/woof/distinfo diff -u pkgsrc/games/woof/distinfo:1.22 pkgsrc/games/woof/distinfo:1.23 --- pkgsrc/games/woof/distinfo:1.22 Mon Aug 23 14:27:43 2021 +++ pkgsrc/games/woof/distinfo Fri Aug 27 10:47:40 2021 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.22 2021/08/23 14:27:43 micha Exp $ +$NetBSD: distinfo,v 1.23 2021/08/27 10:47:40 micha Exp $ SHA1 (woof_6.3.1.tar.gz) = 03336e19759847187fe1e2ae0a2893577a90782d RMD160 (woof_6.3.1.tar.gz) = 2186d9d90c888b68d92776723ce78fefae0b578f SHA512 (woof_6.3.1.tar.gz) = aad2a66b36480012ff01d25b6692d0f0d6048d90f5ecf1e0de081a2423884afdedc9e1fd97dec621d2641033907b528fa05481b9d7eeb6e96e4cc226651f8259 Size (woof_6.3.1.tar.gz) = 1986946 bytes -SHA1 (patch-Source_d__iwad.c) = fc897f508e31653495bfed26152a7e6d70021089 -SHA1 (patch-Source_wi__stuff.c) = 94d16305a725ac269e37038d2a8ce3c969a0d2ee +SHA1 (patch-Source_d__iwad.c) = a58291e4717699efaefa3e56294666cfc6e65c75 +SHA1 (patch-Source_wi__stuff.c) = 656f25d82a9125f109800ebc6544d6d729d26947 Index: pkgsrc/games/woof/patches/patch-Source_d__iwad.c diff -u pkgsrc/games/woof/patches/patch-Source_d__iwad.c:1.1 pkgsrc/games/woof/patches/patch-Source_d__iwad.c:1.2 --- pkgsrc/games/woof/patches/patch-Source_d__iwad.c:1.1 Mon May 11 10:46:12 2020 +++ pkgsrc/games/woof/patches/patch-Source_d__iwad.c Fri Aug 27 10:47:40 2021 @@ -1,6 +1,7 @@ -$NetBSD: patch-Source_d__iwad.c,v 1.1 2020/05/11 10:46:12 micha Exp $ +$NetBSD: patch-Source_d__iwad.c,v 1.2 2021/08/27 10:47:40 micha Exp $ Add pkgsrc ${PREFIX}/share/doom to WAD file search path. +Patch is not suitable for upstream. --- Source/d_iwad.c.orig 2020-04-14 06:39:44.000000000 +0000 +++ Source/d_iwad.c Index: pkgsrc/games/woof/patches/patch-Source_wi__stuff.c diff -u pkgsrc/games/woof/patches/patch-Source_wi__stuff.c:1.1 pkgsrc/games/woof/patches/patch-Source_wi__stuff.c:1.2 --- pkgsrc/games/woof/patches/patch-Source_wi__stuff.c:1.1 Mon Aug 23 14:27:43 2021 +++ pkgsrc/games/woof/patches/patch-Source_wi__stuff.c Fri Aug 27 10:47:40 2021 @@ -1,4 +1,4 @@ -$NetBSD: patch-Source_wi__stuff.c,v 1.1 2021/08/23 14:27:43 micha Exp $ +$NetBSD: patch-Source_wi__stuff.c,v 1.2 2021/08/27 10:47:40 micha Exp $ Workaround for namespace clash on SmartOS: @@ -6,6 +6,8 @@ Workaround for namespace clash on SmartO 366 | static patch_t* time; | ^~~~ +Already merged upstream. Remove this patch for next release. + --- Source/wi_stuff.c.orig 2021-08-13 13:18:32.000000000 +0000 +++ Source/wi_stuff.c @@ -363,7 +363,7 @@ static patch_t* items; --_----------=_163006126032400--