27 files changed, 99 insertions, 141 deletions

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 6d207e143ff0..e9828dcb2ded 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -131,8 +131,8 @@ RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 RUBY_VERSION?=		1.8.0
 RUBY_PORT?=		lang/ruby${RUBY_R}-devel
 RUBY_DISTVERSION?=	${RUBY_VERSION}-preview2
-#RUBY_PATCHFILES?=	ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
-RUBY_PORTVERSION?=	${RUBY_VERSION}.p2
+RUBY_PATCHFILES?=	ruby-${RUBY_DISTVERSION}-2003.04.19.diff.bz2
+RUBY_PORTVERSION?=	${RUBY_VERSION}.p2.2003.04.19
 RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_VERSION}
 #MASTER_SITE_SUBDIR_RUBY=	snapshots
 .elif defined(RUBY_VER) && ${RUBY_VER} == 1.7
@@ -140,8 +140,8 @@ RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_VERSION}
 .else
 RUBY_VERSION?=		1.6.8
 #RUBY_DISTVERSION?=	${RUBY_VERSION}
-RUBY_PATCHFILES?=	ruby-${RUBY_DISTVERSION}-2003.01.19.diff.bz2
-RUBY_PORTVERSION?=	${RUBY_VERSION}.2003.01.19
+RUBY_PATCHFILES?=	ruby-${RUBY_DISTVERSION}-2003.04.19.diff.bz2
+RUBY_PORTVERSION?=	${RUBY_VERSION}.2003.04.19
 #RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_VERSION}
 #MASTER_SITE_SUBDIR_RUBY=	snapshots
 .endif
@@ -376,6 +376,7 @@ RUN_DEPENDS+=		${DEPEND_RUBY}
 
 .if defined(USE_RUBY_FEATURES)
 shim=	${USE_RUBY_FEATURES:Mbenchmark} \
+	${USE_RUBY_FEATURES:Mbigdecimal} \
 	${USE_RUBY_FEATURES:Mdl} \
 	${USE_RUBY_FEATURES:Merb} \
 	${USE_RUBY_FEATURES:Mfileutils} \
@@ -390,7 +391,8 @@ shim=	${USE_RUBY_FEATURES:Mbenchmark} \
 	${USE_RUBY_FEATURES:Mstringio} \
 	${USE_RUBY_FEATURES:Mstrscan} \
 	${USE_RUBY_FEATURES:Mtestunit} \
-	${USE_RUBY_FEATURES:Mtsort}
+	${USE_RUBY_FEATURES:Mtsort} \
+	${USE_RUBY_FEATURES:Mzlib}
 .if !empty(shim) && ${RUBY_VER} <= 1.6
 BUILD_DEPENDS+=		${DEPEND_RUBY_SHIM18}
 RUN_DEPENDS+=		${DEPEND_RUBY_SHIM18}
diff --git a/archivers/Makefile b/archivers/Makefile
index a711512b0f9a..b96c84a921b5 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -49,7 +49,6 @@
     SUBDIR += rpm2cpio
     SUBDIR += ruby-bz2
     SUBDIR += ruby-zip
-    SUBDIR += ruby-zlib
     SUBDIR += sectar
     SUBDIR += star
     SUBDIR += stuffit
diff --git a/archivers/ruby-zip/Makefile b/archivers/ruby-zip/Makefile
index 3c090ec1d29d..1c7fa76ab4a5 100644
--- a/archivers/ruby-zip/Makefile
+++ b/archivers/ruby-zip/Makefile
@@ -18,9 +18,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby module for reading and writing zip files
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/zlib.so:${PORTSDIR}/archivers/ruby-zlib
-
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	zlib
 
 WRKSRC=		${WRKDIR}/ruby${PORTNAME}
 NO_BUILD=	yes
