- outdated

Changed files:
    ruby-LIB_PREFIX.patch -> 1.4
    ruby-vendordir.patch -> 1.6

diff --git a/ruby-LIB_PREFIX.patch b/ruby-LIB_PREFIX.patch
deleted file mode 100644 (file)
index 40164f9..0000000
--- a/ruby-LIB_PREFIX.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -dur ruby-1.8.1.orig/configure.in ruby-1.8.1/configure.in
---- ruby-1.8.1.orig/configure.in       2003-12-24 20:19:12.000000000 +0100
-+++ ruby-1.8.1/configure.in    2004-01-06 17:33:27.052504945 +0100
-@@ -1375,7 +1375,7 @@
-     RUBY_LIB_PREFIX="/lib/ruby"
-     ;;
-   *)
--    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
-+    RUBY_LIB_PREFIX="${libdir}/ruby"
-     ;;
- esac
- RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
-Only in ruby-1.8.1: configure.in~

diff --git a/ruby-vendordir.patch b/ruby-vendordir.patch
deleted file mode 100644 (file)
index 540b09d..0000000
--- a/ruby-vendordir.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -ur ruby-1.8.6-p111-o/configure.in ruby-1.8.6-p111/configure.in
---- ruby-1.8.6-p111-o/configure.in     2007-12-07 18:57:23.000000000 -0700
-+++ ruby-1.8.6-p111/configure.in       2007-12-07 21:44:21.000000000 -0700
-@@ -1575,9 +1575,28 @@
- AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
- AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
- 
-+AC_ARG_WITH(vendordir,
-+          [  --with-vendordir=DIR      vendor libraries in DIR [LIBDIR/ruby/vendor_ruby]],
-+            [vendordir=$withval],
-+            [vendordir='${libdir}/ruby/vendor_ruby'])
-+VENDOR_DIR=`eval echo \\"${vendordir}\\"`
-+case "$target_os" in
-+  cygwin*|mingw*|*djgpp*|os2_emx*)
-+    RUBY_VENDOR_LIB_PATH="`expr "$VENDOR_DIR" : "$prefix\(/.*\)"`" ||
-+    RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";;
-+  *)
-+    RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";;
-+esac
-+RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
-+
-+AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
-+AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
-+
- AC_SUBST(arch)dnl
- AC_SUBST(sitearch)dnl
-+AC_SUBST(vendorarch)dnl
- AC_SUBST(sitedir)dnl
-+AC_SUBST(vendordir)dnl
- 
- configure_args=$ac_configure_args
- AC_SUBST(configure_args)dnl
-@@ -1590,6 +1609,8 @@
- 
-     AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
-                  "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-+    AC_DEFINE_UNQUOTED(RUBY_VENDOR_THIN_ARCHLIB,
-+                 "${RUBY_VENDOR_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}")
- else
-     arch="${target_cpu}-${target_os}"
-@@ -1597,12 +1618,15 @@
- fi
- 
- case "$target_os" in
--  mingw*) sitearch="i386-$rb_cv_msvcrt" ;;
--  *) sitearch="${arch}" ;;
-+  mingw*) sitearch="i386-$rb_cv_msvcrt"
-+                vendorarch="i386-$rb_cv_msvcrt" ;;
-+  *) sitearch="${arch}"
-+     vendorarch="${arch}" ;;
- esac
- 
- AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
- AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
-+AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCHLIB, "${RUBY_VENDOR_LIB_PATH2}/${vendorarch}")
- 
- AC_ARG_WITH(search-path,
-               [  --with-search-path=DIR specify the additional search path],
-diff -ur ruby-1.8.6-p111-o/instruby.rb ruby-1.8.6-p111/instruby.rb
---- ruby-1.8.6-p111-o/instruby.rb      2007-12-07 18:57:32.000000000 -0700
-+++ ruby-1.8.6-p111/instruby.rb        2007-12-07 21:44:21.000000000 -0700
-@@ -162,6 +162,8 @@
- archlibdir = CONFIG["archdir"]
- sitelibdir = CONFIG["sitelibdir"]
- sitearchlibdir = CONFIG["sitearchdir"]
-+vendorlibdir = CONFIG["vendorlibdir"]
-+vendorarchlibdir = CONFIG["vendorarchdir"]
- mandir = File.join(CONFIG["mandir"], "man")
- configure_args = Shellwords.shellwords(CONFIG["configure_args"])
- enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
-@@ -202,7 +204,7 @@
-   extout = "#$extout"
-   install?(:ext, :arch, :'ext-arch') do
-     puts "installing extension objects"
--    makedirs [archlibdir, sitearchlibdir]
-+    makedirs [archlibdir, sitearchlibdir, vendorarchlibdir]
-     if noinst = CONFIG["no_install_files"] and noinst.empty?
-       noinst = nil
-     end
-@@ -210,7 +212,7 @@
-   end
-   install?(:ext, :comm, :'ext-comm') do
-     puts "installing extension scripts"
--    makedirs [rubylibdir, sitelibdir]
-+    makedirs [rubylibdir, sitelibdir, vendorlibdir]
-     install_recursive("#{extout}/common", rubylibdir)
-   end
- end
-diff -ur ruby-1.8.6-p111-o/lib/mkmf.rb ruby-1.8.6-p111/lib/mkmf.rb
---- ruby-1.8.6-p111-o/lib/mkmf.rb      2007-12-07 18:56:55.000000000 -0700
-+++ ruby-1.8.6-p111/lib/mkmf.rb        2007-12-07 21:44:21.000000000 -0700
-@@ -51,6 +51,9 @@
- $sitedir = CONFIG["sitedir"]
- $sitelibdir = CONFIG["sitelibdir"]
- $sitearchdir = CONFIG["sitearchdir"]
-+$vendordir = CONFIG["vendordir"]
-+$vendorlibdir = CONFIG["vendorlibdir"]
-+$vendorarchdir = CONFIG["vendorarchdir"]
- 
- $mswin = /mswin/ =~ RUBY_PLATFORM
- $bccwin = /bccwin/ =~ RUBY_PLATFORM
-@@ -417,7 +420,7 @@
- 
- def try_func(func, libs, headers = nil, &b)
-   headers = cpp_include(headers)
--  try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
-+  try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
- #{COMMON_HEADERS}
- #{headers}
- /*top*/
-@@ -429,6 +432,11 @@
- int main() { return 0; }
- int t() { #{func}(); return 0; }
- SRC
-+int #{func}();
-+/*top*/
-+int main() { return 0; }
-+int t() { #{func}(); return 0; }
-+SRC
- end
- 
- def try_var(var, headers = nil, &b)
-@@ -1097,6 +1105,7 @@
- RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
- arch = #{CONFIG['arch']}
- sitearch = #{CONFIG['sitearch']}
-+vendorarch = #{CONFIG['vendorarch']}
- ruby_version = #{Config::CONFIG['ruby_version']}
- ruby = #{$ruby}
- RUBY = $(ruby#{sep})
-Only in ruby-1.8.6-p111/lib: mkmf.rb.orig
-diff -ur ruby-1.8.6-p111-o/Makefile.in ruby-1.8.6-p111/Makefile.in
---- ruby-1.8.6-p111-o/Makefile.in      2007-12-07 18:57:25.000000000 -0700
-+++ ruby-1.8.6-p111/Makefile.in        2007-12-07 21:44:21.000000000 -0700
-@@ -24,6 +24,8 @@
- arch = @arch@
- sitearch = @sitearch@
- sitedir = @sitedir@
-+vendorarch = @vendorarch@
-+vendordir = @vendordir@
- 
- TESTUI = console
- TESTS =
-diff -ur ruby-1.8.6-p111-o/mkconfig.rb ruby-1.8.6-p111/mkconfig.rb
---- ruby-1.8.6-p111-o/mkconfig.rb      2007-12-07 18:57:32.000000000 -0700
-+++ ruby-1.8.6-p111/mkconfig.rb        2007-12-07 21:44:21.000000000 -0700
-@@ -143,6 +143,14 @@
-   CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
-   CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
-   CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
-+  CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)"
-+  CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(vendorarch)"
-+  if defined?(VENDOR_SPECIFIC) && VENDOR_SPECIFIC
-+      CONFIG["sitearch"] = CONFIG["vendorarch"]
-+      CONFIG["sitedir"] = CONFIG["vendordir"]
-+      CONFIG["sitelibdir"] = CONFIG["vendorlibdir"]
-+      CONFIG["sitearchdir"] = CONFIG["vendorarchdir"]
-+  end
-   CONFIG["topdir"] = File.dirname(__FILE__)
-   MAKEFILE_CONFIG = {}
-   CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
-Only in ruby-1.8.6-p111: mkconfig.rb.orig
-diff -ur ruby-1.8.6-p111-o/ruby.c ruby-1.8.6-p111/ruby.c
---- ruby-1.8.6-p111-o/ruby.c   2007-12-07 18:57:31.000000000 -0700
-+++ ruby-1.8.6-p111/ruby.c     2007-12-07 22:30:13.000000000 -0700
-@@ -321,6 +321,13 @@
- #endif
-     incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
-     incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
-+              
-+    incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2));
-+#ifdef RUBY_VENDOR_THIN_ARCHLIB
-+    incpush(RUBY_RELATIVE(RUBY_VENDOR_THIN_ARCHLIB));
-+#endif
-+    incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCHLIB));
-+    incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB));
- 
-     incpush(RUBY_RELATIVE(RUBY_LIB));
- #ifdef RUBY_THIN_ARCHLIB
-Only in ruby-1.8.6-p111: ruby.c~
-Only in ruby-1.8.6-p111: ruby.c.orig
-Only in ruby-1.8.6-p111: ruby.c.rej
-Only in ruby-1.8.6-p111: ruby.c.rej~