Update ruby-base package to 1.6.6nb1.

- Install more documents.
- Stop pkglint warn:

	possible direct use of command "file" found. Use ${FILE_CMD} instead.

3 files changed, 31 insertions, 20 deletions

diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
index 180183aa838..10a6009f019 100644
--- a/lang/ruby-base/Makefile
+++ b/lang/ruby-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/12/30 16:21:51 taca Exp $
+# $NetBSD: Makefile,v 1.4 2002/01/04 09:44:59 taca Exp $
 # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}base-${RUBY_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -25,9 +26,13 @@ MLINKS=		ruby${_RUBY_SUFFIX}.1 ruby.1
 
 DOCS=		README README.EXT README.EXT.ja README.ja ToDo \
 		doc/NEWS doc/forwardable.rd doc/forwardable.rd.ja \
-		doc/shell.rd doc/shell.rd.ja
-DOCS_ETC=	etc.txt etc.txt.ja
-DOCS_PTY=	README README.expect README.expect.ja README.ja
+		doc/shell.rd doc/shell.rd.ja doc/irb/irb-tools.rd.ja \
+		doc/irb/irb.rd doc/irb/irb.rd.ja doc/net/http.rd.ja \
+		doc/net/pop.rd.ja doc/net/smtp.rd.ja doc/shell.rd \
+		doc/shell.rd.ja
+EXT_DOCS=	ext/etc/etc.txt ext/etc/etc.txt.ja ext/pty/README \
+		ext/pty/README.expect ext/pty/README.expect.ja \
+		ext/pty/README.ja ext/syslog/syslog.txt
 
 REPLACE_RUBY=	ext/curses/hello.rb ext/curses/rain.rb ext/curses/view.rb \
 		lib/matrix.rb sample/biorhythm.rb sample/cal.rb \
@@ -87,17 +92,13 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ext/pty/expect_sample.rb \
 		${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb \
 		${RUBY_EXAMPLESDIR}/pty
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}
-.endfor
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/etc
-.for f in ${DOCS_ETC}
-	${INSTALL_DATA} ${WRKSRC}/ext/etc/${f} ${RUBY_DOCDIR}/etc
-.endfor
+	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/irb
+	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/net
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/pty
-.for f in ${DOCS_PTY}
-	${INSTALL_DATA} ${WRKSRC}/ext/pty/${f} ${RUBY_DOCDIR}/pty
+	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/syslog
+.for f in ${DOCS} ${EXT_DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${f:C/^(doc|ext)\///}
 .endfor
 
 test:
diff --git a/lang/ruby-base/Makefile.common b/lang/ruby-base/Makefile.common
index 89789cbb748..bafe0f5ff08 100644
--- a/lang/ruby-base/Makefile.common
+++ b/lang/ruby-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2001/12/30 16:21:51 taca Exp $
+# $NetBSD: Makefile.common,v 1.4 2002/01/04 09:44:59 taca Exp $
 # FreeBSD: ports/Mk/bsd.ruby.mk,v 1.11 2000/11/16 17:59:40 knu Exp
 # Makefile.common: ruby common makefile, based on FreeBSD's bsd.ruby.mk.
 
@@ -127,12 +127,12 @@ RUBY_DISTINFO?=		${.CURDIR}/../../lang/ruby${RUBY_SUFFIX}-base/distinfo
 pre-configure: replace-ruby
 
 replace-ruby:
-	@for file in ${REPLACE_RUBY}; do \
-		case $${file} in \
-		/*)	f=$${file};; \
-		*)	f=${WRKSRC}/$${file};; \
+	@for s in ${REPLACE_RUBY}; do \
+		case $${s} in \
+		/*)	f=$${s};; \
+		*)	f=${WRKSRC}/$${s};; \
 		esac; \
-		${ECHO_MSG} "===>  Fixing the #! line of $${file}"; \
+		${ECHO_MSG} "===>  Fixing the #! line of $${s}"; \
 		${SED}	-e 's| *[a-z0-9_/\.-][a-z0-9_/\.-]*/env *||g' \
 			-e 's| *[a-z0-9_/\.-]*ruby|${RUBY}|' $$f > $$f.tmp; \
 		if ${CMP} -s $$f $$f.tmp; then \
diff --git a/lang/ruby-base/PLIST b/lang/ruby-base/PLIST
index 67e333f8bec..ac50cb7b508 100644
--- a/lang/ruby-base/PLIST
+++ b/lang/ruby-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/30 16:21:51 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/01/04 09:44:59 taca Exp $
 bin/irb
 bin/ruby
 bin/ruby${_RUBY_SUFFIX}
@@ -146,6 +146,14 @@ ${RUBY_DOCDIR}/etc/etc.txt.ja
 @dirrm ${RUBY_DOCDIR}/etc
 ${RUBY_DOCDIR}/forwardable.rd
 ${RUBY_DOCDIR}/forwardable.rd.ja
+${RUBY_DOCDIR}/irb/irb-tools.rd.ja
+${RUBY_DOCDIR}/irb/irb.rd
+${RUBY_DOCDIR}/irb/irb.rd.ja
+@dirrm ${RUBY_DOCDIR}/irb
+${RUBY_DOCDIR}/net/http.rd.ja
+${RUBY_DOCDIR}/net/pop.rd.ja
+${RUBY_DOCDIR}/net/smtp.rd.ja
+@dirrm ${RUBY_DOCDIR}/net
 ${RUBY_DOCDIR}/pty/README
 ${RUBY_DOCDIR}/pty/README.expect
 ${RUBY_DOCDIR}/pty/README.expect.ja
@@ -153,6 +161,8 @@ ${RUBY_DOCDIR}/pty/README.ja
 @dirrm ${RUBY_DOCDIR}/pty
 ${RUBY_DOCDIR}/shell.rd
 ${RUBY_DOCDIR}/shell.rd.ja
+${RUBY_DOCDIR}/syslog/syslog.txt
+@dirrm ${RUBY_DOCDIR}/syslog
 @dirrm ${RUBY_DOCDIR}
 ${RUBY_EXAMPLESDIR}/README
 ${RUBY_EXAMPLESDIR}/biorhythm.rb