Author: aredridel Date: Sat Nov 4 20:56:09 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - added
---- Files affected: SOURCES: ruby-mongrel-nogems.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/ruby-mongrel-nogems.patch diff -u /dev/null SOURCES/ruby-mongrel-nogems.patch:1.1 --- /dev/null Sat Nov 4 21:56:09 2006 +++ SOURCES/ruby-mongrel-nogems.patch Sat Nov 4 21:56:04 2006 @@ -0,0 +1,180 @@ +diff -ur ruby-mongrel-0.3.13.4-o/bin/mongrel_rails ruby-mongrel-0.3.13.4/bin/mongrel_rails +--- ruby-mongrel-0.3.13.4-o/bin/mongrel_rails 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/bin/mongrel_rails 2006-11-04 13:44:48.000000000 -0700 +@@ -4,7 +4,6 @@ + # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html + # for more information. + +-require 'rubygems' + require 'yaml' + require 'mongrel' + require 'mongrel/rails' +diff -ur ruby-mongrel-0.3.13.4-o/bin/mongrel_rails_service ruby-mongrel-0.3.13.4/bin/mongrel_rails_service +--- ruby-mongrel-0.3.13.4-o/bin/mongrel_rails_service 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/bin/mongrel_rails_service 2006-11-04 13:44:50.000000000 -0700 +@@ -5,7 +5,6 @@ + # + # WARNING: stop command still doesn't work with rails! + ############################################### +-require 'rubygems' + require 'mongrel' + require 'win32/service' + include Win32 +diff -ur ruby-mongrel-0.3.13.4-o/bin/mongrel_rails_svc ruby-mongrel-0.3.13.4/bin/mongrel_rails_svc +--- ruby-mongrel-0.3.13.4-o/bin/mongrel_rails_svc 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/bin/mongrel_rails_svc 2006-11-04 13:44:45.000000000 -0700 +@@ -3,7 +3,6 @@ + # + # This is where Win32::Daemon resides. + ############################################### +-require 'rubygems' + require 'mongrel' + require 'mongrel/rails' + require 'optparse' +diff -ur ruby-mongrel-0.3.13.4-o/doc/rdoc/files/lib/mongrel/command_rb.html ruby-mongrel-0.3.13.4/doc/rdoc/files/lib/mongrel/command_rb.html +--- ruby-mongrel-0.3.13.4-o/doc/rdoc/files/lib/mongrel/command_rb.html 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/doc/rdoc/files/lib/mongrel/command_rb.html 2006-11-04 13:44:57.000000000 -0700 +@@ -85,7 +85,6 @@ + <h3 class="section-bar">Required files</h3> + + <div class="name-list"> +- rubygems + singleton + optparse + gem_plugin +@@ -120,4 +119,4 @@ + </div> + + </body> +-</html> +\ No newline at end of file ++</html> +diff -ur ruby-mongrel-0.3.13.4-o/doc/rdoc/files/lib/mongrel/init_rb.html ruby-mongrel-0.3.13.4/doc/rdoc/files/lib/mongrel/init_rb.html +--- ruby-mongrel-0.3.13.4-o/doc/rdoc/files/lib/mongrel/init_rb.html 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/doc/rdoc/files/lib/mongrel/init_rb.html 2006-11-04 13:45:04.000000000 -0700 +@@ -85,8 +85,6 @@ + <h3 class="section-bar">Required files</h3> + + <div class="name-list"> +- rubygems +- gem_plugin + </div> + </div> + +@@ -118,4 +116,4 @@ + </div> + + </body> +-</html> +\ No newline at end of file ++</html> +diff -ur ruby-mongrel-0.3.13.4-o/doc/rdoc/files/lib/mongrel_rb.html ruby-mongrel-0.3.13.4/doc/rdoc/files/lib/mongrel_rb.html +--- ruby-mongrel-0.3.13.4-o/doc/rdoc/files/lib/mongrel_rb.html 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/doc/rdoc/files/lib/mongrel_rb.html 2006-11-04 13:44:54.000000000 -0700 +@@ -97,7 +97,6 @@ + yaml + mongrel/configurator + time +- rubygems + etc + </div> + </div> +@@ -130,4 +129,4 @@ + </div> + + </body> +-</html> +\ No newline at end of file ++</html> +diff -ur ruby-mongrel-0.3.13.4-o/examples/camping/blog.rb ruby-mongrel-0.3.13.4/examples/camping/blog.rb +--- ruby-mongrel-0.3.13.4-o/examples/camping/blog.rb 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/examples/camping/blog.rb 2006-11-04 13:45:27.000000000 -0700 +@@ -1,8 +1,6 @@ + #!/usr/bin/env ruby + + $:.unshift File.dirname(__FILE__) + "/../../lib" +-require 'rubygems' +-require_gem 'camping', '>=1.4' + require 'camping/session' + + Camping.goes :Blog +diff -ur ruby-mongrel-0.3.13.4-o/examples/camping/tepee.rb ruby-mongrel-0.3.13.4/examples/camping/tepee.rb +--- ruby-mongrel-0.3.13.4-o/examples/camping/tepee.rb 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/examples/camping/tepee.rb 2006-11-04 13:45:19.000000000 -0700 +@@ -1,6 +1,6 @@ + #!/usr/bin/ruby + $:.unshift File.dirname(__FILE__) + "/../../lib" +-%w(rubygems redcloth camping acts_as_versioned).each { |lib| require lib } ++%w(redcloth camping acts_as_versioned).each { |lib| require lib } + + Camping.goes :Tepee + +diff -ur ruby-mongrel-0.3.13.4-o/examples/mongrel_simple_service.rb ruby-mongrel-0.3.13.4/examples/mongrel_simple_service.rb +--- ruby-mongrel-0.3.13.4-o/examples/mongrel_simple_service.rb 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/examples/mongrel_simple_service.rb 2006-11-04 13:45:09.000000000 -0700 +@@ -1,5 +1,4 @@ + # This script emualtes script/server behavior but running webrick http server +-require 'rubygems' + + require 'mongrel' + require 'yaml' +diff -ur ruby-mongrel-0.3.13.4-o/lib/mongrel/command.rb ruby-mongrel-0.3.13.4/lib/mongrel/command.rb +--- ruby-mongrel-0.3.13.4-o/lib/mongrel/command.rb 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/lib/mongrel/command.rb 2006-11-04 13:46:27.000000000 -0700 +@@ -4,10 +4,8 @@ + # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html + # for more information. + +-require 'rubygems' + require 'singleton' + require 'optparse' +-require 'gem_plugin' + + module Mongrel + +@@ -147,9 +145,10 @@ + + # Builds a list of possible commands from the Command derivates list + def commands +- pmgr = GemPlugin::Manager.instance +- list = pmgr.plugins["/commands"].keys +- return list.sort ++ #pmgr = GemPlugin::Manager.instance ++ #list = pmgr.plugins["/commands"].keys ++ #return list.sort ++ return [] + end + + # Prints a list of available commands. +@@ -189,7 +188,7 @@ + cmd_name = "mongrel::" + cmd_name + end + +- command = GemPlugin::Manager.instance.create("/commands/#{cmd_name}", :argv => args) ++ #command = GemPlugin::Manager.instance.create("/commands/#{cmd_name}", :argv => args) + rescue OptionParser::InvalidOption + STDERR.puts "#$! for command '#{cmd_name}'" + STDERR.puts "Try #{cmd_name} -h to get help." +diff -ur ruby-mongrel-0.3.13.4-o/lib/mongrel/init.rb ruby-mongrel-0.3.13.4/lib/mongrel/init.rb +--- ruby-mongrel-0.3.13.4-o/lib/mongrel/init.rb 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/lib/mongrel/init.rb 2006-11-04 13:46:43.000000000 -0700 +@@ -4,8 +4,6 @@ + # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html + # for more information. + +-require 'rubygems' +-require 'gem_plugin' + + # file is just a stub that makes sure the mongrel_plugins gem is loaded and ready + +diff -ur ruby-mongrel-0.3.13.4-o/lib/mongrel.rb ruby-mongrel-0.3.13.4/lib/mongrel.rb +--- ruby-mongrel-0.3.13.4-o/lib/mongrel.rb 1969-12-31 17:00:00.000000000 -0700 ++++ ruby-mongrel-0.3.13.4/lib/mongrel.rb 2006-11-04 13:45:34.000000000 -0700 +@@ -18,7 +18,6 @@ + require 'yaml' + require 'mongrel/configurator' + require 'time' +-require 'rubygems' + require 'etc' + + ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
