- Update ruby to 1.8.6

- Synchronise portversions and portepochs in all ruby subports
- Take maintainerships of all ruby subports.

5 files changed, 23 insertions, 16 deletions

diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index f2c208efe7a2..ee0c88289348 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -29,6 +29,7 @@ USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${RUBY_DISTVERSION}
 
 RUBY_VER=		1.8
+USE_BZIP2=		yes
 USE_RUBY=		yes
 RUBY_NO_BUILD_DEPENDS=	yes
 RUBY_NO_RUN_DEPENDS=	yes
@@ -115,7 +116,6 @@ EXTSAMPLES=	bigdecimal/sample/*.rb	\
 		pty/shl.rb
 
 EXTDOCS=	bigdecimal/bigdecimal_*.html	\
-		digest/digest.txt*		\
 		dl/doc/dl.txt			\
 		enumerator/enumerator.txt	\
 		etc/etc.txt*			\
@@ -156,7 +156,8 @@ post-patch:
 pre-configure:
 .if defined(WITH_ONIGURUMA)
 	cd ${ONIGURUMA_WRKSRC}; ./configure; \
-		${MAKE} -f Makefile ${RUBY_VER:S/.//} RUBYDIR="${WRKSRC}"
+		${MAKE} -f Makefile ${RUBY_RELVERSION:S/.//g} \
+		RUBYDIR="${WRKSRC}"
 .endif
 	${TOUCH} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index 3918cbe45447..5d2309381515 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-1.8.5-p12.tar.gz) = d7d12dd9124c9b7d55cdbbee313e3931
-SHA256 (ruby/ruby-1.8.5-p12.tar.gz) = c72ad433adee87c79ece02f506008afa9ea783a11d1acdaf4107306caede5d0a
-SIZE (ruby/ruby-1.8.5-p12.tar.gz) = 4526961
+MD5 (ruby/ruby-1.8.6.tar.bz2) = e558a0e00ae318d43bf6ff9af452bad2
+SHA256 (ruby/ruby-1.8.6.tar.bz2) = 0fc6ad0b31d8ec3997db2a56a2ac1c235283a3607abb876300fc711b3f8e3dd7
+SIZE (ruby/ruby-1.8.6.tar.bz2) = 3946186
diff --git a/lang/ruby18/files/patch-ext_tk_tkutil_extconf.rb b/lang/ruby18/files/patch-ext_tk_tkutil_extconf.rb
new file mode 100644
index 000000000000..d528928f9c81
--- /dev/null
+++ b/lang/ruby18/files/patch-ext_tk_tkutil_extconf.rb
@@ -0,0 +1,10 @@
+--- ext/tk/tkutil/extconf.rb.orig	Tue Apr  3 21:08:12 2007
++++ ext/tk/tkutil/extconf.rb	Tue Apr  3 21:08:16 2007
+@@ -5,7 +5,5 @@
+   has_tk = true
+ end
+ 
+-if has_tk
+   require 'mkmf'
+   create_makefile('tkutil')
+-end
diff --git a/lang/ruby18/files/patch-tk-tkutil-extconf.rb b/lang/ruby18/files/patch-tk-tkutil-extconf.rb
deleted file mode 100644
index 33b5154e6d3d..000000000000
--- a/lang/ruby18/files/patch-tk-tkutil-extconf.rb
+++ /dev/null
@@ -1,7 +0,0 @@
---- ext/tk/tkutil/extconf.rb.orig	Wed Nov  2 12:19:30 2005
-+++ ext/tk/tkutil/extconf.rb	Sat Jan 14 16:21:55 2006
-@@ -1,4 +1,2 @@
--if compiled?('tk')
-   require 'mkmf'
-   create_makefile('tkutil')
--end
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index c34a17ed9327..70da98e15b5e 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -20,15 +20,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog-1.8.0
 %%PORTDOCS%%%%RUBY_DOCDIR%%/LEGAL
-%%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS
+%%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS-1.8.0
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/bigdecimal/bigdecimal_en.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/bigdecimal/bigdecimal_ja.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/dl/dl.txt
 %%PORTDOCS%%%%RUBY_DOCDIR%%/enumerator/enumerator.txt
 %%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
@@ -56,7 +54,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/enumerator
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dl
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/bigdecimal
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bigdecimal/linear.rb
@@ -247,6 +244,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/date2.rb
 %%RUBY_LIBDIR%%/debug.rb
 %%RUBY_LIBDIR%%/delegate.rb
+%%RUBY_LIBDIR%%/digest/sha2.rb
+%%RUBY_LIBDIR%%/digest.rb
 %%RUBY_LIBDIR%%/dl/import.rb
 %%RUBY_LIBDIR%%/dl/struct.rb
 %%RUBY_LIBDIR%%/dl/types.rb
@@ -281,10 +280,12 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/curses.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dbm.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/defines.h
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/bubblebabble.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/md5.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/rmd160.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/sha1.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/sha2.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest.h
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dl.h
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dl.so
@@ -320,6 +321,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/strscan.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/syck.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/syslog.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/thread.so
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/util.h
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/version.h
 %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/zlib.so
@@ -864,6 +866,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%
 @dirrm %%RUBY_LIBDIR%%/drb
 @dirrm %%RUBY_LIBDIR%%/dl
+@dirrm %%RUBY_LIBDIR%%/digest
 @dirrm %%RUBY_LIBDIR%%/date
 @dirrm %%RUBY_LIBDIR%%/cgi/session
 @dirrm %%RUBY_LIBDIR%%/cgi