[101463] trunk/dports/editors/textmate2

[cal at macports.org]

Revision: 101463
          https://trac.macports.org/changeset/101463
Author:   cal at macports.org
Date:     2013-01-11 06:16:18 -0800 (Fri, 11 Jan 2013)
Log Message:
-----------
textmate2: revert to using system ruby for the build process

Previously the build required rb-json, which forced us to use MacPorts
ruby. Since upstream has since removed this requirement and the build
works fine with the Apple's ruby on the platforms supported by this
port, we don't need a build-time dependency on ruby.

This closes #37602, although not in the way suggested.

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

Removed Paths:
-------------
    trunk/dports/editors/textmate2/files/patch-bin-gen_credits.rb-use-mp-ruby.diff
    trunk/dports/editors/textmate2/files/patch-bin-gen_html-use-mp-ruby.diff

Modified: trunk/dports/editors/textmate2/Portfile
===================================================================
--- trunk/dports/editors/textmate2/Portfile	2013-01-11 13:50:16 UTC (rev 101462)
+++ trunk/dports/editors/textmate2/Portfile	2013-01-11 14:16:18 UTC (rev 101463)
@@ -34,14 +34,11 @@
 
 patchfiles              patch-configure-versionnumber.diff \
                         patch-create_default_bundles_tbz-verbose.diff \
-                        patch-configure-mdt.diff \
-                        patch-bin-gen_credits.rb-use-mp-ruby.diff \
-                        patch-bin-gen_html-use-mp-ruby.diff
+                        patch-configure-mdt.diff
 
 post-patch {
     reinplace "s/@REVISION@/${github.version}/" ${worksrcpath}/configure
     reinplace "s/__MACOSX_DEPLOYMENT_TARGET__/${macosx_deployment_target}/" ${worksrcpath}/configure
-    reinplace "s#@PREFIX@#${prefix}#" ${worksrcpath}/bin/gen_credits.rb ${worksrcpath}/bin/gen_html
     fs-traverse file ${worksrcpath} {
         if {[file tail ${file}] == "target"} {
             reinplace "/TEST_SOURCES =/d" ${file}
@@ -51,9 +48,7 @@
 
 depends_build-append    port:ninja \
                         port:ragel \
-                        port:proctools \
-                        port:ruby \
-                        port:rb-json
+                        port:proctools
 
 depends_skip_archcheck  ninja ragel proctools
 

Deleted: trunk/dports/editors/textmate2/files/patch-bin-gen_credits.rb-use-mp-ruby.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-bin-gen_credits.rb-use-mp-ruby.diff	2013-01-11 13:50:16 UTC (rev 101462)
+++ trunk/dports/editors/textmate2/files/patch-bin-gen_credits.rb-use-mp-ruby.diff	2013-01-11 14:16:18 UTC (rev 101463)
@@ -1,8 +0,0 @@
---- bin/gen_credits.rb.orig	2012-12-09 21:31:56.000000000 +0100
-+++ bin/gen_credits.rb	2012-12-09 21:32:22.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -wKU
-+#!@PREFIX@/bin/ruby -wKU
- # == Synopsis
- #
- # Module to assist in building the Contributors page using git commit history.

Deleted: trunk/dports/editors/textmate2/files/patch-bin-gen_html-use-mp-ruby.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-bin-gen_html-use-mp-ruby.diff	2013-01-11 13:50:16 UTC (rev 101462)
+++ trunk/dports/editors/textmate2/files/patch-bin-gen_html-use-mp-ruby.diff	2013-01-11 14:16:18 UTC (rev 101463)
@@ -1,8 +0,0 @@
---- bin/gen_html.orig	2012-12-09 21:52:18.000000000 +0100
-+++ bin/gen_html	2012-12-09 21:52:32.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -wKU
-+#!@PREFIX@/bin/ruby -wKU
- # == Synopsis
- #
- # gen_html: generates HTML file from markdown and optional template(s)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130111/ccbccd72/attachment.html>