<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/8f9e623210518cfb1fb5176e260781da11c2e010">https://github.com/macports/macports-ports/commit/8f9e623210518cfb1fb5176e260781da11c2e010</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8f9e623210518cfb1fb5176e260781da11c2e010
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Oct 11 08:57:44 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> py-game: update to 2.0.2
</span>---
python/py-game/Portfile | 9 +++---
python/py-game/files/patch-config_darwin.py.diff | 36 ++++++++++++++++--------
2 files changed, 29 insertions(+), 16 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 089f2380054..c8f54389d22 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 2.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.2
</span> categories-append devel multimedia graphics
platforms darwin
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +19,9 @@ 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 6353c0eb2367f70b8c8d07d3decc1e46 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3943e514f86be98f31a098582d43886b20f22a16 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8b1e7b63f47aafcdd8849933b206778747ef1802bd3d526aca45ed77141e4001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 e94c1b7fff782a43c6dfeb726df8ae94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 dd05d8ab3a81c32707fe41bfd8dbf51ebf0385d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 52b8d65c07f90f53af139e6a756b749878360b2b609baaf239f7a5a025e0b50f
</span>
python.versions 27 35 36 37 38 39
<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 e2c6e379c10..b8130ccb895 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- buildconfig/config_darwin.py.orig 2019-03-29 19:24:30.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ buildconfig/config_darwin.py 2019-04-09 04:37:02.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,6 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- buildconfig/config_darwin.py.orig 2021-10-10 18:59:29.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ buildconfig/config_darwin.py 2021-10-11 08:40:34.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +9,7 @@
</span> except ImportError:
from buildconfig.config_unix import DependencyProg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,21 @@
</span>
try:
basestring_ = basestring
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,7 +149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,11 +56,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class FrameworkDependency(Dependency):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def configure(self, incdirs, libdirs):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BASE_DIRS = '/', os.path.expanduser('~/'), '/System/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BASE_DIRS = '/System/',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for n in BASE_DIRS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ n += 'Library/Frameworks/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmwk = n + self.libs + '.framework/Versions/Current/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if os.path.isfile(fmwk + self.libs):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if os.path.isdir(fmwk):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print ('Framework ' + self.libs + ' found')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.found = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.inc_dir = fmwk + 'Headers'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,7 +148,7 @@
</span>
DEPS.extend([
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,18 +31,18 @@
</span> FrameworkDependency('QUICKTIME', 'QuickTime.h', 'QuickTime', 'QuickTime'),
Dependency('PNG', 'png.h', 'libpng', ['png']),
Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -159,19 +160,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -158,19 +159,16 @@
</span> ])
print ('Hunting dependencies...')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- incdirs = ['/usr/local/include']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- incdirs = ['/usr/local/include', '/opt/homebrew/include']
</span> + incdirs = [localbase+'/include']
if sdl2:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- incdirs.append('/usr/local/include/SDL2')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ incdirs.append(localbase+'/include/SDL2')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- incdirs.extend(['/usr/local/include/SDL2', '/opt/homebrew/include/SDL2', '/opt/local/include/SDL2'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ incdirs.extend([localbase+'/include/SDL2'])
</span> else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- incdirs.append('/usr/local/include/SDL')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ incdirs.append(localbase+'/include/SDL')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- incdirs.extend(['/usr/local/include/SDL', '/opt/homebrew/include/SDL', '/opt/local/include/SDL'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ incdirs.extend([localbase+'/include/SDL'])
</span>
incdirs.extend([
- #'/usr/X11/include',
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +51,7 @@
</span> + localbase+'/include/freetype2/freetype']
)
- #libdirs = ['/usr/local/lib', '/usr/X11/lib', '/opt/local/lib']
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- libdirs = ['/usr/local/lib', '/opt/local/lib']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libdirs = ['/usr/local/lib', '/opt/local/lib', '/opt/homebrew/lib']
</span> + libdirs = [localbase+'/lib']
for d in DEPS:
</pre><pre style='margin:0'>
</pre>