3 files changed, 38 insertions, 29 deletions

diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index e842463c20cc..d70049dc5ea8 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -8,18 +8,20 @@
 PORTNAME=	ruby${RUBY_R}
 PORTVERSION=	${RUBY_PORTVERSION}
 CATEGORIES=	lang ruby ipv6
-MASTER_SITES=	http://www.ruby-lang.org/~knu/	# ${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	${RUBY_VER}
+MASTER_SITES=	${MASTER_SITE_RUBY}
+MASTER_SITE_SUBDIR=	snapshots
 DISTNAME=	${RUBY_DISTNAME}
 DIST_SUBDIR=	ruby
 
-PATCH_SITES=	http://www.ruby-lang.org/~knu/ \
-		http://www.iDaemons.org/distfiles/
-PATCHFILES=	${RUBY_PATCHFILES}
-PATCH_DIST_STRIP=	-p1
+#PATCH_SITES=	${MASTER_SITE_RUBY}
+#PATCH_SITE_SUBDIR=	snapshots
+#PATCHFILES=	${RUBY_PATCHFILES}
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	knu@FreeBSD.org
 
+USE_BZIP2=	yes
+
 RUBY_VER=	1.7
 
 USE_RUBY=	yes
@@ -116,17 +118,17 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ext/curses/hello.rb ${WRKSRC}/ext/curses/rain.rb ${WRKSRC}/ext/curses/view.rb ${RUBY_EXAMPLESDIR}/curses
 	${MKDIR} ${RUBY_EXAMPLESDIR}/pty
 	${INSTALL_DATA} ${WRKSRC}/ext/pty/expect_sample.rb ${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb ${RUBY_EXAMPLESDIR}/pty
+	${INSTALL_DATA} ${WRKSRC}/COPYING* ${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
-	${MKDIR} ${RUBY_DOCDIR}/md5
-	${INSTALL_DATA} ${WRKSRC}/ext/md5/md5.txt* ${RUBY_DOCDIR}/md5
 	${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}/sha1
-	${INSTALL_DATA} ${WRKSRC}/ext/sha1/sha1.txt* ${RUBY_DOCDIR}/sha1
+	${INSTALL_DATA} ${WRKSRC}/ext/readline/README* ${RUBY_DOCDIR}/readline
 	${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index 04f5c1078308..847cab0e3074 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-1.7.1-alpha-2001.06.21.tar.gz) = 988145548e5067f7b5d72ec6bab6d81c
+MD5 (ruby/ruby-1.7-2001.07.31.tar.bz2) = 4cd70a3085e89944b09f3beb7dce9e86
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 011378b454db..d5613e17c164 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -8,13 +8,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/curses.so
 %%RUBY_ARCHLIBDIR%%/dbm.so
 %%RUBY_ARCHLIBDIR%%/defines.h
+%%RUBY_ARCHLIBDIR%%/digest.so
 %%RUBY_ARCHLIBDIR%%/dln.h
 %%RUBY_ARCHLIBDIR%%/env.h
 %%RUBY_ARCHLIBDIR%%/etc.so
 %%RUBY_ARCHLIBDIR%%/fcntl.so
 %%RUBY_ARCHLIBDIR%%/intern.h
 %%RUBY_ARCHLIBDIR%%/lib%%RUBY_NAME%%.a
-%%RUBY_ARCHLIBDIR%%/md5.so
 %%RUBY_ARCHLIBDIR%%/nkf.so
 %%RUBY_ARCHLIBDIR%%/node.h
 %%RUBY_ARCHLIBDIR%%/pty.so
@@ -26,11 +26,15 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/rubyio.h
 %%RUBY_ARCHLIBDIR%%/rubysig.h
 %%RUBY_ARCHLIBDIR%%/sdbm.so
-%%RUBY_ARCHLIBDIR%%/sha1.so
 %%RUBY_ARCHLIBDIR%%/socket.so
 %%RUBY_ARCHLIBDIR%%/st.h
 %%RUBY_ARCHLIBDIR%%/util.h
 %%RUBY_ARCHLIBDIR%%/version.h
+%%RUBY_ARCHLIBDIR%%/digest/md5.so
+%%RUBY_ARCHLIBDIR%%/digest/rmd160.so
+%%RUBY_ARCHLIBDIR%%/digest/sha1.so
+%%RUBY_ARCHLIBDIR%%/digest/sha2.so
+@dirrm %%RUBY_ARCHLIBDIR%%/digest
 %%RUBYLIB%%%%RUBY_LIBDIR%%/English.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/Env.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/base64.rb
@@ -59,6 +63,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mailread.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mathn.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/matrix.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/md5.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mkmf.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/monitor.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/mutex_m.rb
@@ -74,6 +79,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%%%RUBY_LIBDIR%%/readbytes.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv-replace.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/sha1.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/shell.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/shellwords.rb
 %%RUBYLIB%%%%RUBY_LIBDIR%%/singleton.rb
@@ -137,35 +143,36 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ELISPDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
 @unexec rmdir %D/lib/ruby 2>/dev/null || true
+%%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING
+%%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/LEGAL
 %%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/README.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT
-%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.jp
+%%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.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
-%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
-%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sha1/sha1.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/sha1/sha1.txt.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/md5
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/sha1
 %%RUBY_DOCDIR%%/.keep_me
 @unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README