lang/ruby-usersguide:

  - Replace with Mark Slagell's retranslation version.
  - Add an Author: credit to DESCR.

japanese/ruby-usersguide:
  - Use MASTER_SITE_RUBY.
  - Add Authors: credits to DESCR.

6 files changed, 25 insertions, 9 deletions

diff --git a/japanese/ruby-usersguide/Makefile b/japanese/ruby-usersguide/Makefile
index b53a2e2..0cf41e2 100644
--- a/japanese/ruby-usersguide/Makefile
+++ b/japanese/ruby-usersguide/Makefile
@@ -7,7 +7,9 @@
 
 MASTERDIR=	${.CURDIR}/../../lang/ruby-usersguide
 
-MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/doc/
+MASTER_SITES=	${MASTER_SITE_RUBY}
+MASTER_SITE_SUBDIR=	doc
+DISTNAME=	${SHORTNAME}-${VERSION}
 
 CATEGORIES=	japanese
 
@@ -20,7 +22,4 @@ PKGDIR=		${.CURDIR}/pkg
 
 LANGSUFFIX=	-jp
 
-pre-install:
-	${LN} -sf uguide00.html ${WRKSRC}/index.html
-
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/ruby-usersguide/pkg-descr b/japanese/ruby-usersguide/pkg-descr
index 6cb41f4..eaa0f9a 100644
--- a/japanese/ruby-usersguide/pkg-descr
+++ b/japanese/ruby-usersguide/pkg-descr
@@ -4,3 +4,4 @@ files and to do system management tasks.  This package contains
 Japanese version of the Ruby users guide in HTML format.
 
 WWW:	http://www.ruby-lang.org/
+Author:	Yukihiro Matsumoto <matz@netlab.co.jp>
diff --git a/lang/ruby-usersguide/Makefile b/lang/ruby-usersguide/Makefile
index 78ba9d4..582bb23 100644
--- a/lang/ruby-usersguide/Makefile
+++ b/lang/ruby-usersguide/Makefile
@@ -8,14 +8,14 @@
 PORTNAME=	ruby-usersguide
 PORTVERSION=	${VERSION}
 CATEGORIES+=	lang ruby
-MASTER_SITES?=	http://www.math.sci.hokudai.ac.jp/~gotoken/ruby/
-DISTNAME=	${SHORTNAME}-${PORTVERSION}
+MASTER_SITES?=	http://www.cs.iastate.edu/~slagell/ruby/
+DISTNAME?=	${SHORTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
 SHORTNAME=	${PORTNAME:S/usersguide/uguide/}
-VERSION?=	981227
+VERSION?=	20000904
 
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" LANGSUFFIX="${LANGSUFFIX}"
 
@@ -25,8 +25,12 @@ NO_BUILD=	yes
 
 DOCDIR=		${PREFIX}/share/doc/ruby/${PORTNAME}${LANGSUFFIX}
 
+post-extract:
+	if [ -f ${WRKSRC}/ansi.com ]; then ${RM} ${WRKSRC}/ansi.com; fi
+
 do-install:
 	${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/index.html ${WRKSRC}/uguide* ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/* ${DOCDIR}
+	${LN} -fs uguide00.html ${DOCDIR}/index.html
 
 .include <bsd.port.mk>
diff --git a/lang/ruby-usersguide/distinfo b/lang/ruby-usersguide/distinfo
index 4a7268c..84b1d3e 100644
--- a/lang/ruby-usersguide/distinfo
+++ b/lang/ruby-usersguide/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-uguide-981227.tar.gz) = 24eadcd067278901da9ad70efb146b07
+MD5 (ruby/ruby-uguide.tar.gz) = 951b7c743599b85fc435525a73f08dd3
diff --git a/lang/ruby-usersguide/pkg-descr b/lang/ruby-usersguide/pkg-descr
index 1bdab93..1f50321 100644
--- a/lang/ruby-usersguide/pkg-descr
+++ b/lang/ruby-usersguide/pkg-descr
@@ -4,3 +4,8 @@ files and to do system management tasks.  This package contains the
 Ruby users guide in HTML format.
 
 WWW:	http://www.ruby-lang.org/
+Authors:
+	Yukihiro Matsumoto <matz@netlab.co.jp> (Japanese version)
+	GOTO Kentaro <gotoken@notwork.org> (Initial translation)
+	Julian Fondren (ditto)
+	Mark Slagell <slagell@cs.iastate.edu> (Retranslation)
diff --git a/lang/ruby-usersguide/pkg-plist b/lang/ruby-usersguide/pkg-plist
index b0ed2c9..d1a5f1f 100644
--- a/lang/ruby-usersguide/pkg-plist
+++ b/lang/ruby-usersguide/pkg-plist
@@ -1,4 +1,10 @@
+share/doc/ruby/ruby-usersguide/README.txt
+share/doc/ruby/ruby-usersguide/a2l.gif
+share/doc/ruby/ruby-usersguide/a2r.gif
+share/doc/ruby/ruby-usersguide/a2u.gif
+share/doc/ruby/ruby-usersguide/eval.rb
 share/doc/ruby/ruby-usersguide/index.html
+share/doc/ruby/ruby-usersguide/install.html
 share/doc/ruby/ruby-usersguide/uguide.css
 share/doc/ruby/ruby-usersguide/uguide00.html
 share/doc/ruby/ruby-usersguide/uguide01.html
@@ -26,5 +32,6 @@ share/doc/ruby/ruby-usersguide/uguide22.html
 share/doc/ruby/ruby-usersguide/uguide23.html
 share/doc/ruby/ruby-usersguide/uguide24.html
 share/doc/ruby/ruby-usersguide/uguide25.html
+share/doc/ruby/ruby-usersguide/uguide26.html
 @dirrm share/doc/ruby/ruby-usersguide
 @unexec rmdir %D/share/doc/ruby 2>/dev/null || true