Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1525989171200230"
MIME-Version: 1.0
Date: Thu, 10 May 2018 21:52:51 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/devel/py-game
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20180510215251.55EFCFBEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1525989171200230
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Thu May 10 21:52:51 UTC 2018

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

Log Message:
py-game: fix build with latest freetype2.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-game/distinfo
cvs rdiff -u -r1.2 -r1.3 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.


--_----------=_1525989171200230
Content-Disposition: inline
Content-Length: 2783
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/py-game/distinfo
diff -u pkgsrc/devel/py-game/distinfo:1.8 pkgsrc/devel/py-game/distinfo:1.9
--- pkgsrc/devel/py-game/distinfo:1.8	Fri Dec 22 19:05:44 2017
+++ pkgsrc/devel/py-game/distinfo	Thu May 10 21:52:51 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2017/12/22 19:05:44 he Exp $
+$NetBSD: distinfo,v 1.9 2018/05/10 21:52:51 wiz 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) = 1cce6e0d55777dd8e7cdd3b8d734f00fc8a6decf
+SHA1 (patch-config__unix.py) = 0572bf12ce06ffd7d9a762a7718d1330715af9ec

Index: pkgsrc/devel/py-game/patches/patch-config__unix.py
diff -u pkgsrc/devel/py-game/patches/patch-config__unix.py:1.2 pkgsrc/devel/py-game/patches/patch-config__unix.py:1.3
--- pkgsrc/devel/py-game/patches/patch-config__unix.py:1.2	Fri Dec 22 19:05:44 2017
+++ pkgsrc/devel/py-game/patches/patch-config__unix.py	Thu May 10 21:52:51 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-config__unix.py,v 1.2 2017/12/22 19:05:44 he Exp $
+$NetBSD: patch-config__unix.py,v 1.3 2018/05/10 21:52:51 wiz Exp $
 
 Detect X11R6 or X11R7; avoid localbase overriding search...
 Disable portmidi and porttime; porttime is a part of portmidi
@@ -18,7 +18,7 @@ Disable portmidi and porttime; porttime 
  if 'ORIGLIBDIRS' in os.environ and os.environ['ORIGLIBDIRS'] != "":
      origlibdirs = os.environ['ORIGLIBDIRS'].split(":")
  
-@@ -169,18 +169,15 @@ def main():
+@@ -169,20 +169,17 @@ def main():
          else:
              return Dependency('PORTTIME', 'porttime.h', 'libporttime.so', ['porttime'])
  
@@ -35,9 +35,13 @@ Disable portmidi and porttime; porttime 
          Dependency('SCRAP', '', 'libX11', ['X11']),
 -        Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi']),
 -        porttime_dep,
-         DependencyProg('FREETYPE', 'FREETYPE_CONFIG', 'freetype-config', '2.0',
-                        ['freetype'], '--ftversion'),
+-        DependencyProg('FREETYPE', 'FREETYPE_CONFIG', 'freetype-config', '2.0',
+-                       ['freetype'], '--ftversion'),
++        DependencyProg('FREETYPE', 'FREETYPE_CONFIG', 'pkg-config freetype2', '2.0',
++                       ['freetype'], '--modversion'),
          #Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
+     ]
+     if not DEPS[0].found:
 @@ -192,11 +189,11 @@ def main():
      libdirs = []
      incdirs += ["/usr"+d for d in origincdirs]


--_----------=_1525989171200230--