[105298] trunk/dports/editors/textmate2

cal at macports.org cal at macports.org
Tue Apr 16 15:20:38 PDT 2013 

Revision: 105298
          https://trac.macports.org/changeset/105298
Author:   cal at macports.org
Date:     2013-04-16 15:20:38 -0700 (Tue, 16 Apr 2013)
Log Message:
-----------
textmate2: update to a9413, closes #38811

also:
 - revert r100162 that was supposed to use the configured
   MACOSX_DEPLOYMENT_TARGET, but broke the build instead.
 - regenerate some of the patch files.
 - set deployment target to 10.7, because the build will fail with 10.8.
 - patch the download tool to use $HOME as home dir, rather than getting
   ~macports from getpwent(3), but limit that to configure time.
 - fix livecheck

Revision Links:
--------------
    https://trac.macports.org/changeset/100162

Modified Paths:
--------------
    trunk/dports/editors/textmate2/Portfile
    trunk/dports/editors/textmate2/files/patch-configure-versionnumber.diff
    trunk/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff

Added Paths:
-----------
    trunk/dports/editors/textmate2/files/patch-Frameworks__io__src__path.cc-use-home-from-env.diff

Removed Paths:
-------------
    trunk/dports/editors/textmate2/files/patch-configure-mdt.diff

Modified: trunk/dports/editors/textmate2/Portfile
===================================================================
--- trunk/dports/editors/textmate2/Portfile	2013-04-16 18:19:35 UTC (rev 105297)
+++ trunk/dports/editors/textmate2/Portfile	2013-04-16 22:20:38 UTC (rev 105298)
@@ -6,7 +6,7 @@
 PortGroup               xcodeversion 1.0
 PortGroup               conflicts_build 1.0
 
-github.setup            textmate textmate 9395 r
+github.setup            textmate textmate 9413 a
 epoch                   1
 version                 2.0.${github.version}
 
@@ -27,18 +27,21 @@
 supported_archs         x86_64
 license                 GPL-3+
 
+minimum_xcodeversions   {11 4.4}
+
 fetch.type              git
 post-fetch {
     system -W ${worksrcpath} "git submodule update --init"
 }
 
 patchfiles              patch-configure-versionnumber.diff \
-                        patch-create_default_bundles_tbz-verbose.diff \
-                        patch-configure-mdt.diff
+                        patch-create_default_bundles_tbz-verbose.diff
 
+# The build will fail with deployment target set to 10.8
+macosx_deployment_target 10.7
+
 post-patch {
     reinplace "s/@REVISION@/${github.version}/" ${worksrcpath}/configure
-    reinplace "s/__MACOSX_DEPLOYMENT_TARGET__/${macosx_deployment_target}/" ${worksrcpath}/configure
     fs-traverse file ${worksrcpath} {
         if {[file tail ${file}] == "target"} {
             reinplace "/TESTS *=/d" ${file}
@@ -53,8 +56,6 @@
 
 depends_skip_archcheck  ninja ragel proctools
 
-minimum_xcodeversions   {11 4.4}
-
 depends_lib-append      port:boost \
                         port:multimarkdown \
                         port:curl \
@@ -75,10 +76,17 @@
 configure.env-append    builddir=${worksrcpath}/build \
                         tag=-macports
 
-pre-build {
+pre-configure {
     # the textmate build expects this to be present
     file mkdir $env(HOME)/Library/Caches/com.macromates.TextMate
+    # patch the code to use $HOME from env rather than from getpwent(3)
+    system -W ${worksrcpath} "patch -p0 <${filespath}/patch-Frameworks__io__src__path.cc-use-home-from-env.diff"
 }
+post-configure {
+    # revert the patch
+    system -W ${worksrcpath} "patch -R -p0 <${filespath}/patch-Frameworks__io__src__path.cc-use-home-from-env.diff"
+}
+
 build.cmd               ninja
 build.args              -v -j ${build.jobs}
 build.target            TextMate mate
@@ -86,5 +94,6 @@
 destroot {
     copy ${worksrcpath}/build/Applications/TextMate/TextMate.app ${destroot}${applications_dir}
     xinstall -m 0755 ${worksrcpath}/build/Applications/mate/mate ${destroot}${prefix}/bin
-    xinstall -m 0755 ${worksrcpath}/rmate/rmate ${destroot}${prefix}/bin
 }
+
+livecheck.url           https://github.com/textmate/textmate/tags?after=r9301

Added: trunk/dports/editors/textmate2/files/patch-Frameworks__io__src__path.cc-use-home-from-env.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-Frameworks__io__src__path.cc-use-home-from-env.diff	                        (rev 0)
+++ trunk/dports/editors/textmate2/files/patch-Frameworks__io__src__path.cc-use-home-from-env.diff	2013-04-16 22:20:38 UTC (rev 105298)
@@ -0,0 +1,11 @@
+--- Frameworks/io/src/path.cc.orig	2013-04-16 23:53:22.000000000 +0200
++++ Frameworks/io/src/path.cc	2013-04-16 23:54:34.000000000 +0200
+@@ -1046,7 +1046,7 @@
+ 
+ 	std::string home ()
+ 	{
+-		return passwd_entry()->pw_dir;
++		return getenv("HOME");
+ 	}
+ 
+ 	std::string trash (std::string const& forPath)

Deleted: trunk/dports/editors/textmate2/files/patch-configure-mdt.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-configure-mdt.diff	2013-04-16 18:19:35 UTC (rev 105297)
+++ trunk/dports/editors/textmate2/files/patch-configure-mdt.diff	2013-04-16 22:20:38 UTC (rev 105298)
@@ -1,11 +0,0 @@
---- configure.orig	2012-12-01 16:55:18.000000000 +1100
-+++ configure	2012-12-01 16:54:47.000000000 +1100
-@@ -17,7 +17,7 @@
- name=TextMate
- ver=2.0.0-alpha.\$APP_REVISION${tag:-+git.$(git rev-parse --short HEAD)}
- rev=@REVISION@
--min_os=10.7
-+min_os=__MACOSX_DEPLOYMENT_TARGET__
- 
- # ===============================================
- # = Find clang via xcrun, MacPorts, or Homebrew =

Modified: trunk/dports/editors/textmate2/files/patch-configure-versionnumber.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-configure-versionnumber.diff	2013-04-16 18:19:35 UTC (rev 105297)
+++ trunk/dports/editors/textmate2/files/patch-configure-versionnumber.diff	2013-04-16 22:20:38 UTC (rev 105298)
@@ -1,5 +1,5 @@
---- configure.orig	2012-09-06 21:56:18.000000000 +0200
-+++ configure	2012-09-06 21:56:30.000000000 +0200
+--- configure.orig	2013-04-16 01:14:30.000000000 +0200
++++ configure	2013-04-16 01:15:54.000000000 +0200
 @@ -16,7 +16,7 @@
  
  name=TextMate

Modified: trunk/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff	2013-04-16 18:19:35 UTC (rev 105297)
+++ trunk/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff	2013-04-16 22:20:38 UTC (rev 105298)
@@ -1,8 +1,8 @@
---- bin/create_default_bundles_tbz.orig	2013-01-24 20:31:24.000000000 +0100
-+++ bin/create_default_bundles_tbz	2013-01-24 20:31:30.000000000 +0100
-@@ -11,7 +11,7 @@
- 	BZIP2_FLAG="--use-compress-prog=pbzip2"
- fi
+--- 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"; } && \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130416/3c7694d6/attachment.html>

More information about the macports-changes mailing list