Revision: 67113 http://trac.macports.org/changeset/67113 Author: jmr@macports.org Date: 2010-04-29 01:37:09 -0700 (Thu, 29 Apr 2010) Log Message: ----------- ruby portgroup: simplify using option defaults Modified Paths: -------------- trunk/dports/_resources/port1.0/group/ruby-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/ruby-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/ruby-1.0.tcl 2010-04-29 08:16:08 UTC (rev 67112) +++ trunk/dports/_resources/port1.0/group/ruby-1.0.tcl 2010-04-29 08:37:09 UTC (rev 67113) @@ -47,12 +47,12 @@ return $val } -set ruby.version [ruby.extract_config ruby_version] -set ruby.arch [ruby.extract_config arch ${os.platform}] - +options ruby.version ruby.arch ruby.lib ruby.archlib +default ruby.version {[ruby.extract_config ruby_version]} +default ruby.arch {[ruby.extract_config arch "${os.arch}-${os.platform}${os.major}"]} # define installation libraries as vendor location -set ruby.lib [ruby.extract_config vendorlibdir ${prefix}/lib/ruby/vendor_ruby/${ruby.version}] -set ruby.archlib [ruby.extract_config vendorarchdir ${ruby.lib}/${ruby.arch}] +default ruby.lib {[ruby.extract_config vendorlibdir ${prefix}/lib/ruby/vendor_ruby/${ruby.version}]} +default ruby.archlib {[ruby.extract_config vendorarchdir ${ruby.lib}/${ruby.arch}]} set ruby.module "" set ruby.filename "" @@ -65,8 +65,7 @@ proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"} {implementation "ruby"}} { global destroot prefix worksrcpath os.platform global ruby.bin ruby.rdoc ruby.gem - global ruby.version - global ruby.lib ruby.archlib + global ruby.version ruby.lib global ruby.module ruby.filename ruby.project ruby.docs ruby.srcdir if {${implementation} eq "ruby19"} { @@ -82,12 +81,6 @@ return -code error "ruby.setup failed" } - # re-define variables to pick up possible implemantation change - set ruby.version [ruby.extract_config ruby_version] - set ruby.arch [ruby.extract_config arch ${os.platform}] - set ruby.lib [ruby.extract_config vendorlibdir ${prefix}/lib/ruby/vendor_ruby/${ruby.version}] - set ruby.archlib [ruby.extract_config vendorarchdir ${ruby.lib}/${ruby.arch}] - # define ruby global names and lists # check if module is a list or string if {[llength ${module}] > 1} {