<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3d3a2d7864b7619cd0b8b0f271456b10c3b8693d">https://github.com/macports/macports-ports/commit/3d3a2d7864b7619cd0b8b0f271456b10c3b8693d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3d3a2d7864b7619cd0b8b0f271456b10c3b8693d
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Jul 18 23:08:54 2020 -0400

<span style='display:block; white-space:pre;color:#404040;'>    qscintilla-qt5: fix rpath in install_name
</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/60796
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/60845
</span>---
 devel/qscintilla/Portfile                               |  7 +++++--
 devel/qscintilla/files/patch-Qt4Qt5-qscintilla.pro.diff | 13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla/Portfile b/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f01a19100b2..008b2ae7ee9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ version             2.11.5
</span> checksums           rmd160  bf0596f336fe888fd3d08d9ce816231533233bdb \
                     sha256  9361e26fd7fb7b5819a7eb92c5c1880a18de9bd3ed9dd2eb008e57388696716b \
                     size    3007564
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> 
 categories          devel
 license             GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +48,9 @@ foreach qt_major {4 5} {
</span>         # temporary path to fix necessary inclusion of QUrl
         patchfiles-append patch-Qt4Qt5_qsciscintillabase.cpp.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # fixup @rpath in the library's install_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append patch-Qt4Qt5-qscintilla.pro.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         if {${qt_major} eq 4} {
             # enable C++11
             configure.cxxflags-append -std=c++11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +182,7 @@ foreach qt_major {4 5} {
</span> }
 
 if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision 2
</span> 
     distfiles
     patchfiles
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla/files/patch-Qt4Qt5-qscintilla.pro.diff b/devel/qscintilla/files/patch-Qt4Qt5-qscintilla.pro.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fc6e65f601c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla/files/patch-Qt4Qt5-qscintilla.pro.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;'>+--- qscintilla.pro.orig    2020-07-19 10:42:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qscintilla.pro 2020-07-19 10:42:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,10 +37,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}
</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;'>+-macx:!CONFIG(staticlib) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET)
</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;'>+ INCLUDEPATH += . ../include ../lexlib ../src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !CONFIG(staticlib) {
</span></pre><pre style='margin:0'>

</pre>