diff options
Diffstat (limited to 'lang/ruby19-base/patches')
27 files changed, 0 insertions, 917 deletions
diff --git a/lang/ruby19-base/patches/patch-aa b/lang/ruby19-base/patches/patch-aa deleted file mode 100644 index e03693c490c..00000000000 --- a/lang/ruby19-base/patches/patch-aa +++ /dev/null @@ -1,81 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2012/07/25 19:27:09 bsiegert Exp $ - -* Adding Interix and MirBSD support. -* Ignore doxygen. - ---- configure.in.orig Thu Aug 11 00:38:34 2011 -+++ configure.in -@@ -351,11 +351,7 @@ AC_SUBST(MAKEDIRS) - - AC_CHECK_TOOL(DOT, dot) - AC_CHECK_TOOL(DOXYGEN, doxygen) --if test x"$DOXYGEN" = x; then -- CAPITARGET=nodoc --else -- CAPITARGET=capi --fi -+CAPITARGET=nodoc - AC_SUBST(CAPITARGET) - - # checks for UNIX variants that set C preprocessor variables -@@ -982,6 +978,8 @@ main() - ], - [superux*], [ ac_cv_func_setitimer=no - ], -+[interix*], [ LIBS="-lm $LIBS" -+ ac_cv_func_getpgrp_void=yes], - [ LIBS="-lm $LIBS"]) - AC_CHECK_LIB(crypt, crypt) - AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV -@@ -1062,6 +1060,9 @@ AC_CHECK_MEMBERS([struct stat.st_ctimens - - AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H - @%:@include <time.h> -+@%:@endif -+@%:@ifdef HAVE_SYS_TIME_H -+@%:@ include <sys/time.h> - @%:@endif]) - - AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H -@@ -1834,7 +1835,9 @@ if test "$with_dln_a_out" != yes; then - rb_cv_dlopen=yes], - [interix*], [ : ${LDSHARED='$(CC) -shared'} - XLDFLAGS="$XLDFLAGS -Wl,-E" -+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' - LIBPATHFLAG=" -L%1\$-s" -+ RPATHFLAG=' -Wl,-R%1$-s' - rb_cv_dlopen=yes], - [freebsd*|dragonfly*], [ - : ${LDSHARED='$(CC) -shared'} -@@ -1845,7 +1848,7 @@ if test "$with_dln_a_out" != yes; then - test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" - fi - rb_cv_dlopen=yes], -- [openbsd*], [ : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} -+ [openbsd*|mirbsd*], [ : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} - if test "$rb_cv_binary_elf" = yes; then - LDFLAGS="$LDFLAGS -Wl,-E" - fi -@@ -2141,7 +2144,7 @@ if test "$enable_shared" = 'yes'; then - LIBRUBY_ALIASES="" - fi - ], -- [openbsd*], [ -+ [openbsd*|mirbsd*], [ - SOLIBS='$(LIBS)' - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` - ], -@@ -2190,7 +2193,12 @@ if test "$enable_shared" = 'yes'; then - LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib' - ], - [interix*], [ -- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' -+ SOLIBS='$(LIBS)' -+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' -+ # link explicitly to 0x48000000 -+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' -+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' -+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' - ]) - fi - if test "$enable_rpath" = yes; then diff --git a/lang/ruby19-base/patches/patch-ab b/lang/ruby19-base/patches/patch-ab deleted file mode 100644 index 29dfed6ffaf..00000000000 --- a/lang/ruby19-base/patches/patch-ab +++ /dev/null @@ -1,94 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2012/07/25 19:27:09 bsiegert Exp $ - -* Adding Interix and MirBSD support. -* Ignore doxygen. - ---- configure.orig Sat Apr 21 23:11:44 2012 -+++ configure -@@ -5976,11 +5976,7 @@ else - DOXYGEN="$ac_cv_prog_DOXYGEN" - fi - --if test x"$DOXYGEN" = x; then -- CAPITARGET=nodoc --else -- CAPITARGET=capi --fi -+CAPITARGET=nodoc - - - # checks for UNIX variants that set C preprocessor variables -@@ -9463,6 +9459,9 @@ esac - superux*) : - ac_cv_func_setitimer=no - ;; #( -+ interix*) LIBS="-lm $LIBS" -+ ac_cv_func_getpgrp_void=yes -+ ;; #( - *) : - LIBS="-lm $LIBS" ;; - esac -@@ -10835,6 +10834,9 @@ fi - ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#ifdef HAVE_TIME_H - #include <time.h> - #endif -+#ifdef HAVE_SYS_TIME_H -+# include <sys/time.h> -+#endif - " - if test "x$ac_cv_type_struct_timespec" = xyes; then : - -@@ -15261,8 +15263,12 @@ esac ;; #( - rb_cv_dlopen=yes ;; #( - interix*) : - : ${LDSHARED='$(CC) -shared'} -+ LDFLAGS="$LDFLAGS -Wl,-E" - XLDFLAGS="$XLDFLAGS -Wl,-E" -+ # use special random-slot linkage in 0x[56]XXXXXXX - LIBPATHFLAG=" -L%1\$-s" -+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' -+ RPATHFLAG=' -Wl,-R%1$-s' - rb_cv_dlopen=yes ;; #( - freebsd*|dragonfly*) : - -@@ -15274,7 +15280,7 @@ esac ;; #( - test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" - fi - rb_cv_dlopen=yes ;; #( -- openbsd*) : -+ openbsd*|mirbsd*) : - : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} - if test "$rb_cv_binary_elf" = yes; then - LDFLAGS="$LDFLAGS -Wl,-E" -@@ -15791,7 +15797,7 @@ if test "$enable_shared" = 'yes'; then - LIBRUBY_ALIASES="" - fi - ;; #( -- openbsd*) : -+ openbsd*|mirbsd*) : - - SOLIBS='$(LIBS)' - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` -@@ -15851,7 +15857,12 @@ esac - ;; #( - interix*) : - -- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' -+ SOLIBS='$(LIBS)' -+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' -+ # link explicitly to 0x48000000 -+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' -+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' -+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' - ;; #( - *) : - ;; -@@ -17323,6 +17334,8 @@ do - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; diff --git a/lang/ruby19-base/patches/patch-ac b/lang/ruby19-base/patches/patch-ac deleted file mode 100644 index 86c068ec7d2..00000000000 --- a/lang/ruby19-base/patches/patch-ac +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Accept db3, db4 or db5 as include/library. - ---- ext/dbm/extconf.rb.orig 2009-10-02 10:45:39.000000000 +0000 -+++ ext/dbm/extconf.rb -@@ -5,13 +5,16 @@ dir_config("dbm") - if dblib = with_config("dbm-type", nil) - dblib = dblib.split(/[ ,]+/) - else -- dblib = %w(db db2 db1 dbm gdbm gdbm_compat qdbm) -+ dblib = %w(db db2 db1 db5 db4 db3 dbm gdbm gdbm_compat qdbm) - end - - headers = { - "db" => ["db.h"], - "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"], - "db2" => ["db2/db.h", "db2.h", "db.h"], -+ "db3" => ["db3/db.h", "db3.h", "db.h"], -+ "db4" => ["db4/db.h", "db4.h", "db.h"], -+ "db5" => ["db5/db.h", "db5.h", "db.h"], - "dbm" => ["ndbm.h"], - "gdbm" => ["gdbm-ndbm.h", "ndbm.h"], - "gdbm_compat" => ["gdbm-ndbm.h", "ndbm.h"], -@@ -24,7 +27,7 @@ def headers.db_check(db) - hsearch = nil - - case db -- when /^db2?$/ -+ when /^db[2-5]?$/ - db_prefix = "__db_n" - hsearch = "-DDB_DBM_HSEARCH " - when "gdbm" -@@ -36,7 +39,8 @@ def headers.db_check(db) - db_prefix ||= "" - - if (have_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and -- hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", h, hsearch)} -+ hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", h, hsearch)} or -+ hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", ["db.h", h], hsearch)} - have_func(db_prefix+"dbm_clearerr") unless have_gdbm - $defs << hsearch if hsearch - $defs << '-DDBM_HDR="<'+hdr+'>"' diff --git a/lang/ruby19-base/patches/patch-ad b/lang/ruby19-base/patches/patch-ad deleted file mode 100644 index 0d5c39ddc66..00000000000 --- a/lang/ruby19-base/patches/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Use proper OpenSSL's API. - ---- ext/openssl/ossl_ssl.c.orig 2010-05-23 12:18:51.000000000 +0000 -+++ ext/openssl/ossl_ssl.c -@@ -700,10 +700,10 @@ ossl_sslctx_get_ciphers(VALUE self) - if (!ciphers) - return rb_ary_new(); - -- num = sk_num((STACK*)ciphers); -+ num = sk_SSL_CIPHER_num(ciphers); - ary = rb_ary_new2(num); - for(i = 0; i < num; i++){ -- cipher = (SSL_CIPHER*)sk_value((STACK*)ciphers, i); -+ cipher = sk_SSL_CIPHER_value(ciphers, i); - rb_ary_push(ary, ossl_ssl_cipher_to_ary(cipher)); - } - return ary; diff --git a/lang/ruby19-base/patches/patch-ae b/lang/ruby19-base/patches/patch-ae deleted file mode 100644 index 5225790d570..00000000000 --- a/lang/ruby19-base/patches/patch-ae +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Add install_root option for pkgsrc's rubygems support. - ---- lib/rubygems.rb.orig 2010-08-26 08:25:09.000000000 +0000 -+++ lib/rubygems.rb -@@ -353,7 +353,10 @@ module Gem - ## - # The path where gem executables are to be installed. - -- def self.bindir(install_dir=Gem.dir) -+ def self.bindir(install_dir=Gem.dir, install_root=nil) -+ unless install_root.nil? -+ install_dir = install_dir.sub(install_root, "") -+ end - return File.join(install_dir, 'bin') unless - install_dir.to_s == Gem.default_dir - Gem.default_bindir -@@ -576,7 +579,7 @@ module Gem - ## - # The index to insert activated gem paths into the $LOAD_PATH. - # -- # Defaults to the site lib directory unless gem_prelude.rb has loaded paths, -+ # Defaults to the vendor lib directory unless gem_prelude.rb has loaded paths, - # then it inserts the activated gem's paths before the gem_prelude.rb paths - # so you can override the gem_prelude.rb default $LOAD_PATH paths. - -@@ -687,6 +690,7 @@ module Gem - prefix = File.dirname dir - - if prefix == File.expand_path(ConfigMap[:sitelibdir]) or -+ prefix == File.expand_path(ConfigMap[:vendorlibdir]) or - prefix == File.expand_path(ConfigMap[:libdir]) or - 'lib' != File.basename(dir) then - nil diff --git a/lang/ruby19-base/patches/patch-af b/lang/ruby19-base/patches/patch-af deleted file mode 100644 index 8afbfe9cc76..00000000000 --- a/lang/ruby19-base/patches/patch-af +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Prevent access to HOME when --install-root is used. - ---- lib/rubygems/commands/install_command.rb.orig 2010-04-22 08:24:42.000000000 +0000 -+++ lib/rubygems/commands/install_command.rb -@@ -146,7 +146,7 @@ to write the specification by hand. For - Gem::DocManager.new(gem, options[:rdoc_args]).generate_ri - end - -- Gem::DocManager.update_ri_cache -+ Gem::DocManager.update_ri_cache(options[:install_root]) - end - - if options[:generate_rdoc] then diff --git a/lang/ruby19-base/patches/patch-ag b/lang/ruby19-base/patches/patch-ag deleted file mode 100644 index b2064bf89bb..00000000000 --- a/lang/ruby19-base/patches/patch-ag +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Make sure to setup under DESTDIR. - ---- lib/rubygems/commands/setup_command.rb.orig 2010-04-22 08:24:42.000000000 +0000 -+++ lib/rubygems/commands/setup_command.rb -@@ -118,7 +118,7 @@ By default, this RubyGems will install g - - uninstall_old_gemcutter - -- install_rdoc -+ install_rdoc install_destdir - - say - if @verbose then -@@ -229,16 +229,20 @@ TEXT - end - end - -- def install_rdoc -+ def install_rdoc(install_destdir) - gem_doc_dir = File.join Gem.dir, 'doc' - rubygems_name = "rubygems-#{Gem::VERSION}" - rubygems_doc_dir = File.join gem_doc_dir, rubygems_name - -+ unless install_destdir.empty? -+ FileUtils.mkdir_p gem_doc_dir unless File.exist?(gem_doc_dir) -+ end -+ - if File.writable? gem_doc_dir and - (not File.exist? rubygems_doc_dir or - File.writable? rubygems_doc_dir) then - say "Removing old RubyGems RDoc and ri" if @verbose -- Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir| -+ Dir[File.join(gem_doc_dir, 'rubygems-[0-9]*')].each do |dir| - rm_rf dir - end - diff --git a/lang/ruby19-base/patches/patch-ah b/lang/ruby19-base/patches/patch-ah deleted file mode 100644 index b6098ec551e..00000000000 --- a/lang/ruby19-base/patches/patch-ah +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Add install_root option for pkgsrc's rubygems support. - ---- lib/rubygems/commands/uninstall_command.rb.orig 2009-10-02 10:45:39.000000000 +0000 -+++ lib/rubygems/commands/uninstall_command.rb -@@ -21,6 +21,11 @@ class Gem::Commands::UninstallCommand < - options[:all] = value - end - -+ add_option('-B', '--install-root DIR', -+ 'Root directory for gem files') do |value, options| -+ options[:install_root] = File.expand_path(value) -+ end -+ - add_option('-I', '--[no-]ignore-dependencies', - 'Ignore dependency requirements while', - 'uninstalling') do |value, options| diff --git a/lang/ruby19-base/patches/patch-ai b/lang/ruby19-base/patches/patch-ai deleted file mode 100644 index 2911cf309c9..00000000000 --- a/lang/ruby19-base/patches/patch-ai +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Add install_root option for pkgsrc's rubygems support. - ---- lib/rubygems/commands/unpack_command.rb.orig 2010-04-22 08:24:42.000000000 +0000 -+++ lib/rubygems/commands/unpack_command.rb -@@ -12,6 +12,10 @@ class Gem::Commands::UnpackCommand < Gem - :version => Gem::Requirement.default, - :target => Dir.pwd - -+ add_option('--install-root DIR', 'Root directory for gem files on extract') do |value, options| -+ options[:install_root] = value -+ end -+ - add_option('--target=DIR', - 'target directory for unpacking') do |value, options| - options[:target] = value -@@ -56,7 +60,8 @@ class Gem::Commands::UnpackCommand < Gem - basename = File.basename path, '.gem' - target_dir = File.expand_path basename, options[:target] - FileUtils.mkdir_p target_dir -- Gem::Installer.new(path, :unpack => true).unpack target_dir -+ Gem::Installer.new(path, :unpack => true, -+ :install_root => options[:install_root]).unpack target_dir - say "Unpacked gem: '#{target_dir}'" - else - alert_error "Gem '#{name}' not installed." diff --git a/lang/ruby19-base/patches/patch-aj b/lang/ruby19-base/patches/patch-aj deleted file mode 100644 index 1564d4a6a10..00000000000 --- a/lang/ruby19-base/patches/patch-aj +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Don't hard code config file's path for gem. - ---- lib/rubygems/config_file.rb.orig 2010-06-08 13:14:51.000000000 +0000 -+++ lib/rubygems/config_file.rb -@@ -45,13 +45,7 @@ class Gem::ConfigFile - - PLATFORM_DEFAULTS = {} - -- system_config_path = -- begin -- require 'etc.so' -- Etc.sysconfdir -- rescue LoadError -- '/etc' -- end -+ system_config_path = '@PKG_SYSCONFDIR@' - - SYSTEM_WIDE_CONFIG_FILE = File.join system_config_path, 'gemrc' - diff --git a/lang/ruby19-base/patches/patch-ak b/lang/ruby19-base/patches/patch-ak deleted file mode 100644 index 29be73ed757..00000000000 --- a/lang/ruby19-base/patches/patch-ak +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Use vendordir instead of sitedir. - ---- lib/rubygems/defaults.rb.orig 2010-04-22 08:24:42.000000000 +0000 -+++ lib/rubygems/defaults.rb -@@ -18,7 +18,7 @@ module Gem - - def self.default_dir - if defined? RUBY_FRAMEWORK_VERSION then -- File.join File.dirname(ConfigMap[:sitedir]), 'Gems', -+ File.join File.dirname(ConfigMap[:vendordir]), 'Gems', - ConfigMap[:ruby_version] - elsif ConfigMap[:rubylibprefix] then - File.join(ConfigMap[:rubylibprefix], 'gems', diff --git a/lang/ruby19-base/patches/patch-al b/lang/ruby19-base/patches/patch-al deleted file mode 100644 index e690a9a0444..00000000000 --- a/lang/ruby19-base/patches/patch-al +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-al,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Add install_root option for pkgsrc's rubygems support. - ---- lib/rubygems/dependency_installer.rb.orig 2010-04-22 08:24:42.000000000 +0000 -+++ lib/rubygems/dependency_installer.rb -@@ -38,6 +38,7 @@ class Gem::DependencyInstaller - # :format_executable:: See Gem::Installer#initialize. - # :ignore_dependencies:: Don't install any dependencies. - # :install_dir:: See Gem::Installer#install. -+ # :install_root: See Gem::Installer#install. - # :prerelease:: Allow prerelease versions. See #install. - # :security_policy:: See Gem::Installer::new and Gem::Security. - # :user_install:: See Gem::Installer.new -@@ -45,7 +46,11 @@ class Gem::DependencyInstaller - - def initialize(options = {}) - if options[:install_dir] then -- spec_dir = options[:install_dir], 'specifications' -+ if options[:install_root].nil? or options[:install_root] == "" then -+ spec_dir = options[:install_dir], 'specifications' -+ else -+ spec_dir = options[:install_root], options[:install_dir], 'specifications' -+ end - @source_index = Gem::SourceIndex.from_gems_in spec_dir - else - @source_index = Gem.source_index -@@ -68,7 +73,12 @@ class Gem::DependencyInstaller - @installed_gems = [] - - @install_dir = options[:install_dir] || Gem.dir -- @cache_dir = options[:cache_dir] || @install_dir -+ @install_root = options[:install_root] -+ install_dir = @install_dir -+ unless @install_root.nil? or @install_root == "" -+ install_dir = File.join(@install_root, @install_dir) -+ end -+ @cache_dir = options[:cache_dir] || install_dir - - # Set with any errors that SpecFetcher finds while search through - # gemspecs for a dep -@@ -269,6 +279,7 @@ class Gem::DependencyInstaller - :format_executable => @format_executable, - :ignore_dependencies => @ignore_dependencies, - :install_dir => @install_dir, -+ :install_root => @install_root, - :security_policy => @security_policy, - :source_index => @source_index, - :user_install => @user_install, diff --git a/lang/ruby19-base/patches/patch-am b/lang/ruby19-base/patches/patch-am deleted file mode 100644 index 3300f5369a7..00000000000 --- a/lang/ruby19-base/patches/patch-am +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-am,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Prevent access to HOME when --install-root is used. - ---- lib/rubygems/doc_manager.rb.orig 2010-04-22 08:24:42.000000000 +0000 -+++ lib/rubygems/doc_manager.rb -@@ -61,7 +61,7 @@ class Gem::DocManager - ## - # Updates the RI cache for RDoc 2 if it is installed - -- def self.update_ri_cache -+ def self.update_ri_cache(install_root = nil) - load_rdoc rescue return - - return unless defined? RDoc::VERSION # RDoc 1 does not have VERSION -@@ -72,7 +72,7 @@ class Gem::DocManager - :use_cache => true, - :use_system => true, - :use_site => true, -- :use_home => true, -+ :use_home => (install_root == nil)? true: false, - :use_gems => true, - :formatter => RDoc::RI::Formatter, - } diff --git a/lang/ruby19-base/patches/patch-an b/lang/ruby19-base/patches/patch-an deleted file mode 100644 index ebd83dd4ad7..00000000000 --- a/lang/ruby19-base/patches/patch-an +++ /dev/null @@ -1,82 +0,0 @@ -$NetBSD: patch-an,v 1.3 2011/09/04 17:02:39 taca Exp $ - -* Make sure to load YAML before use it. When should YAML be loaded? -* Relax to allow some attribute could be nil. -* Complete "http://" to homepage attribute if it isn't begin with it. -* Fix handling of String in ruby_code(). (From rubygem's repository, - 6ff4e0eed52ef066fe33.) - ---- lib/rubygems/specification.rb.orig 2010-04-22 08:24:42.000000000 +0000 -+++ lib/rubygems/specification.rb -@@ -107,6 +107,10 @@ class Gem::Specification - - @@default_value = {} - -+ # under pkgsrc environment -+ @@pkgsrc_nil_attributes = -+ [:authors, :cert_chain, :executables, :extensions, :extra_rdoc_files, :licenses, :required_rubygems_version, :test_files] -+ - ## - # Names of all specification attributes - -@@ -476,6 +480,7 @@ class Gem::Specification - # 'input' can be anything that YAML.load() accepts: String or IO. - - def self.from_yaml(input) -+ require 'yaml' - input = normalize_yaml_input input - spec = YAML.load input - -@@ -819,6 +824,23 @@ class Gem::Specification - "expected RubyGems version #{Gem::VERSION}, was #{rubygems_version}" - end - -+ @@pkgsrc_nil_attributes.each do |name| -+ val = instance_variable_get("@#{name}") -+ if val.nil? -+ case name -+ when :required_rubygems_version -+ val = Gem::Requirement.default -+ else -+ val = [] -+ end -+ instance_variable_set("@#{name}", val) -+ end -+ if name == :authors and val.empty? -+ val = ['not specified'] -+ instance_variable_set("@#{name}", val) -+ end -+ end -+ - @@required_attributes.each do |symbol| - unless self.send symbol then - raise Gem::InvalidSpecificationException, -@@ -901,10 +923,15 @@ class Gem::Specification - '"FIXME" or "TODO" is not a summary' - end - -- if homepage and not homepage.empty? and -- homepage !~ /\A[a-z][a-z\d+.-]*:/i then -- raise Gem::InvalidSpecificationException, -- "\"#{homepage}\" is not a URI" -+ if homepage and not homepage.empty? -+ if @homepage =~ /\A[a-z][a-z\d+.-]*/i and -+ @homepage !~ /\A[a-z][a-z\d+.-]*:/i -+ @homepage = "http://" + @homepage -+ end -+ if homepage !~ /\A[a-z][a-z\d+.-]*:/i then -+ raise Gem::InvalidSpecificationException, -+ "\"#{homepage}\" is not a URI" -+ end - end - - # Warnings -@@ -1038,7 +1065,7 @@ class Gem::Specification - - def ruby_code(obj) - case obj -- when String then '%q{' + obj + '}' -+ when String then obj.inspect - when Array then obj.inspect - when Gem::Version then obj.to_s.inspect - when Date then '%q{' + obj.strftime('%Y-%m-%d') + '}' diff --git a/lang/ruby19-base/patches/patch-ao b/lang/ruby19-base/patches/patch-ao deleted file mode 100644 index 1378a66e823..00000000000 --- a/lang/ruby19-base/patches/patch-ao +++ /dev/null @@ -1,68 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2011/11/08 15:22:45 taca Exp $ - -* Add install_root option for pkgsrc's rubygems support. -* Avoid to use Gem::RequirePathsBuilder. - ---- lib/rubygems/installer.rb.orig 2010-04-22 08:24:42.000000000 +0000 -+++ lib/rubygems/installer.rb -@@ -40,7 +40,7 @@ class Gem::Installer - - include Gem::UserInteraction - -- include Gem::RequirePathsBuilder -+# include Gem::RequirePathsBuilder - - ## - # The directory a gem's executables will be installed into -@@ -84,6 +84,9 @@ class Gem::Installer - # for a signed-gems-only policy. - # :ignore_dependencies:: Don't raise if a dependency is missing. - # :install_dir:: The directory to install the gem into. -+ # :install_root:: The directory to use as a buildroot for "destdir"-style -+ # installation. All paths during installation are relative -+ # to the buildroot. - # :format_executable:: Format the executable the same as the ruby executable. - # If your ruby is ruby18, foo_exec will be installed as - # foo_exec18. -@@ -99,6 +102,7 @@ class Gem::Installer - :exec_format => false, - :force => false, - :install_dir => Gem.dir, -+ :install_root => nil, - :source_index => Gem.source_index, - }.merge options - -@@ -110,6 +114,11 @@ class Gem::Installer - @format_executable = options[:format_executable] - @security_policy = options[:security_policy] - @wrappers = options[:wrappers] -+ install_root = options[:install_root] -+ unless install_root.nil? or install_root == "" -+ @install_root = File.expand_path install_root -+ @gem_home = File.join(@install_root, @gem_home) -+ end - @bin_dir = options[:bin_dir] - @development = options[:development] - @source_index = options[:source_index] -@@ -198,7 +207,7 @@ class Gem::Installer - build_extensions - write_spec - -- write_require_paths_file_if_needed -+# write_require_paths_file_if_needed - - # HACK remove? Isn't this done in multiple places? - cached_gem = File.join @gem_home, "cache", @gem.split(/\//).pop -@@ -289,7 +298,11 @@ class Gem::Installer - # If the user has asked for the gem to be installed in a directory that is - # the system gem directory, then use the system bin directory, else create - # (or use) a new bin dir under the gem_home. -- bindir = @bin_dir ? @bin_dir : Gem.bindir(@gem_home) -+ bindir = @bin_dir ? @bin_dir : (Gem.bindir @gem_home, @install_root) -+ -+ unless @install_root.nil? or @install_root == "" -+ bindir = File.join(@install_root, bindir) -+ end - - Dir.mkdir bindir unless File.exist? bindir - raise Gem::FilePermissionError.new(bindir) unless File.writable? bindir diff --git a/lang/ruby19-base/patches/patch-ap b/lang/ruby19-base/patches/patch-ap deleted file mode 100644 index f34bde72ace..00000000000 --- a/lang/ruby19-base/patches/patch-ap +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ap,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Add install_root option for pkgsrc's rubygems support. - ---- lib/rubygems/install_update_options.rb.orig 2010-06-11 14:02:18.000000000 +0000 -+++ lib/rubygems/install_update_options.rb -@@ -22,6 +22,12 @@ module Gem::InstallUpdateOptions - value - end - -+ add_option(:"Install/Update", '-B', '--install-root DIR', -+ 'Root directory for gem files on install') do |value, options| -+ options[:install_root] = File.expand_path(value) -+ Gem.ensure_gem_subdirectories File.join options[:install_root], Gem.dir -+ end -+ - add_option(:"Install/Update", '-i', '--install-dir DIR', - 'Gem repository directory to get installed', - 'gems') do |value, options| diff --git a/lang/ruby19-base/patches/patch-aq b/lang/ruby19-base/patches/patch-aq deleted file mode 100644 index c0efb41eb7e..00000000000 --- a/lang/ruby19-base/patches/patch-aq +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-aq,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Add install_root option for pkgsrc's rubygems support. - ---- lib/rubygems/uninstaller.rb.orig 2010-02-22 02:52:35.000000000 +0000 -+++ lib/rubygems/uninstaller.rb -@@ -50,6 +50,11 @@ class Gem::Uninstaller - @force_all = options[:all] - @force_ignore = options[:ignore] - @bin_dir = options[:bin_dir] -+ install_root = options[:install_root] -+ unless install_root.nil? or install_root == "" -+ @install_root = File.expand_path install_root -+ @gem_home = File.join(@install_root, @gem_home) -+ end - - # only add user directory if install_dir is not set - @user_install = false -@@ -124,7 +129,11 @@ class Gem::Uninstaller - return if spec.nil? - - unless spec.executables.empty? then -- bindir = @bin_dir ? @bin_dir : Gem.bindir(spec.installation_path) -+ bindir = @bin_dir ? @bin_dir : (Gem.bindir @gem_home, @install_root) -+ -+ unless @install_root.nil? or @install_root == "" -+ bindir = File.join(@install_root, bindir) -+ end - - list = @source_index.find_name(spec.name).delete_if { |s| - s.version == spec.version diff --git a/lang/ruby19-base/patches/patch-ar b/lang/ruby19-base/patches/patch-ar deleted file mode 100644 index 1f117308841..00000000000 --- a/lang/ruby19-base/patches/patch-ar +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ar,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Use vendordir instead of sitedir. - ---- test/rubygems/test_gem.rb.orig 2010-04-22 08:24:42.000000000 +0000 -+++ test/rubygems/test_gem.rb -@@ -427,17 +427,17 @@ class TestGem < RubyGemTestCase - end - - def test_self_prefix_sitelibdir -- orig_sitelibdir = Gem::ConfigMap[:sitelibdir] -+ orig_sitelibdir = Gem::ConfigMap[:vendorlibdir] - - file_name = File.expand_path __FILE__ - prefix = File.dirname File.dirname(file_name) - prefix = File.dirname prefix if File.basename(prefix) == 'test' - -- Gem::ConfigMap[:sitelibdir] = prefix -+ Gem::ConfigMap[:vendorlibdir] = prefix - - assert_nil Gem.prefix - ensure -- Gem::ConfigMap[:sitelibdir] = orig_sitelibdir -+ Gem::ConfigMap[:vendorlibdir] = orig_sitelibdir - end - - def test_self_refresh diff --git a/lang/ruby19-base/patches/patch-as b/lang/ruby19-base/patches/patch-as deleted file mode 100644 index 66a48e2b345..00000000000 --- a/lang/ruby19-base/patches/patch-as +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-as,v 1.3 2012/02/23 14:15:58 taca Exp $ - -* Handle 64bit size of time_t. - ---- thread_pthread.c.orig 2012-02-13 15:29:27.000000000 +0000 -+++ thread_pthread.c -@@ -17,6 +17,12 @@ - #include <sys/resource.h> - #endif - -+#if SIZEOF_TIME_T == 8 -+#define FMT_TIME_T "lld" -+#else -+#define FMT_TIME_T "ld" -+#endif -+ - static void native_mutex_lock(pthread_mutex_t *lock); - static void native_mutex_unlock(pthread_mutex_t *lock); - static int native_mutex_trylock(pthread_mutex_t *lock); -@@ -645,7 +651,7 @@ native_sleep(rb_thread_t *th, struct tim - } - } - -- thread_debug("native_sleep %ld\n", tv ? tv->tv_sec : -1); -+ thread_debug("native_sleep %" FMT_TIME_T "\n", tv ? tv->tv_sec : -1); - GVL_UNLOCK_BEGIN(); - { - pthread_mutex_lock(&th->interrupt_lock); -@@ -667,8 +673,8 @@ native_sleep(rb_thread_t *th, struct tim - } - else { - int r; -- thread_debug("native_sleep: pthread_cond_timedwait start (%ld, %ld)\n", -- (unsigned long)ts.tv_sec, ts.tv_nsec); -+ thread_debug("native_sleep: pthread_cond_timedwait start (%" -+ FMT_TIME_T ", %ld)\n", ts.tv_sec, ts.tv_nsec); - r = pthread_cond_timedwait(&th->native_thread_data.sleep_cond, - &th->interrupt_lock, &ts); - if (r && r != ETIMEDOUT) rb_bug_errno("pthread_cond_timedwait", r); diff --git a/lang/ruby19-base/patches/patch-at b/lang/ruby19-base/patches/patch-at deleted file mode 100644 index 66aaebc94d8..00000000000 --- a/lang/ruby19-base/patches/patch-at +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-at,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Avoid ugly warning. - ---- vsnprintf.c.orig 2010-04-28 01:27:37.000000000 +0000 -+++ vsnprintf.c -@@ -203,7 +203,9 @@ typedef struct __sFILE { - #define __sfeof(p) (((p)->_flags & __SEOF) != 0) - #define __sferror(p) (((p)->_flags & __SERR) != 0) - #define __sclearerr(p) ((void)((p)->_flags &= ~(__SERR|__SEOF))) -+#ifndef __sfileno - #define __sfileno(p) ((p)->_file) -+#endif - - #undef feof - #undef ferror diff --git a/lang/ruby19-base/patches/patch-au b/lang/ruby19-base/patches/patch-au deleted file mode 100644 index 9e1d0d1bd4c..00000000000 --- a/lang/ruby19-base/patches/patch-au +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-au,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ - -Defer loading readline, when it is really needed. -Some unknown reason: - -1. build devel/ruby-readline with editline(3). -2. Execute a ruby script loading readline in background from shell. -3. When the script output something to stdout, it got SIGTSTP and suspends. - -There is no such problem when build devel/ruby-readline with GNU's readline. - ---- lib/rdoc/ri/driver.rb.orig 2010-07-01 02:05:35.000000000 +0000 -+++ lib/rdoc/ri/driver.rb -@@ -1,11 +1,6 @@ - require 'abbrev' - require 'optparse' - --begin -- require 'readline' --rescue LoadError --end -- - require 'rdoc/ri' - require 'rdoc/ri/paths' - require 'rdoc/markup' -@@ -809,6 +804,11 @@ Options may also be set in the 'RI' envi - # Runs ri interactively using Readline if it is available. - - def interactive -+ begin -+ require 'readline' -+ rescue LoadError -+ end -+ - puts "\nEnter the method name you want to look up." - - if defined? Readline then diff --git a/lang/ruby19-base/patches/patch-lib_mkmf.rb b/lang/ruby19-base/patches/patch-lib_mkmf.rb deleted file mode 100644 index 0b8c383dc07..00000000000 --- a/lang/ruby19-base/patches/patch-lib_mkmf.rb +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-lib_mkmf.rb,v 1.1 2012/06/02 02:21:16 taca Exp $ - -Make sure to keep space; patch from Ruby's repository, r35698. - ---- lib/mkmf.rb.orig 2010-05-29 00:43:09.000000000 +0000 -+++ lib/mkmf.rb -@@ -1491,8 +1491,9 @@ LIBRUBY = #{CONFIG['LIBRUBY']} - LIBRUBY_A = #{CONFIG['LIBRUBY_A']} - LIBRUBYARG_SHARED = #$LIBRUBYARG_SHARED - LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC --OUTFLAG = #{OUTFLAG} --COUTFLAG = #{COUTFLAG} -+empty = -+OUTFLAG = #{OUTFLAG}$(empty) -+COUTFLAG = #{COUTFLAG}$(empty) - - RUBY_EXTCONF_H = #{$extconf_h} - cflags = #{CONFIG['cflags']} diff --git a/lang/ruby19-base/patches/patch-lib_rubygems_require__paths__builder.rb b/lang/ruby19-base/patches/patch-lib_rubygems_require__paths__builder.rb deleted file mode 100644 index 5237b0d65fa..00000000000 --- a/lang/ruby19-base/patches/patch-lib_rubygems_require__paths__builder.rb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lib_rubygems_require__paths__builder.rb,v 1.1 2011/11/08 15:22:45 taca Exp $ - -* Avoid to use Gem::RequirePathsBuilder. - ---- lib/rubygems/require_paths_builder.rb.orig 2010-06-27 01:41:40.000000000 +0000 -+++ lib/rubygems/require_paths_builder.rb -@@ -9,5 +9,4 @@ module Gem::RequirePathsBuilder - file.puts require_paths - end - end --end -- -+end if false diff --git a/lang/ruby19-base/patches/patch-man_erb.1 b/lang/ruby19-base/patches/patch-man_erb.1 deleted file mode 100644 index dc8943c4833..00000000000 --- a/lang/ruby19-base/patches/patch-man_erb.1 +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-man_erb.1,v 1.1 2012/01/24 20:41:51 joerg Exp $ - ---- man/erb.1.orig 2009-10-26 06:44:31.000000000 +0000 -+++ man/erb.1 -@@ -143,12 +143,12 @@ class. - .Pp - .Sh REPORTING BUGS - .Bl -bullet --.Li Security vulnerabilities should be reported via an email to --.Aq security@ruby-lang.org Ns --.Li . -+.It -+Security vulnerabilities should be reported via an email to -+.Aq security@ruby-lang.org . - Reported problems will be published after fixed. --.Pp --.Li And you can report other bugs and feature requests via the -+.It -+You can report other bugs and feature requests via the - Ruby Issue Tracking System (http://redmine.ruby-lang.org). - Do not report security vulnerabilities - via the system because it publishes the vulnerabilities immedately. diff --git a/lang/ruby19-base/patches/patch-man_irb.1 b/lang/ruby19-base/patches/patch-man_irb.1 deleted file mode 100644 index 9925fad4fda..00000000000 --- a/lang/ruby19-base/patches/patch-man_irb.1 +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-man_irb.1,v 1.1 2012/01/24 20:41:51 joerg Exp $ - ---- man/irb.1.orig 2009-10-26 06:44:31.000000000 +0000 -+++ man/irb.1 -@@ -159,12 +159,12 @@ Personal irb initialization. - .Pp - .Sh REPORTING BUGS - .Bl -bullet --.Li Security vulnerabilities should be reported via an email to --.Aq security@ruby-lang.org Ns --.Li . -+.It -+Security vulnerabilities should be reported via an email to -+.Aq security@ruby-lang.org . - Reported problems will be published after fixed. --.Pp --.Li And you can report other bugs and feature requests via the -+.It -+You can report other bugs and feature requests via the - Ruby Issue Tracking System (http://redmine.ruby-lang.org). - Do not report security vulnerabilities - via the system because it publishes the vulnerabilities immedately. diff --git a/lang/ruby19-base/patches/patch-man_ri.1 b/lang/ruby19-base/patches/patch-man_ri.1 deleted file mode 100644 index 5029ff8b161..00000000000 --- a/lang/ruby19-base/patches/patch-man_ri.1 +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-man_ri.1,v 1.1 2012/01/24 20:41:51 joerg Exp $ - ---- man/ri.1.orig 2009-10-26 06:44:31.000000000 +0000 -+++ man/ri.1 -@@ -165,12 +165,12 @@ Searches user-wide documents here. - .Pp - .Sh REPORTING BUGS - .Bl -bullet --.Li Security vulnerabilities should be reported via an email to --.Aq security@ruby-lang.org Ns --.Li . -+.It -+Security vulnerabilities should be reported via an email to -+.Aq security@ruby-lang.org . - Reported problems will be published after fixed. --.Pp --.Li And you can report other bugs and feature requests via the -+.It -+You can report other bugs and feature requests via the - Ruby Issue Tracking System (http://redmine.ruby-lang.org). - Do not report security vulnerabilities - via the system because it publishes the vulnerabilities immedately. diff --git a/lang/ruby19-base/patches/patch-man_ruby.1 b/lang/ruby19-base/patches/patch-man_ruby.1 deleted file mode 100644 index 4b2a2f6df1c..00000000000 --- a/lang/ruby19-base/patches/patch-man_ruby.1 +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-man_ruby.1,v 1.1 2012/01/24 20:41:51 joerg Exp $ - ---- man/ruby.1.orig 2009-10-26 06:44:31.000000000 +0000 -+++ man/ruby.1 -@@ -494,12 +494,13 @@ Ruby Application Archive. - .Pp - .Sh REPORTING BUGS - .Bl -bullet --.Li Security vulnerabilities should be reported via an email to --.Aq security@ruby-lang.org Ns --.Li . -+.It -+Security vulnerabilities should be reported via an email to -+.Aq security@ruby-lang.org . - Reported problems will be published after fixed. - .Pp --.Li And you can report other bugs and feature requests via the -+.It -+You can report other bugs and feature requests via the - Ruby Issue Tracking System (http://redmine.ruby-lang.org). - Do not report security vulnerabilities - via the system because it publishes the vulnerabilities immedately. |