Removing ruby-base package since this is obsolete with new framework

for Ruby packages.

21 files changed, 0 insertions, 1082 deletions

diff --git a/lang/ruby-base/DESCR b/lang/ruby-base/DESCR
deleted file mode 100644
index 0c65b55b9be..00000000000
--- a/lang/ruby-base/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-Ruby is the interpreted scripting language for quick and
-easy object-oriented programming.  It has many features to
-process text files and to do system management tasks (as in
-Perl).  It is simple, straight-forward, and extensible.
-
-Features of Ruby are shown below.
-
-  + Simple Syntax
-  + *Normal* Object-Oriented features (ex. class, method calls)
-  + *Advanced* Object-Oriented features (ex. Mix-in, Singleton-method)
-  + Operator Overloading
-  + Exception Handling
-  + Iterators and Closures
-  + Garbage Collection
-  + Dynamic Loading of Object files (on some architecture)
-  + Highly Portable (works on many UNIX machines, and on DOS,
-    Windows, Mac, BeOS etc.)
-
-Author:	Matsumoto "matz" Yukihiro <matz@netlab.co.jp>
diff --git a/lang/ruby-base/MESSAGE b/lang/ruby-base/MESSAGE
deleted file mode 100644
index 9f160da1e1a..00000000000
--- a/lang/ruby-base/MESSAGE
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/02/11 19:13:04 sketch Exp $
-
-Note that a number of packages which are installed as default with
-the Ruby 1.6 distribution are provided as separate packages:
-
-	databases/ruby-gdbm:		GDBM module
-	security/ruby-digest:		message digest module
-	devel/ruby-readline:		readline module
-	x11/ruby-tcltklib:		Tcl/Tk libraries
-	x11/ruby-tk:			Tk modules
-
-They can all be installed via the lang/ruby meta package.
-
-===========================================================================
diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
deleted file mode 100644
index 75f0c96a35a..00000000000
--- a/lang/ruby-base/Makefile
+++ /dev/null
@@ -1,113 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2004/11/09 14:11:33 taca Exp $
-# FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
-
-DISTNAME=	${RUBY_DISTNAME}
-PKGNAME=	${RUBY_PKGNAMEPREFIX}base-${RUBY_VERSION}
-PKGREVISION=	7
-CATEGORIES=	lang ruby
-MASTER_SITES=	${MASTER_SITE_RUBY}
-
-MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	http://www.ruby-lang.org/en/
-COMMENT= 	Base installation of Ruby
-
-WRKSRC=		${RUBY_WRKSRC}
-USE_BUILDLINK3=	yes
-DIST_SUBDIR=	ruby
-USE_RUBY=	yes
-RUBY_DEPENDS=	no
-RUBY_BUILD_DEPENDS= no
-DIST_SUBDIR=	ruby
-
-BUILD_DEFS+=		USE_INET6
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared
-MLINKS=		ruby${_RUBY_SUFFIX}.1 ruby.1
-TEST_TARGET=	test
-CONFIGURE_ENV+=	PREFIX="${PREFIX}"
-# Ruby build process depends on config.status's content
-CONFIG_STATUS_OVERRIDE=	# empty
-
-DOCS=		ChangeLog README README.EXT README.EXT.ja README.ja ToDo \
-		doc/NEWS doc/forwardable.rd doc/forwardable.rd.ja \
-		doc/shell.rd doc/shell.rd.ja doc/irb/irb-tools.rd.ja \
-		doc/irb/irb.rd doc/irb/irb.rd.ja doc/net/http.rd.ja \
-		doc/net/pop.rd.ja doc/net/smtp.rd.ja doc/shell.rd \
-		doc/shell.rd.ja
-EXT_DOCS=	ext/etc/etc.txt ext/etc/etc.txt.ja ext/pty/README \
-		ext/pty/README.expect ext/pty/README.expect.ja \
-		ext/pty/README.ja ext/syslog/syslog.txt
-
-REPLACE_RUBY=	bin/irb \
-		ext/curses/hello.rb ext/curses/rain.rb ext/curses/view.rb \
-		lib/matrix.rb sample/biorhythm.rb sample/cal.rb \
-		sample/exyacc.rb sample/from.rb sample/fullpath.rb \
-		sample/goodfriday.rb sample/less.rb \
-		sample/mine.rb sample/mpart.rb sample/observ.rb \
-		sample/pi.rb sample/rcs.rb sample/test.rb \
-		sample/time.rb sample/trojan.rb sample/uumerge.rb
-
-.include "Makefile.common"
-
-.if ${OPSYS} == "IRIX"
-# X111BASE, *not* X11PREFIX:  X11PREFIX == PREFIX, but we need to point
-# to the ABI-specific libraries
-CONFIGURE_ENV+=	X11BASE="${X11BASE}"
-.endif
-
-.if !empty(RUBY_SUFFIX)
-CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
-.endif
-
-.if defined(USE_INET6) && ${USE_INET6} == YES
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
-
-pre-configure:
-	${RM} -f ${WRKSRC}/ext/gdbm/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/md5/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/rmd160/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/sha1/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/sha2/MANIFEST
-	${RM} -f ${WRKSRC}/ext/readline/MANIFEST
-	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
-	${RM} -f ${WRKSRC}/ext/tk/MANIFEST
-
-pre-build:
-	@${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
-
-post-install:
-	strip ${RUBY}
-.if empty(RUBY_SUFFIX)
-	${MV} ${RUBY} ${RUBY}${_RUBY_SUFFIX}
-	${LN} -fs ruby${_RUBY_SUFFIX} ${RUBY}
-	${MV} ${PREFIX}/man/man1/ruby.1 ${PREFIX}/man/man1/ruby${_RUBY_SUFFIX}.1
-.else
-	${LN} -fs ${RUBY_NAME} ${PREFIX}/bin/ruby
-.endif
-	${LN} -fs ruby${_RUBY_SUFFIX}.1 ${PREFIX}/man/man1/ruby.1
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/irb ${PREFIX}/bin/irb
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/curses
-	${INSTALL_DATA} ${RUBY_WRKSRC}/ext/curses/hello.rb \
-		${RUBY_WRKSRC}/ext/curses/rain.rb \
-		${RUBY_WRKSRC}/ext/curses/view.rb \
-		${RUBY_EXAMPLESDIR}/curses
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/pty
-	${INSTALL_DATA} ${WRKSRC}/ext/pty/expect_sample.rb \
-		${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb \
-		${RUBY_EXAMPLESDIR}/pty
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/etc
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/irb
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/net
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/pty
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/syslog
-.for f in ${DOCS} ${EXT_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${f:C/^(doc|ext)\///}
-.endfor
-
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby-base/Makefile.common b/lang/ruby-base/Makefile.common
deleted file mode 100644
index 67cd6367f13..00000000000
--- a/lang/ruby-base/Makefile.common
+++ /dev/null
@@ -1,304 +0,0 @@
-# $NetBSD: Makefile.common,v 1.19 2004/03/15 09:25:34 taca Exp $
-# FreeBSD: ports/Mk/bsd.ruby.mk,v 1.11 2000/11/16 17:59:40 knu Exp
-# Makefile.common: ruby common makefile, based on FreeBSD's bsd.ruby.mk.
-
-#
-# [variables that each package can define]
-#
-# RUBY_PKGNAMEPREFIX	- Common PKGNAMEPREFIX for ruby packages.
-#			  (default: ruby${RUBY_SUFFIX}-)
-# RUBY_VER		- Set to the alternative short version of ruby in the
-#			  form of `x.y' (see below for current value).
-# RUBY_REQD		- Set to required version of ruby in the form of
-#			  `x.y.z'.
-# USE_RUBY		- Says that the package uses ruby for building and
-#			  running.
-# RUBY_BUILD_DEPENDS	- Says that the package should build-depend on ruby.
-# RUBY_DEPENDS		- Says that the package should depend on ruby.
-# USE_RUBY_EXTCONF	- Says that the package  uses extconf.rb to configure.
-#			  Implies USE_RUBY.
-# RUBY_EXTCONF		- Set to the alternative name of extconf.rb (default:
-#			  extconf.rb).
-# RUBY_EXTCONF_SUBDIRS	- Set to list of subdirectories, if multiple modules
-#			  are included.
-# USE_RUBY_SETUP	- Says that the package uses setup.rb to configure and
-#			  build.
-# RUBY_SETUP		- Set to the alternative name of setup.rb (default:
-#			  setup.rb).
-# REPLACE_RUBY		- Specify the files whose first line be replaced.
-#
-# [variables that each package should not define]
-#
-# RUBY			- Full path of ruby executable.
-# RUBY_ARCH		- Directory name of architecture dependent libraries.
-# RUBY_NAME		- Ruby's name with trailing suffix.
-# RUBY_VERSION		- Full version of ruby without preview/beta suffix in
-#			  the form of `x.y.z' (see below for current value).
-# RUBY_SUFFIX		- Suffix for ruby binaries and directories.
-# _RUBY_SUFFIX		- String to be used as RUBY_SUFFIX.  Always
-#			  ${RUBY_VER:S/.//}.
-# RUBY_DISTNAME		- DISTNAME for the standard ruby ports, i.e. the
-#			  basename of the ruby distribution tarball.
-# RUBY_WRKSRC		- WRKSRC for the ruby package.
-# RUBY_DISTINFO		- DISTINFO file of base distribution.
-# RUBY_SHLIBVER		- Major version of libruby (see below for current
-#			  value).
-#
-# RUBY_LIBDIR		- Installation path for architecture independent
-#			  libraries.
-# RUBY_ARCHLIBDIR	- Installation path for architecture dependent
-#			  libraries.
-# RUBY_SITELIBDIR	- Installation path for site architecture independent
-#			  libraries.
-# RUBY_SITEARCHLIBDIR	- Installation path for site architecture dependent
-#			  libraries.
-# RUBY_DOCDIR		- Installation path for documents.
-# RUBY_EXAMPLESDIR	- Installation path for examples.
-#
-.include "../../mk/bsd.prefs.mk"
-
-.ifndef RUBY_COMMON
-RUBY_COMMON=		# defined
-
-RUBY_VER?=		1.6
-
-RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
-
-.if ${RUBY_VER} < 1.7
-RUBY_VERSION?=		1.6.8
-RUBY_SUFFIX?=		# empty
-.else
-RUBY_VERSION?=		1.7			# current, not tested.
-RUBY_SUFFIX?=		${_RUBY_SUFFIX}
-.endif
-
-RUBY_ARCH?=		${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
-RUBY_NAME?=		ruby${RUBY_SUFFIX}
-
-RUBY_DISTNAME?=		ruby-${RUBY_VERSION}
-RUBY_WRKSRC?=		${WRKDIR}/${RUBY_DISTNAME}
-
-.if ${OPSYS} == "Linux"
-RUBY_NOEXT_CURSES=	"@comment "
-RUBY_NOEXT_DBM=		"@comment "
-_RUBY_SUFFIX=		${RUBY_VER}
-.else
-_RUBY_SUFFIX=		${RUBY_VER:S/.//}
-.endif
-
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "FreeBSD"
-RUBY_NOSHLIBMAJOR=	"@comment "
-.endif
-
-RUBY_PKGNAMEPREFIX?=	ruby${RUBY_SUFFIX}-	# could be rb${RUBY_SUFFIX}-
-.if ${OPSYS} == "NetBSD"
-RUBY_SHLIBVER?=		${RUBY_VERSION:S/.//}
-.elif ${OPSYS} == "FreeBSD"
-RUBY_SHLIBVER?=		${RUBY_VERSION:S/.6.8/6/}
-.else
-RUBY_SHLIBVER?=		${RUBY_VERSION}
-.endif
-
-.if ${OPSYS} == "IRIX"
-RUBY_NOSHLIBMAJOR=	"@comment "
-.endif
-
-RUBY_SHLIBMAJOR?=	${_RUBY_SUFFIX}
-
-#CONFIGURE_TARGET?=	${RUBY_ARCH}
-
-# Directories
-RUBY_LIBDIR?=		${LOCALBASE}/lib/ruby/${RUBY_VER}
-RUBY_ARCHLIBDIR?=	${RUBY_LIBDIR}/${RUBY_ARCH}
-RUBY_SITELIBDIR?=	${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}
-RUBY_SITEARCHLIBDIR?=	${RUBY_SITELIBDIR}/${RUBY_ARCH}
-RUBY_DOCDIR?=		${LOCALBASE}/share/doc/${RUBY_NAME}
-RUBY_EXAMPLESDIR?=	${LOCALBASE}/share/examples/${RUBY_NAME}
-
-# MAKE_ENV
-MAKEFLAGS+=		RUBY_VER=${RUBY_VER}
-
-# PLIST
-PLIST_RUBY_DIRS=	RUBY_LIBDIR="${RUBY_LIBDIR}" \
-			RUBY_ARCHLIBDIR="${RUBY_ARCHLIBDIR}" \
-			RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" \
-			RUBY_SITEARCHLIBDIR="${RUBY_SITEARCHLIBDIR}" \
-			RUBY_DOCDIR="${RUBY_DOCDIR}" \
-			RUBY_EXAMPLESDIR="${RUBY_EXAMPLESDIR}"
-
-PLIST_SUBST+=		RUBY_VERSION="${RUBY_VERSION}" \
-			RUBY_VER="${RUBY_VER}" \
-			RUBY_SHLIBVER="${RUBY_SHLIBVER}" \
-			RUBY_SHLIBMAJOR="${RUBY_SHLIBMAJOR}" \
-			RUBY_ARCH="${RUBY_ARCH}" \
-			_RUBY_SUFFIX="${_RUBY_SUFFIX}" \
-			RUBY_SUFFIX="${RUBY_SUFFIX}" \
-			RUBY_NAME="${RUBY_NAME}" \
-			RUBY_NOEXT_CURSES=${RUBY_NOEXT_CURSES} \
-			RUBY_NOEXT_DBM=${RUBY_NOEXT_DBM} \
-			RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR} \
-			RUBY_COMMENT=${RUBY_COMMENT} \
-			${PLIST_RUBY_DIRS:S,DIR="${LOCALBASE}/,DIR=",}
-
-# base digest checksum
-RUBY_DISTINFO?=		${.CURDIR}/../../lang/ruby${RUBY_SUFFIX}-base/distinfo
-
-# fix shebang lines
-.if defined(REPLACE_RUBY) && !empty(REPLACE_RUBY)
-pre-configure: replace-ruby
-
-replace-ruby:
-	${_PKG_SILENT}${_PKG_DEBUG}for s in ${REPLACE_RUBY}; do \
-		case $${s} in \
-		/*)	f=$${s};; \
-		*)	f=${WRKSRC}/$${s};; \
-		esac; \
-		${ECHO_MSG} "===>  Fixing the #! line of $${s}"; \
-		${SED}	-e '1s| *[a-z0-9_/\.-][a-z0-9_/\.-]*/env *||g' \
-			-e '1s| *[a-z0-9_/\.-]*ruby|${RUBY}|' $$f > $$f.tmp; \
-		if ${CMP} -s $$f $$f.tmp; then \
-			${RM} $$f.tmp; \
-		else \
-			${MV} $$f.tmp $$f; \
-		fi; \
-	done
-.endif
-
-# extconf.rb
-.if defined(USE_RUBY_EXTCONF)
-USE_RUBY?=		yes
-
-RUBY_EXTCONF?=		extconf.rb
-CONFIGURE_ARGS+=	--with-opt-dir="${LOCALBASE}"
-
-do-configure:	ruby-extconf-configure
-
-.if defined(RUBY_EXTCONF_SUBDIRS)
-ruby-extconf-configure:
-.for d in ${RUBY_EXTCONF_SUBDIRS}
-	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} in ${d} to configure"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
-.endfor
-
-.if !target(do-build)
-do-build:	ruby-extconf-build
-
-ruby-extconf-build:
-.for d in ${RUBY_EXTCONF_SUBDIRS}
-	@${ECHO_MSG} "===>  Building ${d}"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET}
-.endfor
-.endif
-
-.if !target(do-install)
-do-install:	ruby-extconf-install
-
-ruby-extconf-install:
-.for d in ${RUBY_EXTCONF_SUBDIRS}
-	@${ECHO_MSG} "===>  Installing ${d}"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/${d}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
-.endfor
-.endif
-
-.else
-ruby-extconf-configure:
-	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} to configure"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
-.endif
-.endif
-
-# setup.rb
-.if defined(USE_RUBY_SETUP)
-USE_RUBY?=		yes
-RUBY_SETUP?=		setup.rb
-
-.if !target(do-configure)
-do-configure:	ruby-setup-configure
-
-ruby-setup-configure:
-	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to configure"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_SETUP} config ${CONFIGURE_ARGS}
-.endif
-
-.if !target(do-build)
-do-build:	ruby-setup-build
-
-ruby-setup-build:
-	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to build"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} setup
-.endif
-
-.if !target(do-install)
-do-install:	ruby-setup-install
-
-ruby-setup-install:
-	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to ${INSTALL_TARGET}"
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_SETUP} ${INSTALL_TARGET}
-.endif
-.endif
-
-# RUBY_REQD
-.if defined(RUBY_REQD)
-_RUBY_REQD=	${RUBY_REQD:S/.//}
-_RUBY_REQMAJOR=	${_RUBY_REQD:C/\.[0-9]+//}
-.if ${_RUBY_REQD:M[0-9]*.[0-9]*} == ""
-_RUBY_REQMINOR=	0
-.else
-_RUBY_REQMINOR=	${_RUBY_REQD:C/[0-9]+\.//}
-.endif
-_RUBY_VERSION=	${RUBY_VERSION:S/.//}
-_RUBY_VERMAJOR=	${_RUBY_VERSION:C/\.[0-9]+//}
-.if ${_RUBY_VERSION:M[0-9]*.[0-9]*} == ""
-_RUBY_VERMINOR=	0
-.else
-_RUBY_VERMINOR=	${_RUBY_VERSION:C/[0-9]+\.//}
-.endif
-_RUBY_PROVIDED!= case `expr ${_RUBY_VERMAJOR} ">" ${_RUBY_REQMAJOR}` in \
-	1)	${ECHO} "ok"; exit 0;; \
-	esac ; \
-	case `expr ${_RUBY_VERMAJOR} "=" ${_RUBY_REQMAJOR}` in \
-	1)	case `expr ${_RUBY_VERMINOR} ">=" ${_RUBY_REQMINOR}` in \
-			1)	${ECHO} "ok"; exit 0;; \
-		esac ;; \
-	esac; ${ECHO} "no"
-.if ${_RUBY_PROVIDED} == "no"
-PKG_FAIL_REASON+=	"This package requires ruby ${RUBY_REQD} or later."
-.endif
-.else
-RUBY_REQD?=		${RUBY_VERSION}
-.endif
-
-# USE_RUBY
-.if defined(USE_RUBY)
-RUBY_DEPENDS?=		yes
-.if ${RUBY_DEPENDS} != "no"
-DEPENDS+=		${RUBY_PKGNAMEPREFIX}base>=${RUBY_REQD}:../../lang/ruby${RUBY_SUFFIX}-base
-.else
-RUBY_BUILD_DEPENDS?=	yes
-.if ${RUBY_BUILD_DEPENDS} != "no"
-BUILD_DEPENDS+=		${RUBY_PKGNAMEPREFIX}base>=${RUBY_REQD}:../../lang/ruby${RUBY_SUFFIX}-base
-.endif
-.endif
-.endif
-
-MASTER_SITE_RUBY?= \
-	ftp://ftp.ruby-lang.org/pub/ruby/${RUBY_VER}/ \
-	ftp://www.ibiblio.org/pub/languages/ruby/${RUBY_VER}/ \
-	ftp://xyz.lcs.mit.edu/pub/ruby/${RUBY_VER}/ \
-	ftp://gd.tuwien.ac.at/languages/ruby/${RUBY_VER}/ \
-	ftp://ftp.fu-berlin.de/unix/languages/ruby/${RUBY_VER}/ \
-	ftp://ftp.easynet.be/ruby/ruby/${RUBY_VER}/ \
-	ftp://ftp.ntua.gr/pub/lang/ruby/${RUBY_VER}/ \
-	ftp://sunsite.dk/mirrors/ruby/${RUBY_VER}/ \
-	ftp://ruby.cdpa.nsysu.edu.tw/ruby/${RUBY_VER}/ \
-	ftp://ftp.chg.ru/pub/lang/ruby/${RUBY_VER}/ \
-	ftp://ftp.ring.gr.jp/pub/lang/ruby/${RUBY_VER}/ \
-	ftp://ftp.iij.ad.jp/pub/lang/ruby/${RUBY_VER}/ \
-	ftp://ftp.idaemons.org/pub/mirror/ftp.ruby-lang.org/ruby/${RUBY_VER}/
-
-.endif
diff --git a/lang/ruby-base/PLIST b/lang/ruby-base/PLIST
deleted file mode 100644
index a3ddac50d63..00000000000
--- a/lang/ruby-base/PLIST
+++ /dev/null
@@ -1,234 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2003/06/23 21:40:22 jschauma Exp $
-bin/irb
-bin/ruby
-bin/ruby${_RUBY_SUFFIX}
-lib/lib${RUBY_NAME}.so
-${RUBY_NOSHLIBMAJOR}lib/lib${RUBY_NAME}.so.${RUBY_SHLIBMAJOR}
-lib/lib${RUBY_NAME}.so.${RUBY_SHLIBVER}
-${RUBY_ARCHLIBDIR}/config.h
-${RUBY_NOEXT_CURSES}${RUBY_ARCHLIBDIR}/curses.so
-${RUBY_NOEXT_DBM}${RUBY_ARCHLIBDIR}/dbm.so
-${RUBY_ARCHLIBDIR}/defines.h
-${RUBY_ARCHLIBDIR}/dln.h
-${RUBY_ARCHLIBDIR}/env.h
-${RUBY_ARCHLIBDIR}/etc.so
-${RUBY_ARCHLIBDIR}/fcntl.so
-${RUBY_ARCHLIBDIR}/intern.h
-${RUBY_ARCHLIBDIR}/lib${RUBY_NAME}.a
-${RUBY_ARCHLIBDIR}/nkf.so
-${RUBY_ARCHLIBDIR}/node.h
-${RUBY_ARCHLIBDIR}/pty.so
-${RUBY_ARCHLIBDIR}/rbconfig.rb
-${RUBY_ARCHLIBDIR}/re.h
-${RUBY_ARCHLIBDIR}/regex.h
-${RUBY_ARCHLIBDIR}/ruby.h
-${RUBY_ARCHLIBDIR}/rubyio.h
-${RUBY_ARCHLIBDIR}/rubysig.h
-${RUBY_ARCHLIBDIR}/sdbm.so
-${RUBY_ARCHLIBDIR}/socket.so
-${RUBY_ARCHLIBDIR}/st.h
-${RUBY_ARCHLIBDIR}/syslog.so
-${RUBY_ARCHLIBDIR}/util.h
-${RUBY_ARCHLIBDIR}/version.h
-${RUBY_LIBDIR}/English.rb
-${RUBY_LIBDIR}/Env.rb
-${RUBY_LIBDIR}/base64.rb
-${RUBY_LIBDIR}/cgi-lib.rb
-${RUBY_LIBDIR}/cgi.rb
-${RUBY_LIBDIR}/cgi/session.rb
-@dirrm ${RUBY_LIBDIR}/cgi
-${RUBY_LIBDIR}/complex.rb
-${RUBY_LIBDIR}/date.rb
-${RUBY_LIBDIR}/date2.rb
-${RUBY_LIBDIR}/debug.rb
-${RUBY_LIBDIR}/delegate.rb
-${RUBY_LIBDIR}/e2mmap.rb
-${RUBY_LIBDIR}/eregex.rb
-${RUBY_LIBDIR}/expect.rb
-${RUBY_LIBDIR}/final.rb
-${RUBY_LIBDIR}/finalize.rb
-${RUBY_LIBDIR}/find.rb
-${RUBY_LIBDIR}/forwardable.rb
-${RUBY_LIBDIR}/ftools.rb
-${RUBY_LIBDIR}/ftplib.rb
-${RUBY_LIBDIR}/getoptlong.rb
-${RUBY_LIBDIR}/getopts.rb
-${RUBY_LIBDIR}/importenv.rb
-${RUBY_LIBDIR}/irb.rb
-${RUBY_LIBDIR}/irb/completion.rb
-${RUBY_LIBDIR}/irb/context.rb
-${RUBY_LIBDIR}/irb/extend-command.rb
-${RUBY_LIBDIR}/irb/frame.rb
-${RUBY_LIBDIR}/irb/help.rb
-${RUBY_LIBDIR}/irb/init.rb
-${RUBY_LIBDIR}/irb/input-method.rb
-${RUBY_LIBDIR}/irb/lc/error.rb
-${RUBY_LIBDIR}/irb/lc/help-message
-${RUBY_LIBDIR}/irb/lc/ja/error.rb
-${RUBY_LIBDIR}/irb/lc/ja/help-message
-@dirrm ${RUBY_LIBDIR}/irb/lc/ja
-@dirrm ${RUBY_LIBDIR}/irb/lc
-${RUBY_LIBDIR}/irb/loader.rb
-${RUBY_LIBDIR}/irb/locale.rb
-${RUBY_LIBDIR}/irb/multi-irb.rb
-${RUBY_LIBDIR}/irb/ruby-lex.rb
-${RUBY_LIBDIR}/irb/ruby-token.rb
-${RUBY_LIBDIR}/irb/slex.rb
-${RUBY_LIBDIR}/irb/version.rb
-${RUBY_LIBDIR}/irb/workspace.rb
-${RUBY_LIBDIR}/irb/ws-for-case-2.rb
-${RUBY_LIBDIR}/irb/xmp.rb
-@dirrm ${RUBY_LIBDIR}/irb
-${RUBY_LIBDIR}/jcode.rb
-${RUBY_LIBDIR}/kconv.rb
-${RUBY_LIBDIR}/mailread.rb
-${RUBY_LIBDIR}/mathn.rb
-${RUBY_LIBDIR}/matrix.rb
-${RUBY_LIBDIR}/mkmf.rb
-${RUBY_LIBDIR}/monitor.rb
-${RUBY_LIBDIR}/mutex_m.rb
-${RUBY_LIBDIR}/net/ftp.rb
-${RUBY_LIBDIR}/net/http.rb
-${RUBY_LIBDIR}/net/imap.rb
-${RUBY_LIBDIR}/net/pop.rb
-${RUBY_LIBDIR}/net/protocol.rb
-${RUBY_LIBDIR}/net/smtp.rb
-${RUBY_LIBDIR}/net/telnet.rb
-@dirrm ${RUBY_LIBDIR}/net
-${RUBY_LIBDIR}/observer.rb
-${RUBY_LIBDIR}/open3.rb
-${RUBY_LIBDIR}/ostruct.rb
-${RUBY_LIBDIR}/parsearg.rb
-${RUBY_LIBDIR}/parsedate.rb
-${RUBY_LIBDIR}/ping.rb
-${RUBY_LIBDIR}/profile.rb
-${RUBY_LIBDIR}/pstore.rb
-${RUBY_LIBDIR}/rational.rb
-${RUBY_LIBDIR}/readbytes.rb
-${RUBY_LIBDIR}/resolv-replace.rb
-${RUBY_LIBDIR}/resolv.rb
-${RUBY_LIBDIR}/shell.rb
-${RUBY_LIBDIR}/shell/builtin-command.rb
-${RUBY_LIBDIR}/shell/command-processor.rb
-${RUBY_LIBDIR}/shell/error.rb
-${RUBY_LIBDIR}/shell/filter.rb
-${RUBY_LIBDIR}/shell/process-controller.rb
-${RUBY_LIBDIR}/shell/system-command.rb
-${RUBY_LIBDIR}/shell/version.rb
-@dirrm ${RUBY_LIBDIR}/shell
-${RUBY_LIBDIR}/shellwords.rb
-${RUBY_LIBDIR}/singleton.rb
-${RUBY_LIBDIR}/sync.rb
-${RUBY_LIBDIR}/telnet.rb
-${RUBY_LIBDIR}/tempfile.rb
-${RUBY_LIBDIR}/thread.rb
-${RUBY_LIBDIR}/thwait.rb
-${RUBY_LIBDIR}/time.rb
-${RUBY_LIBDIR}/timeout.rb
-${RUBY_LIBDIR}/tracer.rb
-${RUBY_LIBDIR}/uri.rb
-${RUBY_LIBDIR}/uri/common.rb
-${RUBY_LIBDIR}/uri/ftp.rb
-${RUBY_LIBDIR}/uri/generic.rb
-${RUBY_LIBDIR}/uri/http.rb
-${RUBY_LIBDIR}/uri/https.rb
-${RUBY_LIBDIR}/uri/ldap.rb
-${RUBY_LIBDIR}/uri/mailto.rb
-@dirrm ${RUBY_LIBDIR}/uri
-${RUBY_LIBDIR}/weakref.rb
-@exec ${MKDIR} %D/${RUBY_SITEARCHLIBDIR}
-@unexec ${RMDIR} %D/${RUBY_SITEARCHLIBDIR} 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/${RUBY_SITELIBDIR} 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/ruby/site_ruby 2>/dev/null || ${TRUE}
-@dirrm ${RUBY_ARCHLIBDIR}
-@dirrm ${RUBY_LIBDIR}
-@unexec ${RMDIR} %D/lib/ruby 2>/dev/null || ${TRUE}
-man/man1/ruby${_RUBY_SUFFIX}.1
-man/man1/ruby.1
-${RUBY_DOCDIR}/ChangeLog
-${RUBY_DOCDIR}/NEWS
-${RUBY_DOCDIR}/README
-${RUBY_DOCDIR}/README.EXT
-${RUBY_DOCDIR}/README.EXT.ja
-${RUBY_DOCDIR}/README.ja
-${RUBY_DOCDIR}/ToDo
-${RUBY_DOCDIR}/etc/etc.txt
-${RUBY_DOCDIR}/etc/etc.txt.ja
-@dirrm ${RUBY_DOCDIR}/etc
-${RUBY_DOCDIR}/forwardable.rd
-${RUBY_DOCDIR}/forwardable.rd.ja
-${RUBY_DOCDIR}/irb/irb-tools.rd.ja
-${RUBY_DOCDIR}/irb/irb.rd
-${RUBY_DOCDIR}/irb/irb.rd.ja
-@dirrm ${RUBY_DOCDIR}/irb
-${RUBY_DOCDIR}/net/http.rd.ja
-${RUBY_DOCDIR}/net/pop.rd.ja
-${RUBY_DOCDIR}/net/smtp.rd.ja
-@dirrm ${RUBY_DOCDIR}/net
-${RUBY_DOCDIR}/pty/README
-${RUBY_DOCDIR}/pty/README.expect
-${RUBY_DOCDIR}/pty/README.expect.ja
-${RUBY_DOCDIR}/pty/README.ja
-@dirrm ${RUBY_DOCDIR}/pty
-${RUBY_DOCDIR}/shell.rd
-${RUBY_DOCDIR}/shell.rd.ja
-${RUBY_DOCDIR}/syslog/syslog.txt
-@dirrm ${RUBY_DOCDIR}/syslog
-@dirrm ${RUBY_DOCDIR}
-${RUBY_EXAMPLESDIR}/README
-${RUBY_EXAMPLESDIR}/biorhythm.rb
-${RUBY_EXAMPLESDIR}/cal.rb
-${RUBY_EXAMPLESDIR}/cbreak.rb
-${RUBY_EXAMPLESDIR}/clnt.rb
-${RUBY_EXAMPLESDIR}/curses/hello.rb
-${RUBY_EXAMPLESDIR}/curses/rain.rb
-${RUBY_EXAMPLESDIR}/curses/view.rb
-@dirrm ${RUBY_EXAMPLESDIR}/curses
-${RUBY_EXAMPLESDIR}/dbmtest.rb
-${RUBY_EXAMPLESDIR}/dir.rb
-${RUBY_EXAMPLESDIR}/dualstack-fetch.rb
-${RUBY_EXAMPLESDIR}/dualstack-httpd.rb
-${RUBY_EXAMPLESDIR}/eval.rb
-${RUBY_EXAMPLESDIR}/export.rb
-${RUBY_EXAMPLESDIR}/exyacc.rb
-${RUBY_EXAMPLESDIR}/fact.rb
-${RUBY_EXAMPLESDIR}/fib.awk
-${RUBY_EXAMPLESDIR}/fib.pl
-${RUBY_EXAMPLESDIR}/fib.py
-${RUBY_EXAMPLESDIR}/fib.rb
-${RUBY_EXAMPLESDIR}/fib.scm
-${RUBY_EXAMPLESDIR}/freq.rb
-${RUBY_EXAMPLESDIR}/from.rb
-${RUBY_EXAMPLESDIR}/fullpath.rb
-${RUBY_EXAMPLESDIR}/getopts.test
-${RUBY_EXAMPLESDIR}/goodfriday.rb
-${RUBY_EXAMPLESDIR}/less.rb
-${RUBY_EXAMPLESDIR}/list.rb
-${RUBY_EXAMPLESDIR}/list2.rb
-${RUBY_EXAMPLESDIR}/list3.rb
-${RUBY_EXAMPLESDIR}/mine.rb
-${RUBY_EXAMPLESDIR}/mkproto.rb
-${RUBY_EXAMPLESDIR}/mpart.rb
-${RUBY_EXAMPLESDIR}/mrshtest.rb
-${RUBY_EXAMPLESDIR}/observ.rb
-${RUBY_EXAMPLESDIR}/occur.pl
-${RUBY_EXAMPLESDIR}/occur.rb
-${RUBY_EXAMPLESDIR}/occur2.rb
-${RUBY_EXAMPLESDIR}/philos.rb
-${RUBY_EXAMPLESDIR}/pi.rb
-${RUBY_EXAMPLESDIR}/pty/expect_sample.rb
-${RUBY_EXAMPLESDIR}/pty/script.rb
-${RUBY_EXAMPLESDIR}/pty/shl.rb
-@dirrm ${RUBY_EXAMPLESDIR}/pty
-${RUBY_EXAMPLESDIR}/rcs.awk
-${RUBY_EXAMPLESDIR}/rcs.dat
-${RUBY_EXAMPLESDIR}/rcs.rb
-${RUBY_EXAMPLESDIR}/regx.rb
-${RUBY_EXAMPLESDIR}/sieve.rb
-${RUBY_EXAMPLESDIR}/svr.rb
-${RUBY_EXAMPLESDIR}/test.rb
-${RUBY_EXAMPLESDIR}/time.rb
-${RUBY_EXAMPLESDIR}/trojan.rb
-${RUBY_EXAMPLESDIR}/tsvr.rb
-${RUBY_EXAMPLESDIR}/uumerge.rb
-@dirrm ${RUBY_EXAMPLESDIR}
diff --git a/lang/ruby-base/buildlink3.mk b/lang/ruby-base/buildlink3.mk
deleted file mode 100644
index 390430c88d7..00000000000
--- a/lang/ruby-base/buildlink3.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/11 04:37:40 snj Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-RUBY_BASE_BUILDLINK3_MK:=	${RUBY_BASE_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ruby-base
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nruby-base}
-BUILDLINK_PACKAGES+=	ruby-base
-
-.if !empty(RUBY_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ruby-base+=	ruby-base>=1.6.8nb1
-BUILDLINK_PKGSRCDIR.ruby-base?=	../../lang/ruby-base
-.endif	# RUBY_BASE_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/ruby-base/distinfo b/lang/ruby-base/distinfo
deleted file mode 100644
index 2da2b22fbaa..00000000000
--- a/lang/ruby-base/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.16 2004/11/09 14:11:33 taca Exp $
-
-SHA1 (ruby/ruby-1.6.8.tar.gz) = 4b475ac1c837cd62b6dfe85359e1502a71b08cd1
-Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes
-SHA1 (patch-aa) = 654efb008caadf7973c78cabc70f76c8eab09266
-SHA1 (patch-ab) = 9151af68fd069e03b9d3a12818a001deb6407f8e
-SHA1 (patch-ac) = 5b897041345ec4077fa2165e3c4c58a6671b942d
-SHA1 (patch-ae) = 8c9925dcb7d4fdb9aad5432befbc3b21c56eb884
-SHA1 (patch-af) = 33aa9f1e524e2f4a6dd2f1310ce7358744b83a8c
-SHA1 (patch-ag) = 4b5893b55253526af687bc81a9acea3686a00d39
-SHA1 (patch-aj) = d61950c108cda41a7a5227f02c583bc6e85e43bb
-SHA1 (patch-al) = 8a3e5eb250f517f10bea7f52fbfe8b05957b7bb4
-SHA1 (patch-am) = 2e096dcb882be923d2ff775a4271a300954a9dec
-SHA1 (patch-an) = 72461b10296cb9a03fc37bba6af69650c8777741
-SHA1 (patch-ao) = 1070614441174b30926ba1d8a4d1a4718172ce4b
-SHA1 (patch-ap) = 19f520406a9b699a4bbe53b0e9e2b69b4eb7d96a
-SHA1 (patch-aq) = cf9f16f056c2f5df2493b6f04232fb62edf4448f
-SHA1 (patch-ar) = 03e15c32b0865d11339f609b2e98613fc09083b4
diff --git a/lang/ruby-base/patches/patch-aa b/lang/ruby-base/patches/patch-aa
deleted file mode 100644
index 5c850241c08..00000000000
--- a/lang/ruby-base/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2003/03/24 14:49:38 taca Exp $
-
---- configure.in.orig	2002-11-14 03:59:18.000000000 +0900
-+++ configure.in
-@@ -990,6 +990,7 @@ case "$target_os" in
- 	;;	
- esac
- 
-+AC_SUBST(X11BASE)
- AC_SUBST(LIBRUBY_LDSHARED)
- AC_SUBST(LIBRUBY_DLDFLAGS)
- AC_SUBST(RUBY_INSTALL_NAME)
diff --git a/lang/ruby-base/patches/patch-ab b/lang/ruby-base/patches/patch-ab
deleted file mode 100644
index c3a6f19fdff..00000000000
--- a/lang/ruby-base/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2003/06/23 21:40:24 jschauma Exp $
-
---- configure.orig	Tue Nov 19 03:49:26 2002
-+++ configure	Mon Jun 23 11:47:50 2003
-@@ -4524,7 +4524,7 @@
- 
-   case "$target_os" in
- 	hpux*)		DLDFLAGS="-E"
--			LDSHARED='ld -b'
-+			LDSHARED="ld -b $LDSHARED"
- 			LDFLAGS="-Wl,-E"
- 			rb_cv_dlopen=yes;;
- 	solaris*) 	if test "$GCC" = yes; then
-@@ -4539,7 +4539,8 @@
- 			rb_cv_dlopen=yes;;
- 	sunos*) 	LDSHARED='ld -assert nodefinitions'
- 			rb_cv_dlopen=yes;;
--	irix*)		LDSHARED='ld -shared'
-+	irix*)		LDSHARED='ld -shared -L${X11BASE}/lib${ABI}'
-+			LDFLAGS="-L${X11BASE}/lib${ABI} ${LDFLAGS}"
- 			rb_cv_dlopen=yes;;
- 	sysv4*) 	LDSHARED='ld -G'
- 			rb_cv_dlopen=yes;;
diff --git a/lang/ruby-base/patches/patch-ac b/lang/ruby-base/patches/patch-ac
deleted file mode 100644
index 49dc9c8985e..00000000000
--- a/lang/ruby-base/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/12/30 16:21:52 taca Exp $
-
---- ext/curses/extconf.rb.orig	Mon Dec  3 19:04:46 2001
-+++ ext/curses/extconf.rb
-@@ -6,17 +6,9 @@
- 
- make=false
- have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
--if have_header("ncurses.h") and have_library("ncurses", "initscr")
-+have_library("termcap", "tgetent") 
-+if have_header("curses.h") and have_library("curses", "initscr")
-   make=true
--elsif have_header("ncurses/curses.h") and have_library("ncurses", "initscr")
--  make=true
--elsif have_header("curses_colr/curses.h") and have_library("cur_colr", "initscr")
--  make=true
--else
--  have_library("termcap", "tgetent") 
--  if have_header("curses.h") and have_library("curses", "initscr")
--    make=true
--  end
- end
- 
- if make
diff --git a/lang/ruby-base/patches/patch-ae b/lang/ruby-base/patches/patch-ae
deleted file mode 100644
index 8207faccc07..00000000000
--- a/lang/ruby-base/patches/patch-ae
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/03/24 14:49:38 taca Exp $
-
---- instruby.rb.orig	2002-12-03 01:53:03.000000000 +0900
-+++ instruby.rb
-@@ -117,21 +117,21 @@ Find.find("lib") do |f|
-   next unless /\.rb$/ =~ f || /help-message$/ =~ f
-   dir = rubylibdir+"/"+File.dirname(f[4..-1])
-   File.makedirs dir, true unless File.directory? dir
--  File.install f, dir, 0644, true
-+  File.install f, dir, 0444, true
- end
- 
- for f in Dir["*.h"]
--  File.install f, archlibdir, 0644, true
-+  File.install f, archlibdir, 0444, true
- end
- if RUBY_PLATFORM =~ /mswin32|mingw/
-   File.makedirs archlibdir + "/win32", true
-   File.install "win32/win32.h", archlibdir + "/win32", 0644, true
- end
--File.install wdir+'/'+CONFIG['LIBRUBY_A'], archlibdir, 0644, true
-+File.install wdir+'/'+CONFIG['LIBRUBY_A'], archlibdir, 0444, true
- 
- File.makedirs mandir, true
--File.install "ruby.1", mandir+"/"+ruby_install_name+".1", 0644, true
-+File.install "ruby.1", mandir+"/"+ruby_install_name+".1", 0444, true
- Dir.chdir wdir
--File.install "config.h", archlibdir, 0644, true
--File.install "rbconfig.rb", archlibdir, 0644, true
-+File.install "config.h", archlibdir, 0444, true
-+File.install "rbconfig.rb", archlibdir, 0444, true
- # vi:set sw=2:
diff --git a/lang/ruby-base/patches/patch-af b/lang/ruby-base/patches/patch-af
deleted file mode 100644
index cfc1f846976..00000000000
--- a/lang/ruby-base/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2003/03/24 14:49:39 taca Exp $
-
---- lib/mkmf.rb.orig	2002-12-24 17:29:10.000000000 +0900
-+++ lib/mkmf.rb
-@@ -452,7 +452,7 @@ def install_rb(mfile, dest, srcdir = nil
-   for f in path
-     d = '/' + File::dirname(f)
-     d = '' if d == '/.' 
--    mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' %s/%s %s%s\n", libdir, f, dest, d
-+    mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0444, true)' %s/%s %s%s\n", libdir, f, dest, d
-   end
- end
- 
diff --git a/lang/ruby-base/patches/patch-ag b/lang/ruby-base/patches/patch-ag
deleted file mode 100644
index b582f2319af..00000000000
--- a/lang/ruby-base/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/12/30 16:21:52 taca Exp $
-
---- lib/irb/locale.rb.orig	Fri Jun 29 17:25:29 2001
-+++ lib/irb/locale.rb
-@@ -135,6 +135,7 @@
-       end
-       lc_file.close
-       toplevel_load lc_file.path, priv
-+      lc_file.close(true)
-     end
-     private :real_load
- 
diff --git a/lang/ruby-base/patches/patch-aj b/lang/ruby-base/patches/patch-aj
deleted file mode 100644
index ed268921a05..00000000000
--- a/lang/ruby-base/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2002/03/02 09:10:56 taca Exp $
-
---- ext/extmk.rb.in.orig	Mon Jan 28 17:42:04 2002
-+++ ext/extmk.rb.in
-@@ -181,7 +181,7 @@
-     end
-   end
-   for f in path
--    mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)$(target_prefix)/%s\n", f, f
-+    mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0444, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)$(target_prefix)/%s\n", f, f
-   end
- end
- 
diff --git a/lang/ruby-base/patches/patch-al b/lang/ruby-base/patches/patch-al
deleted file mode 100644
index 7d866364434..00000000000
--- a/lang/ruby-base/patches/patch-al
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-al,v 1.2 2004/03/20 04:39:34 taca Exp $
-
---- eval.c.orig	2002-12-16 16:34:22.000000000 +0900
-+++ eval.c
-@@ -3531,7 +3531,8 @@ rb_jump_tag(tag)
- int
- rb_block_given_p()
- {
--    if (ruby_frame->iter) return Qtrue;
-+    if (ruby_frame->iter && ruby_block)
-+	return Qtrue;
-     return Qfalse;
- }
- 
-@@ -4489,7 +4490,7 @@ rb_call0(klass, recv, id, argc, argv, bo
- 			rb_raise(rb_eArgError, "wrong # of arguments(%d for %d)",
- 				 argc, i);
- 		    }
--		    if (node->nd_rest == -1) {
-+		    if ((int)node->nd_rest == -1) {
- 			int opt = i;
- 			NODE *optnode = node->nd_opt;
- 
-@@ -4525,7 +4526,7 @@ rb_call0(klass, recv, id, argc, argv, bo
- 				rb_eval(recv, opt);
- 			    }
- 			}
--			if (node->nd_rest >= 0) {
-+			if ((int)node->nd_rest >= 0) {
- 			    VALUE v;
- 
- 			    if (argc > 0)
diff --git a/lang/ruby-base/patches/patch-am b/lang/ruby-base/patches/patch-am
deleted file mode 100644
index 8f231998b79..00000000000
--- a/lang/ruby-base/patches/patch-am
+++ /dev/null
@@ -1,113 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/03/12 04:59:20 taca Exp $
-
---- ext/pty/pty.c.orig	2002-01-27 02:15:53.000000000 +0900
-+++ ext/pty/pty.c
-@@ -202,17 +202,41 @@ chld_changed()
- 
- static void getDevice _((int*, int*));
- 
--static void
--establishShell(shellname, info)
--    char *shellname;
-+struct exec_info {
-+    int argc;
-+    VALUE *argv;
-+};
-+
-+static VALUE
-+pty_exec(arg)
-+    struct exec_info *arg;
-+{
-+    return rb_funcall2(Qnil, rb_intern("exec"), arg->argc, arg->argv);
-+}
-+
-+establishShell(command, info)
-+    VALUE command;
-     struct pty_info *info;
- {	
-     static int		i,j,master,slave,currentPid;
-     char		*p,*getenv();
-     struct passwd	*pwent;
--    RETSIGTYPE		chld_changed();
--    
--    if (shellname[0] == '\0') {
-+    VALUE		v, *argv;
-+    struct exec_info	arg;
-+    int			status, argc;
-+
-+    if (TYPE(command) == T_ARRAY) {
-+	argc = RARRAY(command)->len;
-+	argv = RARRAY(command)->ptr;
-+    }
-+    else {
-+	Check_SafeStr(command);
-+	argc = RSTRING(command)->len ? 1 : 0;
-+	argv = &command;
-+    }
-+    if (argc == 0) {
-+	char *shellname;
-+
- 	if ((p = getenv("SHELL")) != NULL) {
- 	    shellname = p;
- 	}
-@@ -223,18 +247,21 @@ establishShell(shellname, info)
- 	    else
- 		shellname = "/bin/sh";
- 	}
-+	v = rb_str_new2(shellname);
-+	argc = 1;
-+	argv = &v;
-     }
-     getDevice(&master,&slave);
- 
-     currentPid = getpid();
-     set_signal_action(chld_changed);
--    if((i = vfork()) < 0) {
-+    if((i = fork()) < 0) {
-+	close(master);
-+	close(slave);
- 	rb_sys_fail("fork failed");
-     }
- 
-     if(i == 0) {	/* child */
--	int argc;
--	char *argv[1024];
- 	currentPid = getpid();	
- 
- 	/*
-@@ -286,19 +313,10 @@ establishShell(shellname, info)
- 	seteuid(getuid());
- #endif
- 
--	argc = 0;
--	for (i = 0; shellname[i];) {
--	    while (isspace(shellname[i])) i++;
--	    for (j = i; shellname[j] && !isspace(shellname[j]); j++);
--	    argv[argc] = (char*)xmalloc(j-i+1);
--	    strncpy(argv[argc],&shellname[i],j-i);
--	    argv[argc][j-i] = 0;
--	    i = j;
--	    argc++;
--	}
--	argv[argc] = NULL;
-+	arg.argc = argc;
-+	arg.argv = argv;
-+	rb_protect(pty_exec, (VALUE)&arg, &status);
- 	execvp(argv[0],argv);
--	sleep(1);
- 	_exit(1);
-     }
- 
-@@ -442,11 +460,7 @@ pty_getpty(self, command)
-     OBJSETUP(wport, rb_cFile, T_FILE);
-     MakeOpenFile(wport, wfptr);
- 
--    if (TYPE(command) == T_ARRAY)
--	command = rb_ary_join(command,rb_str_new2(" "));
--    Check_SafeStr(command);
--
--    establishShell(RSTRING(command)->ptr,&info);
-+    establishShell(command, &info);
- 
-     rfptr->mode = rb_io_mode_flags("r");
-     rfptr->f = fdopen(info.fd, "r");
diff --git a/lang/ruby-base/patches/patch-an b/lang/ruby-base/patches/patch-an
deleted file mode 100644
index 3866b8ff83f..00000000000
--- a/lang/ruby-base/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/03/12 04:59:20 taca Exp $
-
---- lib/delegate.rb.orig	2001-11-21 02:48:49.000000000 +0900
-+++ lib/delegate.rb
-@@ -36,7 +36,7 @@ class Delegator
- 	  rescue Exception
- 	    $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
- 	    $@.delete_if{|s| /^\\(eval\\):/ =~ s}
--	    raise
-+	    Kernel::raise
- 	  end
- 	end
-       EOS
diff --git a/lang/ruby-base/patches/patch-ao b/lang/ruby-base/patches/patch-ao
deleted file mode 100644
index 2383c99e8ef..00000000000
--- a/lang/ruby-base/patches/patch-ao
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/03/12 04:59:20 taca Exp $
-
---- ext/socket/socket.c.orig	2002-11-01 03:40:11.000000000 +0900
-+++ ext/socket/socket.c
-@@ -585,6 +585,23 @@ ip_addrsetup(host, port)
- 	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
-     }
- 
-+#if defined(__APPLE__) && defined(__MACH__)
-+    {
-+	struct addrinfo *r;
-+	r = res;
-+	while (r) {
-+	    if (! r->ai_socktype) r->ai_socktype = hints.ai_socktype;
-+	    if (! r->ai_protocol) {
-+		if (r->ai_socktype == SOCK_DGRAM) {
-+		    r->ai_protocol = IPPROTO_UDP;
-+		} else if (r->ai_socktype == SOCK_STREAM) {
-+		    r->ai_protocol = IPPROTO_TCP;
-+		}
-+	    }
-+	    r = r->ai_next;
-+	}
-+    }
-+#endif
-     return res;
- }
- 
diff --git a/lang/ruby-base/patches/patch-ap b/lang/ruby-base/patches/patch-ap
deleted file mode 100644
index 8617369cd16..00000000000
--- a/lang/ruby-base/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/03/15 15:55:08 taca Exp $
-
---- dln.c.orig	2002-10-18 01:39:01.000000000 +0900
-+++ dln.c
-@@ -1084,7 +1084,7 @@ dln_sym(name)
- #endif /* USE_DLN_A_OUT */
- 
- #ifdef USE_DLN_DLOPEN
--# ifdef __NetBSD__
-+# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ < 105000000
- #  include <nlist.h>
- #  include <link.h>
- # else
diff --git a/lang/ruby-base/patches/patch-aq b/lang/ruby-base/patches/patch-aq
deleted file mode 100644
index 339de48b919..00000000000
--- a/lang/ruby-base/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2004/08/24 15:43:56 taca Exp $
-
---- lib/cgi/session.rb.orig	2002-05-01 18:36:28.000000000 +0900
-+++ lib/cgi/session.rb
-@@ -116,7 +116,7 @@ class CGI
- 	begin
- 	  @f = open(path, "r+")
- 	rescue Errno::ENOENT
--	  @f = open(path, "w+")
-+	  @f = File.open(path, File::CREAT|File::RDWR, 0600)
- 	end
-       end
- 
diff --git a/lang/ruby-base/patches/patch-ar b/lang/ruby-base/patches/patch-ar
deleted file mode 100644
index 64e16abbb8e..00000000000
--- a/lang/ruby-base/patches/patch-ar
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2004/11/09 14:11:33 taca Exp $
-
---- lib/cgi.rb.orig	2002-08-29 18:05:06.000000000 +0900
-+++ lib/cgi.rb
-@@ -823,10 +823,13 @@ convert string charset, and set language
-           end
- 
-           c = if bufsize < content_length
--                stdinput.read(bufsize) or ''
-+                stdinput.read(bufsize)
-               else
--                stdinput.read(content_length) or ''
-+                stdinput.read(content_length)
-               end
-+	  if c.nil?
-+	    raise EOFError, "bad content body"
-+	  end
-           buf += c
-           content_length -= c.size
-