<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a2992f7fc8e9e57f8a4aef4172a2ba20a73946e8">https://github.com/macports/macports-ports/commit/a2992f7fc8e9e57f8a4aef4172a2ba20a73946e8</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 a2992f7fc8e jam: update to 2.6.1; fix build error
</span>a2992f7fc8e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a2992f7fc8e9e57f8a4aef4172a2ba20a73946e8
</span>Author: Matthew Hollingworth <mdholling@gmail.com>
AuthorDate: Fri Jan 13 15:45:01 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> jam: update to 2.6.1; fix build error
</span>---
devel/jam/Portfile | 17 ++++++++---------
devel/jam/files/patch-make1.c.diff | 13 +++++++++++++
devel/jam/files/patch-scan.h.diff | 11 +++++++++++
devel/jam/files/patch-variable.c.diff | 21 ---------------------
4 files changed, 32 insertions(+), 30 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jam/Portfile b/devel/jam/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 73556fba5d1..4944fb6911c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name jam
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The version didn't change, but the binary did because it was upgraded
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# from rc3 to 2.5.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel
license Permissive
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,16 +26,16 @@ master_sites https://swarm.workshop.perforce.com/projects/perforce_softwa
</span> use_tar yes
dist_subdir ${name}/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 34497c89ca4bbd1db049627e2dfcc1287138af24 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 71481dba7f9e4156300c4234475a54fc7c4f53facb0e48fa9e78b6771a9c8611 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 614400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 210c15fc72d1bc21c07b72ca0152c5c11570909d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ace6b227c1a9985934fd13c9c0ae4f7ff44171c6ded8b83bb3da75e6efdcb3a7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 665600
</span> platforms darwin
universal_variant yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Enables post-patch options & Matt Armstrong memory leak patch.
</span> patchfiles patch-Makefile.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-variable.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-make1.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-scan.h.diff
</span>
post-patch {
# fix up reminder of Makefile, depending on variants
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jam/files/patch-make1.c.diff b/devel/jam/files/patch-make1.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d560f9b98a3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jam/files/patch-make1.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- make1.c.orig 2023-01-15 00:19:14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ make1.c 2023-01-15 00:19:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,6 +62,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include "command.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include "execcmd.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifdef OS_MACOSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void make1a( TARGET *t, TARGET *parent );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void make1b( TARGET *t );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void make1c( TARGET *t );
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jam/files/patch-scan.h.diff b/devel/jam/files/patch-scan.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..06d63e69e14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jam/files/patch-scan.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scan.h.orig 2023-01-15 00:19:42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scan.h 2023-01-15 00:19:48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int yylex();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int yyparse();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *yyfname();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int yylineo();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int yylineno();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define SCAN_NORMAL 0 /* normal parsing */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define SCAN_STRING 1 /* look only for matching } */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jam/files/patch-variable.c.diff b/devel/jam/files/patch-variable.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 273c919eb5e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jam/files/patch-variable.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- variable.c Wed Apr 23 06:45:52 2003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ variable.c.new Mon Jun 16 12:10:53 2003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,7 +176,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( dollar )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIST *l = var_expand( L0, lastword, out, lol, 0 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIST *h = var_expand( L0, lastword, out, lol, 0 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIST *l = h;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- out = lastword;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -196,7 +197,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *out++ = ' ';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list_free( l );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list_free( h );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>