Update to version 1.4.2.

PR:		14629
Submitted by:	maintainer

5 files changed, 57 insertions, 21 deletions

diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index 2dc9b5c74620..728ad15994f0 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    rubytk
-# Version required:     1.4.0
+# Version required:     1.4.2
 # Date created:         15 March 1999
 # Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
 #
@@ -26,19 +26,22 @@ LIB_DEPENDS=	${TCL_LIB}.1:${PORTSDIR}/${TCL_CATEGORY}/tcl${TCL_VERSION} \
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/ext
 CONFIGURE_ARGS+= --with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
-		--with-tcl-lib="${PREFIX}/lib/${TCL_DIR}" \
-		--with-tk-lib="${PREFIX}/lib/${TK_DIR}" \
-		--with-tcl-include="${PREFIX}/include/${TCL_DIR}" \
-		--with-tk-include="${PREFIX}/include/${TK_DIR}" \
+		--with-tcl-lib="${LOCALBASE}/lib/${TCL_DIR}" \
+		--with-tk-lib="${LOCALBASE}/lib/${TK_DIR}" \
+		--with-tcl-include="${LOCALBASE}/include/${TCL_DIR}" \
+		--with-tk-include="${LOCALBASE}/include/${TK_DIR}" \
 		--with-X11-dir="${X11BASE}"
 PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-VERSION=	1.4.0
-BRANCH_NAME=	.
+VERSION=	1.4.2
+BRANCH_NAME=	1.4
 
 RUBY_VER=	1.4
 RUBY_ARCH=	${ARCH}-freebsd${OSREL}
 
+DOCDIR=		${PREFIX}/share/doc/ruby
+EXAMPLESDIR=	${PREFIX}/share/examples/ruby
+
 # Set these vars as the version numbers (without decimal points) of Tcl/Tk
 # you want to use with Ruby/Tk.
 # e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build
@@ -59,7 +62,7 @@ TK_LIB=		tk${TK_VERSION}${TCL_JP}
 TCL_DIR=	`echo "${TCL_LIB}" | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 TK_DIR=		`echo "${TK_LIB}"  | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 
-RUBY=		${PREFIX}/bin/ruby
+RUBY=		${LOCALBASE}/bin/ruby
 EXTS=		tcltklib tk
 
 do-configure:
@@ -78,8 +81,16 @@ do-install:
 .for dir in ${EXTS}
 	@${ECHO_MSG} "Installing in ${dir}..."
 	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
