Update to version 1.4.0

PR:		13305
Submitted by:	maintainer

5 files changed, 99 insertions, 53 deletions

diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index 5301e5b430c4..ce2f062e17a6 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:    rubytk
-# Version required:     1.2.5
+# Version required:     1.4.0
 # Date created:         15 March 1999
 # Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/04/27 12:39:46 taoka Exp $
 #
 
 DISTNAME=	ruby-${VERSION}
@@ -25,14 +25,19 @@ LIB_DEPENDS=	${TCL_LIB}.1:${PORTSDIR}/${TCL_CATEGORY}/tcl${TCL_VERSION} \
 
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/ext
-CONFIGURE_ENV+=	TCL_LIB="${TCL_LIB}" TK_LIB="${TK_LIB}" \
-		PREFIX="${PREFIX}" X11BASE="${X11BASE}"
-PLIST_SUB+=	RUBY_ARCH="${RUBY_ARCH}"
+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-X11-dir="${X11BASE}"
+PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-RUBY_ARCH=	${ARCH}-freebsd${OSREL}
+VERSION=	1.4.0
+BRANCH_NAME=	.
 
-VERSION=	1.2.5
-BRANCH_NAME=	1.2
+RUBY_VER=	1.4
+RUBY_ARCH=	${ARCH}-freebsd${OSREL}
 
 # Set these vars as the version numbers (without decimal points) of Tcl/Tk
 # you want to use with Ruby/Tk.
@@ -51,6 +56,8 @@ TCL_JP=		# empty
 
 TCL_LIB=	tcl${TCL_VERSION}${TCL_JP}
 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
 EXTS=		tcltklib tk
@@ -58,7 +65,7 @@ EXTS=		tcltklib tk
 do-configure:
 .for dir in ${EXTS}
 	@${ECHO_MSG} "Configuring in ${dir}..."
-	@cd ${WRKSRC}/${dir}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb
+	@cd ${WRKSRC}/${dir}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
 .endfor
 
 do-build:
@@ -71,6 +78,8 @@ 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}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-tk/pkg-plist b/x11-toolkits/ruby-tk/pkg-plist
index e7556ea023a0..650fe3b55916 100644
--- a/x11-toolkits/ruby-tk/pkg-plist
+++ b/x11-toolkits/ruby-tk/pkg-plist
@@ -1,17 +1,31 @@
-lib/ruby/%%RUBY_ARCH%%/tcltklib.so
-lib/ruby/%%RUBY_ARCH%%/tkutil.so
-lib/ruby/tcltk.rb
-lib/ruby/tk.rb
-lib/ruby/tkafter.rb
-lib/ruby/tkbgerror.rb
-lib/ruby/tkcanvas.rb
-lib/ruby/tkclass.rb
-lib/ruby/tkdialog.rb
-lib/ruby/tkentry.rb
-lib/ruby/tkfont.rb
-lib/ruby/tkmenubar.rb
-lib/ruby/tkmngfocus.rb
-lib/ruby/tkpalette.rb
-lib/ruby/tkscrollbox.rb
-lib/ruby/tktext.rb
-lib/ruby/tkvirtevent.rb
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tcltklib.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tkutil.so
+lib/ruby/%%RUBY_VER%%/tcltk.rb
+lib/ruby/%%RUBY_VER%%/tk.rb
+lib/ruby/%%RUBY_VER%%/tkafter.rb
+lib/ruby/%%RUBY_VER%%/tkbgerror.rb
+lib/ruby/%%RUBY_VER%%/tkcanvas.rb
+lib/ruby/%%RUBY_VER%%/tkclass.rb
+lib/ruby/%%RUBY_VER%%/tkdialog.rb
+lib/ruby/%%RUBY_VER%%/tkentry.rb
+lib/ruby/%%RUBY_VER%%/tkfont.rb
+lib/ruby/%%RUBY_VER%%/tkmenubar.rb
+lib/ruby/%%RUBY_VER%%/tkmngfocus.rb
+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/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
+@dirrm share/examples/ruby/tcltklib
+share/examples/ruby/tk/tkbiff.rb
+share/examples/ruby/tk/tkbrowse.rb
+share/examples/ruby/tk/tkdialog.rb
+share/examples/ruby/tk/tkfrom.rb
+share/examples/ruby/tk/tkhello.rb
+share/examples/ruby/tk/tkline.rb
+share/examples/ruby/tk/tktimer.rb
+@dirrm share/examples/ruby/tk
diff --git a/x11-toolkits/ruby14-tk/Makefile b/x11-toolkits/ruby14-tk/Makefile
index 5301e5b430c4..ce2f062e17a6 100644
--- a/x11-toolkits/ruby14-tk/Makefile
+++ b/x11-toolkits/ruby14-tk/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:    rubytk
-# Version required:     1.2.5
+# Version required:     1.4.0
 # Date created:         15 March 1999
 # Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/04/27 12:39:46 taoka Exp $
 #
 
 DISTNAME=	ruby-${VERSION}
