Revision

147496

Author

mojca@macports.org

Date

2016-04-05 17:43:24 -0700 (Tue, 05 Apr 2016)

Log Message

rbenv: executables should be in libexec rather than in bin, else 'gem install' sees binaries from MacPorts

Modified Paths

• trunk/dports/ruby/rbenv/Portfile
• trunk/dports/ruby/rbenv/files/patch-libexec-rbenv-init.diff

Diff

--- trunk/dports/ruby/rbenv/Portfile	2016-04-05 21:05:47 UTC (rev 147495)
+++ trunk/dports/ruby/rbenv/Portfile	2016-04-06 00:43:24 UTC (rev 147496)
@@ -5,6 +5,7 @@
 PortGroup           github 1.0
 
 github.setup        rbenv rbenv 1.0.0 v
+revision            1
 license             MIT
 platforms           darwin
 supported_archs     noarch
@@ -23,8 +24,8 @@
 use_configure       no
 build {}
 destroot {
-    delete ${destroot}${prefix}/bin
-    copy ${worksrcpath}/libexec ${destroot}${prefix}/bin
+    copy ${worksrcpath}/libexec ${destroot}${prefix}/libexec/rbenv
+    ln -s ../libexec/rbenv/rbenv ${destroot}${prefix}/bin/rbenv
     xinstall -d ${destroot}${prefix}/etc/bash_completion.d
     xinstall ${worksrcpath}/completions/rbenv.bash \
         ${destroot}${prefix}/etc/bash_completion.d/rbenv

--- trunk/dports/ruby/rbenv/files/patch-libexec-rbenv-init.diff	2016-04-05 21:05:47 UTC (rev 147495)
+++ trunk/dports/ruby/rbenv/files/patch-libexec-rbenv-init.diff	2016-04-06 00:43:24 UTC (rev 147496)
@@ -18,10 +18,10 @@
 -fi
 +case "$shell" in
 +bash )
-+  echo "source \"$root/etc/bash_completion.d/rbenv\""
++  echo "source \"$root/../etc/bash_completion.d/rbenv\""
 +  ;;
 +zsh )
-+  echo "source \"$root/share/zsh/site-functions/rbenv.zsh_completion\""
++  echo "source \"$root/../share/zsh/site-functions/rbenv.zsh_completion\""
 +  ;;
 +# support for fish and other shells missing
 +esac