[127935] trunk/dports/editors/textmate2

[and.damore at macports.org]

Revision: 127935
          https://trac.macports.org/changeset/127935
Author:   and.damore at macports.org
Date:     2014-11-08 03:19:58 -0800 (Sat, 08 Nov 2014)
Log Message:
-----------
port textmate2: upgrade to 2.0-beta.6, fix livecheck URL since mainstream dropped usage of revision, fix #45504; openmaintainer

Modified Paths:
--------------
    trunk/dports/editors/textmate2/Portfile
    trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff
    trunk/dports/editors/textmate2/files/patch-configure-versionnumber.diff

Modified: trunk/dports/editors/textmate2/Portfile
===================================================================
--- trunk/dports/editors/textmate2/Portfile	2014-11-08 10:53:03 UTC (rev 127934)
+++ trunk/dports/editors/textmate2/Portfile	2014-11-08 11:19:58 UTC (rev 127935)
@@ -6,9 +6,9 @@
 PortGroup               xcodeversion 1.0
 PortGroup               conflicts_build 1.0
 
-set app_revision        9561
-github.setup            textmate textmate 2.0-alpha.${app_revision} v
-epoch                   2
+set app_revision        6
+github.setup            textmate textmate 2.0-beta.${app_revision} v
+epoch                   4
 
 maintainers             cal openmaintainer
 name                    textmate2
@@ -43,7 +43,7 @@
 macosx_deployment_target 10.7
 
 post-patch {
-    reinplace "s/@REVISION@/${app_revision}/" ${worksrcpath}/configure
+    reinplace "s/@VERSION@/${version}/" ${worksrcpath}/configure
     fs-traverse file ${worksrcpath} {
         if {[file tail ${file}] == "target"} {
             reinplace "/TESTS *=/d" ${file}
@@ -101,6 +101,6 @@
 }
 
 livecheck.type          regex
-livecheck.regex         "^(\[0-9]\+)\$"
-livecheck.url           https://api.textmate.org/releases/release/revision
-livecheck.version       ${app_revision}
+livecheck.regex         "^(.\*)\$"
+livecheck.url           https://api.textmate.org/releases/release/version
+livecheck.version       $version

Modified: trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff	2014-11-08 10:53:03 UTC (rev 127934)
+++ trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff	2014-11-08 11:19:58 UTC (rev 127935)
@@ -1,17 +1,9 @@
 --- bin/gen_build.orig	2014-05-03 18:05:12.000000000 +0200
 +++ bin/gen_build	2014-05-03 18:05:21.000000000 +0200
-@@ -887,7 +887,6 @@
- 
- rule debug_executable
-   command = lldb $in
--  pool = console
-   description = Debug ‘$in’…
- 
- rule run_application
 @@ -920,7 +919,6 @@
  
  rule upload
-   command = bin/upload -k$upload_keyfile -d$upload_destination -t'v$APP_VERSION' -m'{"version":"$APP_VERSION","revision":"$APP_REVISION"}' $in > $out~ && mv $out~ $out
+   command = bin/upload -k$upload_keyfile -d$upload_destination -t'v$APP_VERSION' -m'{"version":"$APP_VERSION"}' $in > $out~ && mv $out~ $out
 -  pool = console
    generator = true
    description = Upload ‘$in’…

Modified: trunk/dports/editors/textmate2/files/patch-configure-versionnumber.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-configure-versionnumber.diff	2014-11-08 10:53:03 UTC (rev 127934)
+++ trunk/dports/editors/textmate2/files/patch-configure-versionnumber.diff	2014-11-08 11:19:58 UTC (rev 127935)
@@ -1,13 +1,11 @@
---- configure.orig	2013-08-17 18:06:43.000000000 +0200
-+++ configure	2013-08-17 18:08:13.000000000 +0200
-@@ -15,8 +15,8 @@
+--- configure.orig	2014-11-04 11:02:02.000000000 +0100
++++ configure	2014-11-04 11:05:37.000000000 +0100
+@@ -18,8 +18,8 @@
  # ========================================================
  
  name=TextMate
--ver=2.0-alpha.\$APP_REVISION${tag:-+git.$(git rev-parse --short HEAD)}
--rev=$(( $(curl -sf "${rest_api}/releases/nightly/revision")+1 ))
-+ver=2.0-alpha.\$APP_REVISION${tag:-+macports.git.$(git rev-parse --short HEAD)}
-+rev=@REVISION@
+-ver=$(curl -sf "${rest_api}/releases/nightly/version")${tag:-+git.$(git rev-parse --short HEAD)}
++ver=@VERSION@${tag:-+macports.git.$(git rev-parse --short HEAD)}
  min_os=10.7
  
- # ===============================================
+ # ===============================
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141108/222f4845/attachment.html>