7 files changed, 2 insertions, 122 deletions
diff --git a/MOVED b/MOVED
index 1621b1c457c5..37321c49647a 100644
--- a/MOVED
+++ b/MOVED
@@ -2055,3 +2055,5 @@ www/plog|www/lifetype|2006-01-11|project renamed
 mail/thunderbird-devel|mail/thunderbird|2006-01-12|Thunderbird 1.5 is now stable
 databases/pecl-hash|security/pecl-hash|2006-01-13|Moved to a better category
 multimedia/kino-dvtitler||2006-01-14|Merged into multimedia/kino
+lang/ruby-tcltklib||2006-01-14|Merged into x11-toolkits/ruby-tk
+japanese/ruby-tcltklib||2006-01-14|Merged into japanese/ruby-tk
diff --git a/japanese/Makefile b/japanese/Makefile
index fbef61060e70..c9702ae2a3bf 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -326,7 +326,6 @@
     SUBDIR += ruby-refe
     SUBDIR += ruby-romkan
     SUBDIR += ruby-slang
-    SUBDIR += ruby-tcltklib
     SUBDIR += ruby-tk
     SUBDIR += ruby-uconv
     SUBDIR += ruby-usersguide
diff --git a/japanese/ruby-tcltklib/Makefile b/japanese/ruby-tcltklib/Makefile
deleted file mode 100644
index b58abae50f45..000000000000
--- a/japanese/ruby-tcltklib/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:    ja-ruby-tcltklib
-# Date created:         15 March 1999
-# Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	japanese
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Ruby interface to Japanized Tcl/Tk libraries
-
-TCL_VERSION?=	80
-TK_VERSION?=	80
-WITH_TCLTK_JP=	yes
-
-MASTERDIR=	${.CURDIR}/../../lang/ruby-tcltklib
-
-.include "${MASTERDIR}/Makefile"
diff --git a/lang/Makefile b/lang/Makefile
index b0b5262830ea..f4df299ac585 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -241,7 +241,6 @@
     SUBDIR += ruby-perl
     SUBDIR += ruby-programmingruby
     SUBDIR += ruby-reference
-    SUBDIR += ruby-tcltklib
     SUBDIR += ruby-usersguide
     SUBDIR += ruby16
     SUBDIR += ruby16-shim-ruby18
diff --git a/lang/ruby-tcltklib/Makefile b/lang/ruby-tcltklib/Makefile
deleted file mode 100644
index 781200cbfdf2..000000000000
--- a/lang/ruby-tcltklib/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-# New ports collection makefile for:	ruby-tcltklib
-# Date created:		15 March 1999
-# Whom:			Yasuhiro Fukuma <yasuf@big.or.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tcltklib
-PORTVERSION=	${RUBY_PORTVERSION}
-PORTEPOCH=	1
-CATEGORIES+=	lang x11-toolkits ruby tcl${TCL_VERSION} tk${TK_VERSION}
-MASTER_SITES=	# none
-DISTFILES=	# none
-
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	A Ruby interface to Tcl/Tk libraries
-
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/${RUBY_PORT}:patch
-LIB_DEPENDS=	${TCL_LIB}.1:${PORTSDIR}/${TCL_CATEGORY}/tcl${TCL_VERSION} \
-		${TK_LIB}.1:${PORTSDIR}/${TK_CATEGORY}/tk${TK_VERSION}
-
-USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
-USE_XLIB=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-CONFIGURE_ARGS=	--with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
-		--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}"
-
-# 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
-TCL_VERSION?=	84
-TK_VERSION?=	84
-.if defined(WITH_TCLTK_JP)
-TCL_CATEGORY=	japanese
-TK_CATEGORY=	japanese
-TCL_JP=		jp
-.else
-TCL_CATEGORY=	lang
-TK_CATEGORY=	x11-toolkits
-TCL_JP=		# empty
-.endif
-
-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/'`
-
-.include <bsd.port.pre.mk>
-
-.if ${RUBY_VER} >= 1.7
-MAKE_ARGS=	sitelibdir='$$(rubylibdir)'
-.endif
-
-.if defined(PKGNAMEPREFIX)
-PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
-.else
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-.endif
-
-do-extract:
-	${MKDIR} ${WRKDIR}
-	${LN} -sf `cd ${PORTSDIR}/${RUBY_PORT}; ${MAKE} -V WRKDIR`/${PORTNAME} ${WRKDIR}/
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}/demo
-	${CP} -R ${WRKSRC}/demo/* ${RUBY_MODEXAMPLESDIR}/demo/
-	${MKDIR} ${RUBY_MODDOCDIR}/ja
-	${INSTALL_DATA} ${WRKSRC}/*.euc ${RUBY_MODDOCDIR}/ja/
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/lang/ruby-tcltklib/pkg-descr b/lang/ruby-tcltklib/pkg-descr
deleted file mode 100644
index d678df691d5d..000000000000
--- a/lang/ruby-tcltklib/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-This is Ruby/TclTkLib, a Ruby interface to Tcl/Tk libraries.
-It's a part of the official Ruby distribution.
diff --git a/lang/ruby-tcltklib/pkg-plist b/lang/ruby-tcltklib/pkg-plist
deleted file mode 100644
index d354d77573db..000000000000
--- a/lang/ruby-tcltklib/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-%%RUBY_ARCHLIBDIR%%/tcltklib.so
-%%RUBY_LIBDIR%%/tcltk.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/MANUAL.euc
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.euc
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/batsu.gif
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/maru.gif
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample0.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample1.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo/lines0.tcl
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo/lines1.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo/lines2.rb
-%%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/demo/lines3.rb
-%%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/demo/lines4.rb
-%%PORTDOCS%%%%RUBY18_ONLY%%%%RUBY_MODEXAMPLESDIR%%/demo/safeTk.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/demo
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%