<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/861429ec724450fe6173da3149a7f8b9daa75d35">https://github.com/macports/macports-ports/commit/861429ec724450fe6173da3149a7f8b9daa75d35</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 861429ec724450fe6173da3149a7f8b9daa75d35
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Wed Feb 15 00:00:13 2017 +0100

<span style='display:block; white-space:pre;color:#404040;'>    textmate2: 2.0-rc.4
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Update textmate and drop a number of patches that are no longer needed.
</span><span style='display:block; white-space:pre;color:#404040;'>    Additionally, simplify the Portfile a bit.
</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/53564
</span>---
 editors/textmate2/Portfile                              | 15 ++++++---------
 .../files/patch-frameworks_license_target.diff          | 17 -----------------
 editors/textmate2/files/patch-target.diff               | 11 -----------
 3 files changed, 6 insertions(+), 37 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/Portfile b/editors/textmate2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c7b87d2..7dfeb4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/textmate2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup               github 1.0
</span> PortGroup               xcodeversion 1.0
 
 epoch                   4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup            textmate textmate 2.0-beta.12.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup            textmate textmate 2.0-rc.4 v
</span> revision                0
 
 maintainers             cal openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,13 +32,8 @@ post-fetch {
</span> }
 
 patchfiles              patch-configure-versionnumber.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-target.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-frameworks_license_target.diff \
</span>                         patch-Applications_commit_target.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The build will fail with deployment target set to 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-macosx_deployment_target 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
     reinplace "s/@VERSION@/${version}/" ${worksrcpath}/configure
     fs-traverse file ${worksrcpath} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +47,8 @@ post-patch {
</span> depends_build-append    port:ninja \
                         port:ragel \
                         port:sparsehash \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:proctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:proctools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
</span> 
 depends_skip_archcheck  ninja ragel proctools
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +71,8 @@ if {${os.platform} ne "darwin" || ${os.major} < 12} {
</span> }
 
 configure.env-append    builddir=${worksrcpath}/build \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        capnp_prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        capnp_prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        libressl_prefix=${prefix}
</span> 
 pre-configure {
     # the textmate build expects this to be present
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +86,7 @@ post-configure {
</span> }
 
 build.cmd               ninja
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args              -v -j ${build.jobs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args              -v -j${build.jobs}
</span> build.target            TextMate mate
 
 destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/patch-frameworks_license_target.diff b/editors/textmate2/files/patch-frameworks_license_target.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8614292..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-frameworks_license_target.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Pending
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This pach fixes undefined symbol errors when linking against the static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libcrypto library without an explicit -lz linker flag.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It partially reverts [1] where the static library linking was introduced.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[1]: https://github.com/textmate/textmate/commit/5bbcf424874917d4f021a3f33379c6b530dae0f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Frameworks/license/target.orig 2016-01-24 17:03:26.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Frameworks/license/target      2016-01-24 17:03:43.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,5 +3,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINK        += text cf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX_FLAGS   += -I"$libressl_prefix/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LN_FLAGS    += -Wl,-U,__Z15revoked_serialsv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LN_FLAGS    += "$libressl_prefix"/lib/libcrypto.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS        += crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FRAMEWORKS   = Security
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/textmate2/files/patch-target.diff b/editors/textmate2/files/patch-target.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a49362e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/textmate2/files/patch-target.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- target.orig    2015-09-18 07:37:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ target 2015-09-18 07:51:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LN_FLAGS += -Wl,-dead_strip_dylibs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LN_FLAGS += -rpath @executable_path/../Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXX_FLAGS += -I"$capnp_prefix/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXX_FLAGS += -isystem"$capnp_prefix/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LN_FLAGS  += -L"$capnp_prefix/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRELUDE = Shared/PCH/prelude.*
</span></pre><pre style='margin:0'>

</pre>