From 7099675cd9a1a28d47178f291c95f887e6493e78 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <juergen.daubert@t-online.de>
Date: Sat, 26 Aug 2006 13:13:31 +0000
Subject: [PATCH] ruby: update to 1.8.5

---
 ruby/.footprint       |  7 ++++---
 ruby/.md5sum          |  4 ++--
 ruby/Pkgfile          |  5 +++--
 ruby/ruby-1.8.4.patch | 12 ------------
 ruby/ruby-1.8.5.patch | 24 ++++++++++++++++++++++++
 5 files changed, 33 insertions(+), 19 deletions(-)
 delete mode 100644 ruby/ruby-1.8.4.patch
 create mode 100644 ruby/ruby-1.8.5.patch

diff --git a/ruby/.footprint b/ruby/.footprint
index 583ab4284..bb2a734b8 100644
--- a/ruby/.footprint
+++ b/ruby/.footprint
@@ -8,9 +8,9 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/testrb
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libruby-static.a
-lrwxrwxrwx	root/root	usr/lib/libruby.so -> libruby.so.1.8.4
-lrwxrwxrwx	root/root	usr/lib/libruby.so.1.8 -> libruby.so.1.8.4
--rwxr-xr-x	root/root	usr/lib/libruby.so.1.8.4
+lrwxrwxrwx	root/root	usr/lib/libruby.so -> libruby.so.1.8.5
+lrwxrwxrwx	root/root	usr/lib/libruby.so.1.8 -> libruby.so.1.8.5
+-rwxr-xr-x	root/root	usr/lib/libruby.so.1.8.5
 drwxr-xr-x	root/root	usr/lib/ruby/
 drwxr-xr-x	root/root	usr/lib/ruby/1.8/
 -rw-r--r--	root/root	usr/lib/ruby/1.8/English.rb
@@ -366,6 +366,7 @@ drwxr-xr-x	root/root	usr/lib/ruby/1.8/rss/maker/
 -rw-r--r--	root/root	usr/lib/ruby/1.8/rss/maker/dublincore.rb
 -rw-r--r--	root/root	usr/lib/ruby/1.8/rss/maker/image.rb
 -rw-r--r--	root/root	usr/lib/ruby/1.8/rss/maker/syndication.rb
+-rw-r--r--	root/root	usr/lib/ruby/1.8/rss/maker/taxonomy.rb
 -rw-r--r--	root/root	usr/lib/ruby/1.8/rss/maker/trackback.rb
 -rw-r--r--	root/root	usr/lib/ruby/1.8/rss/parser.rb
 -rw-r--r--	root/root	usr/lib/ruby/1.8/rss/rexmlparser.rb
diff --git a/ruby/.md5sum b/ruby/.md5sum
index 1e37dcaef..8c9a19473 100644
--- a/ruby/.md5sum
+++ b/ruby/.md5sum
@@ -1,2 +1,2 @@
-41841ded3036eddc477036960d2cdab1  ruby-1.8.4.patch
-bd8c2e593e1fa4b01fd98eaf016329bb  ruby-1.8.4.tar.gz
+c29d1494e946c08c4731c3e4cdabb2cb  ruby-1.8.5.patch
+3fbb02294a8ca33d4684055adba5ed6f  ruby-1.8.5.tar.gz
diff --git a/ruby/Pkgfile b/ruby/Pkgfile
index 31703ed8b..0825307e4 100644
--- a/ruby/Pkgfile
+++ b/ruby/Pkgfile
@@ -4,15 +4,16 @@
 # Depends on:  db, gdbm, ncurses, openssl, readline, zlib
 
 name=ruby
-version=1.8.4
+version=1.8.5
 release=1
-source=(ftp://ftp.ruby-lang.org/pub/$name/$name-$version.tar.gz \
+source=(ftp://ftp.ruby-lang.org/pub/$name/1.8/$name-$version.tar.gz \
         $name-$version.patch)
 
 build () {
     cd $name-$version
     patch -p1 < $SRC/$name-$version.patch
     ./configure --prefix=/usr \
+                --mandir=/usr/man \
                 --enable-shared \
                 --enable-pthread
     make 
diff --git a/ruby/ruby-1.8.4.patch b/ruby/ruby-1.8.4.patch
deleted file mode 100644
index f01278b3f..000000000
--- a/ruby/ruby-1.8.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru ruby-1.8.4.orig/configure ruby-1.8.4/configure
---- ruby-1.8.4.orig/configure	2005-12-25 11:19:52.000000000 +0100
-+++ ruby-1.8.4/configure	2005-12-25 11:20:06.000000000 +0100
-@@ -15398,7 +15398,7 @@
- _ACEOF
- 
- else
--    arch="${target_cpu}-${target_os}"
-+    arch="${target_os}"
-     cat >>confdefs.h <<_ACEOF
- #define RUBY_PLATFORM "${arch}"
- _ACEOF
diff --git a/ruby/ruby-1.8.5.patch b/ruby/ruby-1.8.5.patch
new file mode 100644
index 000000000..3ff258d93
--- /dev/null
+++ b/ruby/ruby-1.8.5.patch
@@ -0,0 +1,24 @@
+diff -Nru ruby-1.8.5.orig/configure ruby-1.8.5/configure
+--- ruby-1.8.5.orig/configure	2006-08-26 15:03:23.000000000 +0200
++++ ruby-1.8.5/configure	2006-08-26 15:03:53.000000000 +0200
+@@ -19254,7 +19254,7 @@
+ _ACEOF
+ 
+ else
+-    arch="${target_cpu}-${target_os}"
++    arch="${target_os}"
+     cat >>confdefs.h <<_ACEOF
+ #define RUBY_PLATFORM "${arch}"
+ _ACEOF
+diff -Nru ruby-1.8.5.orig/ext/dbm/extconf.rb ruby-1.8.5/ext/dbm/extconf.rb
+--- ruby-1.8.5.orig/ext/dbm/extconf.rb	2006-08-26 15:03:23.000000000 +0200
++++ ruby-1.8.5/ext/dbm/extconf.rb	2006-08-26 15:04:19.000000000 +0200
+@@ -55,7 +55,7 @@
+ 
+ have_header("cdefs.h") 
+ have_header("sys/cdefs.h") 
+-if /DBM_HDR/ =~ $CFLAGS and have_func(db_prefix("dbm_open"))
++if have_func(db_prefix("dbm_open"))
+   have_func(db_prefix("dbm_clearerr")) unless $dbm_conf_have_gdbm
+   create_makefile("dbm")
+ end