<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/98fa4ac18784081ec04873989b96f5afdc2a2a59">https://github.com/macports/macports-ports/commit/98fa4ac18784081ec04873989b96f5afdc2a2a59</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 98fa4ac  py-game: update to 1.9.5
</span>98fa4ac is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 98fa4ac18784081ec04873989b96f5afdc2a2a59
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Apr 9 05:23:31 2019 +1000

<span style='display:block; white-space:pre;color:#404040;'>    py-game: update to 1.9.5
</span>---
 python/py-game/Portfile                          | 34 ++++++++++------
 python/py-game/files/patch-config_darwin.py.diff | 52 ++++++++++++++----------
 python/py-game/files/patch-disable_portmidi.diff | 22 +++++-----
 3 files changed, 64 insertions(+), 44 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-game/Portfile b/python/py-game/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96e9952..ff1950d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-game/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-game/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem      1.0
</span> PortGroup       python 1.0
 
 name            py-game
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version         1.9.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision        1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version         1.9.5
</span> categories-append     devel multimedia graphics
 platforms       darwin
 license         LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,28 +21,35 @@ homepage        http://www.pygame.org/
</span> python.rootname Pygame
 master_sites    pypi:P/Pygame
 distname        pygame-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums       rmd160 8ff2ae8d1846cf7df237cf2350b1652be097d337 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                sha256 700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums       rmd160 07b56c042e99558b1f0fbba1c44eea7920f4f786 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                sha256 d15e7238015095a12c19379565a66285e989fdcb3807ec360b27338cd8bdaf05
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 26 27 35 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36 37
</span> 
 if {$subport ne $name} {
     patchfiles  patch-config_darwin.py.diff \
                 patch-disable_portmidi.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:libsdl_mixer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:libsdl_image \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:libsdl_ttf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib port:py${python.version}-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset sdl2]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:libsdl2_mixer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:libsdl2_image \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:libsdl2_ttf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:libsdl_mixer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:libsdl_image \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:libsdl_ttf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     use_configure   yes
     configure.env-append LOCALBASE=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.cmd   ${python.bin} config.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.cmd   ${python.bin} setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args  -config
</span> 
     post-destroot   {
         copy {*}[glob ${worksrcpath}/docs/*] ${destroot}${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        xinstall -m 644 -W ${worksrcpath} install.html LGPL WHATSNEW \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            readme.html README.rst ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -m 644 -W ${worksrcpath} README.rst \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${destroot}${prefix}/share/doc/${subport}
</span>     }
 
     variant portmidi description {Enable MIDI support using portmidi} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,5 +57,9 @@ if {$subport ne $name} {
</span>         patchfiles-delete patch-disable_portmidi.diff
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant sdl2 description {Use SDL 2 (experimental)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append   -sdl2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     livecheck.type  none
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-game/files/patch-config_darwin.py.diff b/python/py-game/files/patch-config_darwin.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b1569d..df7fc02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-game/files/patch-config_darwin.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-game/files/patch-config_darwin.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +1,43 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config_darwin.py.orig  2016-08-21 06:28:55.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config_darwin.py       2017-07-08 16:04:22.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from distutils.sysconfig import get_python_inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from config_unix import DependencyProg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- buildconfig/config_darwin.py.orig      2019-03-29 19:24:30.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ buildconfig/config_darwin.py   2019-04-09 04:37:02.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,6 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     from buildconfig.config_unix import DependencyProg
</span>  
 +localbase = os.environ.get('LOCALBASE', '')
  
  try:
      basestring_ = basestring
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,7 +108,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          FrameworkDependency('IMAGE', 'SDL_image.h', 'libSDL_image', 'SDL_image')],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     [Dependency('MIXER', ['SDL_mixer.h', 'SDL/SDL_mixer.h'], 'libSDL_mixer', ['SDL_mixer']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          FrameworkDependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer', 'SDL_mixer')],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    FrameworkDependency('PORTTIME', 'CoreMidi.h', 'CoreMidi', 'CoreMIDI'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    FrameworkDependency('PORTTIME', 'CoreMIDI.h', 'CoreMIDI', 'CoreMIDI'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     FrameworkDependency('QUICKTIME', 'QuickTime.h', 'QuickTime', 'QuickTime'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     Dependency('PNG', 'png.h', 'libpng', ['png']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -124,12 +125,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     global DEPS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,7 +149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     DEPS.extend([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        FrameworkDependency('PORTTIME', 'CoreMidi.h', 'CoreMidi', 'CoreMIDI'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        FrameworkDependency('PORTTIME', 'CoreMIDI.h', 'CoreMIDI', 'CoreMIDI'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         FrameworkDependency('QUICKTIME', 'QuickTime.h', 'QuickTime', 'QuickTime'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         Dependency('PNG', 'png.h', 'libpng', ['png']),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -159,19 +160,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ])
</span>  
      print ('Hunting dependencies...')
<span style='display:block; white-space:pre;background:#ffe0e0;'>--    incdirs = ['/usr/local/include', '/usr/local/include/SDL',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--               #'/usr/X11/include',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--               '/opt/local/include',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--               '/opt/local/include/freetype2/freetype']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    incdirs = ['/usr/local/include']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    incdirs = [localbase+'/include']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if sdl2:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        incdirs.append('/usr/local/include/SDL2')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        incdirs.append(localbase+'/include/SDL2')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        incdirs.append('/usr/local/include/SDL')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        incdirs.append(localbase+'/include/SDL')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     incdirs.extend([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       #'/usr/X11/include',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       '/opt/local/include',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       '/opt/local/include/freetype2/freetype']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       localbase+'/include/freetype2/freetype']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     )
</span> -    #libdirs = ['/usr/local/lib', '/usr/X11/lib', '/opt/local/lib']
 -    libdirs = ['/usr/local/lib', '/opt/local/lib']
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+    incdirs = [localbase+'/include']
</span> +    libdirs = [localbase+'/lib']
  
      for d in DEPS:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-game/files/patch-disable_portmidi.diff b/python/py-game/files/patch-disable_portmidi.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 814356e..16e5a71 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-game/files/patch-disable_portmidi.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-game/files/patch-disable_portmidi.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config_darwin.py.orig  2018-07-17 23:28:16.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config_darwin.py       2018-07-21 13:20:12.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,7 +130,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     FrameworkDependency('QUICKTIME', 'QuickTime.h', 'QuickTime', 'QuickTime'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     Dependency('PNG', 'png.h', 'libpng', ['png']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    Dependency('PORTMIDI', 'portmidi.h', 'libportmidi', ['portmidi']),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    Dependency('PORTMIDI', '', '', []),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     find_freetype(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     # Scrap is included in sdlmain_osx, there is nothing to look at.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     # Dependency('SCRAP', '','',[]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- buildconfig/config_darwin.py.orig      2019-04-09 04:37:02.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ buildconfig/config_darwin.py   2019-04-09 04:39:53.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,7 +153,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         FrameworkDependency('QUICKTIME', 'QuickTime.h', 'QuickTime', 'QuickTime'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         Dependency('PNG', 'png.h', 'libpng', ['png']),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        Dependency('PORTMIDI', 'portmidi.h', 'libportmidi', ['portmidi']),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        Dependency('PORTMIDI', '', '', []),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         find_freetype(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # Scrap is included in sdlmain_osx, there is nothing to look at.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # Dependency('SCRAP', '','',[]),
</span></pre><pre style='margin:0'>

</pre>