[119669] trunk/dports/editors/textmate2

[cal at macports.org]

Revision: 119669
          https://trac.macports.org/changeset/119669
Author:   cal at macports.org
Date:     2014-05-03 09:43:07 -0700 (Sat, 03 May 2014)
Log Message:
-----------
textmate2: update to a9543, work around requirement for master ninja, use -isystem for the capnp headers to avoid a build failure when libplist is present

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

Added Paths:
-----------
    trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff
    trunk/dports/editors/textmate2/files/patch-target-isystem.diff

Modified: trunk/dports/editors/textmate2/Portfile
===================================================================
--- trunk/dports/editors/textmate2/Portfile	2014-05-03 16:19:07 UTC (rev 119668)
+++ trunk/dports/editors/textmate2/Portfile	2014-05-03 16:43:07 UTC (rev 119669)
@@ -6,7 +6,7 @@
 PortGroup               xcodeversion 1.0
 PortGroup               conflicts_build 1.0
 
-set app_revision        9537
+set app_revision        9543
 github.setup            textmate textmate 2.0-alpha.${app_revision} v
 epoch                   2
 
@@ -22,7 +22,7 @@
     TextMate is well-known for its large number of bundles adding support, snippets, completions \
     and commands for a huge number of file types.
 
-conflicts_build         libc-headers libplist
+conflicts_build         libc-headers
 platforms               darwin
 supported_archs         x86_64
 license                 GPL-3+
@@ -35,7 +35,9 @@
 }
 
 patchfiles              patch-configure-versionnumber.diff \
-                        patch-create_default_bundles_tbz-verbose.diff
+                        patch-create_default_bundles_tbz-verbose.diff \
+                        patch-bin__gen_build-avoid-ninja-pool-console.diff \
+                        patch-target-isystem.diff
 
 # The build will fail with deployment target set to 10.8
 macosx_deployment_target 10.7

Added: 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	                        (rev 0)
+++ trunk/dports/editors/textmate2/files/patch-bin__gen_build-avoid-ninja-pool-console.diff	2014-05-03 16:43:07 UTC (rev 119669)
@@ -0,0 +1,18 @@
+--- 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
+-  pool = console
+   generator = true
+   description = Upload ‘$in’…
+ 

Added: trunk/dports/editors/textmate2/files/patch-target-isystem.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-target-isystem.diff	                        (rev 0)
+++ trunk/dports/editors/textmate2/files/patch-target-isystem.diff	2014-05-03 16:43:07 UTC (rev 119669)
@@ -0,0 +1,11 @@
+--- target.orig	2014-05-03 18:37:19.000000000 +0200
++++ target	2014-05-03 18:37:32.000000000 +0200
+@@ -26,7 +26,7 @@
+ LN_FLAGS += -Wl,-dead_strip_dylibs
+ LN_FLAGS += -rpath @executable_path/../Frameworks
+ 
+-CXX_FLAGS += -I"$capnp_prefix/include"
++CXX_FLAGS += -isystem"$capnp_prefix/include"
+ LN_FLAGS  += -L"$capnp_prefix/lib"
+ 
+ PRELUDE = Shared/PCH/prelude.*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140503/87803717/attachment.html>