[151086] trunk/dports/editors/textmate2

[cal at macports.org]

Revision: 151086
          https://trac.macports.org/changeset/151086
Author:   cal at macports.org
Date:     2016-08-06 12:10:11 -0700 (Sat, 06 Aug 2016)
Log Message:
-----------
textmate2: 2.0-beta.9.2

Modified Paths:
--------------
    trunk/dports/editors/textmate2/Portfile

Added Paths:
-----------
    trunk/dports/editors/textmate2/files/patch-Applications_commit_target.diff

Removed Paths:
-------------
    trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff
    trunk/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff

Modified: trunk/dports/editors/textmate2/Portfile
===================================================================
--- trunk/dports/editors/textmate2/Portfile	2016-08-06 18:45:49 UTC (rev 151085)
+++ trunk/dports/editors/textmate2/Portfile	2016-08-06 19:10:11 UTC (rev 151086)
@@ -6,8 +6,8 @@
 PortGroup               xcodeversion 1.0
 
 epoch                   4
-github.setup            textmate textmate 2.0-beta.9 v
-revision                1
+github.setup            textmate textmate 2.0-beta.9.2 v
+revision                0
 
 maintainers             cal openmaintainer
 name                    textmate2
@@ -33,10 +33,9 @@
 }
 
 patchfiles              patch-configure-versionnumber.diff \
-                        patch-create_default_bundles_tbz-verbose.diff \
-                        patch-bin__gen_build-avoid-ninja-pool-console.diff \
                         patch-target.diff \
-                        patch-frameworks_license_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

Added: trunk/dports/editors/textmate2/files/patch-Applications_commit_target.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-Applications_commit_target.diff	                        (rev 0)
+++ trunk/dports/editors/textmate2/files/patch-Applications_commit_target.diff	2016-08-06 19:10:11 UTC (rev 151086)
@@ -0,0 +1,15 @@
+Add missing build dependency to make sure CommitWindow.h is found
+
+Fixes a build failure:
+
+| Applications/commit/src/commit.mm:1:10: fatal error: 'CommitWindow/CommitWindow.h' file not found
+| #include <CommitWindow/CommitWindow.h>
+|          ^
+| 1 error generated.
+
+Upstream-Status: Pending
+--- Applications/commit/target.orig	2016-08-06 20:55:29.000000000 +0200
++++ Applications/commit/target	2016-08-06 20:55:58.000000000 +0200
+@@ -1 +1,2 @@
+ SOURCES = src/*.mm
++LINK   += CommitWindow

Deleted: 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	2016-08-06 18:45:49 UTC (rev 151085)
+++ trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff	2016-08-06 19:10:11 UTC (rev 151086)
@@ -1,10 +0,0 @@
---- bin/gen_build.orig	2014-05-03 18:05:12.000000000 +0200
-+++ bin/gen_build	2014-05-03 18:05:21.000000000 +0200
-@@ -920,7 +919,6 @@
- 
- rule upload
-   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’…
- 

Deleted: trunk/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff	2016-08-06 18:45:49 UTC (rev 151085)
+++ trunk/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff	2016-08-06 19:10:11 UTC (rev 151086)
@@ -1,11 +0,0 @@
---- bin/create_default_bundles_tbz.orig	2013-04-16 01:16:48.000000000 +0200
-+++ bin/create_default_bundles_tbz	2013-04-16 01:19:10.000000000 +0200
-@@ -14,7 +14,7 @@
- builddir="${builddir:-$HOME/build/TextMate}"
- bl="$builddir/Applications/bl/bl"
- 
--{ [ -x "$bl" ] || ninja "$bl"; } && \
-+{ [ -x "$bl" ] || ninja -v "$bl"; } && \
- 	mkdir -p "$BUNDLES_DST/Managed" && \
- 	"$bl" -C "$BUNDLES_DST/Managed" install Apache Bundle\ Development Bundle\ Support C CSS Diff Git HTML Hyperlink\ Helper JavaScript JSON Mail Make Markdown Math Mercurial Objective-C PHP Property\ List Python Ruby SCM Shell\ Script Source SQL Subversion Text TextMate Themes TODO XML && \
- 	gnutar -cf "$TBZ_DST~" "$BZIP2_FLAG" -C "$BUNDLES_DST" "Managed" && \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160806/2f121dfa/attachment.html>