textmate2: 2.0-rc.4

Update textmate and drop a number of patches that are no longer needed. Additionally, simplify the Portfile a bit. Closes: https://trac.macports.org/ticket/53564
macports · Feb 14, 2017 · 861429e · 861429e
1 parent bcc939f
commit 861429e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 37 deletions.
diff --git a/editors/textmate2/Portfile b/editors/textmate2/Portfile
@@ -5,7 +5,7 @@ PortGroup               github 1.0
 PortGroup               xcodeversion 1.0
 
 epoch                   4
-github.setup            textmate textmate 2.0-beta.12.4 v
+github.setup            textmate textmate 2.0-rc.4 v
 revision                0
 
 maintainers             cal openmaintainer
@@ -32,13 +32,8 @@ post-fetch {
 }
 
 patchfiles              patch-configure-versionnumber.diff \
-                        patch-target.diff \
-                        patch-frameworks_license_target.diff \
                         patch-Applications_commit_target.diff
 
-# The build will fail with deployment target set to 10.8
-macosx_deployment_target 10.7
-
 post-patch {
     reinplace "s/@VERSION@/${version}/" ${worksrcpath}/configure
     fs-traverse file ${worksrcpath} {
@@ -52,7 +47,8 @@ post-patch {
 depends_build-append    port:ninja \
                         port:ragel \
                         port:sparsehash \
-                        port:proctools
+                        port:proctools \
+                        path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
 
 depends_skip_archcheck  ninja ragel proctools
 
@@ -75,7 +71,8 @@ if {${os.platform} ne "darwin" || ${os.major} < 12} {
 }
 
 configure.env-append    builddir=${worksrcpath}/build \
-                        capnp_prefix=${prefix}
+                        capnp_prefix=${prefix} \
+                        libressl_prefix=${prefix}
 
 pre-configure {
     # the textmate build expects this to be present
@@ -89,7 +86,7 @@ post-configure {
 }
 
 build.cmd               ninja
-build.args              -v -j ${build.jobs}
+build.args              -v -j${build.jobs}
 build.target            TextMate mate
 
 destroot {

diff --git a/editors/textmate2/files/patch-frameworks_license_target.diff b/editors/textmate2/files/patch-frameworks_license_target.diff
diff --git a/editors/textmate2/files/patch-target.diff b/editors/textmate2/files/patch-target.diff