CVS commit: pkgsrc/games/powder-toy

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

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.

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'])