Revision: 69163 http://trac.macports.org/changeset/69163 Author: jmr@macports.org Date: 2010-06-26 04:58:22 -0700 (Sat, 26 Jun 2010) Log Message: ----------- jruby: update to 1.5.0 (#24756, maintainer timeout), fix apidocs variant (#22373) Modified Paths: -------------- trunk/dports/lang/jruby/Portfile Modified: trunk/dports/lang/jruby/Portfile =================================================================== --- trunk/dports/lang/jruby/Portfile 2010-06-26 09:53:44 UTC (rev 69162) +++ trunk/dports/lang/jruby/Portfile 2010-06-26 11:58:22 UTC (rev 69163) @@ -3,7 +3,7 @@ PortSystem 1.0 name jruby -version 1.4.0 +version 1.5.0 categories lang ruby maintainers gmail.com:ameingast @@ -18,12 +18,12 @@ on C language-based extensions have been reimplemented. homepage http://jruby.codehaus.org/ -master_sites http://jruby.kenai.com/downloads/${version}/ +master_sites http://jruby.org.s3.amazonaws.com/downloads/${version}/ distname ${name}-src-${version} worksrcdir ${name}-${version} use_bzip2 no -checksums md5 a363b6c2ea24f0ef8df478c93ac8cc59 \ - sha1 3d6f634e16b789a5a086327c0f09710dd29d1ec7 +checksums md5 092f2d21285f3295e74777a71e7c6401 \ + sha1 3e21f8aace0715f98bcad4692548126220d1d989 depends_build bin:ant:apache-ant depends_lib bin:java:kaffe @@ -35,7 +35,7 @@ build.target jar variant apidocs description "include API documentation" { - build.target jar create-apidocs + build.target-append apidocs } variant default_ruby description "build without j prefix" { @@ -56,10 +56,16 @@ file copy ${worksrcpath}/docs ${destroot}${prefix}/share/java/${name} } - # Remove extraneous bat files + # Remove extraneous .bat, .exe and .dll files foreach f [glob -directory ${destroot}${prefix}/share/java/${name}/bin *.bat] { file delete $f } + foreach f [glob -directory ${destroot}${prefix}/share/java/${name}/bin *.exe] { + file delete $f + } + foreach f [glob -directory ${destroot}${prefix}/share/java/${name}/bin *.dll] { + file delete $f + } set jruby_prefix "" @@ -67,7 +73,7 @@ set jruby_prefix "j" } - foreach f { jruby jirb jrubyc jrubcli jrubysrv } { + foreach f { jruby jirb jrubyc jirb_swing } { regsub {^j} $f $jruby_prefix dest if { ${dest} != ${f} } { ln -s ${prefix}/share/java/${name}/bin/${f} ${destroot}${prefix}/bin/${dest} @@ -75,7 +81,7 @@ ln -s ${prefix}/share/java/${name}/bin/${f} ${destroot}${prefix}/bin/ } - foreach f { gem gem_mirror gemri gemwhich rake spec testrb } { + foreach f { ast autospec gem rake rdebug rdoc ri spec testrb } { ln -s ${prefix}/share/java/${name}/bin/${f} \ ${destroot}${prefix}/bin/${jruby_prefix}${f} }