diff --git a/archivers/ruby-zlib/Makefile b/archivers/ruby-zlib/Makefile
deleted file mode 100644
index eff77e24f07f..000000000000
--- a/archivers/ruby-zlib/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	Ruby-zlib
-# Date created:		12 Aug 2000
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	zlib
-PORTVERSION=	0.6.0
-CATEGORIES=	archivers ruby
-MASTER_SITES=	http://www.blue.sky.or.jp/atelier/ruby/
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-${PORTNAME}-${PORTVERSION:S/.p/-pre/}
-DIST_SUBDIR=	ruby
-
-MAINTAINER=	knu@FreeBSD.org
-COMMENT=	An extension library to use zlib from Ruby
-
-USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
-
-INSTALL_TARGET=	site-install
-
-DOCS_EN=	ChangeLog doc/zlib.rd doc/zlib.html
-DOCS_JA=	doc/zlib.rd.ja doc/zlib.ja.html
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODDOCDIR}/ja
-.for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
-.for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/archivers/ruby-zlib/distinfo b/archivers/ruby-zlib/distinfo
deleted file mode 100644
index 00693ff84da4..000000000000
--- a/archivers/ruby-zlib/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ruby/ruby-zlib-0.6.0.tar.gz) = 7741150f81bef5a5c6413c9cacfeef33
diff --git a/archivers/ruby-zlib/pkg-descr b/archivers/ruby-zlib/pkg-descr
deleted file mode 100644
index 271c3e36df79..000000000000
--- a/archivers/ruby-zlib/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This is an extension library to use zlib from Ruby.  Ruby/zlib has
-original .gz file handler of its own.
-
-Author:	Ueno Katsuhiro <katsu@blue.sky.or.jp>
-WWW:	http://www.blue.sky.or.jp/atelier/#ruby-zlib
diff --git a/archivers/ruby-zlib/pkg-plist b/archivers/ruby-zlib/pkg-plist
deleted file mode 100644
index 4d5148f33c1a..000000000000
--- a/archivers/ruby-zlib/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-%%RUBY_SITEARCHLIBDIR%%/zlib.so
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/zlib.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/zlib.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/zlib.ja.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/zlib.rd.ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/graphics/ruby-svg/Makefile b/graphics/ruby-svg/Makefile
index e184780ff50c..e098acf1c5ab 100644
--- a/graphics/ruby-svg/Makefile
+++ b/graphics/ruby-svg/Makefile
@@ -16,9 +16,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby library for generating SVG files
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/zlib.so:${PORTSDIR}/archivers/ruby-zlib
-
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	zlib
 
 NO_BUILD=	yes
 
diff --git a/japanese/gorua/Makefile b/japanese/gorua/Makefile
index 2175ca662a44..1cba35f0e9e8 100644
--- a/japanese/gorua/Makefile
+++ b/japanese/gorua/Makefile
@@ -15,11 +15,11 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Gtk+ on Ruby User Agent for 2ch BBS
 
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk \
-		${RUBY_SITEARCHLIBDIR}/zlib.so:${PORTSDIR}/archivers/ruby-zlib \
 		${X11BASE}/lib/X11/fonts/local/mona6x12a.pcf.gz:${PORTSDIR}/japanese/monafonts
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	zlib
 
 NO_BUILD=	yes
 
diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index 6cbc8de439b0..541a648d5415 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/Makefile
@@ -87,7 +87,8 @@ INSTALLED_SCRIPTS=	${PREFIX}/bin/irb \
 			${PREFIX}/bin/erb \
 			${PREFIX}/bin/h2rb
 
-OBSOLETED_MODULES=	dl \
+OBSOLETED_MODULES=	bigfloat \
+			dl \
 			erb \
 			fileutils \
 			optparse \
@@ -99,7 +100,8 @@ OBSOLETED_MODULES=	dl \
 			testunit \
 			timex \
 			urb \
-			uri
+			uri \
+			zlib
 
 post-extract:
 	${MV} ${WRKSRC}/ext/dl/h2rb ${WRKSRC}/bin/
@@ -152,18 +154,16 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${RUBY_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LEGAL ${RUBY_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README* ${RUBY_DOCDIR}
-	${MKDIR} ${RUBY_DOCDIR}/digest
-	${INSTALL_DATA} ${WRKSRC}/ext/digest/digest.txt* ${RUBY_DOCDIR}/digest
-	${MKDIR} ${RUBY_DOCDIR}/dl
-	${INSTALL_DATA} ${WRKSRC}/ext/dl/doc/dl.txt ${RUBY_DOCDIR}/dl
-	${MKDIR} ${RUBY_DOCDIR}/etc
-	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}/etc
+	${INSTALL_DATA} ${WRKSRC}/ext/bigdecimal/bigdecimal_*.html ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/digest/digest.txt* ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/dl/doc/dl.txt ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}
 	${MKDIR} ${RUBY_DOCDIR}/pty
 	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
 	${MKDIR} ${RUBY_DOCDIR}/readline
 	${INSTALL_DATA} ${WRKSRC}/ext/readline/README* ${RUBY_DOCDIR}/readline
