Received: by mail.netbsd.org (Postfix, from userid 605) id 7E69884E09; Sat, 20 Jun 2020 20:57:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 06B4484D9E for ; Sat, 20 Jun 2020 20:57:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Y1IVpzdhzqm4 for ; Sat, 20 Jun 2020 20:57:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 74B7084D33 for ; Sat, 20 Jun 2020 20:57:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 62F12FB28; Sat, 20 Jun 2020 20:57:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159268662278960" MIME-Version: 1.0 Date: Sat, 20 Jun 2020 20:57:02 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/games/powder-toy To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200620205702.62F12FB28@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. --_----------=_159268662278960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Jun 20 20:57:02 UTC 2020 Modified Files: pkgsrc/games/powder-toy: distinfo pkgsrc/games/powder-toy/patches: patch-SConscript Log Message: powder-toy: Use pkgconf to find libX11 to avoid rpath problems To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/powder-toy/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/powder-toy/patches/patch-SConscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_159268662278960 Content-Disposition: inline Content-Length: 2557 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/powder-toy/distinfo diff -u pkgsrc/games/powder-toy/distinfo:1.1 pkgsrc/games/powder-toy/distinfo:1.2 --- pkgsrc/games/powder-toy/distinfo:1.1 Sat Apr 13 12:08:04 2019 +++ pkgsrc/games/powder-toy/distinfo Sat Jun 20 20:57:02 2020 @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.1 2019/04/13 12:08:04 nia Exp $ +$NetBSD: distinfo,v 1.2 2020/06/20 20:57:02 nia Exp $ SHA1 (powder-toy-94.1.tar.gz) = 14249c100e38971444bb96fd31ff26fd24cc2190 RMD160 (powder-toy-94.1.tar.gz) = 88671b2007f2f1a2ecc3a079cc961d3475742f56 SHA512 (powder-toy-94.1.tar.gz) = ecda20d206298ff605a3a361255a0766caceece4d268355e4dbf1d56ef78bd7c43e54560d1ad71f29a8c3572d66eca875d5539e1006b260e029561ab91bf34d4 Size (powder-toy-94.1.tar.gz) = 1254309 bytes -SHA1 (patch-SConscript) = e1b11abaf9100b2a509cefbfa713baf3c11a2c5a +SHA1 (patch-SConscript) = 73cb6c1efb0bfe7db2f8e67c3b8cff6aa93da313 SHA1 (patch-resources_powder.appdata.xml) = e687b33b50c286ec2858bdf2024e201df4b8be8e SHA1 (patch-resources_powder.desktop) = 9c77feb557afbd2e5ad4fb0b5f15be1809214555 SHA1 (patch-src_Config.h) = 01d9cced7a87b6f33b1974bf51dd9d93949d41a2 +SHA1 (patch-src_lua_luascripts_eventcompat.lua) = 8d32490978be03c85ccd3131e52fae0b750b34af Index: pkgsrc/games/powder-toy/patches/patch-SConscript diff -u pkgsrc/games/powder-toy/patches/patch-SConscript:1.1 pkgsrc/games/powder-toy/patches/patch-SConscript:1.2 --- pkgsrc/games/powder-toy/patches/patch-SConscript:1.1 Sat Apr 13 12:08:04 2019 +++ pkgsrc/games/powder-toy/patches/patch-SConscript Sat Jun 20 20:57:02 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-SConscript,v 1.1 2019/04/13 12:08:04 nia Exp $ +$NetBSD: patch-SConscript,v 1.2 2020/06/20 20:57:02 nia Exp $ Support NetBSD. @@ -58,7 +58,7 @@ Support NetBSD. if not conf.CheckLib('GL'): FatalError("libGL not found or not installed") try: -@@ -363,7 +360,7 @@ def findLibs(env, conf): +@@ -363,10 +360,12 @@ def findLibs(env, conf): if not conf.CheckFramework("OpenGL"): FatalError("OpenGL framework not found or not installed") @@ -67,7 +67,12 @@ Support NetBSD. if not conf.CheckLib('X11'): FatalError("X11 development library not found or not installed") -@@ -418,7 +415,7 @@ if platform == "Windows": ++ env.ParseConfig('pkg-config --libs x11') ++ + if not conf.CheckLib('rt'): + FatalError("librt not found or not installed") + elif platform == "Windows": +@@ -418,7 +417,7 @@ if platform == "Windows": env.Append(LINKFLAGS=['/NODEFAULTLIB:msvcrtd.lib']) else: env.Append(LINKFLAGS=['-mwindows']) --_----------=_159268662278960--