CVS commit: pkgsrc/devel/py-game

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jun 22 11:33:41 UTC 2020

Modified Files:
        pkgsrc/devel/py-game: distinfo
        pkgsrc/devel/py-game/patches: patch-buildconfig_config__unix.py

Log Message:
py-game: Fix X11_TYPE=native and python27 build under NetBSD 9

* Detect libX11 library in /usr/X11R7 too.
* And this change does not break python37 build.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-game/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-game/distinfo
diff -u pkgsrc/devel/py-game/distinfo:1.10 pkgsrc/devel/py-game/distinfo:1.11
--- pkgsrc/devel/py-game/distinfo:1.10  Thu Jun  6 21:46:11 2019
+++ pkgsrc/devel/py-game/distinfo       Mon Jun 22 11:33:41 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2019/06/06 21:46:11 adam Exp $
+$NetBSD: distinfo,v 1.11 2020/06/22 11:33:41 ryoon Exp $
 
 SHA1 (pygame-1.9.6.tar.gz) = d055cf1e37d8c340579e2d745e8ca4c9397767da
 RMD160 (pygame-1.9.6.tar.gz) = abe4dc7b5e350617048474a3d168d9d1d09eae2b
@@ -7,4 +7,4 @@ Size (pygame-1.9.6.tar.gz) = 3223131 byt
 SHA1 (patch-buildconfig_Setup.SDL1.in) = 2f4b60f933952b67092fabfe4c84d7525b9d0338
 SHA1 (patch-buildconfig_Setup.SDL2.in) = 9b33e714df4319622aac66ced2b3ce36f879dc8c
 SHA1 (patch-buildconfig_config__darwin.py) = c1e8ac90619fce59e250a33175a546cd235c0fe1
-SHA1 (patch-buildconfig_config__unix.py) = 31185536cbc25550df3441607ec278c533a28f1f
+SHA1 (patch-buildconfig_config__unix.py) = 1072834d9eb38170a4bc650c9dea0992f3e0aba8

Index: pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py
diff -u pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py:1.1 pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py:1.2
--- pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py:1.1  Thu Jun  6 21:46:12 2019
+++ pkgsrc/devel/py-game/patches/patch-buildconfig_config__unix.py      Mon Jun 22 11:33:41 2020
@@ -1,12 +1,12 @@
-$NetBSD: patch-buildconfig_config__unix.py,v 1.1 2019/06/06 21:46:12 adam Exp $
+$NetBSD: patch-buildconfig_config__unix.py,v 1.2 2020/06/22 11:33:41 ryoon Exp $
 
 Detect X11R6 or X11R7; avoid localbase overriding search.
 Use correct libpng.
 Disable portmidi and porttime; porttime is a part of portmidi.
 
---- buildconfig/config_unix.py.orig    2019-06-06 17:38:22.000000000 +0000
+--- buildconfig/config_unix.py.orig    2019-04-25 06:14:17.000000000 +0000
 +++ buildconfig/config_unix.py
-@@ -148,8 +148,8 @@ def main(sdl2=False):
+@@ -148,12 +148,12 @@ def main(sdl2=False):
  
      #these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
      if sdl2:
@@ -17,6 +17,11 @@ Disable portmidi and porttime; porttime 
                         '/lib/i386-linux-gnu', '/lib/x86_64-linux-gnu']
      else:
          origincdirs = ['/include', '/include/SDL', '/include/SDL']
+-        origlibdirs = ['/lib','/lib64','/X11R6/lib']
++        origlibdirs = ['/lib','/lib64','/X11R6/lib','/X11R7/lib']
+     if 'ORIGLIBDIRS' in os.environ and os.environ['ORIGLIBDIRS'] != "":
+         origlibdirs = os.environ['ORIGLIBDIRS'].split(":")
+ 
 @@ -216,13 +216,12 @@ def main(sdl2=False):
              #Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
          ]