<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cc09948522920e69f422707b68a9b375aa2f2411">https://github.com/macports/macports-ports/commit/cc09948522920e69f422707b68a9b375aa2f2411</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 cc099485229 nonpareil: Fix build for python 3
</span>cc099485229 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cc09948522920e69f422707b68a9b375aa2f2411
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Mar 9 03:58:08 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> nonpareil: Fix build for python 3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65393
</span>---
emulators/nonpareil/Portfile | 3 +--
emulators/nonpareil/files/patch-sconstruct.diff | 30 +++++++++++++++++++++----
2 files changed, 27 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/nonpareil/Portfile b/emulators/nonpareil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d128cb62a2..0389ff895b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/nonpareil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/nonpareil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,6 @@ PortSystem 1.0
</span> name nonpareil
version 0.79
revision 8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> categories emulators
license GPL-2
maintainers {krischik @krischik} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +68,7 @@ patchfiles osx.patch \
</span>
use_parallel_build yes
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd scons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${prefix}/bin/scons
</span> build.args prefix=${prefix}
build.target
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/nonpareil/files/patch-sconstruct.diff b/emulators/nonpareil/files/patch-sconstruct.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0dc613e18ac..753da2a0ea5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/nonpareil/files/patch-sconstruct.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/nonpareil/files/patch-sconstruct.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;'>---- SConstruct 2008-08-23 19:37:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ SConstruct 2019-07-04 09:06:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SConstruct.orig 2008-08-23 19:37:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SConstruct 2023-03-09 03:53:53.000000000 -0600
</span> @@ -27,57 +27,57 @@
# Options
#-----------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +80,29 @@
</span> help = 'use Readline library for command editing and history (only when debugger CLI is enabled)',
default = 1)) # only if has_debugger_cli
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,7 +235,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,9 +120,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.mkdir (treedir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- except OSError, (errnum, strerror):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ except OSError as errnum_and_strerror:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (errnum, strerror) = errnum_and_strerror.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if errnum != errno.EEXIST:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print 'mkdir ', treedir, ':', strerror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print('mkdir ', treedir, ':', strerror)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd = 'tar cf - '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,7 +138,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def tarballer (target, source, env):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd = 'tar -czf ' + str (target[0]) + ' ' + str(source[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print 'running ', cmd, ' ... '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print('running ', cmd, ' ... ')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p = os.popen (cmd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return p.close ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,7 +236,7 @@
</span> # host platform code
#-----------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +111,7 @@
</span> native_env ['build_target_only'] = 0
SConscript ('src/SConscript',
build_dir = 'build/' + env ['host'],
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -256,7 +256,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -256,7 +257,7 @@
</span> #-----------------------------------------------------------------------------
if (env ['host'] != env ['target']):
</pre><pre style='margin:0'>
</pre>