@@ -25,14 +25,19 @@ LIB_DEPENDS=	${TCL_LIB}.1:${PORTSDIR}/${TCL_CATEGORY}/tcl${TCL_VERSION} \
 
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/ext
-CONFIGURE_ENV+=	TCL_LIB="${TCL_LIB}" TK_LIB="${TK_LIB}" \
-		PREFIX="${PREFIX}" X11BASE="${X11BASE}"
-PLIST_SUB+=	RUBY_ARCH="${RUBY_ARCH}"
+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-X11-dir="${X11BASE}"
+PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-RUBY_ARCH=	${ARCH}-freebsd${OSREL}
+VERSION=	1.4.0
+BRANCH_NAME=	.
 
-VERSION=	1.2.5
-BRANCH_NAME=	1.2
+RUBY_VER=	1.4
+RUBY_ARCH=	${ARCH}-freebsd${OSREL}
 
 # Set these vars as the version numbers (without decimal points) of Tcl/Tk
 # you want to use with Ruby/Tk.
@@ -51,6 +56,8 @@ TCL_JP=		# empty
 
 TCL_LIB=	tcl${TCL_VERSION}${TCL_JP}
 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
 EXTS=		tcltklib tk
@@ -58,7 +65,7 @@ EXTS=		tcltklib tk
 do-configure:
 .for dir in ${EXTS}
 	@${ECHO_MSG} "Configuring in ${dir}..."
-	@cd ${WRKSRC}/${dir}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb
+	@cd ${WRKSRC}/${dir}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
 .endfor
 
 do-build:
@@ -71,6 +78,8 @@ 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}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/ruby14-tk/distinfo b/x11-toolkits/ruby14-tk/distinfo
index b08ccbf9c196..d9fe74ba01f4 100644
--- a/x11-toolkits/ruby14-tk/distinfo
+++ b/x11-toolkits/ruby14-tk/distinfo
@@ -1 +1 @@
-MD5 (ruby-1.2.5.tar.gz) = 3ec298b7697843733ea0230f23b626b6
+MD5 (ruby-1.4.0.tar.gz) = e093dcd834caeedd84459d62e09e72ea
diff --git a/x11-toolkits/ruby14-tk/pkg-plist b/x11-toolkits/ruby14-tk/pkg-plist
index e7556ea023a0..650fe3b55916 100644
--- a/x11-toolkits/ruby14-tk/pkg-plist
+++ b/x11-toolkits/ruby14-tk/pkg-plist
@@ -1,17 +1,31 @@
-lib/ruby/%%RUBY_ARCH%%/tcltklib.so
-lib/ruby/%%RUBY_ARCH%%/tkutil.so
-lib/ruby/tcltk.rb
-lib/ruby/tk.rb
-lib/ruby/tkafter.rb
-lib/ruby/tkbgerror.rb
-lib/ruby/tkcanvas.rb
-lib/ruby/tkclass.rb
-lib/ruby/tkdialog.rb
-lib/ruby/tkentry.rb
-lib/ruby/tkfont.rb
-lib/ruby/tkmenubar.rb
-lib/ruby/tkmngfocus.rb
-lib/ruby/tkpalette.rb
-lib/ruby/tkscrollbox.rb
-lib/ruby/tktext.rb
-lib/ruby/tkvirtevent.rb
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tcltklib.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tkutil.so
+lib/ruby/%%RUBY_VER%%/tcltk.rb
+lib/ruby/%%RUBY_VER%%/tk.rb
+lib/ruby/%%RUBY_VER%%/tkafter.rb
+lib/ruby/%%RUBY_VER%%/tkbgerror.rb
+lib/ruby/%%RUBY_VER%%/tkcanvas.rb
+lib/ruby/%%RUBY_VER%%/tkclass.rb
+lib/ruby/%%RUBY_VER%%/tkdialog.rb
+lib/ruby/%%RUBY_VER%%/tkentry.rb
+lib/ruby/%%RUBY_VER%%/tkfont.rb
+lib/ruby/%%RUBY_VER%%/tkmenubar.rb
+lib/ruby/%%RUBY_VER%%/tkmngfocus.rb
+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/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
+@dirrm share/examples/ruby/tcltklib
+share/examples/ruby/tk/tkbiff.rb
+share/examples/ruby/tk/tkbrowse.rb
+share/examples/ruby/tk/tkdialog.rb
+share/examples/ruby/tk/tkfrom.rb
+share/examples/ruby/tk/tkhello.rb
+share/examples/ruby/tk/tkline.rb
+share/examples/ruby/tk/tktimer.rb
+@dirrm share/examples/ruby/tk