-	${MKDIR} ${PREFIX}/share/examples/ruby/${dir}
-	${INSTALL_DATA} ${WRKSRC}/${dir}/sample/* ${PREFIX}/share/examples/ruby/${dir}
+	${MKDIR} ${EXAMPLESDIR}/${dir}
+	${INSTALL_DATA} ${WRKSRC}/${dir}/sample/* ${EXAMPLESDIR}/${dir}
 .endfor
 
+post-install:
+	${MKDIR} ${EXAMPLESDIR}/tcltklib/demo
+	${INSTALL_DATA} ${WRKSRC}/tcltklib/demo/* ${EXAMPLESDIR}/tcltklib/demo
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCDIR}/tcltklib
+	${INSTALL_DATA} ${WRKSRC}/tcltklib/*.euc ${DOCDIR}/tcltklib
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-tk/pkg-plist b/x11-toolkits/ruby-tk/pkg-plist
index 650fe3b55916..8f13229dd143 100644
--- a/x11-toolkits/ruby-tk/pkg-plist
+++ b/x11-toolkits/ruby-tk/pkg-plist
@@ -15,11 +15,18 @@ lib/ruby/%%RUBY_VER%%/tkpalette.rb
 lib/ruby/%%RUBY_VER%%/tkscrollbox.rb
 lib/ruby/%%RUBY_VER%%/tktext.rb
 lib/ruby/%%RUBY_VER%%/tkvirtevent.rb
+share/doc/ruby/tcltklib/MANUAL.euc
+share/doc/ruby/tcltklib/README.euc
+@dirrm share/doc/ruby/tcltklib
 share/examples/ruby/tcltklib/batsu.gif
 share/examples/ruby/tcltklib/maru.gif
 share/examples/ruby/tcltklib/sample0.rb
 share/examples/ruby/tcltklib/sample1.rb
 share/examples/ruby/tcltklib/sample2.rb
+share/examples/ruby/tcltklib/demo/lines0.tcl
+share/examples/ruby/tcltklib/demo/lines1.rb
+share/examples/ruby/tcltklib/demo/lines2.rb
+@dirrm share/examples/ruby/tcltklib/demo
 @dirrm share/examples/ruby/tcltklib
 share/examples/ruby/tk/tkbiff.rb
 share/examples/ruby/tk/tkbrowse.rb
diff --git a/x11-toolkits/ruby14-tk/Makefile b/x11-toolkits/ruby14-tk/Makefile
index 2dc9b5c74620..728ad15994f0 100644
--- a/x11-toolkits/ruby14-tk/Makefile
+++ b/x11-toolkits/ruby14-tk/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    rubytk
-# Version required:     1.4.0
+# Version required:     1.4.2
 # Date created:         15 March 1999
 # Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
 #
@@ -26,19 +26,22 @@ LIB_DEPENDS=	${TCL_LIB}.1:${PORTSDIR}/${TCL_CATEGORY}/tcl${TCL_VERSION} \
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/ext
 CONFIGURE_ARGS+= --with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
-		--with-tcl-lib="${PREFIX}/lib/${TCL_DIR}" \
-		--with-tk-lib="${PREFIX}/lib/${TK_DIR}" \
-		--with-tcl-include="${PREFIX}/include/${TCL_DIR}" \
-		--with-tk-include="${PREFIX}/include/${TK_DIR}" \
+		--with-tcl-lib="${LOCALBASE}/lib/${TCL_DIR}" \
+		--with-tk-lib="${LOCALBASE}/lib/${TK_DIR}" \
+		--with-tcl-include="${LOCALBASE}/include/${TCL_DIR}" \
+		--with-tk-include="${LOCALBASE}/include/${TK_DIR}" \
 		--with-X11-dir="${X11BASE}"
 PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-VERSION=	1.4.0
-BRANCH_NAME=	.
+VERSION=	1.4.2
+BRANCH_NAME=	1.4
 
 RUBY_VER=	1.4
 RUBY_ARCH=	${ARCH}-freebsd${OSREL}
 
+DOCDIR=		${PREFIX}/share/doc/ruby
+EXAMPLESDIR=	${PREFIX}/share/examples/ruby
+
 # Set these vars as the version numbers (without decimal points) of Tcl/Tk
 # you want to use with Ruby/Tk.
 # e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build
@@ -59,7 +62,7 @@ TK_LIB=		tk${TK_VERSION}${TCL_JP}
 TCL_DIR=	`echo "${TCL_LIB}" | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 TK_DIR=		`echo "${TK_LIB}"  | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 
-RUBY=		${PREFIX}/bin/ruby
+RUBY=		${LOCALBASE}/bin/ruby
 EXTS=		tcltklib tk
 
 do-configure:
@@ -78,8 +81,16 @@ do-install:
 .for dir in ${EXTS}
 	@${ECHO_MSG} "Installing in ${dir}..."
 	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
-	${MKDIR} ${PREFIX}/share/examples/ruby/${dir}
-	${INSTALL_DATA} ${WRKSRC}/${dir}/sample/* ${PREFIX}/share/examples/ruby/${dir}
+	${MKDIR} ${EXAMPLESDIR}/${dir}
+	${INSTALL_DATA} ${WRKSRC}/${dir}/sample/* ${EXAMPLESDIR}/${dir}
 .endfor
 
+post-install:
+	${MKDIR} ${EXAMPLESDIR}/tcltklib/demo
+	${INSTALL_DATA} ${WRKSRC}/tcltklib/demo/* ${EXAMPLESDIR}/tcltklib/demo
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCDIR}/tcltklib
+	${INSTALL_DATA} ${WRKSRC}/tcltklib/*.euc ${DOCDIR}/tcltklib
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/ruby14-tk/distinfo b/x11-toolkits/ruby14-tk/distinfo
index d9fe74ba01f4..79ba6843970c 100644
--- a/x11-toolkits/ruby14-tk/distinfo
+++ b/x11-toolkits/ruby14-tk/distinfo
@@ -1 +1 @@
-MD5 (ruby-1.4.0.tar.gz) = e093dcd834caeedd84459d62e09e72ea
+MD5 (ruby-1.4.2.tar.gz) = 13c18f8cfa0cb0bf1268942cfc04c462
diff --git a/x11-toolkits/ruby14-tk/pkg-plist b/x11-toolkits/ruby14-tk/pkg-plist
index 650fe3b55916..8f13229dd143 100644
--- a/x11-toolkits/ruby14-tk/pkg-plist
+++ b/x11-toolkits/ruby14-tk/pkg-plist
@@ -15,11 +15,18 @@ lib/ruby/%%RUBY_VER%%/tkpalette.rb
 lib/ruby/%%RUBY_VER%%/tkscrollbox.rb
 lib/ruby/%%RUBY_VER%%/tktext.rb
 lib/ruby/%%RUBY_VER%%/tkvirtevent.rb
+share/doc/ruby/tcltklib/MANUAL.euc
+share/doc/ruby/tcltklib/README.euc
+@dirrm share/doc/ruby/tcltklib
 share/examples/ruby/tcltklib/batsu.gif
 share/examples/ruby/tcltklib/maru.gif
 share/examples/ruby/tcltklib/sample0.rb
 share/examples/ruby/tcltklib/sample1.rb
 share/examples/ruby/tcltklib/sample2.rb
+share/examples/ruby/tcltklib/demo/lines0.tcl
+share/examples/ruby/tcltklib/demo/lines1.rb
+share/examples/ruby/tcltklib/demo/lines2.rb
+@dirrm share/examples/ruby/tcltklib/demo
 @dirrm share/examples/ruby/tcltklib
 share/examples/ruby/tk/tkbiff.rb
 share/examples/ruby/tk/tkbrowse.rb