CVS commit: pkgsrc/devel/py-game

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Fri Dec 22 19:05:44 UTC 2017

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

Log Message:
If localbase is set, avoid nulling out the search path (use +=).
Also search for X11 includes in X11R6/include and X11R7/include.
Fixes the configure phase on NetBSD/amd64 with native X11.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/py-game/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-game/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-game/patches/patch-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/Makefile
diff -u pkgsrc/devel/py-game/Makefile:1.35 pkgsrc/devel/py-game/Makefile:1.36
--- pkgsrc/devel/py-game/Makefile:1.35  Tue Jun 20 17:00:07 2017
+++ pkgsrc/devel/py-game/Makefile       Fri Dec 22 19:05:44 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2017/06/20 17:00:07 adam Exp $
+# $NetBSD: Makefile,v 1.36 2017/12/22 19:05:44 he Exp $
 
 DISTNAME=      pygame-1.9.3
+PKGREVISION=   1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_PYPI:=P/Pygame/}

Index: pkgsrc/devel/py-game/distinfo
diff -u pkgsrc/devel/py-game/distinfo:1.7 pkgsrc/devel/py-game/distinfo:1.8
--- pkgsrc/devel/py-game/distinfo:1.7   Tue Jun 20 17:00:07 2017
+++ pkgsrc/devel/py-game/distinfo       Fri Dec 22 19:05:44 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2017/06/20 17:00:07 adam Exp $
+$NetBSD: distinfo,v 1.8 2017/12/22 19:05:44 he Exp $
 
 SHA1 (pygame-1.9.3.tar.gz) = b3ef126f0baea3bd0986fddebba82b6b13f6f282
 RMD160 (pygame-1.9.3.tar.gz) = ac95b8c2afa5076746227a6d1ae9c200d14d5757
@@ -7,4 +7,4 @@ Size (pygame-1.9.3.tar.gz) = 2974541 byt
 SHA1 (patch-Setup.in) = 71659c0150ec53b063cd47531b8b0a93ea671ceb
 SHA1 (patch-Setup__Unix.in) = 03fb45137f018761e6b9f19de056c0fdff5d153d
 SHA1 (patch-config__darwin.py) = c39c00b3252195dcf4476574e9b8439acf66c0ab
-SHA1 (patch-config__unix.py) = b02951432fb41d1e9cffd6d85de877b710e39b28
+SHA1 (patch-config__unix.py) = 1cce6e0d55777dd8e7cdd3b8d734f00fc8a6decf

Index: pkgsrc/devel/py-game/patches/patch-config__unix.py
diff -u pkgsrc/devel/py-game/patches/patch-config__unix.py:1.1 pkgsrc/devel/py-game/patches/patch-config__unix.py:1.2
--- pkgsrc/devel/py-game/patches/patch-config__unix.py:1.1      Tue Jun 20 17:00:07 2017
+++ pkgsrc/devel/py-game/patches/patch-config__unix.py  Fri Dec 22 19:05:44 2017
@@ -1,15 +1,19 @@
-$NetBSD: patch-config__unix.py,v 1.1 2017/06/20 17:00:07 adam Exp $
+$NetBSD: patch-config__unix.py,v 1.2 2017/12/22 19:05:44 he Exp $
 
-Detect X11R7
+Detect X11R6 or X11R7; avoid localbase overriding search...
 Disable portmidi and porttime; porttime is a part of portmidi
 
 --- config_unix.py.orig        2016-08-20 20:28:55.000000000 +0000
 +++ config_unix.py
-@@ -16,7 +16,7 @@ localbase = os.environ.get('LOCALBASE', 
+@@ -14,9 +14,9 @@ configcommand = os.environ.get('SDL_CONF
+ configcommand = configcommand + ' --version --cflags --libs'
+ localbase = os.environ.get('LOCALBASE', '')
  
- #these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
- origincdirs = ['/include', '/include/SDL', '/include/SDL']
+-#these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
+-origincdirs = ['/include', '/include/SDL', '/include/SDL']
 -origlibdirs = ['/lib','/lib64','/X11R6/lib']
++#these get prefixes with '/usr' and '/usr/pkg' or the $LOCALBASE
++origincdirs = ['/include', '/include/SDL', '/include/SDL', '/X11R6/include', '/X11R7/include']
 +origlibdirs = ['/lib','/lib64','/X11R6/lib','/X11R7/lib']
  if 'ORIGLIBDIRS' in os.environ and os.environ['ORIGLIBDIRS'] != "":
      origlibdirs = os.environ['ORIGLIBDIRS'].split(":")
@@ -34,3 +38,19 @@ Disable portmidi and porttime; porttime 
          DependencyProg('FREETYPE', 'FREETYPE_CONFIG', 'freetype-config', '2.0',
                         ['freetype'], '--ftversion'),
          #Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
+@@ -192,11 +189,11 @@ def main():
+     libdirs = []
+     incdirs += ["/usr"+d for d in origincdirs]
+     libdirs += ["/usr"+d for d in origlibdirs]
+-    incdirs += ["/usr/local"+d for d in origincdirs]
+-    libdirs += ["/usr/local"+d for d in origlibdirs]
++    incdirs += ["/usr/pkg"+d for d in origincdirs]
++    libdirs += ["/usr/pkg"+d for d in origlibdirs]
+     if localbase:
+-        incdirs = [localbase+d for d in origincdirs]
+-        libdirs = [localbase+d for d in origlibdirs]
++        incdirs += [localbase+d for d in origincdirs]
++        libdirs += [localbase+d for d in origlibdirs]
+ 
+     for arg in DEPS[0].cflags.split():
+         if arg[:2] == '-I':