<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/47608d2846f1ecb20af9823cf7521e8598e4be67">https://github.com/macports/macports-ports/commit/47608d2846f1ecb20af9823cf7521e8598e4be67</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 47608d2846f graphviz-devel: gvedit: fix regex for short version string
</span>47608d2846f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 47608d2846f1ecb20af9823cf7521e8598e4be67
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Oct 5 09:58:56 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> graphviz-devel: gvedit: fix regex for short version string
</span>---
graphics/graphviz-devel/Portfile | 36 ++++++++++++++++--------------------
1 file changed, 16 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz-devel/Portfile b/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd33ee469b7..438223033eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -364,16 +364,14 @@ subport gvedit${thisbranch} {
</span>
depends_lib-append port:graphviz${thisbranch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ## the sed command in `get_short_version_string` is currently not working,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## so hard-coding the short_version_string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# set short_version_string [get_short_version_string]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if {${short_version_string} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# return -code error "cannot find ${app.name} short version string"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ui_debug "${app.name} short version string: ${short_version_string}"
</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:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set short_version_string [get_short_version_string]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${short_version_string} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "cannot find ${app.name} short version string"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "${app.name} short version string: ${short_version_string}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
patchfiles patch-cmd-gvedit-Makefile.in.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -387,15 +385,13 @@ subport gvedit${thisbranch} {
</span> app.name GVEdit
app.executable gvedit
app.icon ${build.dir}/images/icon.png
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # from '${build.dir}/mainwindow.cpp' line 276, " version: 1.02\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- app.short_version_string 1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# app.short_version_string [get_short_version_string]
</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;'>-# proc get_short_version_string {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# global build.dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# return [exec /usr/bin/sed -E -n s/^\[\[:space:\]\]*"\[Vv\]ersion:\[\[:space:\]\]*(\[0-9.\]+).*/\\1/p ${build.dir}/mainwindow.cpp]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.short_version_string [get_short_version_string]
</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;'>+ proc get_short_version_string {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global build.dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [exec /usr/bin/sed -E -n s/^\[\[:space:\]\]*\"\[\[:space:\]\]*\[Vv\]ersion:\[\[:space:\]\]*(\[0-9.\]+).*/\\1/p ${build.dir}/mainwindow.cpp]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
</pre><pre style='margin:0'>
</pre>