Ignore:
Timestamp:
Apr 16, 2013, 10:20:38 PM (7 years ago)
Author:
cal@…
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
Location:
trunk/dports/editors/textmate2
Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/editors/textmate2/Portfile

    r104125 r105298  
    77PortGroup               conflicts_build 1.0
    88
    9 github.setup            textmate textmate 9395 r
     9github.setup            textmate textmate 9413 a
    1010epoch                   1
    1111version                 2.0.${github.version}
     
    2828license                 GPL-3+
    2929
     30minimum_xcodeversions   {11 4.4}
     31
    3032fetch.type              git
    3133post-fetch {
     
    3436
    3537patchfiles              patch-configure-versionnumber.diff \
    36                         patch-create_default_bundles_tbz-verbose.diff \
    37                         patch-configure-mdt.diff
     38                        patch-create_default_bundles_tbz-verbose.diff
     39
     40# The build will fail with deployment target set to 10.8
     41macosx_deployment_target 10.7
    3842
    3943post-patch {
    4044    reinplace "s/@REVISION@/${github.version}/" ${worksrcpath}/configure
    41     reinplace "s/__MACOSX_DEPLOYMENT_TARGET__/${macosx_deployment_target}/" ${worksrcpath}/configure
    4245    fs-traverse file ${worksrcpath} {
    4346        if {[file tail ${file}] == "target"} {
     
    5356
    5457depends_skip_archcheck  ninja ragel proctools
    55 
    56 minimum_xcodeversions   {11 4.4}
    5758
    5859depends_lib-append      port:boost \
     
    7677                        tag=-macports
    7778
    78 pre-build {
     79pre-configure {
    7980    # the textmate build expects this to be present
    8081    file mkdir $env(HOME)/Library/Caches/com.macromates.TextMate
     82    # patch the code to use $HOME from env rather than from getpwent(3)
     83    system -W ${worksrcpath} "patch -p0 <${filespath}/patch-Frameworks__io__src__path.cc-use-home-from-env.diff"
    8184}
     85post-configure {
     86    # revert the patch
     87    system -W ${worksrcpath} "patch -R -p0 <${filespath}/patch-Frameworks__io__src__path.cc-use-home-from-env.diff"
     88}
     89
    8290build.cmd               ninja
    8391build.args              -v -j ${build.jobs}
     
    8795    copy ${worksrcpath}/build/Applications/TextMate/TextMate.app ${destroot}${applications_dir}
    8896    xinstall -m 0755 ${worksrcpath}/build/Applications/mate/mate ${destroot}${prefix}/bin
    89     xinstall -m 0755 ${worksrcpath}/rmate/rmate ${destroot}${prefix}/bin
    9097}
     98
     99livecheck.url           https://github.com/textmate/textmate/tags?after=r9301
  • trunk/dports/editors/textmate2/files/patch-configure-versionnumber.diff

    r103162 r105298  
    1 --- configure.orig      2012-09-06 21:56:18.000000000 +0200
    2 +++ configure   2012-09-06 21:56:30.000000000 +0200
     1--- configure.orig      2013-04-16 01:14:30.000000000 +0200
     2+++ configure   2013-04-16 01:15:54.000000000 +0200
    33@@ -16,7 +16,7 @@
    44 
  • trunk/dports/editors/textmate2/files/patch-create_default_bundles_tbz-verbose.diff

    r102015 r105298  
    1 --- bin/create_default_bundles_tbz.orig 2013-01-24 20:31:24.000000000 +0100
    2 +++ bin/create_default_bundles_tbz      2013-01-24 20:31:30.000000000 +0100
    3 @@ -11,7 +11,7 @@
    4         BZIP2_FLAG="--use-compress-prog=pbzip2"
    5  fi
     1--- bin/create_default_bundles_tbz.orig 2013-04-16 01:16:48.000000000 +0200
     2+++ bin/create_default_bundles_tbz      2013-04-16 01:19:10.000000000 +0200
     3@@ -14,7 +14,7 @@
     4 builddir="${builddir:-$HOME/build/TextMate}"
     5 bl="$builddir/Applications/bl/bl"
    66 
    77-{ [ -x "$bl" ] || ninja "$bl"; } && \
Note: See TracChangeset for help on using the changeset viewer.