10 files changed, 18 insertions, 11 deletions

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 92e6e791437d..0a8ff702ed13 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -64,7 +64,7 @@ _RUBY_SUFFIX=		${RUBY_VER:S/.//}
 RUBY_VERSION?=		1.4.6
 RUBY_SUFFIX?=		${_RUBY_SUFFIX}
 .else
-RUBY_VERSION?=		1.6.0
+RUBY_VERSION?=		1.6.1
 RUBY_SUFFIX?=		# empty
 .endif
 
diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile
index ecd4793d40bb..7363ab451b67 100644
--- a/databases/ruby-gdbm/Makefile
+++ b/databases/ruby-gdbm/Makefile
@@ -21,6 +21,8 @@ LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
+MD5_FILE=	${PORTSDIR}/lang/ruby/files/md5
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/ext/gdbm
 
 post-install:
diff --git a/japanese/ruby-tcltklib/Makefile b/japanese/ruby-tcltklib/Makefile
index 6da1e2d9da35..97c8c1d40f3d 100644
--- a/japanese/ruby-tcltklib/Makefile
+++ b/japanese/ruby-tcltklib/Makefile
@@ -7,7 +7,7 @@
 
 CATEGORIES=	japanese
 
-MAINTAINER=	yasuf@bsdclub.org
+MAINTAINER=	knu@FreeBSD.org
 
 TCL_VERSION?=	80
 TK_VERSION?=	80
diff --git a/japanese/ruby-tk/Makefile b/japanese/ruby-tk/Makefile
index 2984a400d1b3..809a92992293 100644
--- a/japanese/ruby-tk/Makefile
+++ b/japanese/ruby-tk/Makefile
@@ -7,7 +7,7 @@
 
 CATEGORIES=	japanese
 
-MAINTAINER=	yasuf@bsdclub.org
+MAINTAINER=	knu@FreeBSD.org
 
 TK_VERSION?=	80
 WITH_TCLTK_JP=	yes
diff --git a/lang/ruby-tcltklib/Makefile b/lang/ruby-tcltklib/Makefile
index 2de946cc6b25..71b1f2295d4a 100644
--- a/lang/ruby-tcltklib/Makefile
+++ b/lang/ruby-tcltklib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_RUBY}
 DISTNAME=	ruby-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
-MAINTAINER?=	yasuf@bsdclub.org
+MAINTAINER?=	knu@FreeBSD.org
 
 LIB_DEPENDS=	${TCL_LIB}.1:${PORTSDIR}/${TCL_CATEGORY}/tcl${TCL_VERSION} \
 		${TK_LIB}.1:${PORTSDIR}/${TK_CATEGORY}/tk${TK_VERSION}
@@ -21,6 +21,9 @@ LIB_DEPENDS=	${TCL_LIB}.1:${PORTSDIR}/${TCL_CATEGORY}/tcl${TCL_VERSION} \
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_XLIB=	yes
+
+MD5_FILE=	${PORTSDIR}/lang/ruby/files/md5
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/ext/tcltklib
 CONFIGURE_ARGS=	--with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
 		--with-tcl-lib="${LOCALBASE}/lib/${TCL_DIR}" \
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index f30b0a651600..82e177ae05be 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${RUBY_VER}
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	yasuf@bsdclub.org
+MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
 RUBY_NO_BUILD_DEPENDS=	yes
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
index 78be989c6959..78c49ef5fc06 100644
--- a/lang/ruby/distinfo
+++ b/lang/ruby/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-1.6.0.tar.gz) = fc35bbdc50c7512b838f45558744f75d
+MD5 (ruby/ruby-1.6.1.tar.gz) = 59e5b9ab8dfe65214e1b72eec4219dff
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index f30b0a651600..82e177ae05be 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${RUBY_VER}
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	yasuf@bsdclub.org
+MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
 RUBY_NO_BUILD_DEPENDS=	yes
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index 78be989c6959..78c49ef5fc06 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-1.6.0.tar.gz) = fc35bbdc50c7512b838f45558744f75d
+MD5 (ruby/ruby-1.6.1.tar.gz) = 59e5b9ab8dfe65214e1b72eec4219dff
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index 6cf0fed4418c..c489d69a0025 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -13,15 +13,17 @@ MASTER_SITE_SUBDIR=	${RUBY_VER}
 DISTNAME=	ruby-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
-MAINTAINER?=	yasuf@bsdclub.org
+MAINTAINER?=	knu@FreeBSD.org
 
 RUN_DEPENDS=	${RUBY_ARCHLIBDIR}/tcltklib.so:${PORTSDIR}/${TCLTKLIB_CATEGORY}/ruby-tcltklib
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/ext/tk
-
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
+MD5_FILE=	${PORTSDIR}/lang/ruby/files/md5
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/ext/tk
+
 TK_VERSION?=	82
 .if defined(WITH_TCLTK_JP)
 TCLTKLIB_CATEGORY?=	japanese