<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/733709c1df5e4d7171633d6f8aecbd44359e79cf">https://github.com/macports/macports-ports/commit/733709c1df5e4d7171633d6f8aecbd44359e79cf</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 733709c1df5 wxWidgets-*: do not bake in MacPorts ggrep
</span>733709c1df5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 733709c1df5e4d7171633d6f8aecbd44359e79cf
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Dec 26 17:52:40 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> wxWidgets-*: do not bake in MacPorts ggrep
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/57508
</span>---
graphics/wxWidgets-2.8/Portfile | 6 +++++-
graphics/wxWidgets-3.0/Portfile | 8 ++++++--
graphics/wxWidgets-3.2/Portfile | 6 +++++-
3 files changed, 16 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-2.8/Portfile b/graphics/wxWidgets-2.8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index abeed744f46..3e8726d3b44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-2.8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-2.8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup wxWidgets 1.0
</span>
name wxWidgets-2.8
version 2.8.12
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> set branch [join [lrange [split ${version} .] 0 1] .]
set wxpythonsubset wxPython-2.8.12.1-MacPorts-subset
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,6 +70,10 @@ depends_lib path:include/turbojpeg.h:libjpeg-turbo \
</span> depends_run port:wxWidgets-common\
port:wxWidgets_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/57508
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GREP=/usr/bin/grep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set selectdir ${workpath}/select
select.group wxWidgets
select.file ${selectdir}/${subport}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.0/Portfile b/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41fccbfa27f..ac23f348411 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup wxWidgets 1.0
</span>
github.setup wxWidgets wxWidgets 3.0.5.1 v
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
name wxWidgets-3.0
# ugly workaround to allow some C++11-only applications to be built on < 10.9
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ if {${subport} eq ${name}} {
</span> } elseif {${subport} eq "wxPython-3.0"} {
wxWidgets.use wxPython-3.0
version 3.0.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 8
</span> } elseif {${subport} eq "wxgtk-3.0"} {
# with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
# wxgtk-3.0 is here mainly for testing purposes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,6 +84,10 @@ depends_lib path:include/turbojpeg.h:libjpeg-turbo \
</span> depends_run port:wxWidgets-common \
port:wxWidgets_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/57508
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GREP=/usr/bin/grep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles-append patch-configure.diff
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.2/Portfile b/graphics/wxWidgets-3.2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fa94d91ab62..d0698036efa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup wxWidgets 1.0
</span>
# remember to bump version of wxWidgets-common
github.setup wxWidgets wxWidgets 3.1.5 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> name wxWidgets-3.2
wxWidgets.use wxWidgets-3.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +53,10 @@ depends_lib-append path:include/turbojpeg.h:libjpeg-turbo \
</span> depends_run port:wxWidgets-common \
port:wxWidgets_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/57508
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GREP=/usr/bin/grep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
file mkdir ${selectdir}
system "echo \"${wxWidgets.wxdir}/wx-config\n${wxWidgets.wxdir}/wxrc-${branch}\" > ${select.file}"
</pre><pre style='margin:0'>
</pre>