-	${MKDIR} ${RUBY_DOCDIR}/syslog
-	${INSTALL_DATA} ${WRKSRC}/ext/syslog/syslog.txt ${RUBY_DOCDIR}/syslog
+	${INSTALL_DATA} ${WRKSRC}/ext/syslog/syslog.txt ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/zlib/doc/zlib.rd ${RUBY_DOCDIR}
 	${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/
 .endif
 	@${ECHO} "Deinstalling obsoleted packages that are now part of ruby..."
diff --git a/lang/ruby-devel/distinfo b/lang/ruby-devel/distinfo
index 6b0f4fed8df4..7fe8e3e43ca3 100644
--- a/lang/ruby-devel/distinfo
+++ b/lang/ruby-devel/distinfo
@@ -1,2 +1,3 @@
 MD5 (ruby/ruby-1.8.0-preview2.tar.gz) = 27d00977204a5892d385fd30809d119c
 MD5 (ruby/ruby-1.8.0-preview2-missing.tar.gz) = 3bad9284ad0bdcf1159df9f3448e6a35
+MD5 (ruby/ruby-1.8.0-preview2-2003.04.19.diff.bz2) = e5778217126052594c4db1e9156b9255
diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist
index 2b0b75da786c..2853b35ae834 100644
--- a/lang/ruby-devel/pkg-plist
+++ b/lang/ruby-devel/pkg-plist
@@ -9,6 +9,7 @@ bin/ruby%%_RUBY_SUFFIX%%
 lib/lib%%RUBY_NAME%%-static.a
 lib/lib%%RUBY_NAME%%.so
 lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
+%%RUBY_ARCHLIBDIR%%/bigdecimal.so
 %%RUBY_ARCHLIBDIR%%/config.h
 %%RUBY_ARCHLIBDIR%%/curses.so
 %%RUBY_ARCHLIBDIR%%/dbm.so
@@ -47,12 +48,14 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/syslog.so
 %%RUBY_ARCHLIBDIR%%/util.h
 %%RUBY_ARCHLIBDIR%%/version.h
+%%RUBY_ARCHLIBDIR%%/zlib.so
 @dirrm %%RUBY_ARCHLIBDIR%%/digest
 @dirrm %%RUBY_ARCHLIBDIR%%/racc
 %%RUBYLIB%%%%RUBY_LIBDIR%%/English.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/Env.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/base64.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/benchmark.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/bigdecimal-rational.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi-lib.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi/session.rb
@@ -113,8 +116,11 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/irb/workspace.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ws-for-case-2.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/irb/xmp.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/jacobian.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/jcode.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/kconv.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/linear.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/ludcmp.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mailread.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mathn.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/matrix.rb
@@ -129,6 +135,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/net/protocol.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/net/smtp.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/net/telnet.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/newton.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/nlsolve.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/observer.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/open-uri.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/open3.rb
@@ -137,6 +145,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/time.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/uri.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/ostruct.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/pai.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/parsearg.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/parsedate.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/ping.rb
@@ -243,15 +252,17 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/bigdecimal_en.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/bigdecimal_ja.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dl/dl.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dl.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/digest.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/digest.txt.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/etc.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/etc.txt.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.ja
@@ -261,14 +272,11 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog
+%%PORTDOCS%%%%RUBY_DOCDIR%%/syslog.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/zlib.rd
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dl
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest
 %%RUBY_DOCDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 665c292c3dbd..b2b3679a12fe 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -137,16 +137,13 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${RUBY_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LEGAL ${RUBY_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README* ${RUBY_DOCDIR}
-	${MKDIR} ${RUBY_DOCDIR}/digest
-	${INSTALL_DATA} ${WRKSRC}/ext/digest/digest.txt* ${RUBY_DOCDIR}/digest
-	${MKDIR} ${RUBY_DOCDIR}/etc
-	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}/etc
+	${INSTALL_DATA} ${WRKSRC}/ext/digest/digest.txt* ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}
 	${MKDIR} ${RUBY_DOCDIR}/pty
 	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
 	${MKDIR} ${RUBY_DOCDIR}/readline
 	${INSTALL_DATA} ${WRKSRC}/ext/readline/README* ${RUBY_DOCDIR}/readline
-	${MKDIR} ${RUBY_DOCDIR}/syslog
-	${INSTALL_DATA} ${WRKSRC}/ext/syslog/syslog.txt ${RUBY_DOCDIR}/syslog
+	${INSTALL_DATA} ${WRKSRC}/ext/syslog/syslog.txt ${RUBY_DOCDIR}
 	${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/
 .endif
 	@${ECHO} "Deinstalling obsoleted packages that are now part of ruby..."
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
index 55717ef7b45e..de1e3883e726 100644
--- a/lang/ruby/distinfo
+++ b/lang/ruby/distinfo
@@ -1,2 +1,2 @@
 MD5 (ruby/ruby-1.6.8.tar.gz) = bf48d49dbd94b5c0eda5f75b3bfbac16
-MD5 (ruby/ruby-1.6.8-2003.01.19.diff.bz2) = cf198340b4b7d6db6aae80e10cf64f91
+MD5 (ruby/ruby-1.6.8-2003.04.19.diff.bz2) = 8184c1f07df19a2f8271f72af826da8e
diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist
index 24365d123892..f1d200a04290 100644
--- a/lang/ruby/pkg-plist
+++ b/lang/ruby/pkg-plist
@@ -168,10 +168,10 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/digest.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/digest.txt.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/etc.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/etc.txt.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.ja
@@ -184,14 +184,11 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog
+%%PORTDOCS%%%%RUBY_DOCDIR%%/syslog.txt
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/net
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest
 %%RUBY_DOCDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
diff --git a/lang/ruby16-shim-ruby18/Makefile b/lang/ruby16-shim-ruby18/Makefile
index 22700d110717..4d05f25e2a13 100644
--- a/lang/ruby16-shim-ruby18/Makefile
+++ b/lang/ruby16-shim-ruby18/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	shim-ruby18
-PORTVERSION=	1.8.0.p2
+PORTVERSION=	1.8.0.p2.2003.04.19
 CATEGORIES=	lang devel ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	shim
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	shim-ruby16_18-${PORTVERSION:S/.p/-preview/}
+DISTNAME=	shim-ruby16_18-1.8.0-preview2-2003.04.19
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -44,7 +44,7 @@ PLIST_SUB+=	IF_DEFAULT=${IF_DEFAULT} \
 
 pre-install:
 	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	# Make reinstall work
+# Make make reinstall work
 	${RM} -f ${WRKSRC}/InstalledFiles
 
 post-install:
diff --git a/lang/ruby16-shim-ruby18/distinfo b/lang/ruby16-shim-ruby18/distinfo
index 2c8fb805a4e5..83be568e629a 100644
--- a/lang/ruby16-shim-ruby18/distinfo
+++ b/lang/ruby16-shim-ruby18/distinfo
@@ -1 +1 @@
-MD5 (ruby/shim-ruby16_18-1.8.0-preview2.tar.bz2) = 9ca8eea15f924e17bcd5c542c8b4571c
+MD5 (ruby/shim-ruby16_18-1.8.0-preview2-2003.04.19.tar.bz2) = f1dfd721be632adf03196c26de44bbc5
diff --git a/lang/ruby16-shim-ruby18/pkg-install b/lang/ruby16-shim-ruby18/pkg-install
index afb63e9ed94b..a1a1f756f3cf 100644
--- a/lang/ruby16-shim-ruby18/pkg-install
+++ b/lang/ruby16-shim-ruby18/pkg-install
@@ -12,6 +12,7 @@ die () {
 
 delete_modules () {
     modules="
+	bigfloat
 	dl
 	erb
 	fileutils
@@ -20,6 +21,7 @@ delete_modules () {
 	racc-runtime
 	strscan
 	testunit
+	zlib
     "
 
     echo "Deinstalling modules being replaced by $PKGNAME..."
diff --git a/lang/ruby16-shim-ruby18/pkg-plist b/lang/ruby16-shim-ruby18/pkg-plist
index e369cbce73f8..4b2b95ad5f83 100644
--- a/lang/ruby16-shim-ruby18/pkg-plist
+++ b/lang/ruby16-shim-ruby18/pkg-plist
@@ -33,6 +33,9 @@ bin/h2rb%%_RUBY_SUFFIX%%
 %%RUBY_SITELIBDIR%%/features/ruby18/time.rb
 @dirrm %%RUBY_SITELIBDIR%%/features/ruby18
 @dirrm %%RUBY_SITELIBDIR%%/features
+@comment bigdecimal
+%%RUBY_SITEARCHLIBDIR%%/bigdecimal.so
+%%RUBY_SITELIBDIR%%/bigdecimal-rational.rb
 @comment dl
 %%RUBY_SITEARCHLIBDIR%%/dl.so
 %%RUBY_SITELIBDIR%%/dl/import.rb
@@ -91,6 +94,8 @@ bin/h2rb%%_RUBY_SUFFIX%%
 @dirrm %%RUBY_SITELIBDIR%%/test
 @dirrm %%RUBY_SITELIBDIR%%/runit/cui
 @dirrm %%RUBY_SITELIBDIR%%/runit
+@comment zlib
+%%RUBY_SITEARCHLIBDIR%%/zlib.so
 @comment others
 %%RUBY_SITELIBDIR%%/benchmark.rb
 %%RUBY_SITELIBDIR%%/erb.rb
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 665c292c3dbd..b2b3679a12fe 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -137,16 +137,13 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${RUBY_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LEGAL ${RUBY_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README* ${RUBY_DOCDIR}
-	${MKDIR} ${RUBY_DOCDIR}/digest
-	${INSTALL_DATA} ${WRKSRC}/ext/digest/digest.txt* ${RUBY_DOCDIR}/digest
-	${MKDIR} ${RUBY_DOCDIR}/etc
-	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}/etc
+	${INSTALL_DATA} ${WRKSRC}/ext/digest/digest.txt* ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}
 	${MKDIR} ${RUBY_DOCDIR}/pty
 	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
 	${MKDIR} ${RUBY_DOCDIR}/readline
 	${INSTALL_DATA} ${WRKSRC}/ext/readline/README* ${RUBY_DOCDIR}/readline
-	${MKDIR} ${RUBY_DOCDIR}/syslog
-	${INSTALL_DATA} ${WRKSRC}/ext/syslog/syslog.txt ${RUBY_DOCDIR}/syslog
+	${INSTALL_DATA} ${WRKSRC}/ext/syslog/syslog.txt ${RUBY_DOCDIR}
 	${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/
 .endif
 	@${ECHO} "Deinstalling obsoleted packages that are now part of ruby..."
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index 55717ef7b45e..de1e3883e726 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1,2 +1,2 @@
 MD5 (ruby/ruby-1.6.8.tar.gz) = bf48d49dbd94b5c0eda5f75b3bfbac16
-MD5 (ruby/ruby-1.6.8-2003.01.19.diff.bz2) = cf198340b4b7d6db6aae80e10cf64f91
+MD5 (ruby/ruby-1.6.8-2003.04.19.diff.bz2) = 8184c1f07df19a2f8271f72af826da8e
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index 24365d123892..f1d200a04290 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -168,10 +168,10 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/digest.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/digest.txt.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/etc.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/etc.txt.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.ja
@@ -184,14 +184,11 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog
+%%PORTDOCS%%%%RUBY_DOCDIR%%/syslog.txt
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/net
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest
 %%RUBY_DOCDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
diff --git a/lang/ruby16_static/Makefile b/lang/ruby16_static/Makefile
index 680dc1f6dfec..1c5afd093bda 100644
--- a/lang/ruby16_static/Makefile
+++ b/lang/ruby16_static/Makefile
@@ -25,8 +25,7 @@ RUBY_VER?=	1.6
 
 # Beware, because gdbm is under GPL, you must treat the whole binary
 # as GPL says if you include gdbm in it.
-EXT_PORTS=	archivers/ruby-zlib \
-		databases/ruby-bdb1
+EXT_PORTS=	databases/ruby-bdb1
 _PORTSDIR=	${.CURDIR}/../..
 _RUBY_PORTDIR=	${_PORTSDIR}/${RUBY_PORT}
 
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 6cbc8de439b0..541a648d5415 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -87,7 +87,8 @@ INSTALLED_SCRIPTS=	${PREFIX}/bin/irb \
 			${PREFIX}/bin/erb \
 			${PREFIX}/bin/h2rb
 
-OBSOLETED_MODULES=	dl \
+OBSOLETED_MODULES=	bigfloat \
+			dl \
 			erb \
 			fileutils \
 			optparse \
@@ -99,7 +100,8 @@ OBSOLETED_MODULES=	dl \
 			testunit \
 			timex \
 			urb \
-			uri
+			uri \
+			zlib
 
 post-extract:
 	${MV} ${WRKSRC}/ext/dl/h2rb ${WRKSRC}/bin/
@@ -152,18 +154,16 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${RUBY_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LEGAL ${RUBY_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README* ${RUBY_DOCDIR}
-	${MKDIR} ${RUBY_DOCDIR}/digest
-	${INSTALL_DATA} ${WRKSRC}/ext/digest/digest.txt* ${RUBY_DOCDIR}/digest
-	${MKDIR} ${RUBY_DOCDIR}/dl
-	${INSTALL_DATA} ${WRKSRC}/ext/dl/doc/dl.txt ${RUBY_DOCDIR}/dl
-	${MKDIR} ${RUBY_DOCDIR}/etc
-	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}/etc
+	${INSTALL_DATA} ${WRKSRC}/ext/bigdecimal/bigdecimal_*.html ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/digest/digest.txt* ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/dl/doc/dl.txt ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}
 	${MKDIR} ${RUBY_DOCDIR}/pty
 	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
 	${MKDIR} ${RUBY_DOCDIR}/readline
 	${INSTALL_DATA} ${WRKSRC}/ext/readline/README* ${RUBY_DOCDIR}/readline
-	${MKDIR} ${RUBY_DOCDIR}/syslog
-	${INSTALL_DATA} ${WRKSRC}/ext/syslog/syslog.txt ${RUBY_DOCDIR}/syslog
+	${INSTALL_DATA} ${WRKSRC}/ext/syslog/syslog.txt ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/zlib/doc/zlib.rd ${RUBY_DOCDIR}
 	${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/
 .endif
 	@${ECHO} "Deinstalling obsoleted packages that are now part of ruby..."
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index 6b0f4fed8df4..7fe8e3e43ca3 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,2 +1,3 @@
 MD5 (ruby/ruby-1.8.0-preview2.tar.gz) = 27d00977204a5892d385fd30809d119c
 MD5 (ruby/ruby-1.8.0-preview2-missing.tar.gz) = 3bad9284ad0bdcf1159df9f3448e6a35
+MD5 (ruby/ruby-1.8.0-preview2-2003.04.19.diff.bz2) = e5778217126052594c4db1e9156b9255
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 2b0b75da786c..2853b35ae834 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -9,6 +9,7 @@ bin/ruby%%_RUBY_SUFFIX%%
 lib/lib%%RUBY_NAME%%-static.a
 lib/lib%%RUBY_NAME%%.so
 lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
+%%RUBY_ARCHLIBDIR%%/bigdecimal.so
 %%RUBY_ARCHLIBDIR%%/config.h
 %%RUBY_ARCHLIBDIR%%/curses.so
 %%RUBY_ARCHLIBDIR%%/dbm.so
@@ -47,12 +48,14 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/syslog.so
 %%RUBY_ARCHLIBDIR%%/util.h
 %%RUBY_ARCHLIBDIR%%/version.h
+%%RUBY_ARCHLIBDIR%%/zlib.so
 @dirrm %%RUBY_ARCHLIBDIR%%/digest
 @dirrm %%RUBY_ARCHLIBDIR%%/racc
 %%RUBYLIB%%%%RUBY_LIBDIR%%/English.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/Env.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/base64.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/benchmark.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/bigdecimal-rational.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi-lib.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/cgi/session.rb
@@ -113,8 +116,11 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/irb/workspace.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ws-for-case-2.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/irb/xmp.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/jacobian.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/jcode.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/kconv.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/linear.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/ludcmp.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mailread.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mathn.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/matrix.rb
@@ -129,6 +135,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/net/protocol.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/net/smtp.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/net/telnet.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/newton.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/nlsolve.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/observer.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/open-uri.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/open3.rb
@@ -137,6 +145,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/time.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/optparse/uri.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/ostruct.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/pai.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/parsearg.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/parsedate.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/ping.rb
@@ -243,15 +252,17 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/bigdecimal_en.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/bigdecimal_ja.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dl/dl.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dl.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/digest.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/digest.txt.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/etc.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/etc.txt.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.ja
@@ -261,14 +272,11 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog
+%%PORTDOCS%%%%RUBY_DOCDIR%%/syslog.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/zlib.rd
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dl
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest
 %%RUBY_DOCDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
diff --git a/lang/ruby_static/Makefile b/lang/ruby_static/Makefile
index 680dc1f6dfec..1c5afd093bda 100644
--- a/lang/ruby_static/Makefile
+++ b/lang/ruby_static/Makefile
@@ -25,8 +25,7 @@ RUBY_VER?=	1.6
 
 # Beware, because gdbm is under GPL, you must treat the whole binary
 # as GPL says if you include gdbm in it.
-EXT_PORTS=	archivers/ruby-zlib \
-		databases/ruby-bdb1
+EXT_PORTS=	databases/ruby-bdb1
 _PORTSDIR=	${.CURDIR}/../..
 _RUBY_PORTDIR=	${_PORTSDIR}/${RUBY_PORT}