<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/23e8c6baf2899f90a9dbfc0265d3683c055128a3">https://github.com/macports/macports-ports/commit/23e8c6baf2899f90a9dbfc0265d3683c055128a3</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 23e8c6baf28 py-game: update to 2.1.2
</span>23e8c6baf28 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 23e8c6baf2899f90a9dbfc0265d3683c055128a3
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jan 1 20:38:40 2022 +1100

<span style='display:block; white-space:pre;color:#404040;'>    py-game: update to 2.1.2
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Support for Python < 3.6 was dropped upstream. Keeping py27 at version
</span><span style='display:block; white-space:pre;color:#404040;'>    2.0.3 due to dependents.
</span>---
 python/py-game/Portfile                            | 51 ++++++++++++++--------
 ...rwin.py.diff => patch-config_darwin.py-27.diff} |  0
 python/py-game/files/patch-config_darwin.py.diff   | 14 +++---
 3 files changed, 38 insertions(+), 27 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 518f5287e6e..e4ac1b13ad0 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,9 +4,8 @@ PortSystem      1.0
</span> PortGroup       python 1.0
 
 name            py-game
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version         2.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version         2.1.2
</span> categories-append     devel multimedia graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms       darwin
</span> license         LGPL-2.1+
 maintainers     {jmr @jmroot} openmaintainer
 description     pygame, python modules for writing games
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,11 +18,11 @@ long_description    Pygame is a set of Python modules designed for \
</span> homepage        http://www.pygame.org/
 
 python.rootname pygame
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums       md5 04e082d216b3b771b8d52769597b2fb2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                rmd160 03970781db89e80b3378119247e6e1ea7b69924a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                sha256 d097f2802a9d0d7fb40c49c789af2984b202baa8fd32701082598755f5973f51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums       md5 8467a125e9075fa701f082806d228366 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                rmd160 063aebffd5aae53e22c239f7edfb20af36c6e3ff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                sha256 d6d0eca28f886f0477cd0721ac688189155a587f2bb8eae740e52ca56c3ad23c
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37 38 39 310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 36 37 38 39 310
</span> 
 if {$subport ne $name} {
     patchfiles  patch-config_darwin.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +34,10 @@ if {$subport ne $name} {
</span>                 path:include/turbojpeg.h:libjpeg-turbo \
                 port:libpng
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} != 27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        python.pep517   yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     use_configure   yes
     configure.env-append LOCALBASE=${prefix}
     configure.cmd   ${python.bin} setup.py
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,23 +54,35 @@ if {$subport ne $name} {
</span>         patchfiles-delete patch-disable_portmidi.diff
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant sdl2 description {Use SDL 2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-append   -sdl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} == 27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        version     2.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision    0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums   md5 04e082d216b3b771b8d52769597b2fb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160 03970781db89e80b3378119247e6e1ea7b69924a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 d097f2802a9d0d7fb40c49c789af2984b202baa8fd32701082598755f5973f51
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {!(${os.platform} eq "darwin" && ${os.major} <= 10)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants    +sdl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-replace  patch-config_darwin.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-config_darwin.py-27.diff
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[variant_isset sdl2]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        variant sdl2 description {Use SDL 2} {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {!(${os.platform} eq "darwin" && ${os.major} <= 10)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            default_variants    +sdl2
</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;'>+        if {![variant_isset sdl2]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.args-append   -sdl1
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} != 27 || [variant_isset sdl2]} {
</span>         depends_lib-append  port:libsdl2_mixer \
                             port:libsdl2_image \
                             port:libsdl2_ttf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-append   -sdl1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append  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>     }
 
     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-27.diff
</span>similarity index 100%
copy from python/py-game/files/patch-config_darwin.py.diff
copy to python/py-game/files/patch-config_darwin.py-27.diff
<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 52d11cc6d26..bfa0c42aaed 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,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- buildconfig/config_darwin.py.orig      2021-11-01 02:49:23.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ buildconfig/config_darwin.py   2021-11-02 01:35:00.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- buildconfig/config_darwin.py.orig      2021-12-27 11:57:00.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ buildconfig/config_darwin.py   2022-01-01 20:11:59.000000000 +1100
</span> @@ -9,6 +9,7 @@
  except ImportError:
      from buildconfig.config_unix import DependencyProg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,18 +17,14 @@
</span>          for n in BASE_DIRS:
              n += 'Library/Frameworks/'
              fmwk = n + self.libs + '.framework/Versions/Current/'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -159,19 +160,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,16 +147,13 @@
</span>      ])
  
      print ('Hunting dependencies...')
 -    incdirs = ['/usr/local/include', '/opt/homebrew/include']
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-    incdirs.extend(['/usr/local/include/SDL2', '/opt/homebrew/include/SDL2', '/opt/local/include/SDL2'])
</span> +    incdirs = [localbase+'/include']
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     if sdl2:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        incdirs.extend(['/usr/local/include/SDL2', '/opt/homebrew/include/SDL2', '/opt/local/include/SDL2'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        incdirs.extend([localbase+'/include/SDL2'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        incdirs.extend(['/usr/local/include/SDL', '/opt/homebrew/include/SDL', '/opt/local/include/SDL'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        incdirs.extend([localbase+'/include/SDL'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    incdirs.extend([localbase+'/include/SDL2'])
</span>  
      incdirs.extend([
 -       #'/usr/X11/include',
</pre><pre style='margin:0'>

</pre>