Update to version 1.4.2.

PR:		14628
Submitted by:	maintainer

5 files changed, 66 insertions, 10 deletions

diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 2c833607cc78..d2d3d4de12fc 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby
-# Version required:     1.4.0
+# Version required:     1.4.2
 # Date created:         04 September 1997
 # Whom:                 Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ruby-1.4.0
+DISTNAME=	ruby-1.4.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
@@ -25,19 +25,40 @@ PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 RUBY_VER=	1.4
 RUBY_ARCH=	${ARCH}-freebsd${OSREL}
 
-BRANCH_NAME=	.
+BRANCH_NAME=	1.4
+
+DOCDIR=		${PREFIX}/share/doc/ruby
+EXAMPLESDIR=	${PREFIX}/share/examples/ruby
 
 post-patch:
 	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
 	${RM} -f ${WRKSRC}/ext/tk/MANIFEST
+	${RM} -rf ${WRKSRC}/lib/irb ${WRKSRC}/sample/irb.rb
 
 post-install:
 	strip ${PREFIX}/bin/ruby
-	${MKDIR} ${PREFIX}/share/examples/ruby
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${PREFIX}/share/examples/ruby
-	${MKDIR} ${PREFIX}/share/examples/ruby/misc
-	${INSTALL_DATA} ${WRKSRC}/misc/* ${PREFIX}/share/examples/ruby/misc
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${EXAMPLESDIR}
+	${MKDIR} ${EXAMPLESDIR}/misc
+	${INSTALL_DATA} ${WRKSRC}/misc/* ${EXAMPLESDIR}/misc
+	${MKDIR} ${EXAMPLESDIR}/curses
+	${INSTALL_DATA} ${WRKSRC}/ext/curses/hello.rb ${WRKSRC}/ext/curses/rain.rb ${WRKSRC}/ext/curses/view.rb ${EXAMPLESDIR}/curses
+	${MKDIR} ${EXAMPLESDIR}/pty
+	${INSTALL_DATA} ${WRKSRC}/ext/pty/expect_sample.rb ${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb ${EXAMPLESDIR}/pty
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README* ${DOCDIR}
+	${MKDIR} ${DOCDIR}/etc
+	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${DOCDIR}/etc
+	${MKDIR} ${DOCDIR}/md5
+	${INSTALL_DATA} ${WRKSRC}/ext/md5/md5.txt* ${DOCDIR}/md5
+	${MKDIR} ${DOCDIR}/pty
+	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${DOCDIR}/pty
+	${MKDIR} ${DOCDIR}/readline
+	${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${DOCDIR}/readline
+.endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	@${CAT} ${PKGMESSAGE}
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index d9fe74ba01f4..79ba6843970c 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1 +1 @@
-MD5 (ruby-1.4.0.tar.gz) = e093dcd834caeedd84459d62e09e72ea
+MD5 (ruby-1.4.2.tar.gz) = 13c18f8cfa0cb0bf1268942cfc04c462
diff --git a/lang/ruby16/pkg-descr b/lang/ruby16/pkg-descr
index 2ee17e67a725..f42fdba241cd 100644
--- a/lang/ruby16/pkg-descr
+++ b/lang/ruby16/pkg-descr
@@ -17,4 +17,4 @@ Features of Ruby are shown below.
     Windows, Mac, BeOS etc.)
 
 The Ruby home page is at:
-WWW: http://www.netlab.co.jp/ruby/
+WWW: http://www.ruby-lang.org/
diff --git a/lang/ruby16/pkg-message b/lang/ruby16/pkg-message
new file mode 100644
index 000000000000..564cf52f2485
--- /dev/null
+++ b/lang/ruby16/pkg-message
@@ -0,0 +1,5 @@
+====
+NOTE: This package does NOT contain irb (the interactive Ruby)
+      and Ruby/Tk (an interface to Tk GUI toolkits);  You need to
+      install separate packages to use them.
+====
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index ee92b52ffe77..58eb8306b59e 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -34,6 +34,7 @@ lib/ruby/%%RUBY_VER%%/English.rb
 lib/ruby/%%RUBY_VER%%/Env.rb
 lib/ruby/%%RUBY_VER%%/base64.rb
 lib/ruby/%%RUBY_VER%%/cgi-lib.rb
+lib/ruby/%%RUBY_VER%%/cgi.rb
 lib/ruby/%%RUBY_VER%%/complex.rb
 lib/ruby/%%RUBY_VER%%/date.rb
 lib/ruby/%%RUBY_VER%%/date2.rb
@@ -78,12 +79,34 @@ lib/ruby/%%RUBY_VER%%/thwait.rb
 lib/ruby/%%RUBY_VER%%/timeout.rb
 lib/ruby/%%RUBY_VER%%/tracer.rb
 lib/ruby/%%RUBY_VER%%/weakref.rb
+lib/ruby/%%RUBY_VER%%/net/pop.rb
+lib/ruby/%%RUBY_VER%%/net/session.rb
+lib/ruby/%%RUBY_VER%%/net/smtp.rb
 @exec /bin/mkdir -p %D/lib/ruby/%%RUBY_VER%%/site_ruby/%%RUBY_ARCH%%
 @dirrm lib/ruby/%%RUBY_VER%%/site_ruby/%%RUBY_ARCH%%
 @dirrm lib/ruby/%%RUBY_VER%%/site_ruby
 @dirrm lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%/net
 @dirrm lib/ruby/%%RUBY_VER%%
 @dirrm lib/ruby
+share/doc/ruby/README
+share/doc/ruby/README.EXT
+share/doc/ruby/README.EXT.jp
+share/doc/ruby/README.jp
+share/doc/ruby/etc/etc.txt
+share/doc/ruby/etc/etc.txt.jp
+share/doc/ruby/md5/md5.txt
+share/doc/ruby/md5/md5.txt.jp
+share/doc/ruby/pty/README
+share/doc/ruby/pty/README.expect
+share/doc/ruby/pty/README.expect.jp
+share/doc/ruby/pty/README.jp
+share/doc/ruby/readline/README
+@dirrm share/doc/ruby/etc
+@dirrm share/doc/ruby/md5
+@dirrm share/doc/ruby/pty
+@dirrm share/doc/ruby/readline
+@dirrm share/doc/ruby
 share/examples/ruby/README
 share/examples/ruby/biorhythm.rb
 share/examples/ruby/cal.rb
@@ -121,7 +144,6 @@ share/examples/ruby/occur.rb
 share/examples/ruby/occur2.rb
 share/examples/ruby/philos.rb
 share/examples/ruby/pi.rb
-share/examples/ruby/rbc.rb
 share/examples/ruby/rcs.awk
 share/examples/ruby/rcs.dat
 share/examples/ruby/rcs.rb
@@ -140,5 +162,13 @@ share/examples/ruby/misc/inf-ruby.el
 share/examples/ruby/misc/ruby-mode.el
 share/examples/ruby/misc/rubydb2x.el
 share/examples/ruby/misc/rubydb3x.el
+share/examples/ruby/curses/hello.rb
+share/examples/ruby/curses/rain.rb
+share/examples/ruby/curses/view.rb
+share/examples/ruby/pty/expect_sample.rb
+share/examples/ruby/pty/script.rb
+share/examples/ruby/pty/shl.rb
 @dirrm share/examples/ruby/misc
+@dirrm share/examples/ruby/curses
+@dirrm share/examples/ruby/pty
 @dirrm share/examples/ruby