[103920] trunk/dports/ruby
kimuraw at macports.org
kimuraw at macports.org
Sat Mar 9 18:23:44 PST 2013
Revision: 103920
https://trac.macports.org/changeset/103920
Author: kimuraw at macports.org
Date: 2013-03-09 18:23:44 -0800 (Sat, 09 Mar 2013)
Log Message:
-----------
ruby/: fix errors from chage of PortGroup ruby
- rb-json_pure, rb-webgen, rb-gettext, rb-pdumpfs,
rb-archive-tar-minitar, rb-cvs : ${prefix}/bin -> ${ruby.bindir}
- rb19-haml, rb19-nanoc3: remove conflicts
M rb-json_pure/Portfile
M rb-webgen/Portfile
M rb-gettext/Portfile
M rb-pdumpfs/Portfile
M rb-archive-tar-minitar/Portfile
M rb-cvs/Portfile
M rb19-haml/Portfile
M rb19-nanoc3/Portfile
Modified Paths:
--------------
trunk/dports/ruby/rb-archive-tar-minitar/Portfile
trunk/dports/ruby/rb-cvs/Portfile
trunk/dports/ruby/rb-gettext/Portfile
trunk/dports/ruby/rb-json_pure/Portfile
trunk/dports/ruby/rb-pdumpfs/Portfile
trunk/dports/ruby/rb-webgen/Portfile
trunk/dports/ruby/rb19-haml/Portfile
trunk/dports/ruby/rb19-nanoc3/Portfile
Modified: trunk/dports/ruby/rb-archive-tar-minitar/Portfile
===================================================================
--- trunk/dports/ruby/rb-archive-tar-minitar/Portfile 2013-03-10 02:19:43 UTC (rev 103919)
+++ trunk/dports/ruby/rb-archive-tar-minitar/Portfile 2013-03-10 02:23:44 UTC (rev 103920)
@@ -21,6 +21,7 @@
destroot.args --no-ri --no-tests
post-destroot {
- reinplace "s%#!.*ruby%#!${ruby.bin}%" ${destroot}${prefix}/bin/minitar
- file delete -force ${destroot}${prefix}/bin/minitar.bat
+ reinplace -locale C "s%#!.*ruby%#!${ruby.bin}%" ${destroot}${ruby.bindir}/minitar
+ file delete -force ${destroot}${prefix}/bin/minitar.bat${ruby.link_binaries_suffix}
+ file delete -force ${destroot}${ruby.bindir}/minitar.bat
}
Modified: trunk/dports/ruby/rb-cvs/Portfile
===================================================================
--- trunk/dports/ruby/rb-cvs/Portfile 2013-03-10 02:19:43 UTC (rev 103919)
+++ trunk/dports/ruby/rb-cvs/Portfile 2013-03-10 02:23:44 UTC (rev 103920)
@@ -15,6 +15,8 @@
checksums md5 4e40b597ba43ef8ecc8b0fdce22119bd
post-destroot {
reinplace "s;/usr/local/bin/ruby;${ruby.bin};" ${worksrcpath}/viztree
- xinstall -m 0755 ${worksrcpath}/viztree ${destroot}${prefix}/bin
+ xinstall -m 0755 ${worksrcpath}/viztree ${destroot}${ruby.bindir}
+ # install commands at post-destroot, need to make symlink in portfile
+ ln -s ${ruby.bindir}/viztree ${destroot}${prefix}/bin/viztree${ruby.link_binaries_suffix}
}
platforms darwin
Modified: trunk/dports/ruby/rb-gettext/Portfile
===================================================================
--- trunk/dports/ruby/rb-gettext/Portfile 2013-03-10 02:19:43 UTC (rev 103919)
+++ trunk/dports/ruby/rb-gettext/Portfile 2013-03-10 02:23:44 UTC (rev 103920)
@@ -23,9 +23,9 @@
platforms darwin
post-destroot {
- reinplace "s|^#!.*ruby|#!${ruby.bin}|" ${destroot}${prefix}/bin/rxgettext
- reinplace "s|^#!.*ruby|#!${ruby.bin}|" ${destroot}${prefix}/bin/rmsginit
- reinplace "s|^#!.*ruby|#!${ruby.bin}|" ${destroot}${prefix}/bin/rmsgfmt
- reinplace "s|^#!.*ruby|#!${ruby.bin}|" ${destroot}${prefix}/bin/rmsgmerge
+ reinplace "s|^#!.*ruby|#!${ruby.bin}|" ${destroot}${ruby.bindir}/rxgettext
+ reinplace "s|^#!.*ruby|#!${ruby.bin}|" ${destroot}${ruby.bindir}/rmsginit
+ reinplace "s|^#!.*ruby|#!${ruby.bin}|" ${destroot}${ruby.bindir}/rmsgfmt
+ reinplace "s|^#!.*ruby|#!${ruby.bin}|" ${destroot}${ruby.bindir}/rmsgmerge
}
Modified: trunk/dports/ruby/rb-json_pure/Portfile
===================================================================
--- trunk/dports/ruby/rb-json_pure/Portfile 2013-03-10 02:19:43 UTC (rev 103919)
+++ trunk/dports/ruby/rb-json_pure/Portfile 2013-03-10 02:23:44 UTC (rev 103920)
@@ -19,11 +19,12 @@
rmd160 2ce9c5c4315c330a0f9dac5592e4c8d6c134efc6
# avoid conflict against a command from port:rb-json
+ruby.link_binaries no
post-destroot {
- foreach dir {bin lib/ruby/gems/1.8/bin} {
+ foreach dir [list ${ruby.gemdir}/bin ${ruby.bindir}] {
foreach cmd {edit_json prettify_json} {
- move "${destroot}${prefix}/${dir}/${cmd}.rb" \
- "${destroot}${prefix}/${dir}/${cmd}_pure.rb"
+ move "${destroot}/${dir}/${cmd}.rb" \
+ "${destroot}/${dir}/${cmd}_pure.rb"
}
}
}
Modified: trunk/dports/ruby/rb-pdumpfs/Portfile
===================================================================
--- trunk/dports/ruby/rb-pdumpfs/Portfile 2013-03-10 02:19:43 UTC (rev 103919)
+++ trunk/dports/ruby/rb-pdumpfs/Portfile 2013-03-10 02:23:44 UTC (rev 103920)
@@ -33,8 +33,8 @@
test.target check
destroot {
- xinstall -d -m 0755 ${destroot}${prefix}/bin
- xinstall -m 0755 ${worksrcpath}/pdumpfs ${destroot}${prefix}/bin
+ xinstall -d -m 0755 ${destroot}${ruby.bindir}
+ xinstall -m 0755 ${worksrcpath}/pdumpfs ${destroot}${ruby.bindir}
xinstall -d -m 0755 ${destroot}${prefix}/share/man/man8
xinstall -m 0644 ${worksrcpath}/man/man8/pdumpfs.8 \
${destroot}${prefix}/share/man/man8
Modified: trunk/dports/ruby/rb-webgen/Portfile
===================================================================
--- trunk/dports/ruby/rb-webgen/Portfile 2013-03-10 02:19:43 UTC (rev 103919)
+++ trunk/dports/ruby/rb-webgen/Portfile 2013-03-10 02:23:44 UTC (rev 103920)
@@ -21,6 +21,6 @@
port:rb-kramdown
post-destroot {
- reinplace "s|^#!.*ruby|#!${ruby.bin}|" ${destroot}${prefix}/bin/webgen
+ reinplace "s|^#!.*ruby|#!${ruby.bin}|" ${destroot}${ruby.bindir}/webgen
}
Modified: trunk/dports/ruby/rb19-haml/Portfile
===================================================================
--- trunk/dports/ruby/rb19-haml/Portfile 2013-03-10 02:19:43 UTC (rev 103919)
+++ trunk/dports/ruby/rb19-haml/Portfile 2013-03-10 02:23:44 UTC (rev 103920)
@@ -7,7 +7,6 @@
ruby.setup haml 3.1.7 gem {} rubygems ruby19
checksums rmd160 3296d138441ca252fd718c883acbf954b9f9efd9 \
sha256 d6a7cab4234cc98980ac3b25f1b99efed2ec50acbd0b6b213b68856d14e89bc7
-conflicts rb-haml
description Haml and Sass: markup languages for HTML and CSS
long_description \
Haml is a markup language that’s used to cleanly and simply describe \
Modified: trunk/dports/ruby/rb19-nanoc3/Portfile
===================================================================
--- trunk/dports/ruby/rb19-nanoc3/Portfile 2013-03-10 02:19:43 UTC (rev 103919)
+++ trunk/dports/ruby/rb19-nanoc3/Portfile 2013-03-10 02:23:44 UTC (rev 103920)
@@ -3,7 +3,6 @@
PortGroup ruby 1.0
ruby.setup nanoc3 3.1.3 gem {} rubygems ruby19
-conflicts rb-nanoc3
description A Ruby site compiler that produces static HTML
long_description \
nanoc is a tool for building static web sites. It can transform content \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130309/981d348b/attachment.html>
More information about the macports-changes
mailing list