Remove ruby18 which is EOL almost 4 years ago.

author: taca <taca> 2017-04-22 18:23:55 +0000
committer: taca <taca> 2017-04-22 18:23:55 +0000
commit: f551fb2d5c9975fa6462232b1a34b4fe1078acdb (patch)
tree: 6cce93775cf8006b8010def8e8180e75dddc9991 /lang
parent: 2a878972809b927920bd7a8851975ef5a69a3fad (diff)
download: pkgsrc-f551fb2d5c9975fa6462232b1a34b4fe1078acdb.tar.gz
61 files changed, 0 insertions, 3832 deletions
diff --git a/lang/ruby18-base/ALTERNATIVES b/lang/ruby18-base/ALTERNATIVES
deleted file mode 100644
index cb30b9f8207..00000000000
--- a/lang/ruby18-base/ALTERNATIVES
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/erb @PREFIX@/bin/erb@RUBY_SUFFIX@
-bin/h2rb @PREFIX@/bin/h2rb@RUBY_SUFFIX@
-bin/irb @PREFIX@/bin/irb@RUBY_SUFFIX@
-bin/ruby @PREFIX@/bin/@RUBY_NAME@
-bin/testrb @PREFIX@/bin/testrb@RUBY_SUFFIX@
diff --git a/lang/ruby18-base/DEINSTALL b/lang/ruby18-base/DEINSTALL
deleted file mode 100644
index dff309d9bd8..00000000000
--- a/lang/ruby18-base/DEINSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.3 2011/11/13 15:44:58 taca Exp $
-
-RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@"
-rid="${RUBY_SITERIDIR}/created.rid"
-
-case ${STAGE} in
-DEINSTALL)
-	rm -f ${rid}
-	;;
-esac
diff --git a/lang/ruby18-base/DESCR b/lang/ruby18-base/DESCR
deleted file mode 100644
index 05ced2b70ff..00000000000
--- a/lang/ruby18-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.)
-
-This package is Ruby 1.8.7 release minimum base package.
diff --git a/lang/ruby18-base/INSTALL b/lang/ruby18-base/INSTALL
deleted file mode 100644
index c01bdcba1d4..00000000000
--- a/lang/ruby18-base/INSTALL
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: INSTALL,v 1.4 2011/11/13 15:44:58 taca Exp $
-
-DATE="@DATE@"
-RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@"
-rid="${RUBY_SITERIDIR}/created.rid"
-
-case ${STAGE} in
-POST-INSTALL)
-	if [ -d ${RUBY_SITERIDIR} ]; then
-		${DATE} > ${rid}
-	fi
-	;;
-esac
diff --git a/lang/ruby18-base/MESSAGE b/lang/ruby18-base/MESSAGE
deleted file mode 100644
index 1d55283022f..00000000000
--- a/lang/ruby18-base/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.6 2011/11/08 15:20:36 taca Exp $
-
-Note that this is a minimal package.
-
-The original ${RUBY_DISTNAME} distribution includes more extension
-libraries, some of which are provided as separate packages:
-
-	databases/ruby-gdbm:		GDBM module
-	devel/ruby-curses:		Curses module
-	devel/ruby-readline:		readline module
-	x11/ruby-tk:			Tk modules
-
-===========================================================================
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
deleted file mode 100644
index 839928c368a..00000000000
--- a/lang/ruby18-base/Makefile
+++ /dev/null
@@ -1,172 +0,0 @@
-# $NetBSD: Makefile,v 1.87 2016/09/08 15:19:18 joerg Exp $
-#
-
-DISTNAME=	${RUBY_DISTNAME}
-PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION=	3
-CATEGORIES=	lang ruby
-MASTER_SITES=	${MASTER_SITE_RUBY}
-
-MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	${RUBY_HOMEPAGE}
-COMMENT=	Ruby 1.8 based release minimum package
-LICENSE=	gnu-gpl-v2 OR ruby-license
-
-RUBY_VERSIONS_ACCEPTED=	18
-
-CONFLICTS=	${RUBY_PKGPREFIX}-dbm-[0-9]* \
-		${RUBY_PKGPREFIX}-digest-[0-9]* \
-		${RUBY_PKGPREFIX}-iconv-[0-9]* \
-		${RUBY_PKGPREFIX}-openssl-[0-9]* \
-		${RUBY_PKGPREFIX}-tcltk-[0-9]*
-
-USE_GCC_RUNTIME=yes
-USE_LANGUAGES=	c
-USE_TOOLS+=	pax yacc
-GNU_CONFIGURE=	yes
-TEST_TARGET=	test
-CONFIGURE_ARGS+= --enable-shared \
-		--with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \
-		--with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib"
-WRKSRC=		${RUBY_WRKSRC}
-
-#
-# Don't reference pkgsrc's INSTALL macro since Ruby expect it could
-# execute by unprivileged user.
-#
-CONFIGURE_ENV+=	INSTALL="${INSTALL} ${COPY}" \
-		INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT=
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Msunpro)
-LIBS.SunOS+=	-B static -lsunmath -B dynamic -lm
-LDFLAGS.SunOS+=	-L${SUNWSPROBASE}/lib ${COMPILER_RPATH_FLAG}${SUNWSPROBASE}/lib
-CONFIGURE_ENV+=	LDSHARED="${CC} -G"
-.else
-LIBS.SunOS+=	-lm
-.endif
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-CONFIGURE_ARGS+=	--enable-frame-address
-.endif
-
-# Avoid segfaults as per https://bugs.ruby-lang.org/issues/6383
-.if !empty(CC_VERSION:Mgcc-4.[7-9].*)
-CFLAGS+=	-fno-tree-dce -fno-optimize-sibling-calls
-.endif
-
-# Ruby build process depends on config.status's content
-CONFIG_STATUS_OVERRIDE=	# empty
-
-MAKE_DIRS+=	${RUBY_SITERIDIR}
-FILES_SUBST+=	DATE=${DATE:Q}
-
-.include "options.mk"
-
-.include "../../lang/ruby/rubyversion.mk"
-
-.if !empty(RUBY_SUFFIX)
-CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q}
-.endif
-
-# bmake doesn't like the codesign/POSTLINK constructs.
-.if ${OPSYS} == "Darwin"
-USE_TOOLS+=	gmake
-.endif
-
-#
-# IRIX work around which should be fixed.
-#
-PLIST_VARS+=	io
-.if ${OPSYS} != "IRIX"
-PLIST.io=	yes
-.endif
-
-#
-# Work around for ucontext(3). It was broken in older DragonFly
-# versions and is slow in newer ones.
-#
-CONFIGURE_ENV.DragonFly+=	ac_cv_header_ucontext_h=no
-
-#
-# work around for getaddrinfo(3)
-#
-.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6-9])
-CONFIGURE_ARGS+=	--enable-wide-getaddrinfo
-.endif
-
-DOCS=		COPYING COPYING.ja ChangeLog NEWS README \
-		README.EXT README.EXT.ja README.ja ToDo \
-		doc/ChangeLog-1.8.0 doc/NEWS-1.8.0 \
-		doc/forwardable.rd doc/forwardable.rd.ja \
-		doc/irb/irb-tools.rd.ja doc/irb/irb.rd doc/irb/irb.rd.ja \
-		doc/shell.rd doc/shell.rd.ja
-EXT_DOCS=	bigdecimal/bigdecimal_en.html bigdecimal/bigdecimal_ja.html \
-		dl/doc/dl.txt etc/etc.txt etc/etc.txt.ja syslog/syslog.txt \
-		zlib/doc/zlib.rd
-
-BIGDECIMAL_EXAMPLES=	linear.rb nlsolve.rb pi.rb
-DL_EXAMPLES=		c++sample.C c++sample.rb drives.rb getch.rb libc.rb \
-			msgbox.rb msgbox2.rb stream.rb
-OPENSSL_EXAMPLES=	c_rehash.rb cert2text.rb cert_store_view.rb \
-			certstore.rb cipher.rb crlstore.rb echo_cli.rb \
-			echo_svr.rb gen_csr.rb smime_read.rb smime_write.rb \
-			wget.rb
-PTY_EXAMPLES=		expect_sample.rb script.rb shl.rb
-
-REPLACE_RUBY_DIRS=	bin ext lib sample
-REPLACE_RUBY=		ext/dl/h2rb
-INSTALLATION_DIRS=	bin ${RUBY_ARCHLIB} ${RUBY_DOC}/irb ${RUBY_DOC}/pty \
-			${RUBY_EG}/bigdecimal ${RUBY_EG}/dl \
-			${RUBY_EG}/openssl ${RUBY_EG}/pty
-FIX_PERM=		${RUBY_ARCHLIB}/digest.h ${RUBY_ARCHLIB}/dl.h \
-			${RUBY_ARCHLIB}/dlconfig.h
-
-pre-configure:
-	${RM} -f ${WRKSRC}/ext/curses/extconf.rb
-	${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb
-	${RM} -f ${WRKSRC}/ext/readline/extconf.rb
-	${RM} -f ${WRKSRC}/ext/tk/extconf.rb
-
-pre-install:
-	cd ${WRKSRC}; ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \
-		-exec ${RM} -f {} \;
-
-post-install:
-	${INSTALL_DATA} ${FILESDIR}/CHANGES.pkgsrc ${DESTDIR}${PREFIX}/${RUBY_DOC}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/${f:C/^doc\///}
-.endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/ext/dl/h2rb ${DESTDIR}${PREFIX}/bin/h2rb${RUBY_SUFFIX}
-.for f in ${EXT_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/ext/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}
-.endfor
-	cd ${WRKSRC}/ext/pty; ${PAX} -rw README.* ${DESTDIR}${PREFIX}/${RUBY_DOC}/pty
-	cd ${WRKSRC}/sample; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_EG}
-.for f in ${BIGDECIMAL_EXAMPLES}
-	${INSTALL_DATA} ${RUBY_WRKSRC}/ext/bigdecimal/sample/${f} \
-		${DESTDIR}${PREFIX}/${RUBY_EG}/bigdecimal
-.endfor
-.for f in ${DL_EXAMPLES}
-	${INSTALL_DATA} ${RUBY_WRKSRC}/ext/dl/sample/${f} \
-		${DESTDIR}${PREFIX}/${RUBY_EG}/dl
-.endfor
-.for f in ${OPENSSL_EXAMPLES}
-	${INSTALL_DATA} ${RUBY_WRKSRC}/sample/openssl/${f} \
-		${DESTDIR}${PREFIX}/${RUBY_EG}/openssl
-.endfor
-.for f in ${PTY_EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/ext/pty/${f} ${DESTDIR}${PREFIX}/${RUBY_EG}/pty
-.endfor
-.for f in ${FIX_PERM}
-	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${f}
-.endfor
-	${RUBY_GENERATE_PLIST}
-
-.include "../../mk/bdb.buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../lang/ruby/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST
deleted file mode 100644
index 4a439dd318f..00000000000
--- a/lang/ruby18-base/PLIST
+++ /dev/null
@@ -1,779 +0,0 @@
-@comment $NetBSD: PLIST,v 1.19 2010/12/26 12:31:20 taca Exp $
-bin/erb${RUBY_VER}
-bin/h2rb${RUBY_VER}
-bin/irb${RUBY_VER}
-bin/rdoc${RUBY_VER}
-bin/ri${RUBY_VER}
-bin/${RUBY_NAME}
-bin/testrb${RUBY_VER}
-lib/libruby${RUBY_STATICLIB}
-lib/libruby${RUBY_VER}.${RUBY_SLEXT}
-${RUBY_SHLIBALIAS}
-lib/libruby${RUBY_SHLIB}
-${RUBY_LIB}/English.rb
-${RUBY_LIB}/Env.rb
-${RUBY_LIB}/abbrev.rb
-${RUBY_LIB}/base64.rb
-${RUBY_LIB}/benchmark.rb
-${RUBY_LIB}/bigdecimal/jacobian.rb
-${RUBY_LIB}/bigdecimal/ludcmp.rb
-${RUBY_LIB}/bigdecimal/math.rb
-${RUBY_LIB}/bigdecimal/newton.rb
-${RUBY_LIB}/bigdecimal/util.rb
-${RUBY_LIB}/cgi-lib.rb
-${RUBY_LIB}/cgi.rb
-${RUBY_LIB}/cgi/session.rb
-${RUBY_LIB}/cgi/session/pstore.rb
-${RUBY_LIB}/complex.rb
-${RUBY_LIB}/csv.rb
-${RUBY_LIB}/date.rb
-${RUBY_LIB}/date/format.rb
-${RUBY_LIB}/date2.rb
-${RUBY_LIB}/debug.rb
-${RUBY_LIB}/delegate.rb
-${RUBY_LIB}/digest.rb
-${RUBY_LIB}/digest/sha2.rb
-${RUBY_LIB}/dl/import.rb
-${RUBY_LIB}/dl/struct.rb
-${RUBY_LIB}/dl/types.rb
-${RUBY_LIB}/dl/win32.rb
-${RUBY_LIB}/drb.rb
-${RUBY_LIB}/drb/acl.rb
-${RUBY_LIB}/drb/drb.rb
-${RUBY_LIB}/drb/eq.rb
-${RUBY_LIB}/drb/extserv.rb
-${RUBY_LIB}/drb/extservm.rb
-${RUBY_LIB}/drb/gw.rb
-${RUBY_LIB}/drb/invokemethod.rb
-${RUBY_LIB}/drb/observer.rb
-${RUBY_LIB}/drb/ssl.rb
-${RUBY_LIB}/drb/timeridconv.rb
-${RUBY_LIB}/drb/unix.rb
-${RUBY_LIB}/e2mmap.rb
-${RUBY_LIB}/erb.rb
-${RUBY_LIB}/eregex.rb
-${RUBY_LIB}/expect.rb
-${RUBY_LIB}/fileutils.rb
-${RUBY_LIB}/finalize.rb
-${RUBY_LIB}/find.rb
-${RUBY_LIB}/forwardable.rb
-${RUBY_LIB}/ftools.rb
-${RUBY_LIB}/generator.rb
-${RUBY_LIB}/getoptlong.rb
-${RUBY_LIB}/getopts.rb
-${RUBY_LIB}/gserver.rb
-${RUBY_ARCHLIB}/bigdecimal.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/config.h
-${RUBY_ARCHLIB}/dbm.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/defines.h
-${RUBY_ARCHLIB}/digest.h
-${RUBY_ARCHLIB}/digest.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/digest/bubblebabble.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/digest/md5.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/digest/rmd160.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/digest/sha1.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/digest/sha2.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/dl.h
-${RUBY_ARCHLIB}/dl.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/dlconfig.h
-${RUBY_ARCHLIB}/dln.h
-${RUBY_ARCHLIB}/env.h
-${RUBY_ARCHLIB}/etc.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/fcntl.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/iconv.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/intern.h
-${PLIST.io}${RUBY_ARCHLIB}/io/wait.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/missing.h
-${RUBY_ARCHLIB}/nkf.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/node.h
-${RUBY_ARCHLIB}/openssl.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/pty.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/racc/cparse.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/rbconfig.rb
-${RUBY_ARCHLIB}/re.h
-${RUBY_ARCHLIB}/regex.h
-${RUBY_ARCHLIB}/ruby.h
-${RUBY_ARCHLIB}/rubyio.h
-${RUBY_ARCHLIB}/rubysig.h
-${RUBY_ARCHLIB}/sdbm.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/socket.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/st.h
-${RUBY_ARCHLIB}/stringio.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/strscan.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/syck.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/syslog.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/thread.${RUBY_DLEXT}
-${RUBY_ARCHLIB}/util.h
-${RUBY_ARCHLIB}/version.h
-${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT}
-${RUBY_LIB}/importenv.rb
-${PLIST.io}${RUBY_LIB}/io/nonblock.rb
-${RUBY_LIB}/ipaddr.rb
-${RUBY_LIB}/irb.rb
-${RUBY_LIB}/irb/cmd/chws.rb
-${RUBY_LIB}/irb/cmd/fork.rb
-${RUBY_LIB}/irb/cmd/help.rb
-${RUBY_LIB}/irb/cmd/load.rb
-${RUBY_LIB}/irb/cmd/nop.rb
-${RUBY_LIB}/irb/cmd/pushws.rb
-${RUBY_LIB}/irb/cmd/subirb.rb
-${RUBY_LIB}/irb/completion.rb
-${RUBY_LIB}/irb/context.rb
-${RUBY_LIB}/irb/ext/change-ws.rb
-${RUBY_LIB}/irb/ext/history.rb
-${RUBY_LIB}/irb/ext/loader.rb
-${RUBY_LIB}/irb/ext/math-mode.rb
-${RUBY_LIB}/irb/ext/multi-irb.rb
-${RUBY_LIB}/irb/ext/save-history.rb
-${RUBY_LIB}/irb/ext/tracer.rb
-${RUBY_LIB}/irb/ext/use-loader.rb
-${RUBY_LIB}/irb/ext/workspaces.rb
-${RUBY_LIB}/irb/extend-command.rb
-${RUBY_LIB}/irb/frame.rb
-${RUBY_LIB}/irb/help.rb
-${RUBY_LIB}/irb/init.rb
-${RUBY_LIB}/irb/input-method.rb
-${RUBY_LIB}/irb/lc/error.rb
-${RUBY_LIB}/irb/lc/help-message
-${RUBY_LIB}/irb/lc/ja/error.rb
-${RUBY_LIB}/irb/lc/ja/help-message
-${RUBY_LIB}/irb/locale.rb
-${RUBY_LIB}/irb/notifier.rb
-${RUBY_LIB}/irb/output-method.rb
-${RUBY_LIB}/irb/ruby-lex.rb
-${RUBY_LIB}/irb/ruby-token.rb
-${RUBY_LIB}/irb/slex.rb
-${RUBY_LIB}/irb/version.rb
-${RUBY_LIB}/irb/workspace.rb
-${RUBY_LIB}/irb/ws-for-case-2.rb
-${RUBY_LIB}/irb/xmp.rb
-${RUBY_LIB}/jcode.rb
-${RUBY_LIB}/kconv.rb
-${RUBY_LIB}/logger.rb
-${RUBY_LIB}/mailread.rb
-${RUBY_LIB}/mathn.rb
-${RUBY_LIB}/matrix.rb
-${RUBY_LIB}/md5.rb
-${RUBY_LIB}/mkmf.rb
-${RUBY_LIB}/monitor.rb
-${RUBY_LIB}/mutex_m.rb
-${RUBY_LIB}/net/ftp.rb
-${RUBY_LIB}/net/ftptls.rb
-${RUBY_LIB}/net/http.rb
-${RUBY_LIB}/net/https.rb
-${RUBY_LIB}/net/imap.rb
-${RUBY_LIB}/net/pop.rb
-${RUBY_LIB}/net/protocol.rb
-${RUBY_LIB}/net/smtp.rb
-${RUBY_LIB}/net/telnet.rb
-${RUBY_LIB}/net/telnets.rb
-${RUBY_LIB}/observer.rb
-${RUBY_LIB}/open-uri.rb
-${RUBY_LIB}/open3.rb
-${RUBY_LIB}/openssl.rb
-${RUBY_LIB}/openssl/bn.rb
-${RUBY_LIB}/openssl/buffering.rb
-${RUBY_LIB}/openssl/cipher.rb
-${RUBY_LIB}/openssl/config.rb
-${RUBY_LIB}/openssl/digest.rb
-${RUBY_LIB}/openssl/pkcs7.rb
-${RUBY_LIB}/openssl/ssl-internal.rb
-${RUBY_LIB}/openssl/ssl.rb
-${RUBY_LIB}/openssl/x509-internal.rb
-${RUBY_LIB}/openssl/x509.rb
-${RUBY_LIB}/optparse.rb
-${RUBY_LIB}/optparse/date.rb
-${RUBY_LIB}/optparse/shellwords.rb
-${RUBY_LIB}/optparse/time.rb
-${RUBY_LIB}/optparse/uri.rb
-${RUBY_LIB}/optparse/version.rb
-${RUBY_LIB}/ostruct.rb
-${RUBY_LIB}/parsearg.rb
-${RUBY_LIB}/parsedate.rb
-${RUBY_LIB}/pathname.rb
-${RUBY_LIB}/ping.rb
-${RUBY_LIB}/pp.rb
-${RUBY_LIB}/prettyprint.rb
-${RUBY_LIB}/profile.rb
-${RUBY_LIB}/profiler.rb
-${RUBY_LIB}/pstore.rb
-${RUBY_LIB}/racc/parser.rb
-${RUBY_LIB}/rational.rb
-${RUBY_LIB}/rdoc/code_objects.rb
-${RUBY_LIB}/rdoc/diagram.rb
-${RUBY_LIB}/rdoc/dot/dot.rb
-${RUBY_LIB}/rdoc/generators/chm_generator.rb
-${RUBY_LIB}/rdoc/generators/html_generator.rb
-${RUBY_LIB}/rdoc/generators/ri_generator.rb
-${RUBY_LIB}/rdoc/generators/template/chm/chm.rb
-${RUBY_LIB}/rdoc/generators/template/html/hefss.rb
-${RUBY_LIB}/rdoc/generators/template/html/html.rb
-${RUBY_LIB}/rdoc/generators/template/html/kilmer.rb
-${RUBY_LIB}/rdoc/generators/template/html/old_html.rb
-${RUBY_LIB}/rdoc/generators/template/html/one_page_html.rb
-${RUBY_LIB}/rdoc/generators/template/xml/rdf.rb
-${RUBY_LIB}/rdoc/generators/template/xml/xml.rb
-${RUBY_LIB}/rdoc/generators/xml_generator.rb
-${RUBY_LIB}/rdoc/markup/sample/rdoc2latex.rb
-${RUBY_LIB}/rdoc/markup/sample/sample.rb
-${RUBY_LIB}/rdoc/markup/simple_markup.rb
-${RUBY_LIB}/rdoc/markup/simple_markup/fragments.rb
-${RUBY_LIB}/rdoc/markup/simple_markup/inline.rb
-${RUBY_LIB}/rdoc/markup/simple_markup/lines.rb
-${RUBY_LIB}/rdoc/markup/simple_markup/preprocess.rb
-${RUBY_LIB}/rdoc/markup/simple_markup/to_flow.rb
-${RUBY_LIB}/rdoc/markup/simple_markup/to_html.rb
-${RUBY_LIB}/rdoc/markup/simple_markup/to_latex.rb
-${RUBY_LIB}/rdoc/markup/test/AllTests.rb
-${RUBY_LIB}/rdoc/markup/test/TestInline.rb
-${RUBY_LIB}/rdoc/markup/test/TestParse.rb
-${RUBY_LIB}/rdoc/options.rb
-${RUBY_LIB}/rdoc/parsers/parse_c.rb
-${RUBY_LIB}/rdoc/parsers/parse_f95.rb
-${RUBY_LIB}/rdoc/parsers/parse_rb.rb
-${RUBY_LIB}/rdoc/parsers/parse_simple.rb
-${RUBY_LIB}/rdoc/parsers/parserfactory.rb
-${RUBY_LIB}/rdoc/rdoc.rb
-${RUBY_LIB}/rdoc/ri/ri_cache.rb
-${RUBY_LIB}/rdoc/ri/ri_descriptions.rb
-${RUBY_LIB}/rdoc/ri/ri_display.rb
-${RUBY_LIB}/rdoc/ri/ri_driver.rb
-${RUBY_LIB}/rdoc/ri/ri_formatter.rb
-${RUBY_LIB}/rdoc/ri/ri_options.rb
-${RUBY_LIB}/rdoc/ri/ri_paths.rb
-${RUBY_LIB}/rdoc/ri/ri_reader.rb
-${RUBY_LIB}/rdoc/ri/ri_util.rb
-${RUBY_LIB}/rdoc/ri/ri_writer.rb
-${RUBY_LIB}/rdoc/template.rb
-${RUBY_LIB}/rdoc/tokenstream.rb
-${RUBY_LIB}/rdoc/usage.rb
-${RUBY_LIB}/readbytes.rb
-${RUBY_LIB}/resolv-replace.rb
-${RUBY_LIB}/resolv.rb
-${RUBY_LIB}/rexml/attlistdecl.rb
-${RUBY_LIB}/rexml/attribute.rb
-${RUBY_LIB}/rexml/cdata.rb
-${RUBY_LIB}/rexml/child.rb
-${RUBY_LIB}/rexml/comment.rb
-${RUBY_LIB}/rexml/doctype.rb
-${RUBY_LIB}/rexml/document.rb
-${RUBY_LIB}/rexml/dtd/attlistdecl.rb
-${RUBY_LIB}/rexml/dtd/dtd.rb
-${RUBY_LIB}/rexml/dtd/elementdecl.rb
-${RUBY_LIB}/rexml/dtd/entitydecl.rb
-${RUBY_LIB}/rexml/dtd/notationdecl.rb
-${RUBY_LIB}/rexml/element.rb
-${RUBY_LIB}/rexml/encoding.rb
-${RUBY_LIB}/rexml/encodings/CP-1252.rb
-${RUBY_LIB}/rexml/encodings/EUC-JP.rb
-${RUBY_LIB}/rexml/encodings/ICONV.rb
-${RUBY_LIB}/rexml/encodings/ISO-8859-1.rb
-${RUBY_LIB}/rexml/encodings/ISO-8859-15.rb
-${RUBY_LIB}/rexml/encodings/SHIFT-JIS.rb
-${RUBY_LIB}/rexml/encodings/SHIFT_JIS.rb
-${RUBY_LIB}/rexml/encodings/UNILE.rb
-${RUBY_LIB}/rexml/encodings/US-ASCII.rb
-${RUBY_LIB}/rexml/encodings/UTF-16.rb
-${RUBY_LIB}/rexml/encodings/UTF-8.rb
-${RUBY_LIB}/rexml/entity.rb
-${RUBY_LIB}/rexml/formatters/default.rb
-${RUBY_LIB}/rexml/formatters/pretty.rb
-${RUBY_LIB}/rexml/formatters/transitive.rb
-${RUBY_LIB}/rexml/functions.rb
-${RUBY_LIB}/rexml/instruction.rb
-${RUBY_LIB}/rexml/light/node.rb
-${RUBY_LIB}/rexml/namespace.rb
-${RUBY_LIB}/rexml/node.rb
-${RUBY_LIB}/rexml/output.rb
-${RUBY_LIB}/rexml/parent.rb
-${RUBY_LIB}/rexml/parseexception.rb
-${RUBY_LIB}/rexml/parsers/baseparser.rb
-${RUBY_LIB}/rexml/parsers/lightparser.rb
-${RUBY_LIB}/rexml/parsers/pullparser.rb
-${RUBY_LIB}/rexml/parsers/sax2parser.rb
-${RUBY_LIB}/rexml/parsers/streamparser.rb
-${RUBY_LIB}/rexml/parsers/treeparser.rb
-${RUBY_LIB}/rexml/parsers/ultralightparser.rb
-${RUBY_LIB}/rexml/parsers/xpathparser.rb
-${RUBY_LIB}/rexml/quickpath.rb
-${RUBY_LIB}/rexml/rexml.rb
-${RUBY_LIB}/rexml/sax2listener.rb
-${RUBY_LIB}/rexml/source.rb
-${RUBY_LIB}/rexml/streamlistener.rb
-${RUBY_LIB}/rexml/syncenumerator.rb
-${RUBY_LIB}/rexml/text.rb
-${RUBY_LIB}/rexml/undefinednamespaceexception.rb
-${RUBY_LIB}/rexml/validation/relaxng.rb
-${RUBY_LIB}/rexml/validation/validation.rb
-${RUBY_LIB}/rexml/validation/validationexception.rb
-${RUBY_LIB}/rexml/xmldecl.rb
-${RUBY_LIB}/rexml/xmltokens.rb
-${RUBY_LIB}/rexml/xpath.rb
-${RUBY_LIB}/rexml/xpath_parser.rb
-${RUBY_LIB}/rinda/rinda.rb
-${RUBY_LIB}/rinda/ring.rb
-${RUBY_LIB}/rinda/tuplespace.rb
-${RUBY_LIB}/rss.rb
-${RUBY_LIB}/rss/0.9.rb
-${RUBY_LIB}/rss/1.0.rb
-${RUBY_LIB}/rss/2.0.rb
-${RUBY_LIB}/rss/atom.rb
-${RUBY_LIB}/rss/content.rb
-${RUBY_LIB}/rss/content/1.0.rb
-${RUBY_LIB}/rss/content/2.0.rb
-${RUBY_LIB}/rss/converter.rb
-${RUBY_LIB}/rss/dublincore.rb
-${RUBY_LIB}/rss/dublincore/1.0.rb
-${RUBY_LIB}/rss/dublincore/2.0.rb
-${RUBY_LIB}/rss/dublincore/atom.rb
-${RUBY_LIB}/rss/image.rb
-${RUBY_LIB}/rss/itunes.rb
-${RUBY_LIB}/rss/maker.rb
-${RUBY_LIB}/rss/maker/0.9.rb
-${RUBY_LIB}/rss/maker/1.0.rb
-${RUBY_LIB}/rss/maker/2.0.rb
-${RUBY_LIB}/rss/maker/atom.rb
-${RUBY_LIB}/rss/maker/base.rb
-${RUBY_LIB}/rss/maker/content.rb
-${RUBY_LIB}/rss/maker/dublincore.rb
-${RUBY_LIB}/rss/maker/entry.rb
-${RUBY_LIB}/rss/maker/feed.rb
-${RUBY_LIB}/rss/maker/image.rb
-${RUBY_LIB}/rss/maker/itunes.rb
-${RUBY_LIB}/rss/maker/slash.rb
-${RUBY_LIB}/rss/maker/syndication.rb
-${RUBY_LIB}/rss/maker/taxonomy.rb
-${RUBY_LIB}/rss/maker/trackback.rb
-${RUBY_LIB}/rss/parser.rb
-${RUBY_LIB}/rss/rexmlparser.rb
-${RUBY_LIB}/rss/rss.rb
-${RUBY_LIB}/rss/slash.rb
-${RUBY_LIB}/rss/syndication.rb
-${RUBY_LIB}/rss/taxonomy.rb
-${RUBY_LIB}/rss/trackback.rb
-${RUBY_LIB}/rss/utils.rb
-${RUBY_LIB}/rss/xml-stylesheet.rb
-${RUBY_LIB}/rss/xml.rb
-${RUBY_LIB}/rss/xmlparser.rb
-${RUBY_LIB}/rss/xmlscanner.rb
-${RUBY_LIB}/rubyunit.rb
-${RUBY_LIB}/runit/assert.rb
-${RUBY_LIB}/runit/cui/testrunner.rb
-${RUBY_LIB}/runit/error.rb
-${RUBY_LIB}/runit/testcase.rb
-${RUBY_LIB}/runit/testresult.rb
-${RUBY_LIB}/runit/testsuite.rb
-${RUBY_LIB}/runit/topublic.rb
-${RUBY_LIB}/scanf.rb
-${RUBY_LIB}/securerandom.rb
-${RUBY_LIB}/set.rb
-${RUBY_LIB}/sha1.rb
-${RUBY_LIB}/shell.rb
-${RUBY_LIB}/shell/builtin-command.rb
-${RUBY_LIB}/shell/command-processor.rb
-${RUBY_LIB}/shell/error.rb
-${RUBY_LIB}/shell/filter.rb
-${RUBY_LIB}/shell/process-controller.rb
-${RUBY_LIB}/shell/system-command.rb
-${RUBY_LIB}/shell/version.rb
-${RUBY_LIB}/shellwords.rb
-${RUBY_LIB}/singleton.rb
-${RUBY_LIB}/soap/attachment.rb
-${RUBY_LIB}/soap/baseData.rb
-${RUBY_LIB}/soap/element.rb
-${RUBY_LIB}/soap/encodingstyle/aspDotNetHandler.rb
-${RUBY_LIB}/soap/encodingstyle/handler.rb
-${RUBY_LIB}/soap/encodingstyle/literalHandler.rb
-${RUBY_LIB}/soap/encodingstyle/soapHandler.rb
-${RUBY_LIB}/soap/generator.rb
-${RUBY_LIB}/soap/header/handler.rb
-${RUBY_LIB}/soap/header/handlerset.rb
-${RUBY_LIB}/soap/header/simplehandler.rb
-${RUBY_LIB}/soap/httpconfigloader.rb
-${RUBY_LIB}/soap/mapping.rb
-${RUBY_LIB}/soap/mapping/factory.rb
-${RUBY_LIB}/soap/mapping/mapping.rb
-${RUBY_LIB}/soap/mapping/registry.rb
-${RUBY_LIB}/soap/mapping/rubytypeFactory.rb
-${RUBY_LIB}/soap/mapping/typeMap.rb
-${RUBY_LIB}/soap/mapping/wsdlencodedregistry.rb
-${RUBY_LIB}/soap/mapping/wsdlliteralregistry.rb
-${RUBY_LIB}/soap/marshal.rb
-${RUBY_LIB}/soap/mimemessage.rb
-${RUBY_LIB}/soap/netHttpClient.rb
-${RUBY_LIB}/soap/parser.rb
-${RUBY_LIB}/soap/processor.rb
-${RUBY_LIB}/soap/property.rb
-${RUBY_LIB}/soap/rpc/cgistub.rb
-${RUBY_LIB}/soap/rpc/driver.rb
-${RUBY_LIB}/soap/rpc/element.rb
-${RUBY_LIB}/soap/rpc/httpserver.rb
-${RUBY_LIB}/soap/rpc/proxy.rb
-${RUBY_LIB}/soap/rpc/router.rb
-${RUBY_LIB}/soap/rpc/rpc.rb
-${RUBY_LIB}/soap/rpc/soaplet.rb
-${RUBY_LIB}/soap/rpc/standaloneServer.rb
-${RUBY_LIB}/soap/soap.rb
-${RUBY_LIB}/soap/streamHandler.rb
-${RUBY_LIB}/soap/wsdlDriver.rb
-${RUBY_LIB}/sync.rb
-${RUBY_LIB}/tempfile.rb
-${RUBY_LIB}/test/unit.rb
-${RUBY_LIB}/test/unit/assertionfailederror.rb
-${RUBY_LIB}/test/unit/assertions.rb
-${RUBY_LIB}/test/unit/autorunner.rb
-${RUBY_LIB}/test/unit/collector.rb
-${RUBY_LIB}/test/unit/collector/dir.rb
-${RUBY_LIB}/test/unit/collector/objectspace.rb
-${RUBY_LIB}/test/unit/error.rb
-${RUBY_LIB}/test/unit/failure.rb
-${RUBY_LIB}/test/unit/testcase.rb
-${RUBY_LIB}/test/unit/testresult.rb
-${RUBY_LIB}/test/unit/testsuite.rb
-${RUBY_LIB}/test/unit/ui/console/testrunner.rb
-${RUBY_LIB}/test/unit/ui/fox/testrunner.rb
-${RUBY_LIB}/test/unit/ui/gtk/testrunner.rb
-${RUBY_LIB}/test/unit/ui/gtk2/testrunner.rb
-${RUBY_LIB}/test/unit/ui/testrunnermediator.rb
-${RUBY_LIB}/test/unit/ui/testrunnerutilities.rb
-${RUBY_LIB}/test/unit/ui/tk/testrunner.rb
-${RUBY_LIB}/test/unit/util/backtracefilter.rb
-${RUBY_LIB}/test/unit/util/observable.rb
-${RUBY_LIB}/test/unit/util/procwrapper.rb
-${RUBY_LIB}/thread.rb
-${RUBY_LIB}/thwait.rb
-${RUBY_LIB}/time.rb
-${RUBY_LIB}/timeout.rb
-${RUBY_LIB}/tmpdir.rb
-${RUBY_LIB}/tracer.rb
-${RUBY_LIB}/tsort.rb
-${RUBY_LIB}/un.rb
-${RUBY_LIB}/uri.rb
-${RUBY_LIB}/uri/common.rb
-${RUBY_LIB}/uri/ftp.rb
-${RUBY_LIB}/uri/generic.rb
-${RUBY_LIB}/uri/http.rb
-${RUBY_LIB}/uri/https.rb
-${RUBY_LIB}/uri/ldap.rb
-${RUBY_LIB}/uri/ldaps.rb
-${RUBY_LIB}/uri/mailto.rb
-${RUBY_LIB}/weakref.rb
-${RUBY_LIB}/webrick.rb
-${RUBY_LIB}/webrick/accesslog.rb
-${RUBY_LIB}/webrick/cgi.rb
-${RUBY_LIB}/webrick/compat.rb
-${RUBY_LIB}/webrick/config.rb
-${RUBY_LIB}/webrick/cookie.rb
-${RUBY_LIB}/webrick/htmlutils.rb
-${RUBY_LIB}/webrick/httpauth.rb
-${RUBY_LIB}/webrick/httpauth/authenticator.rb
-${RUBY_LIB}/webrick/httpauth/basicauth.rb
-${RUBY_LIB}/webrick/httpauth/digestauth.rb
-${RUBY_LIB}/webrick/httpauth/htdigest.rb
-${RUBY_LIB}/webrick/httpauth/htgroup.rb
-${RUBY_LIB}/webrick/httpauth/htpasswd.rb
-${RUBY_LIB}/webrick/httpauth/userdb.rb
-${RUBY_LIB}/webrick/httpproxy.rb
-${RUBY_LIB}/webrick/httprequest.rb
-${RUBY_LIB}/webrick/httpresponse.rb
-${RUBY_LIB}/webrick/https.rb
-${RUBY_LIB}/webrick/httpserver.rb
-${RUBY_LIB}/webrick/httpservlet.rb
-${RUBY_LIB}/webrick/httpservlet/abstract.rb
-${RUBY_LIB}/webrick/httpservlet/cgi_runner.rb
-${RUBY_LIB}/webrick/httpservlet/cgihandler.rb
-${RUBY_LIB}/webrick/httpservlet/erbhandler.rb
-${RUBY_LIB}/webrick/httpservlet/filehandler.rb
-${RUBY_LIB}/webrick/httpservlet/prochandler.rb
-${RUBY_LIB}/webrick/httpstatus.rb
-${RUBY_LIB}/webrick/httputils.rb
-${RUBY_LIB}/webrick/httpversion.rb
-${RUBY_LIB}/webrick/log.rb
-${RUBY_LIB}/webrick/server.rb
-${RUBY_LIB}/webrick/ssl.rb
-${RUBY_LIB}/webrick/utils.rb
-${RUBY_LIB}/webrick/version.rb
-${RUBY_LIB}/wsdl/binding.rb
-${RUBY_LIB}/wsdl/data.rb
-${RUBY_LIB}/wsdl/definitions.rb
-${RUBY_LIB}/wsdl/documentation.rb
-${RUBY_LIB}/wsdl/import.rb
-${RUBY_LIB}/wsdl/importer.rb
-${RUBY_LIB}/wsdl/info.rb
-${RUBY_LIB}/wsdl/message.rb
-${RUBY_LIB}/wsdl/operation.rb
-${RUBY_LIB}/wsdl/operationBinding.rb
-${RUBY_LIB}/wsdl/param.rb
-${RUBY_LIB}/wsdl/parser.rb
-${RUBY_LIB}/wsdl/part.rb
-${RUBY_LIB}/wsdl/port.rb
-${RUBY_LIB}/wsdl/portType.rb
-${RUBY_LIB}/wsdl/service.rb
-${RUBY_LIB}/wsdl/soap/address.rb
-${RUBY_LIB}/wsdl/soap/binding.rb
-${RUBY_LIB}/wsdl/soap/body.rb
-${RUBY_LIB}/wsdl/soap/cgiStubCreator.rb
-${RUBY_LIB}/wsdl/soap/classDefCreator.rb
-${RUBY_LIB}/wsdl/soap/classDefCreatorSupport.rb
-${RUBY_LIB}/wsdl/soap/clientSkeltonCreator.rb
-${RUBY_LIB}/wsdl/soap/complexType.rb
-${RUBY_LIB}/wsdl/soap/data.rb
-${RUBY_LIB}/wsdl/soap/definitions.rb
-${RUBY_LIB}/wsdl/soap/driverCreator.rb
-${RUBY_LIB}/wsdl/soap/element.rb
-${RUBY_LIB}/wsdl/soap/fault.rb
-${RUBY_LIB}/wsdl/soap/header.rb
-${RUBY_LIB}/wsdl/soap/headerfault.rb
-${RUBY_LIB}/wsdl/soap/mappingRegistryCreator.rb
-${RUBY_LIB}/wsdl/soap/methodDefCreator.rb
-${RUBY_LIB}/wsdl/soap/operation.rb
-${RUBY_LIB}/wsdl/soap/servantSkeltonCreator.rb
-${RUBY_LIB}/wsdl/soap/standaloneServerStubCreator.rb
-${RUBY_LIB}/wsdl/soap/wsdl2ruby.rb
-${RUBY_LIB}/wsdl/types.rb
-${RUBY_LIB}/wsdl/wsdl.rb
-${RUBY_LIB}/wsdl/xmlSchema/all.rb
-${RUBY_LIB}/wsdl/xmlSchema/annotation.rb
-${RUBY_LIB}/wsdl/xmlSchema/any.rb
-${RUBY_LIB}/wsdl/xmlSchema/attribute.rb
-${RUBY_LIB}/wsdl/xmlSchema/choice.rb
-${RUBY_LIB}/wsdl/xmlSchema/complexContent.rb
-${RUBY_LIB}/wsdl/xmlSchema/complexType.rb
-${RUBY_LIB}/wsdl/xmlSchema/content.rb
-${RUBY_LIB}/wsdl/xmlSchema/data.rb
-${RUBY_LIB}/wsdl/xmlSchema/element.rb
-${RUBY_LIB}/wsdl/xmlSchema/enumeration.rb
-${RUBY_LIB}/wsdl/xmlSchema/import.rb
-${RUBY_LIB}/wsdl/xmlSchema/importer.rb
-${RUBY_LIB}/wsdl/xmlSchema/include.rb
-${RUBY_LIB}/wsdl/xmlSchema/length.rb
-${RUBY_LIB}/wsdl/xmlSchema/parser.rb
-${RUBY_LIB}/wsdl/xmlSchema/pattern.rb
-${RUBY_LIB}/wsdl/xmlSchema/schema.rb
-${RUBY_LIB}/wsdl/xmlSchema/sequence.rb
-${RUBY_LIB}/wsdl/xmlSchema/simpleContent.rb
-${RUBY_LIB}/wsdl/xmlSchema/simpleExtension.rb
-${RUBY_LIB}/wsdl/xmlSchema/simpleRestriction.rb
-${RUBY_LIB}/wsdl/xmlSchema/simpleType.rb
-${RUBY_LIB}/wsdl/xmlSchema/unique.rb
-${RUBY_LIB}/wsdl/xmlSchema/xsd2ruby.rb
-${RUBY_LIB}/xmlrpc/base64.rb
-${RUBY_LIB}/xmlrpc/client.rb
-${RUBY_LIB}/xmlrpc/config.rb
-${RUBY_LIB}/xmlrpc/create.rb
-${RUBY_LIB}/xmlrpc/datetime.rb
-${RUBY_LIB}/xmlrpc/httpserver.rb
-${RUBY_LIB}/xmlrpc/marshal.rb
-${RUBY_LIB}/xmlrpc/parser.rb
-${RUBY_LIB}/xmlrpc/server.rb
-${RUBY_LIB}/xmlrpc/utils.rb
-${RUBY_LIB}/xsd/charset.rb
-${RUBY_LIB}/xsd/codegen.rb
-${RUBY_LIB}/xsd/codegen/classdef.rb
-${RUBY_LIB}/xsd/codegen/commentdef.rb
-${RUBY_LIB}/xsd/codegen/gensupport.rb
-${RUBY_LIB}/xsd/codegen/methoddef.rb
-${RUBY_LIB}/xsd/codegen/moduledef.rb
-${RUBY_LIB}/xsd/datatypes.rb
-${RUBY_LIB}/xsd/datatypes1999.rb
-${RUBY_LIB}/xsd/iconvcharset.rb
-${RUBY_LIB}/xsd/mapping.rb
-${RUBY_LIB}/xsd/namedelements.rb
-${RUBY_LIB}/xsd/ns.rb
-${RUBY_LIB}/xsd/qname.rb
-${RUBY_LIB}/xsd/xmlparser.rb
-${RUBY_LIB}/xsd/xmlparser/parser.rb
-${RUBY_LIB}/xsd/xmlparser/rexmlparser.rb
-${RUBY_LIB}/xsd/xmlparser/xmlparser.rb
-${RUBY_LIB}/xsd/xmlparser/xmlscanner.rb
-${RUBY_LIB}/yaml.rb
-${RUBY_LIB}/yaml/baseemitter.rb
-${RUBY_LIB}/yaml/basenode.rb
-${RUBY_LIB}/yaml/constants.rb
-${RUBY_LIB}/yaml/dbm.rb
-${RUBY_LIB}/yaml/encoding.rb
-${RUBY_LIB}/yaml/error.rb
-${RUBY_LIB}/yaml/loader.rb
-${RUBY_LIB}/yaml/rubytypes.rb
-${RUBY_LIB}/yaml/store.rb
-${RUBY_LIB}/yaml/stream.rb
-${RUBY_LIB}/yaml/stringio.rb
-${RUBY_LIB}/yaml/syck.rb
-${RUBY_LIB}/yaml/tag.rb
-${RUBY_LIB}/yaml/types.rb
-${RUBY_LIB}/yaml/yamlnode.rb
-${RUBY_LIB}/yaml/ypath.rb
-man/man1/${RUBY_NAME}.1
-${RUBY_DOC}/CHANGES.pkgsrc
-${RUBY_DOC}/COPYING
-${RUBY_DOC}/COPYING.ja
-${RUBY_DOC}/ChangeLog
-${RUBY_DOC}/ChangeLog-1.8.0
-${RUBY_DOC}/NEWS
-${RUBY_DOC}/NEWS-1.8.0
-${RUBY_DOC}/README
-${RUBY_DOC}/README.EXT
-${RUBY_DOC}/README.EXT.ja
-${RUBY_DOC}/README.ja
-${RUBY_DOC}/ToDo
-${RUBY_DOC}/bigdecimal_en.html
-${RUBY_DOC}/bigdecimal_ja.html
-${RUBY_DOC}/dl.txt
-${RUBY_DOC}/etc.txt
-${RUBY_DOC}/etc.txt.ja
-${RUBY_DOC}/forwardable.rd
-${RUBY_DOC}/forwardable.rd.ja
-${RUBY_DOC}/irb/irb-tools.rd.ja
-${RUBY_DOC}/irb/irb.rd
-${RUBY_DOC}/irb/irb.rd.ja
-${RUBY_DOC}/pty/README.expect
-${RUBY_DOC}/pty/README.expect.ja
-${RUBY_DOC}/pty/README.ja
-${RUBY_DOC}/shell.rd
-${RUBY_DOC}/shell.rd.ja
-${RUBY_DOC}/syslog.txt
-${RUBY_DOC}/zlib.rd
-${RUBY_EG}/README
-${RUBY_EG}/bigdecimal/linear.rb
-${RUBY_EG}/bigdecimal/nlsolve.rb
-${RUBY_EG}/bigdecimal/pi.rb
-${RUBY_EG}/biorhythm.rb
-${RUBY_EG}/cal.rb
-${RUBY_EG}/cbreak.rb
-${RUBY_EG}/clnt.rb
-${RUBY_EG}/dbmtest.rb
-${RUBY_EG}/dir.rb
-${RUBY_EG}/dl/c++sample.C
-${RUBY_EG}/dl/c++sample.rb
-${RUBY_EG}/dl/drives.rb
-${RUBY_EG}/dl/getch.rb
-${RUBY_EG}/dl/libc.rb
-${RUBY_EG}/dl/msgbox.rb
-${RUBY_EG}/dl/msgbox2.rb
-${RUBY_EG}/dl/stream.rb
-${RUBY_EG}/drb/README.rd
-${RUBY_EG}/drb/README.rd.ja
-${RUBY_EG}/drb/darray.rb
-${RUBY_EG}/drb/darrayc.rb
-${RUBY_EG}/drb/dbiff.rb
-${RUBY_EG}/drb/dcdbiff.rb
-${RUBY_EG}/drb/dchatc.rb
-${RUBY_EG}/drb/dchats.rb
-${RUBY_EG}/drb/dhasen.rb
-${RUBY_EG}/drb/dhasenc.rb
-${RUBY_EG}/drb/dlogc.rb
-${RUBY_EG}/drb/dlogd.rb
-${RUBY_EG}/drb/dqin.rb
-${RUBY_EG}/drb/dqlib.rb
-${RUBY_EG}/drb/dqout.rb
-${RUBY_EG}/drb/dqueue.rb
-${RUBY_EG}/drb/drbc.rb
-${RUBY_EG}/drb/drbch.rb
-${RUBY_EG}/drb/drbm.rb
-${RUBY_EG}/drb/drbmc.rb
-${RUBY_EG}/drb/drbs-acl.rb
-${RUBY_EG}/drb/drbs.rb
-${RUBY_EG}/drb/drbssl_c.rb
-${RUBY_EG}/drb/drbssl_s.rb
-${RUBY_EG}/drb/extserv_test.rb
-${RUBY_EG}/drb/gw_ct.rb
-${RUBY_EG}/drb/gw_cu.rb
-${RUBY_EG}/drb/gw_s.rb
-${RUBY_EG}/drb/holderc.rb
-${RUBY_EG}/drb/holders.rb
-${RUBY_EG}/drb/http0.rb
-${RUBY_EG}/drb/http0serv.rb
-${RUBY_EG}/drb/name.rb
-${RUBY_EG}/drb/namec.rb
-${RUBY_EG}/drb/old_tuplespace.rb
-${RUBY_EG}/drb/rinda_ts.rb
-${RUBY_EG}/drb/rindac.rb
-${RUBY_EG}/drb/rindas.rb
-${RUBY_EG}/drb/ring_echo.rb
-${RUBY_EG}/drb/ring_inspect.rb
-${RUBY_EG}/drb/ring_place.rb
-${RUBY_EG}/drb/simpletuple.rb
-${RUBY_EG}/drb/speedc.rb
-${RUBY_EG}/drb/speeds.rb
-${RUBY_EG}/dualstack-fetch.rb
-${RUBY_EG}/dualstack-httpd.rb
-${RUBY_EG}/erb/erb4html.rb
-${RUBY_EG}/eval.rb
-${RUBY_EG}/export.rb
-${RUBY_EG}/exyacc.rb
-${RUBY_EG}/fact.rb
-${RUBY_EG}/fib.awk
-${RUBY_EG}/fib.pl
-${RUBY_EG}/fib.py
-${RUBY_EG}/fib.rb
-${RUBY_EG}/fib.scm
-${RUBY_EG}/freq.rb
-${RUBY_EG}/from.rb
-${RUBY_EG}/fullpath.rb
-${RUBY_EG}/getopts.test
-${RUBY_EG}/less.rb
-${RUBY_EG}/list.rb
-${RUBY_EG}/list2.rb
-${RUBY_EG}/list3.rb
-${RUBY_EG}/logger/app.rb
-${RUBY_EG}/logger/log.rb
-${RUBY_EG}/logger/shifting.rb
-${RUBY_EG}/mine.rb
-${RUBY_EG}/mkproto.rb
-${RUBY_EG}/mpart.rb
-${RUBY_EG}/mrshtest.rb
-${RUBY_EG}/observ.rb
-${RUBY_EG}/occur.pl
-${RUBY_EG}/occur.rb
-${RUBY_EG}/occur2.rb
-${RUBY_EG}/openssl/c_rehash.rb
-${RUBY_EG}/openssl/cert2text.rb
-${RUBY_EG}/openssl/cert_store_view.rb
-${RUBY_EG}/openssl/certstore.rb
-${RUBY_EG}/openssl/cipher.rb
-${RUBY_EG}/openssl/crlstore.rb
-${RUBY_EG}/openssl/echo_cli.rb
-${RUBY_EG}/openssl/echo_svr.rb
-${RUBY_EG}/openssl/gen_csr.rb
-${RUBY_EG}/openssl/smime_read.rb
-${RUBY_EG}/openssl/smime_write.rb
-${RUBY_EG}/openssl/wget.rb
-${RUBY_EG}/optparse/opttest.rb
-${RUBY_EG}/optparse/subcommand.rb
-${RUBY_EG}/philos.rb
-${RUBY_EG}/pi.rb
-${RUBY_EG}/pty/expect_sample.rb
-${RUBY_EG}/pty/script.rb
-${RUBY_EG}/pty/shl.rb
-${RUBY_EG}/rcs.awk
-${RUBY_EG}/rcs.dat
-${RUBY_EG}/rcs.rb
-${RUBY_EG}/regx.rb
-${RUBY_EG}/rss/blend.rb
-${RUBY_EG}/rss/convert.rb
-${RUBY_EG}/rss/list_description.rb
-${RUBY_EG}/rss/re_read.rb
-${RUBY_EG}/rss/rss_recent.rb
-${RUBY_EG}/sieve.rb
-${RUBY_EG}/svr.rb
-${RUBY_EG}/test.rb
-${RUBY_EG}/testunit/adder.rb
-${RUBY_EG}/testunit/subtracter.rb
-${RUBY_EG}/testunit/tc_adder.rb
-${RUBY_EG}/testunit/tc_subtracter.rb
-${RUBY_EG}/testunit/ts_examples.rb
-${RUBY_EG}/time.rb
-${RUBY_EG}/trojan.rb
-${RUBY_EG}/tsvr.rb
-${RUBY_EG}/uumerge.rb
-${RUBY_EG}/webrick/demo-app.rb
-${RUBY_EG}/webrick/demo-multipart.cgi
-${RUBY_EG}/webrick/demo-servlet.rb
-${RUBY_EG}/webrick/demo-urlencoded.cgi
-${RUBY_EG}/webrick/hello.cgi
-${RUBY_EG}/webrick/hello.rb
-${RUBY_EG}/webrick/httpd.rb
-${RUBY_EG}/webrick/httpproxy.rb
-${RUBY_EG}/webrick/httpsd.rb
-@pkgdir ${RUBY_SITEARCHLIB}
-@pkgdir ${RUBY_VENDORARCHLIB}
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
deleted file mode 100644
index 77053b6a1ab..00000000000
--- a/lang/ruby18-base/distinfo
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: distinfo,v 1.65 2016/03/24 16:30:11 taca Exp $
-
-SHA1 (ruby-1.8.7-p374.tar.bz2) = cf82b6cbeed8e389705aa6b66c2a8141626705c3
-RMD160 (ruby-1.8.7-p374.tar.bz2) = 314efaa961c80c9294202c6e40dec0e38865ed94
-SHA512 (ruby-1.8.7-p374.tar.bz2) = c6859aec9a796c71bb30c18236bd5548826655b08312181376b8dae4a006575f711065f15a002329c5e62c1e1ee44bb86723138abb3b658c8958920f13a5adea
-Size (ruby-1.8.7-p374.tar.bz2) = 4250351 bytes
-SHA1 (patch-aa) = 9f0ffa6fd0bcf2f59eba2604d2b6a4aaad075231
-SHA1 (patch-ab) = 1466b6179cb6ac3a8ee3255eab98a1d3065a12ed
-SHA1 (patch-ac) = 0119134d778bb85c58ef5bfe30d337dc76ed47e0
-SHA1 (patch-ad) = 2b194a26f3a7b9bdf3afcc0819ab239479f47c5b
-SHA1 (patch-aw) = d3dc491da64426ff72a9417a65eb99bee2d21044
-SHA1 (patch-az) = 55c9cba404add5293168ae7fae7ae7aaf4df6550
-SHA1 (patch-bd) = 4bdf2230fd8a6ea21f28150ba5705ebd0db4af99
-SHA1 (patch-be) = 2286b14b5992686481d1d7a964c43cfc72118a45
-SHA1 (patch-dj) = 9d67b57daf6111361c478481f39ee8764a861106
-SHA1 (patch-dk) = ee85c9489f6074e6818713746691ce99ef778159
-SHA1 (patch-dl) = 0a5010f57e0f21170530fd4f940e66608c6d9630
-SHA1 (patch-dn) = 3cd429fcd4f48ad0ab784058a4ac8672f6ae17db
-SHA1 (patch-do) = d2b190074647a591106797922e2ec907f6b3efde
-SHA1 (patch-dp) = ebdc27a84c24d3373769250bf4b7052058f89d9b
-SHA1 (patch-dq) = 00ea4682b13ce3689def163c8ccda8a597a280fb
-SHA1 (patch-dr) = ed734e802f2d1cb59c2b49952d646849c9226d1e
-SHA1 (patch-ds) = e60434cb299d070289a3c80765187e4058a65f99
-SHA1 (patch-dt) = 59c09f6ea19cc02a1d8ca92a99eed7f8c30a5f10
-SHA1 (patch-du) = e3703b678f3b09f2878389a0a0ecbd453bae59d0
-SHA1 (patch-dv) = c3eeeaf6e52e27ce945d29494d42ee4d7b11a14b
-SHA1 (patch-dy) = 4daf6f49dbcc4f07dc43df811aec03639d636d8a
-SHA1 (patch-eb) = e5105edd12906a5599668e96a424132abe523871
-SHA1 (patch-ec) = 0fcd05fea21d480a6536e2f711021ac4c1448771
-SHA1 (patch-ed) = 70b8ec8b2d466a3868556cbe1c19bf50462bae6d
-SHA1 (patch-ee) = 8240954e7f07d94bd3e87abc1946ea5cef2d854a
-SHA1 (patch-ef) = ffc28b86ddce44483fcb7967fdc9a4483b61e0a0
-SHA1 (patch-eg) = 12e5fdc31adfc578cdbc3efec5b3d6fae58ad767
-SHA1 (patch-eh) = a6ff0e0baaf03b5bde8c98a91220dfbf4c08fc61
-SHA1 (patch-ei) = 95c921cecd9a6d5d4557066d2a160276a37634b0
-SHA1 (patch-ej) = c8f2c5dbf2ba463d852b94fecf6014bb5ef1e3f8
-SHA1 (patch-ek) = a5de28017bc57d4e01ec986b6a5602cba2b75670
-SHA1 (patch-el) = c071250196cff37c413e724ce4fc149b920e6dde
-SHA1 (patch-em) = 13ccef1c981c9bf312a104c9eb0a9e2339f38461
-SHA1 (patch-en) = 5f92c80c321149055b962a4c2ba97105c00706e2
-SHA1 (patch-eo) = 41a1ff4e1037415eb50373eff64322f6e1423e27
-SHA1 (patch-ep) = f881aece8ec0836c75df3be567d57ffc3ad8bce1
-SHA1 (patch-eq) = d9dfa070d1f12de4f5f48f07d5a32d649035a657
-SHA1 (patch-er) = 666fc6c22544c7f74f7c17ffef30563effcb4df7
-SHA1 (patch-et) = eba90415e5279c9eb8bea67635f5f8cab5d1e7ac
-SHA1 (patch-eu) = dbf65258dcdc619d220ab39864389c4ec4c5c625
-SHA1 (patch-ev) = 6178be681ca1cf2647cab9a61c8ef989ff5b23cb
-SHA1 (patch-ew) = 3f23697dddbb11a10d1f0c3e47fb602822ecd11f
-SHA1 (patch-ext_openssl_extconf.rb) = f6a5b4e989d7a8864cc49f68331613294cd6f95e
-SHA1 (patch-ext_tk_lib_tkextlib_tktable_tktable.rb) = a903dfbc1a7361bc11b643fb78f1365b4236a195
-SHA1 (patch-ga) = 73f50504baf74ee77d00dcfb5a9446bbaf122726
-SHA1 (patch-gb) = 345ad3e5df6fd9febe7b398f091662fd7c300dc4
-SHA1 (patch-lex.c) = 3bdbd6ccaebe3999fedfc16309657ae5da26fd2a
-SHA1 (patch-lib_rdoc_options.rb) = 0f14417733ad6fc6fbc93af1c8463ecd59abce7c
-SHA1 (patch-lib_rdoc_rdoc.rb) = bef895245cc06ca84fd1e5d506c3c65932921b3a
-SHA1 (patch-lib_rexml_entity.rb) = 5038826abfa6a56406fe369dfc74c9fe096665f6
diff --git a/lang/ruby18-base/files/CHANGES.pkgsrc b/lang/ruby18-base/files/CHANGES.pkgsrc
deleted file mode 100644
index 2a7bb02b49d..00000000000
--- a/lang/ruby18-base/files/CHANGES.pkgsrc
+++ /dev/null
@@ -1,263 +0,0 @@
-$NetBSD: CHANGES.pkgsrc,v 1.1 2005/11/02 08:56:40 taca Exp $
-
-Tue Nov  1 14:20:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call_super): should call method_missing if super is
-	  called from Kernel method.
-
-	* eval.c (exec_under): frame during eval should preserve external
-	  information.
-
-Tue Nov 01 10:50:17 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: should check ERR_peek_last_error().
-	  [ruby-dev:27597]
-
-	* ext/openssl/ossl.c (ossl_raise): ditto.
-
-Mon Oct 31 17:34:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: use proper option for Sun linker. A patch from
-	  Shinya Kuwamura <kuwa@labs.fujitsu.com>.  [ruby-dev:27603]
-
-Mon Oct 31 05:49:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must
-	  not be empty. [ruby-talk:161220]
-
-Mon Oct 31 05:37:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpservlet/cgihandler.rb
-	  (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie:
-	  header field should be splited into each cookie.  [ruby-Bugs:2199]
-
-	* lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookie): new method
-	  to parse the value of Set-Cookie: header field.
-
-Mon Oct 31 03:19:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_readline): type check.
-	  [ruby-core:6089] 
-
-	* util.h (strtod): add #undef for platforms defines strtod()
-	  macro.   [ruby-dev:27563]
-
-Thu Oct 27 16:45:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (scan_once): wrong condition to use mbclen2().
-	  [ruby-dev:27535]
-
-Wed Oct 26 09:27:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/implicit.c (syck_type_id_to_uri): should return
-	  newly allocated memory. otherwise, type_id will be freed
-	  twice. [ruby-dev:27384] [ruby-core:6385]
-
-Wed Oct 26 09:04:51 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ruby.h (Qfalse, Qtrue, Qnil, Qundef): make sure these immediate
-	  values have VALUE type. there is an environment where sizeof(VALUE)
-	  != sizeof(int) like IA64. if 32bit integer (Qtrue) is passed to ANYARGS
-	  and received by 64bit integer (VALUE), upper bits may have garbage value.
-	  [ruby-dev:27513]
-
-Tue Oct 25 15:32:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb.rb (IRB::Irb::eval_input): handle prompts with newlines
-	  in irb auto-indentation mode.  [ruby-core:06358]
-
-Sat Oct 22 13:26:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (sym_inspect), parse.y (parser_yylex, rb_symname_p): check
-	  if valid as a symbol name more strictly.  [ruby-dev:27478]
-
-	* time.c (rb_strftime): removed meaningless volatile modifiers, and
-	  concatenate successive nul characters at once.  [ruby-dev:27472]
-
-Fri Oct 21 19:21:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
-
-Fri Oct 21 15:27:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bignum.c (bignew_1): convertion from `int' to `char' discards
-	  upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
-	  nonzero and set 0 or 1 instead of simply casting ... as a flag usage.
-	  (but I believe this won't cause actual bug in current implementation)
-	  [ruby-dev:27055]
-
-	* time.c: should use LONG_LONG instead of `long long'.
-
-Thu Oct 20 00:13:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* rubysig.h (CHECK_INTS): fix typo.
-
-Wed Oct 19 08:28:32 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_join): elements may contain null pointer strings.
-	  report and fixed by Lloyd Zusman (hippoman): [ruby-core:06326]
-
-Wed Oct 19 02:34:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c, gc.c, time.c: made internal symbols static.  [ruby-dev:27435]
-
-Wed Oct 19 01:27:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): numeric literal inside character class
-	  disabled succeeding backtrack.  fixed: [ruby-list:41328]
-
-Mon Oct 17 16:04:47 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (chmod_internal, lchmod_internal): fixed type of 2nd argument.
-
-Sun Oct 16 22:16:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: omit non-existing directories.
-
-Sun Oct 16 03:38:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* rubysig.h (CHECK_INTS): prevent signal handler to run during
-	  critical section.  [ruby-core:04039]
-
-	* eval.c (load_wait): need not to call rb_thread_schedule()
-	  explicitly.  [ruby-core:04039]
-
-	* eval.c (rb_thread_schedule): clear rb_thread_critical.
-	  [ruby-core:04039]
-
-Fri Oct 14 16:57:32 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/config.rb (Config::FileHandler): :UserDir should be nil.
-	  It is harmful to permit the access to ~/public_html by default.
-	  suggested by Hiroyuki Iwatsuki.
-
-Wed Oct 12 12:52:57 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.c (Init_openssl): should call
-	  OpenSSL_add_ssl_algorithms().
-
-Tue Oct 11 21:41:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_obj_respond_to): check if obj responds to the given
-	  method with the given visibility.  [ruby-dev:27408]
-
-	* eval.c (rb_respond_to): conform to Object#respond_to?.  [ruby-dev:27411]
-
-Tue Oct 11 00:01:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.c (st_free_table): do not call free() but xfree().
-	  [ruby-core:06205]
-
-Sat Oct  8 20:04:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (Init_Binding): add Binding#dup method.  [yarv-dev:666]
-
-Fri Oct  7 09:54:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may
-	  not be parsed correctly.  A patch from August Z. Flatby
-	  (augustzf) in [ruby-Patches-2595].  [ruby-core:06183]
-
-Thu Oct  6 20:12:16 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c (strscan_free): remove useless code.
-	  [ruby-dev:26368] [ruby-dev:27389]
-	  (backported from trunk, rev 1.22)
-
-Wed Oct 05 04:42:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/xmlrpc/server.rb (XMLRPC::Server#initialize): should mount the
-	  servlet on "/".
-
-Wed Oct 05 03:59:09 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
-	  of "join".
-
-Mon Oct  3 00:04:00 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* pack.c (EXTEND16): [ruby-dev:27383]
-
-Thu Sep 29 10:26:18 2005  Tanaka Akira  <akr@m17n.org>
-
-	* ext/dl/dl.c (rb_io_to_ptr): abolish sizeof(FILE).
-	  [ruby-dev:27317]
-
-Thu Sep 29 07:22:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* evalc. (rb_f_send): underscores need to be escaped.
-	  fixed by Doug Kearns.  [ruby-core:06053]
-
-Thu Sep 29 00:57:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ev_const_get), variable.c (rb_const_get_0): retry only when
-	  autoload succeeded.
-
-	* variable.c (rb_autoload_load): now return true if autoload
-	  succeeded.  fixed: [ruby-dev:27331]
-
-Wed Sep 28 23:42:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (apply2files): add prototype.
-
-	* file.c (rb_stat_inspect): constified.
-
-Wed Sep 28 15:14:19 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/cgi.rb (WEBrick::CGI#start): req.query_string should
-	  refer the value of QUERY_STRING. [ruby-list:41186]
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#query_string=):
-	  add new method.
-
-Wed Sep 28 10:45:44 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: cannot compile with Tcl/Tk8.0.x
-	  [ruby-dev:27335].
-
-Wed Sep 28 08:12:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (read_buffered_data): check if reached EOF.  fixed: [ruby-dev:27334]
-
-Wed Sep 28 07:56:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo.
-	  [ruby-dev:27237], [ruby-core:05854]
-
-	* lib/yaml/tag.rb (Module#yaml_as): suppress warnings.
-
-	* lib/yaml/types.rb (YAML::PrivateType, YAML::DomainType): ditto.
-
-Wed Sep 28 03:23:35 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* rubysig.h: fixed build problem with --enable-pthread on platforms
-	  which don't have setitimer().
-
-Mon Sep 26 22:32:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (set_trace_func): add rb_secure(4) to prevent adding
-	  tracing function.
-
-Tue Oct 25 02:12:08 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE):
-	  reduce redundant backtrack.  [ruby-talk:161771]
-
-Sun Sep 25 00:18:11 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (unknown_node): show more information.  [ruby-dev:26196]
-
-Sat Sep 24 08:56:01 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (cd): no longer accept :noop option, related
-	  code is useless (backported from trunk, rev 1.67).
-	  [ruby-core:05858] [ruby-Bugs:2494]
-
-Sat Sep 24 08:38:07 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
-	  DryRun (backported from trunk, rev 1.66). [ruby-core:05954]
-
-Sun Oct 23 07:11:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/*: ditto.
diff --git a/lang/ruby18-base/hacks.mk b/lang/ruby18-base/hacks.mk
deleted file mode 100644
index 959a9cd36c3..00000000000
--- a/lang/ruby18-base/hacks.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: hacks.mk,v 1.2 2006/03/22 23:05:39 taca Exp $
-
-.if !defined(RUBY18_BASE_HACKS_MK)
-RUBY18_BASE_HACKS_MK=	defined
-
-.include "../../mk/compiler.mk"
-
-### [ Sun Jun  5 10:05:39 CEST 2005 : seb ]
-### On NetBSD/sparc64, gcc optimisation, at least for version 3.3.3,
-### produces segmentation faulting miniruby binary.
-### Also note that `-O' level optimisation produces a miniruby
-### binary that loops while running the installation scripts.
-###
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
-.  if !empty(CC_VERSION:Mgcc-3.3.*)
-PKG_HACKS+=		optimisation
-BUILDLINK_TRANSFORM+=	rm:-O[0-9]*
-.  endif
-.endif
-
-.endif	# RUBY18_BASE_HACKS_MK
diff --git a/lang/ruby18-base/options.mk b/lang/ruby18-base/options.mk
deleted file mode 100644
index 66e71603902..00000000000
--- a/lang/ruby18-base/options.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.8 2010/09/10 03:29:00 taca Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.ruby
-PKG_SUPPORTED_OPTIONS=	readline ruby-build-ri-db
-PKG_SUGGESTED_OPTIONS=	readline ruby-build-ri-db
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mruby-build-ri-db)
-BUILD_TARGET=	all rdoc
-CONFIGURE_ARGS+=	--enable-install-doc
-RUBY_DYNAMIC_DIRS+=	${RUBY_SYSRIDIR}
-# Use huge memory.
-UNLIMIT_RESOURCES+=	datasize
-.endif
diff --git a/lang/ruby18-base/patches/patch-aa b/lang/ruby18-base/patches/patch-aa
deleted file mode 100644
index dcfab2f9148..00000000000
--- a/lang/ruby18-base/patches/patch-aa
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-aa,v 1.15 2012/07/25 20:25:50 bsiegert Exp $
-
-* Adding Interix and MirBSD support.
-
---- configure.in.orig	Fri Feb 18 10:37:23 2011
-+++ configure.in
-@@ -456,6 +456,9 @@ bsdi*)          LIBS="-lm $LIBS"
- 		AC_DEFINE(BROKEN_SETREUID, 1)
- 		AC_DEFINE(BROKEN_SETREGID, 1)
-                 ac_cv_sizeof_rlim_t=8;;
-+interix3*)	LIBS="-lm $LIBS"
-+		ac_cv_func_getpgrp_void=yes
-+		;;
- freebsd*)	LIBS="-lm $LIBS"
- 		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
- 		  rb_cv_lib_xpg4_needed,
-@@ -1232,6 +1235,13 @@ if test "$with_dln_a_out" != yes; then
- 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
- 			fi
- 			rb_cv_dlopen=yes ;;
-+	interix3*)	: ${LDSHARED='${CC} -shared'}
-+			LDFLAGS="$LDFLAGS -Wl,-E"
-+			# use special random-slot linkage in 0x[56]XXXXXXX
-+			DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
-+			LIBPATHFLAG=' -L%1$-s'
-+			RPATHFLAG=' -Wl,-R%1$-s'
-+			rb_cv_dlopen=yes ;;
- 	interix*) 	: ${LDSHARED="$CC -shared"}
- 			XLDFLAGS="$XLDFLAGS -Wl,-E"
- 			LIBPATHFLAG=" -L%1\$-s"
-@@ -1244,7 +1254,7 @@ if test "$with_dln_a_out" != yes; then
- 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
- 			fi
- 			rb_cv_dlopen=yes ;;
--	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
-+	openbsd*|mirbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
- 			if test "$rb_cv_binary_elf" = yes; then
- 			    LDFLAGS="$LDFLAGS -Wl,-E"
- 			fi
-@@ -1545,7 +1555,7 @@ if test "$enable_shared" = 'yes'; then
- 	   LIBRUBY_ALIASES=""
- 	fi
-  	;;
--    openbsd*)
-+    openbsd*|mirbsd*)
- 	SOLIBS='$(LIBS)'
- 	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
- 	;;
-@@ -1581,6 +1591,14 @@ if test "$enable_shared" = 'yes'; then
- 	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
- 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
- 	;;
-+    interix3*)
-+	SOLIBS='$(LIBS)'
-+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
-+	# link explicitly to 0x48000000
-+	LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
-+	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
-+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
-+ 	;;
-     interix*)
- 	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
- 	;;
-@@ -1590,6 +1608,7 @@ if test "$enable_shared" = 'yes'; then
- fi
- if test "$enable_rpath" = yes; then
-     LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
-+    LIBRUBY_DLDFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBY_DLDFLAGS"
- fi
- 
- LDFLAGS="-L. $LDFLAGS"
diff --git a/lang/ruby18-base/patches/patch-ab b/lang/ruby18-base/patches/patch-ab
deleted file mode 100644
index b690710f062..00000000000
--- a/lang/ruby18-base/patches/patch-ab
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ab,v 1.15 2012/07/25 20:25:50 bsiegert Exp $
-
-* Adding Interix and MirBSD support.
-
---- configure.orig	Fri Jun 29 13:18:00 2012
-+++ configure
-@@ -6212,6 +6212,9 @@ bsdi*)          LIBS="-lm $LIBS"
- 		$as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
- 
-                 ac_cv_sizeof_rlim_t=8;;
-+interix3*)	LIBS="-lm $LIBS"
-+		ac_cv_func_getpgrp_void=yes
-+		;;
- freebsd*)	LIBS="-lm $LIBS"
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lxpg4 has to be linked" >&5
- $as_echo_n "checking whether -lxpg4 has to be linked... " >&6; }
-@@ -10212,6 +10215,13 @@ fi
- 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
- 			fi
- 			rb_cv_dlopen=yes ;;
-+	interix3*)	: ${LDSHARED='${CC} -shared'}
-+			LDFLAGS="$LDFLAGS -Wl,-E"
-+			# use special random-slot linkage in 0x[56]XXXXXXX
-+			DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
-+			LIBPATHFLAG=' -L%1$-s'
-+			RPATHFLAG=' -Wl,-R%1$-s'
-+			rb_cv_dlopen=yes ;;
- 	interix*) 	: ${LDSHARED="$CC -shared"}
- 			XLDFLAGS="$XLDFLAGS -Wl,-E"
- 			LIBPATHFLAG=" -L%1\$-s"
-@@ -10224,7 +10234,7 @@ fi
- 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
- 			fi
- 			rb_cv_dlopen=yes ;;
--	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
-+	openbsd*|mirbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
- 			if test "$rb_cv_binary_elf" = yes; then
- 			    LDFLAGS="$LDFLAGS -Wl,-E"
- 			fi
-@@ -10704,7 +10714,7 @@ if test "$enable_shared" = 'yes'; then
- 	   LIBRUBY_ALIASES=""
- 	fi
-  	;;
--    openbsd*)
-+    openbsd*|mirbsd*)
- 	SOLIBS='$(LIBS)'
- 	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
- 	;;
-@@ -10740,6 +10750,14 @@ if test "$enable_shared" = 'yes'; then
- 	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
- 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
- 	;;
-+    interix3*)
-+	SOLIBS='$(LIBS)'
-+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
-+	# link explicitly to 0x48000000
-+	LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
-+	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
-+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
-+ 	;;
-     interix*)
- 	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
- 	;;
-@@ -10749,6 +10767,7 @@ if test "$enable_shared" = 'yes'; then
- fi
- if test "$enable_rpath" = yes; then
-     LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
-+    LIBRUBY_DLDFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBY_DLDFLAGS"
- fi
- 
- LDFLAGS="-L. $LDFLAGS"
diff --git a/lang/ruby18-base/patches/patch-ac b/lang/ruby18-base/patches/patch-ac
deleted file mode 100644
index 016d4443c3e..00000000000
--- a/lang/ruby18-base/patches/patch-ac
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2010/06/02 13:27:57 taca Exp $
-
-* Accept db3, db4 or db5 as include/library.
-
---- ext/dbm/extconf.rb.orig	2007-02-12 23:01:19.000000000 +0000
-+++ ext/dbm/extconf.rb
-@@ -5,13 +5,16 @@ dir_config("dbm")
- if dblib = with_config("dbm-type", nil)
-   dblib = dblib.split(/[ ,]+/)
- else
--  dblib = %w(db db2 db1 dbm gdbm gdbm_compat qdbm)
-+  dblib = %w(db db2 db1 db4 db3 dbm gdbm gdbm_compat qdbm)
- end
- 
- headers = {
-   "db" => ["db.h"],
-   "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
-   "db2" => ["db2/db.h", "db2.h", "db.h"],
-+  "db3" => ["db3/db.h", "db3.h", "db.h"],
-+  "db4" => ["db4/db.h", "db4.h", "db.h"],
-+  "db5" => ["db5/db.h", "db5.h", "db.h"],
-   "dbm" => ["ndbm.h"],
-   "gdbm" => ["gdbm-ndbm.h", "ndbm.h"],
-   "gdbm_compat" => ["gdbm-ndbm.h", "ndbm.h"],
-@@ -24,7 +27,7 @@ def headers.db_check(db)
-   hsearch = nil
- 
-   case db
--  when /^db2?$/
-+  when /^db[2-5]?$/
-     db_prefix = "__db_n"
-     hsearch = "-DDB_DBM_HSEARCH "
-   when "gdbm"
-@@ -36,7 +39,8 @@ def headers.db_check(db)
-   db_prefix ||= ""
- 
-   if (have_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and
--      hdr = self.fetch(db, ["ndbm.h"]).find {|hdr| have_type("DBM", hdr, hsearch)}
-+      (hdr = self.fetch(db, ["ndbm.h"]).find {|hdr| have_type("DBM", hdr, hsearch)} or
-+       hdr = self.fetch(db, ["ndbm.h"]).find {|hdr| have_type("DBM", ["db.h", hdr], hsearch)})
-     have_func(db_prefix+"dbm_clearerr") unless have_gdbm
-     $defs << hsearch if hsearch
-     $defs << '-DDBM_HDR="<'+hdr+'>"'
diff --git a/lang/ruby18-base/patches/patch-ad b/lang/ruby18-base/patches/patch-ad
deleted file mode 100644
index b462b14dfbe..00000000000
--- a/lang/ruby18-base/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.11 2010/09/10 03:29:00 taca Exp $
-
-* Fix warnings.
-* Fix for pthread: r26440
-
---- eval.c.orig	2010-06-10 04:38:43.000000000 +0000
-+++ eval.c
-@@ -779,7 +779,7 @@ static unsigned long frame_unique = 0;
-     _frame.argc = 0;			\
-     _frame.flags = 0;			\
-     _frame.uniq = frame_unique++;	\
--    ruby_frame = &_frame
-+    ruby_frame = (struct FRAME *)&_frame
- 
- #define POP_FRAME()  			\
-     ruby_current_node = _frame.node;	\
-@@ -12250,7 +12250,9 @@ rb_thread_alloc(klass)
-     return th;
- }
- 
-+#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
- static int thread_init;
-+#endif
- 
- #if defined(POSIX_SIGNAL)
- #define CATCH_VTALRM() posix_signal(SIGVTALRM, catch_timer)
diff --git a/lang/ruby18-base/patches/patch-aw b/lang/ruby18-base/patches/patch-aw
deleted file mode 100644
index 3e4e2b27c5b..00000000000
--- a/lang/ruby18-base/patches/patch-aw
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aw,v 1.3 2010/09/10 03:29:00 taca Exp $
-
-* r26786: (get_device_once): raise on error when fail is non-zero.
-
---- ext/pty/pty.c.orig	2008-04-15 03:35:55.000000000 +0000
-+++ ext/pty/pty.c
-@@ -369,7 +369,7 @@ get_device_once(master, slave, SlaveName
- 	}
- 	close(i);
-     }
--    if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
-+    if (fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
-     return -1;
- #else
-     char **p;
diff --git a/lang/ruby18-base/patches/patch-az b/lang/ruby18-base/patches/patch-az
deleted file mode 100644
index 8470e023cbe..00000000000
--- a/lang/ruby18-base/patches/patch-az
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-az,v 1.4 2010/09/10 03:29:00 taca Exp $
-
-Fix IO#readpartial test failure.
-
---- io.c.orig	2010-06-08 09:02:21.000000000 +0000
-+++ io.c
-@@ -120,9 +120,6 @@ extern void Init_File _((void));
- # endif
- #endif
- 
--#define preserving_errno(stmts) \
--	do {int saved_errno = errno; stmts; errno = saved_errno;} while (0)
--
- VALUE rb_cIO;
- VALUE rb_eEOFError;
- VALUE rb_eIOError;
-@@ -491,7 +488,16 @@ io_fwrite(str, fptr)
- 	r = write(fileno(f), RSTRING(str)->ptr+offset, l);
-         TRAP_END;
- #if BSD_STDIO
--	preserving_errno(fseeko(f, lseek(fileno(f), (off_t)0, SEEK_CUR), SEEK_SET));
-+	{
-+	    int saved_errno;
-+	    off_t pos;
-+
-+	    saved_errno = errno;
-+	    pos = lseek(fileno(f), (off_t)0, SEEK_CUR);
-+	    if (pos != -1)
-+		fseeko(f, pos, SEEK_SET);
-+	    errno = saved_errno;
-+	}
- #endif
-         if (r == n) return len;
-         if (0 <= r) {
-@@ -1300,8 +1306,13 @@ io_getpartial(int argc, VALUE *argv, VAL
-                 goto again;
-             rb_sys_fail(fptr->path);
-         }
--        if (fptr->f) /* update pos in FILE structure [ruby-core:21561] */
-+        if (fptr->f) { /* update pos in FILE structure [ruby-core:21561] */
-             fflush(fptr->f);
-+#if defined(__SOFF) && defined(__NetBSD__)
-+	    fptr->f->_flags &= ~__SOFF;
-+	    (void)io_tell(fptr);
-+#endif
-+	}
-     }
-     rb_str_resize(str, n);
- 
diff --git a/lang/ruby18-base/patches/patch-bd b/lang/ruby18-base/patches/patch-bd
deleted file mode 100644
index a82122d9ae7..00000000000
--- a/lang/ruby18-base/patches/patch-bd
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-bd,v 1.4 2010/09/10 03:29:00 taca Exp $
-
-Suppress warnings.
-
---- ext/openssl/ossl.c.orig	2010-06-21 09:18:59.000000000 +0000
-+++ ext/openssl/ossl.c
-@@ -15,7 +15,7 @@
-  * String to HEXString conversion
-  */
- int
--string2hex(char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
-+string2hex(const unsigned char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
- {
-     static const char hex[]="0123456789abcdef";
-     int i, len = 2 * buf_len;
-@@ -464,7 +464,7 @@ Init_openssl()
-     /*
-      * Verify callback Proc index for ext-data
-      */
--    if ((ossl_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, "ossl_verify_cb_idx", 0, 0, 0)) < 0)
-+    if ((ossl_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, (void *)"ossl_verify_cb_idx", 0, 0, 0)) < 0)
-         ossl_raise(eOSSLError, "X509_STORE_CTX_get_ex_new_index");
- 
-     /*
-@@ -506,7 +506,7 @@ Init_openssl()
-  * Check if all symbols are OK with 'make LDSHARED=gcc all'
-  */
- int
--main(int argc, char *argv[], char *env[])
-+main(int argc, char *argv[])
- {
-     return 0;
- }
diff --git a/lang/ruby18-base/patches/patch-be b/lang/ruby18-base/patches/patch-be
deleted file mode 100644
index eb7267b30a0..00000000000
--- a/lang/ruby18-base/patches/patch-be
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD: patch-be,v 1.4 2010/09/10 03:29:00 taca Exp $
-
-Suppress warnings.
-
---- ext/openssl/ossl_cipher.c.orig	2010-05-24 23:58:49.000000000 +0000
-+++ ext/openssl/ossl_cipher.c
-@@ -188,7 +188,7 @@ ossl_cipher_init(int argc, VALUE *argv, 
- 	 * We deprecated the arguments for this method, but we decided
- 	 * keeping this behaviour for backward compatibility.
- 	 */
--	char *cname  = rb_class2name(rb_obj_class(self));
-+	const char *cname  = rb_class2name(rb_obj_class(self));
- 	rb_warn("argumtents for %s#encrypt and %s#decrypt were deprecated; "
-                 "use %s#pkcs5_keyivgen to derive key and IV",
-                 cname, cname, cname);
-@@ -204,7 +204,7 @@ ossl_cipher_init(int argc, VALUE *argv, 
- 	    else memcpy(iv, RSTRING_PTR(init_v), sizeof(iv));
- 	}
- 	EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
--		       RSTRING_PTR(pass), RSTRING_LEN(pass), 1, key, NULL);
-+		       (unsigned char *)RSTRING_PTR(pass), RSTRING_LEN(pass), 1, key, NULL);
- 	p_key = key;
- 	p_iv = iv;
-     }
-@@ -281,13 +281,13 @@ ossl_cipher_pkcs5_keyivgen(int argc, VAL
- 	StringValue(vsalt);
- 	if(RSTRING_LEN(vsalt) != PKCS5_SALT_LEN)
- 	    rb_raise(eCipherError, "salt must be an 8-octet string");
--	salt = RSTRING_PTR(vsalt);
-+	salt = (unsigned char *)RSTRING_PTR(vsalt);
-     }
-     iter = NIL_P(viter) ? 2048 : NUM2INT(viter);
-     digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest);
-     GetCipher(self, ctx);
-     EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt,
--		   RSTRING_PTR(vpass), RSTRING_LEN(vpass), iter, key, iv); 
-+		   (unsigned char *)RSTRING_PTR(vpass), RSTRING_LEN(vpass), iter, key, iv); 
-     if (EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, -1) != 1)
- 	ossl_raise(eCipherError, NULL);
-     OPENSSL_cleanse(key, sizeof key);
-@@ -309,7 +309,7 @@ ossl_cipher_pkcs5_keyivgen(int argc, VAL
- static VALUE
- ossl_cipher_update_deprecated(VALUE self, VALUE data)
- {
--    char *cname;
-+    const char *cname;
- 
-     cname = rb_class2name(rb_obj_class(self));
-     rb_warning("%s#<< is deprecated; use %s#update instead", cname, cname);
-@@ -329,14 +329,14 @@ static VALUE 
- ossl_cipher_update(int argc, VALUE *argv, VALUE self)
- {
-     EVP_CIPHER_CTX *ctx;
--    char *in;
-+    unsigned char *in;
-     int in_len, out_len;
-     VALUE data, str;
- 
-     rb_scan_args(argc, argv, "11", &data, &str);
- 
-     StringValue(data);
--    in = RSTRING_PTR(data);
-+    in = (unsigned char *)RSTRING_PTR(data);
-     if ((in_len = RSTRING_LEN(data)) == 0)
-         rb_raise(rb_eArgError, "data must not be empty");
-     GetCipher(self, ctx);
-@@ -349,7 +349,7 @@ ossl_cipher_update(int argc, VALUE *argv
-         rb_str_resize(str, out_len);
-     }
- 
--    if (!EVP_CipherUpdate(ctx, RSTRING_PTR(str), &out_len, in, in_len))
-+    if (!EVP_CipherUpdate(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len))
- 	ossl_raise(eCipherError, NULL);
-     assert(out_len < RSTRING_LEN(str));
-     rb_str_set_len(str, out_len);
-@@ -374,7 +374,7 @@ ossl_cipher_final(VALUE self)
- 
-     GetCipher(self, ctx);
-     str = rb_str_new(0, EVP_CIPHER_CTX_block_size(ctx));
--    if (!EVP_CipherFinal_ex(ctx, RSTRING_PTR(str), &out_len))
-+    if (!EVP_CipherFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), &out_len))
- 	ossl_raise(eCipherError, NULL);
-     assert(out_len <= RSTRING_LEN(str));
-     rb_str_set_len(str, out_len);
-@@ -417,7 +417,7 @@ ossl_cipher_set_key(VALUE self, VALUE ke
-     if (RSTRING_LEN(key) < EVP_CIPHER_CTX_key_length(ctx))
-         ossl_raise(eCipherError, "key length too short");
- 
--    if (EVP_CipherInit_ex(ctx, NULL, NULL, RSTRING_PTR(key), NULL, -1) != 1)
-+    if (EVP_CipherInit_ex(ctx, NULL, NULL, (unsigned char *)RSTRING_PTR(key), NULL, -1) != 1)
-         ossl_raise(eCipherError, NULL);
- 
-     return key;
-@@ -442,7 +442,7 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
-     if (RSTRING_LEN(iv) < EVP_CIPHER_CTX_iv_length(ctx))
-         ossl_raise(eCipherError, "iv length too short");
- 
--    if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, RSTRING_PTR(iv), -1) != 1)
-+    if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, (unsigned char *)RSTRING_PTR(iv), -1) != 1)
- 	ossl_raise(eCipherError, NULL);
- 
-     return iv;
diff --git a/lang/ruby18-base/patches/patch-dj b/lang/ruby18-base/patches/patch-dj
deleted file mode 100644
index 646dea971d1..00000000000
--- a/lang/ruby18-base/patches/patch-dj
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-dj,v 1.5 2010/09/10 03:29:00 taca Exp $
-
-* r18172: suppress warnings.
-* r18943: (ossl_ocspreq_initialize): fix for initialization of r18168.
-* r18975: (ossl_ocspres_initialize): fix for initialization of r18168.
-
---- ext/openssl/ossl_ocsp.c.orig	2010-05-24 23:58:49.000000000 +0000
-+++ ext/openssl/ossl_ocsp.c
-@@ -103,15 +103,17 @@ static VALUE
- ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
- {
-     VALUE arg;
--    unsigned char *p;
-+    const unsigned char *p;
- 
-     rb_scan_args(argc, argv, "01", &arg);
-     if(!NIL_P(arg)){
-+	OCSP_REQUEST *req = DATA_PTR(self), *x;
- 	arg = ossl_to_der_if_possible(arg);
- 	StringValue(arg);
- 	p = (unsigned char*)RSTRING_PTR(arg);
--	if(!d2i_OCSP_REQUEST((OCSP_REQUEST**)&DATA_PTR(self), &p,
--			     RSTRING_LEN(arg))){
-+	x = d2i_OCSP_REQUEST(&req, &p, RSTRING_LEN(arg));
-+	DATA_PTR(self) = req;
-+	if(!x){
- 	    ossl_raise(eOCSPError, "cannot load DER encoded request");
- 	}
-     }
-@@ -134,7 +136,7 @@ ossl_ocspreq_add_nonce(int argc, VALUE *
-     else{
- 	StringValue(val);
- 	GetOCSPReq(self, req);
--	ret = OCSP_request_add1_nonce(req, RSTRING_PTR(val), RSTRING_LEN(val));
-+	ret = OCSP_request_add1_nonce(req, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
-     }
-     if(!ret) ossl_raise(eOCSPError, NULL);
- 
-@@ -265,7 +267,7 @@ ossl_ocspreq_to_der(VALUE self)
-     if((len = i2d_OCSP_REQUEST(req, NULL)) <= 0)
- 	ossl_raise(eOCSPError, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if(i2d_OCSP_REQUEST(req, &p) <= 0)
- 	ossl_raise(eOCSPError, NULL);
-     ossl_str_adjust(str, p);
-@@ -310,15 +312,17 @@ static VALUE
- ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self)
- {
-     VALUE arg;
--    unsigned char *p;
-+    const unsigned char *p;
- 
-     rb_scan_args(argc, argv, "01", &arg);
-     if(!NIL_P(arg)){
-+	OCSP_RESPONSE *res = DATA_PTR(self), *x;
- 	arg = ossl_to_der_if_possible(arg);
- 	StringValue(arg);
--	p = RSTRING_PTR(arg);
--	if(!d2i_OCSP_RESPONSE((OCSP_RESPONSE**)&DATA_PTR(self), &p,
--			      RSTRING_LEN(arg))){
-+	p = (unsigned char *)RSTRING_PTR(arg);
-+	x = d2i_OCSP_RESPONSE(&res, &p, RSTRING_LEN(arg));
-+	DATA_PTR(self) = res;
-+	if(!x){
- 	    ossl_raise(eOCSPError, "cannot load DER encoded response");
- 	}
-     }
-@@ -377,7 +381,7 @@ ossl_ocspres_to_der(VALUE self)
-     if((len = i2d_OCSP_RESPONSE(res, NULL)) <= 0)
- 	ossl_raise(eOCSPError, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if(i2d_OCSP_RESPONSE(res, &p) <= 0)
- 	ossl_raise(eOCSPError, NULL);
-     ossl_str_adjust(str, p);
-@@ -436,7 +440,7 @@ ossl_ocspbres_add_nonce(int argc, VALUE 
-     else{
- 	StringValue(val);
- 	GetOCSPBasicRes(self, bs);
--	ret = OCSP_basic_add1_nonce(bs, RSTRING_PTR(val), RSTRING_LEN(val));
-+	ret = OCSP_basic_add1_nonce(bs, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
-     }
-     if(!ret) ossl_raise(eOCSPError, NULL);
- 
diff --git a/lang/ruby18-base/patches/patch-dk b/lang/ruby18-base/patches/patch-dk
deleted file mode 100644
index 02fca349d94..00000000000
--- a/lang/ruby18-base/patches/patch-dk
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-dk,v 1.2 2010/09/10 03:29:00 taca Exp $
-
-* r18172: suppress warnings.
-* r18181: (d2i_of_void): define for older versions. [ruby-dev:35637]
-* r26835: backport fixes in 1.9.
-
---- ext/openssl/openssl_missing.h.orig	2010-05-24 23:58:49.000000000 +0000
-+++ ext/openssl/openssl_missing.h
-@@ -28,7 +28,7 @@ typedef int i2d_of_void();
- 
- #if !defined(PEM_read_bio_DSAPublicKey)
- # define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
--        (char *(*)())d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(char **)x,cb,u)
-+	(d2i_of_void *)d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(void **)x,cb,u)
- #endif
- 
- #if !defined(PEM_write_bio_DSAPublicKey)
-@@ -40,27 +40,27 @@ typedef int i2d_of_void();
- 
- #if !defined(DSAPrivateKey_dup)
- # define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPrivateKey, \
--	(char *(*)())d2i_DSAPrivateKey,(char *)dsa)
-+	(d2i_of_void *)d2i_DSAPrivateKey,(char *)dsa)
- #endif
- 
- #if !defined(DSAPublicKey_dup)
- # define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPublicKey, \
--	(char *(*)())d2i_DSAPublicKey,(char *)dsa)
-+	(d2i_of_void *)d2i_DSAPublicKey,(char *)dsa)
- #endif
- 
- #if !defined(X509_REVOKED_dup)
- # define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
--	(char *(*)())d2i_X509_REVOKED, (char *)rev)
-+	(d2i_of_void *)d2i_X509_REVOKED, (char *)rev)
- #endif
- 
- #if !defined(PKCS7_SIGNER_INFO_dup)
- #  define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_SIGNER_INFO, \
--	(char *(*)())d2i_PKCS7_SIGNER_INFO, (char *)si)
-+	(d2i_of_void *)d2i_PKCS7_SIGNER_INFO, (char *)si)
- #endif
- 
- #if !defined(PKCS7_RECIP_INFO_dup)
- #  define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_RECIP_INFO, \
--	(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
-+	(d2i_of_void *)d2i_PKCS7_RECIP_INFO, (char *)ri)
- #endif
- 
- #if !defined(HAVE_EVP_MD_CTX_INIT)
diff --git a/lang/ruby18-base/patches/patch-dl b/lang/ruby18-base/patches/patch-dl
deleted file mode 100644
index a446ae7e648..00000000000
--- a/lang/ruby18-base/patches/patch-dl
+++ /dev/null
@@ -1,179 +0,0 @@
-$NetBSD: patch-dl,v 1.2 2010/09/10 03:29:00 taca Exp $
-
-* r18172: suppress warnings.
-* r26835: backport fixes in 1.9.
-
---- ext/openssl/ossl_asn1.c.orig	2010-05-24 23:58:49.000000000 +0000
-+++ ext/openssl/ossl_asn1.c
-@@ -33,7 +33,7 @@ asn1time_to_time(ASN1_TIME *time)
- 	
-     switch (time->type) {
-     case V_ASN1_UTCTIME:
--	if (sscanf(time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
-+	if (sscanf((const char *)time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
-     		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
- 	    ossl_raise(rb_eTypeError, "bad UTCTIME format");
- 	} 
-@@ -44,7 +44,7 @@ asn1time_to_time(ASN1_TIME *time)
- 	}
- 	break;
-     case V_ASN1_GENERALIZEDTIME:
--	if (sscanf(time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
-+	if (sscanf((const char *)time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
-     		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
- 	    ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format" );
- 	} 
-@@ -80,7 +80,7 @@ time_to_time_t(VALUE time)
- VALUE
- asn1str_to_str(ASN1_STRING *str)
- {
--    return rb_str_new(str->data, str->length);
-+    return rb_str_new((const char *)str->data, str->length);
- }
- 
- /*
-@@ -214,7 +214,7 @@ obj_to_asn1bstr(VALUE obj, long unused_b
-     StringValue(obj);
-     if(!(bstr = ASN1_BIT_STRING_new()))
- 	ossl_raise(eASN1Error, NULL);
--    ASN1_BIT_STRING_set(bstr, RSTRING_PTR(obj), RSTRING_LEN(obj));
-+    ASN1_BIT_STRING_set(bstr, (unsigned char *)RSTRING_PTR(obj), RSTRING_LEN(obj));
-     bstr->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
-     bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07);
- 
-@@ -307,7 +307,7 @@ static VALUE
- decode_bool(unsigned char* der, int length)
- {
-     int val;
--    unsigned char *p;
-+    const unsigned char *p;
- 
-     p = der;
-     if((val = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
-@@ -320,7 +320,7 @@ static VALUE
- decode_int(unsigned char* der, int length)
- {
-     ASN1_INTEGER *ai;
--    unsigned char *p;
-+    const unsigned char *p;
-     VALUE ret; 
-     int status = 0;
- 
-@@ -360,7 +360,7 @@ static VALUE
- decode_enum(unsigned char* der, int length)
- {
-     ASN1_ENUMERATED *ai;
--    unsigned char *p;
-+    const unsigned char *p;
-     VALUE ret; 
-     int status = 0;
- 
-@@ -379,7 +379,7 @@ static VALUE
- decode_null(unsigned char* der, int length)
- {
-     ASN1_NULL *null;
--    unsigned char *p;
-+    const unsigned char *p;
- 
-     p = der;
-     if(!(null = d2i_ASN1_NULL(NULL, &p, length)))
-@@ -393,7 +393,7 @@ static VALUE
- decode_obj(unsigned char* der, int length)
- {
-     ASN1_OBJECT *obj;
--    unsigned char *p;
-+    const unsigned char *p;
-     VALUE ret;
-     int nid;
-     BIO *bio;
-@@ -422,7 +422,7 @@ static VALUE
- decode_time(unsigned char* der, int length)
- {
-     ASN1_TIME *time;
--    unsigned char *p;
-+    const unsigned char *p;
-     VALUE ret;
-     int status = 0;
- 
-@@ -697,7 +697,7 @@ ossl_asn1data_to_der(VALUE self)
-     if((length = ASN1_object_size(1, RSTRING_LEN(value), tag)) <= 0)
- 	ossl_raise(eASN1Error, NULL);
-     der = rb_str_new(0, length);
--    p = RSTRING_PTR(der);
-+    p = (unsigned char *)RSTRING_PTR(der);
-     ASN1_put_object(&p, is_cons, RSTRING_LEN(value), tag, tag_class);
-     memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
-     p += RSTRING_LEN(value);
-@@ -711,6 +711,7 @@ ossl_asn1_decode0(unsigned char **pp, lo
- 		  int once, int yield)
- {
-     unsigned char *start, *p;
-+    const unsigned char *p0;
-     long len, off = *offset;
-     int hlen, tag, tc, j;
-     VALUE ary, asn1data, value, tag_class;
-@@ -719,7 +720,9 @@ ossl_asn1_decode0(unsigned char **pp, lo
-     p = *pp;
-     while(length > 0){
- 	start = p;
--	j = ASN1_get_object(&p, &len, &tag, &tc, length);
-+	p0 = p;
-+	j = ASN1_get_object(&p0, &len, &tag, &tc, length);
-+	p = (unsigned char *)p0;
- 	if(j & 0x80) ossl_raise(eASN1Error, NULL);
- 	hlen = p - start;
- 	if(yield){
-@@ -754,7 +757,7 @@ ossl_asn1_decode0(unsigned char **pp, lo
- 	    else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield);
- 	}
- 	else{
--	    value = rb_str_new(p, len);
-+	    value = rb_str_new((const char *)p, len);
- 	    p += len;
- 	    off += len;
- 	}
-@@ -819,7 +822,7 @@ ossl_asn1_traverse(VALUE self, VALUE obj
- 
-     obj = ossl_to_der_if_possible(obj);
-     tmp = rb_str_new4(StringValue(obj));
--    p = RSTRING_PTR(tmp);
-+    p = (unsigned char *)RSTRING_PTR(tmp);
-     ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 1);
- 
-     return Qnil;
-@@ -835,7 +838,7 @@ ossl_asn1_decode(VALUE self, VALUE obj)
- 
-     obj = ossl_to_der_if_possible(obj);
-     tmp = rb_str_new4(StringValue(obj));
--    p = RSTRING_PTR(tmp);
-+    p = (unsigned char *)RSTRING_PTR(tmp);
-     ary = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 1, 0);
-     ret = rb_ary_entry(ary, 0);
- 
-@@ -852,7 +855,7 @@ ossl_asn1_decode_all(VALUE self, VALUE o
- 
-     obj = ossl_to_der_if_possible(obj);
-     tmp = rb_str_new4(StringValue(obj));
--    p = RSTRING_PTR(tmp);
-+    p = (unsigned char *)RSTRING_PTR(tmp);
-     ret = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 0);
- 
-     return ret;
-@@ -947,7 +950,7 @@ ossl_asn1prim_to_der(VALUE self)
-     ossl_ASN1_TYPE_free(asn1);
-     reallen = p - buf;
-     assert(reallen <= len);
--    str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */
-+    str = ossl_buf2str((char *)buf, reallen); /* buf will be free in ossl_buf2str */
- 
-     return str;
- }
-@@ -969,7 +972,7 @@ ossl_asn1cons_to_der(VALUE self)
-     seq_len = ASN1_object_size(1, RSTRING_LEN(value), tag);
-     length = ASN1_object_size(1, seq_len, tn);
-     str = rb_str_new(0, length);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if(tc == V_ASN1_UNIVERSAL)
- 	ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc);
-     else{
diff --git a/lang/ruby18-base/patches/patch-dn b/lang/ruby18-base/patches/patch-dn
deleted file mode 100644
index cfcb737deae..00000000000
--- a/lang/ruby18-base/patches/patch-dn
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-dn,v 1.2 2010/09/10 03:29:00 taca Exp $
-
-* r18172: suppress warnings.
-* r26835: backport fixes in 1.9.
-
---- ext/openssl/ossl_engine.c.orig	2010-06-21 09:18:59.000000000 +0000
-+++ ext/openssl/ossl_engine.c
-@@ -344,7 +344,7 @@ static VALUE
- ossl_engine_inspect(VALUE self)
- {
-     VALUE str;
--    char *cname = rb_class2name(rb_obj_class(self));
-+    const char *cname = rb_class2name(rb_obj_class(self));
-     
-     str = rb_str_new2("#<");
-     rb_str_cat2(str, cname);
diff --git a/lang/ruby18-base/patches/patch-do b/lang/ruby18-base/patches/patch-do
deleted file mode 100644
index 5405961b6dc..00000000000
--- a/lang/ruby18-base/patches/patch-do
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-do,v 1.2 2010/09/10 03:29:00 taca Exp $
-
-* r18172: suppress warnings.
-
---- ext/openssl/ossl_ns_spki.c.orig	2007-06-08 15:02:04.000000000 +0000
-+++ ext/openssl/ossl_ns_spki.c
-@@ -56,14 +56,14 @@ ossl_spki_initialize(int argc, VALUE *ar
- {
-     NETSCAPE_SPKI *spki;
-     VALUE buffer;
--    unsigned char *p;
-+    const unsigned char *p;
- 	
-     if (rb_scan_args(argc, argv, "01", &buffer) == 0) {
- 	return self;
-     }
-     StringValue(buffer);
-     if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING_PTR(buffer), -1))) {
--	p = RSTRING_PTR(buffer);
-+	p = (unsigned char *)RSTRING_PTR(buffer);
- 	if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING_LEN(buffer)))) {
- 	    ossl_raise(eSPKIError, NULL);
- 	}
-@@ -87,7 +87,7 @@ ossl_spki_to_der(VALUE self)
-     if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0)
-         ossl_raise(eX509CertError, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if (i2d_NETSCAPE_SPKI(spki, &p) <= 0)
-         ossl_raise(eX509CertError, NULL);
-     ossl_str_adjust(str, p);
-@@ -172,7 +172,7 @@ ossl_spki_get_challenge(VALUE self)
- 	return rb_str_new(0, 0);
-     }
- 
--    return rb_str_new(spki->spkac->challenge->data,
-+    return rb_str_new((const char *)spki->spkac->challenge->data,
- 		      spki->spkac->challenge->length);
- }
- 
diff --git a/lang/ruby18-base/patches/patch-dp b/lang/ruby18-base/patches/patch-dp
deleted file mode 100644
index 3fd8dde2233..00000000000
--- a/lang/ruby18-base/patches/patch-dp
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-dp,v 1.2 2010/09/10 03:29:00 taca Exp $
-
-* r18172: suppress warnings.
-* r26838: backport the commit from trunk.
-
---- ext/openssl/ossl_pkcs7.c.orig	2010-06-21 09:18:59.000000000 +0000
-+++ ext/openssl/ossl_pkcs7.c
-@@ -309,7 +309,7 @@ ossl_pkcs7_alloc(VALUE klass)
- static VALUE
- ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
- {
--    PKCS7 *p7;
-+    PKCS7 *p7, *pkcs = DATA_PTR(self);
-     BIO *in;
-     VALUE arg;
- 
-@@ -317,10 +317,12 @@ ossl_pkcs7_initialize(int argc, VALUE *a
- 	return self;
-     arg = ossl_to_der_if_possible(arg);
-     in = ossl_obj2bio(arg);
--    p7 = PEM_read_bio_PKCS7(in, (PKCS7 **)&DATA_PTR(self), NULL, NULL);
-+    p7 = PEM_read_bio_PKCS7(in, &pkcs, NULL, NULL);
-+    DATA_PTR(self) = pkcs;
-     if (!p7) {
--	BIO_reset(in);
--        p7 = d2i_PKCS7_bio(in, (PKCS7 **)&DATA_PTR(self));
-+	(void)BIO_reset(in);
-+        p7 = d2i_PKCS7_bio(in, &pkcs);
-+	DATA_PTR(self) = pkcs;
-     }
-     BIO_free(in);
-     ossl_pkcs7_set_data(self, Qnil);
-@@ -798,7 +800,7 @@ ossl_pkcs7_to_der(VALUE self)
-     if((len = i2d_PKCS7(pkcs7, NULL)) <= 0)
- 	ossl_raise(ePKCS7Error, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if(i2d_PKCS7(pkcs7, &p) <= 0)
- 	ossl_raise(ePKCS7Error, NULL);
-     ossl_str_adjust(str, p);
diff --git a/lang/ruby18-base/patches/patch-dq b/lang/ruby18-base/patches/patch-dq
deleted file mode 100644
index 36d7094f97f..00000000000
--- a/lang/ruby18-base/patches/patch-dq
+++ /dev/null
@@ -1,461 +0,0 @@
-$NetBSD: patch-dq,v 1.4 2016/03/24 16:30:11 taca Exp $
-
-* r18172: suppress warnings.
-* r20494: (ossl_ssl_read_nonblock): OpenSSL::SSL::SSLSocket should implement
-          read_nonblock. a patch from Aaron Patterson in [ruby-core:20277].
-          fix: #814 [ruby-core:20241]
-* r21772: Test for Server Name Indication support.
-* r23008: revert incomplete read_nonblock implemenatation.
-* r26835: backport fixes in 1.9.
-* r26838: backport the commit from trunk.
-* Constify (some cases are depends on OpenSSL's version).
-* Only enable SSLv3 methods if library provides support.
-
---- ext/openssl/ossl_ssl.c.orig	2012-02-08 06:09:40.000000000 +0000
-+++ ext/openssl/ossl_ssl.c
-@@ -26,6 +26,12 @@
- #  define TO_SOCKET(s) s
- #endif
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
-+#define OSSL_CONST	const
-+#else
-+#define OSSL_CONST
-+#endif
-+
- VALUE mSSL;
- VALUE eSSLError;
- VALUE cSSLContext;
-@@ -69,6 +75,9 @@ static const char *ossl_sslctx_attrs[] =
-     "verify_callback", "options", "cert_store", "extra_chain_cert",
-     "client_cert_cb", "tmp_dh_callback", "session_id_context",
-     "session_get_cb", "session_new_cb", "session_remove_cb",
-+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-+    "servername_cb",
-+#endif
- };
- 
- #define ossl_ssl_get_io(o)           rb_iv_get((o),"@io")
-@@ -86,7 +95,12 @@ static const char *ossl_sslctx_attrs[] =
- #define ossl_ssl_set_tmp_dh(o,v)     rb_iv_set((o),"@tmp_dh",(v))
- 
- static const char *ossl_ssl_attr_readers[] = { "io", "context", };
--static const char *ossl_ssl_attrs[] = { "sync_close", };
-+static const char *ossl_ssl_attrs[] = {
-+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-+    "hostname",
-+#endif
-+    "sync_close", 
-+};
- 
- ID ID_callback_state;
- 
-@@ -95,21 +109,24 @@ ID ID_callback_state;
-  */
- struct {
-     const char *name;
--    SSL_METHOD *(*func)(void);
-+    OSSL_CONST SSL_METHOD *(*func)(void);
- } ossl_ssl_method_tab[] = {
- #define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method }
-     OSSL_SSL_METHOD_ENTRY(TLSv1),
-     OSSL_SSL_METHOD_ENTRY(TLSv1_server),
-     OSSL_SSL_METHOD_ENTRY(TLSv1_client),
--#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
-+#if !defined(OPENSSL_NO_SSL2) && defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
-         defined(HAVE_SSLV2_CLIENT_METHOD)	
-     OSSL_SSL_METHOD_ENTRY(SSLv2),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
- #endif
-+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \
-+	defined(HAVE_SSLV3_CLIENT_METHOD)
-     OSSL_SSL_METHOD_ENTRY(SSLv3),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
-+#endif
-     OSSL_SSL_METHOD_ENTRY(SSLv23),
-     OSSL_SSL_METHOD_ENTRY(SSLv23_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv23_client),
-@@ -146,7 +163,7 @@ ossl_sslctx_s_alloc(VALUE klass)
- static VALUE
- ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
- {
--    SSL_METHOD *method = NULL;
-+    OSSL_CONST SSL_METHOD *method = NULL;
-     const char *s;
-     int i;
- 
-@@ -299,7 +316,7 @@ ossl_ssl_verify_callback(int preverify_o
- static VALUE
- ossl_call_session_get_cb(VALUE ary)
- {
--    VALUE ssl_obj, sslctx_obj, cb, ret;
-+    VALUE ssl_obj, sslctx_obj, cb;
-     
-     Check_Type(ary, T_ARRAY);
-     ssl_obj = rb_ary_entry(ary, 0);
-@@ -327,7 +344,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, uns
-     ssl_obj = (VALUE)ptr;
-     ary = rb_ary_new2(2);
-     rb_ary_push(ary, ssl_obj);
--    rb_ary_push(ary, rb_str_new(buf, len));
-+    rb_ary_push(ary, rb_str_new((const char *)buf, len));
- 
-     ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_get_cb, ary, &state);
-     if (state) {
-@@ -346,7 +363,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, uns
- static VALUE
- ossl_call_session_new_cb(VALUE ary)
- {
--    VALUE ssl_obj, sslctx_obj, cb, ret;
-+    VALUE ssl_obj, sslctx_obj, cb;
-     
-     Check_Type(ary, T_ARRAY);
-     ssl_obj = rb_ary_entry(ary, 0);
-@@ -389,10 +406,11 @@ ossl_sslctx_session_new_cb(SSL *ssl, SSL
-     return RTEST(ret_obj) ? 1 : 0;
- }
- 
-+#if 0				/* unused */
- static VALUE
- ossl_call_session_remove_cb(VALUE ary)
- {
--    VALUE sslctx_obj, cb, ret;
-+    VALUE sslctx_obj, cb;
-     
-     Check_Type(ary, T_ARRAY);
-     sslctx_obj = rb_ary_entry(ary, 0);
-@@ -402,6 +420,7 @@ ossl_call_session_remove_cb(VALUE ary)
- 
-     return rb_funcall(cb, rb_intern("call"), 1, ary);
- }
-+#endif
- 
- static void
- ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
-@@ -448,6 +467,66 @@ ossl_sslctx_add_extra_chain_cert_i(VALUE
-     return i;
- }
- 
-+static VALUE ossl_sslctx_setup(VALUE self);
-+
-+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-+static VALUE
-+ossl_call_servername_cb(VALUE ary)
-+{
-+    VALUE ssl_obj, sslctx_obj, cb, ret_obj;
-+
-+    Check_Type(ary, T_ARRAY);
-+    ssl_obj = rb_ary_entry(ary, 0);
-+
-+    sslctx_obj = rb_iv_get(ssl_obj, "@context");
-+    if (NIL_P(sslctx_obj)) return Qnil;
-+    cb = rb_iv_get(sslctx_obj, "@servername_cb");
-+    if (NIL_P(cb)) return Qnil;
-+
-+    ret_obj = rb_funcall(cb, rb_intern("call"), 1, ary);
-+    if (rb_obj_is_kind_of(ret_obj, cSSLContext)) {
-+        SSL *ssl;
-+        SSL_CTX *ctx2;
-+
-+        ossl_sslctx_setup(ret_obj);
-+        Data_Get_Struct(ssl_obj, SSL, ssl);
-+        Data_Get_Struct(ret_obj, SSL_CTX, ctx2);
-+        SSL_set_SSL_CTX(ssl, ctx2);
-+    } else if (!NIL_P(ret_obj)) {
-+            rb_raise(rb_eArgError, "servername_cb must return an OpenSSL::SSL::SSLContext object or nil");
-+    }
-+
-+    return ret_obj;
-+}
-+
-+static int
-+ssl_servername_cb(SSL *ssl, int *ad, void *arg)
-+{
-+    VALUE ary, ssl_obj, ret_obj;
-+    void *ptr;
-+    int state = 0;
-+    const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
-+
-+    if (!servername)
-+        return SSL_TLSEXT_ERR_OK;
-+
-+    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
-+    	return SSL_TLSEXT_ERR_ALERT_FATAL;
-+    ssl_obj = (VALUE)ptr;
-+    ary = rb_ary_new2(2);
-+    rb_ary_push(ary, ssl_obj);
-+    rb_ary_push(ary, rb_str_new2(servername));
-+
-+    ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_servername_cb, ary, &state);
-+    if (state) {
-+        rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
-+        return SSL_TLSEXT_ERR_ALERT_FATAL;
-+    }
-+
-+    return SSL_TLSEXT_ERR_OK;
-+}
-+#endif
-+
- /*
-  * call-seq:
-  *    ctx.setup => Qtrue # first time
-@@ -569,7 +648,7 @@ ossl_sslctx_setup(VALUE self)
-     val = ossl_sslctx_get_sess_id_ctx(self);
-     if (!NIL_P(val)){
- 	StringValue(val);
--	if (!SSL_CTX_set_session_id_context(ctx, RSTRING_PTR(val),
-+	if (!SSL_CTX_set_session_id_context(ctx, (unsigned char *)RSTRING_PTR(val),
- 					    RSTRING_LEN(val))){
- 	    ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
- 	}
-@@ -587,11 +666,20 @@ ossl_sslctx_setup(VALUE self)
- 	SSL_CTX_sess_set_remove_cb(ctx, ossl_sslctx_session_remove_cb);
- 	OSSL_Debug("SSL SESSION remove callback added");
-     }
-+
-+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-+    val = rb_iv_get(self, "@servername_cb");
-+    if (!NIL_P(val)) {
-+        SSL_CTX_set_tlsext_servername_callback(ctx, ssl_servername_cb);
-+	OSSL_Debug("SSL TLSEXT servername callback added");
-+    }
-+#endif
-+
-     return Qtrue;
- }
- 
- static VALUE
--ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
-+ossl_ssl_cipher_to_ary(OSSL_CONST SSL_CIPHER *cipher)
- {
-     VALUE ary;
-     int bits, alg_bits;
-@@ -615,7 +703,7 @@ ossl_sslctx_get_ciphers(VALUE self)
- {
-     SSL_CTX *ctx;
-     STACK_OF(SSL_CIPHER) *ciphers;
--    SSL_CIPHER *cipher;
-+    OSSL_CONST SSL_CIPHER *cipher;
-     VALUE ary;
-     int i, num;
- 
-@@ -629,10 +717,10 @@ ossl_sslctx_get_ciphers(VALUE self)
-     if (!ciphers)
-         return rb_ary_new();
- 
--    num = sk_num((STACK*)ciphers);
-+    num = sk_SSL_CIPHER_num(ciphers);
-     ary = rb_ary_new2(num);
-     for(i = 0; i < num; i++){
--        cipher = (SSL_CIPHER*)sk_value((STACK*)ciphers, i);
-+        cipher = sk_SSL_CIPHER_value(ciphers, i);
-         rb_ary_push(ary, ossl_ssl_cipher_to_ary(cipher));
-     }
-     return ary;
-@@ -821,7 +909,6 @@ ossl_sslctx_flush_sessions(int argc, VAL
-     VALUE arg1;
-     SSL_CTX *ctx;
-     time_t tm = 0;
--    int cb_state;
- 
-     rb_scan_args(argc, argv, "01", &arg1);
- 
-@@ -895,6 +982,8 @@ ossl_ssl_initialize(int argc, VALUE *arg
-     ossl_sslctx_setup(ctx);
-     rb_call_super(0, 0);
- 
-+    rb_iv_set(self, "@hostname", Qnil);
-+
-     return self;
- }
- 
-@@ -908,6 +997,10 @@ ossl_ssl_setup(VALUE self)
- 
-     Data_Get_Struct(self, SSL, ssl);
-     if(!ssl){
-+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-+	VALUE hostname = rb_iv_get(self, "@hostname");
-+#endif
-+
-         v_ctx = ossl_ssl_get_ctx(self);
-         Data_Get_Struct(v_ctx, SSL_CTX, ctx);
- 
-@@ -917,6 +1010,12 @@ ossl_ssl_setup(VALUE self)
-         }
-         DATA_PTR(self) = ssl;
- 
-+#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-+        if (!NIL_P(hostname)) {
-+           if (SSL_set_tlsext_host_name(ssl, StringValuePtr(hostname)) != 1)
-+               ossl_raise(eSSLError, "SSL_set_tlsext_host_name:");
-+        }
-+#endif
-         io = ossl_ssl_get_io(self);
-         GetOpenFile(io, fptr);
-         rb_io_check_readable(fptr);
-@@ -953,7 +1052,15 @@ ossl_start_ssl(VALUE self, int (*func)()
-     Data_Get_Struct(self, SSL, ssl);
-     GetOpenFile(ossl_ssl_get_io(self), fptr);
-     for(;;){
--	if((ret = func(ssl)) > 0) break;
-+	ret = func(ssl);
-+
-+	cb_state = rb_ivar_get(self, ID_callback_state);
-+        if (!NIL_P(cb_state))
-+            rb_jump_tag(NUM2INT(cb_state));
-+
-+	if (ret > 0)
-+	    break;
-+
- 	switch((ret2 = ssl_get_error(ssl, ret))){
- 	case SSL_ERROR_WANT_WRITE:
-             rb_io_wait_writable(FPTR_TO_FD(fptr));
-@@ -969,10 +1076,6 @@ ossl_start_ssl(VALUE self, int (*func)()
- 	}
-     }
- 
--    cb_state = rb_ivar_get(self, ID_callback_state);
--    if (!NIL_P(cb_state))
--        rb_jump_tag(NUM2INT(cb_state));
--
-     return self;
- }
- 
-@@ -1010,6 +1113,72 @@ ossl_ssl_accept(VALUE self)
- static VALUE
- ossl_ssl_read(int argc, VALUE *argv, VALUE self)
- {
-+  SSL *ssl;
-+  int ilen, nread = 0;
-+  VALUE len, str;
-+  rb_io_t *fptr;
-+
-+  rb_scan_args(argc, argv, "11", &len, &str);
-+  ilen = NUM2INT(len);
-+  if(NIL_P(str)) str = rb_str_new(0, ilen);
-+  else{
-+    StringValue(str);
-+    rb_str_modify(str);
-+    rb_str_resize(str, ilen);
-+  }
-+  if(ilen == 0) return str;
-+
-+  Data_Get_Struct(self, SSL, ssl);
-+  GetOpenFile(ossl_ssl_get_io(self), fptr);
-+  if (ssl) {
-+    if(SSL_pending(ssl) <= 0)
-+      rb_thread_wait_fd(FPTR_TO_FD(fptr));
-+    for (;;){
-+      nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LEN(str));
-+      switch(SSL_get_error(ssl, nread)){
-+        case SSL_ERROR_NONE:
-+          goto end;
-+        case SSL_ERROR_ZERO_RETURN:
-+          rb_eof_error();
-+        case SSL_ERROR_WANT_WRITE:
-+          rb_io_wait_writable(FPTR_TO_FD(fptr));
-+          continue;
-+        case SSL_ERROR_WANT_READ:
-+	  rb_io_wait_readable(FPTR_TO_FD(fptr));
-+          continue;
-+        case SSL_ERROR_SYSCALL:
-+          if(ERR_peek_error() == 0 && nread == 0) rb_eof_error();
-+          rb_sys_fail(0);
-+        default:
-+          ossl_raise(eSSLError, "SSL_read:");
-+      }
-+    }
-+  }
-+  else {
-+    ID id_sysread = rb_intern("sysread");
-+    rb_warning("SSL session is not started yet.");
-+    return rb_funcall(ossl_ssl_get_io(self), id_sysread, 2, len, str);
-+  }
-+
-+end:
-+  rb_str_set_len(str, nread);
-+  OBJ_TAINT(str);
-+
-+  return str;
-+}
-+
-+/*
-+ * call-seq:
-+ *    ssl.read_nonblock(length) => string
-+ *    ssl.read_nonblock(length, buffer) => buffer
-+ *
-+ * === Parameters
-+ * * +length+ is a positive integer.
-+ * * +buffer+ is a string used to store the result.
-+ */
-+static VALUE
-+ossl_ssl_read_nonblock(int argc, VALUE *argv, VALUE self)
-+{
-     SSL *ssl;
-     int ilen, nread = 0;
-     VALUE len, str;
-@@ -1027,12 +1196,11 @@ ossl_ssl_read(int argc, VALUE *argv, VAL
- 
-     Data_Get_Struct(self, SSL, ssl);
-     GetOpenFile(ossl_ssl_get_io(self), fptr);
-+    rb_io_set_nonblock(fptr);
-     if (ssl) {
--	if(SSL_pending(ssl) <= 0)
--	    rb_thread_wait_fd(FPTR_TO_FD(fptr));
- 	for (;;){
- 	    nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LEN(str));
--	    switch(ssl_get_error(ssl, nread)){
-+	    switch(SSL_get_error(ssl, nread)){
- 	    case SSL_ERROR_NONE:
- 		goto end;
- 	    case SSL_ERROR_ZERO_RETURN:
-@@ -1041,7 +1209,7 @@ ossl_ssl_read(int argc, VALUE *argv, VAL
-                 rb_io_wait_writable(FPTR_TO_FD(fptr));
-                 continue;
- 	    case SSL_ERROR_WANT_READ:
--                rb_io_wait_readable(FPTR_TO_FD(fptr));
-+		rb_sys_fail(fptr->path);
- 		continue;
- 	    case SSL_ERROR_SYSCALL:
- 		if(ERR_peek_error() == 0 && nread == 0) rb_eof_error();
-@@ -1052,9 +1220,8 @@ ossl_ssl_read(int argc, VALUE *argv, VAL
-         }
-     }
-     else {
--        ID id_sysread = rb_intern("sysread");
-         rb_warning("SSL session is not started yet.");
--        return rb_funcall(ossl_ssl_get_io(self), id_sysread, 2, len, str);
-+	return rb_funcall(ossl_ssl_get_io(self), rb_intern("sysread"), 2, len, str);
-     }
- 
-   end:
-@@ -1227,7 +1394,7 @@ ossl_ssl_get_cipher(VALUE self)
-         rb_warning("SSL session is not started yet.");
-         return Qnil;
-     }
--    cipher = SSL_get_current_cipher(ssl);
-+    cipher = (SSL_CIPHER *)SSL_get_current_cipher(ssl);
- 
-     return ossl_ssl_cipher_to_ary(cipher);
- }
-@@ -1350,13 +1517,13 @@ Init_ossl_ssl()
- 
-     ID_callback_state = rb_intern("@callback_state");
- 
--    ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_vcb_idx",0,0,0);
--    ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,"ossl_ssl_ex_store_p",0,0,0);
--    ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_ptr_idx",0,0,0);
-+    ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_vcb_idx",0,0,0);
-+    ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_store_p",0,0,0);
-+    ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_ptr_idx",0,0,0);
-     ossl_ssl_ex_client_cert_cb_idx =
--	SSL_get_ex_new_index(0,"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
-+	SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
-     ossl_ssl_ex_tmp_dh_callback_idx =
--	SSL_get_ex_new_index(0,"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
-+	SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
- 
-     mSSL = rb_define_module_under(mOSSL, "SSL");
-     eSSLError = rb_define_class_under(mSSL, "SSLError", eOSSLError);
diff --git a/lang/ruby18-base/patches/patch-dr b/lang/ruby18-base/patches/patch-dr
deleted file mode 100644
index ff57725f6f1..00000000000
--- a/lang/ruby18-base/patches/patch-dr
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-dr,v 1.2 2010/09/10 03:29:00 taca Exp $
-
-* r18172: suppress warnings.
-* r18943: (ossl_ocspreq_initialize): fix for initialization of r18168.
-* r26838: backport the commit from trunk.
-
---- ext/openssl/ossl_x509attr.c.orig	2010-06-21 09:18:59.000000000 +0000
-+++ ext/openssl/ossl_x509attr.c
-@@ -92,16 +92,17 @@ static VALUE
- ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
- {
-     VALUE oid, value;
--    X509_ATTRIBUTE *attr;
--    unsigned char *p;
-+    X509_ATTRIBUTE *attr, *x;
-+    const unsigned char *p;
- 
-     GetX509Attr(self, attr);
-     if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
- 	oid = ossl_to_der_if_possible(oid);
- 	StringValue(oid);
--	p = RSTRING_PTR(oid);
--	if(!d2i_X509_ATTRIBUTE((X509_ATTRIBUTE**)&DATA_PTR(self),
--			       &p, RSTRING_LEN(oid))){
-+	p = (unsigned char *)RSTRING_PTR(oid);
-+	x = d2i_X509_ATTRIBUTE(&attr, &p, RSTRING_LEN(oid));
-+	DATA_PTR(self) = attr;
-+	if(!x){
- 	    ossl_raise(eX509AttrError, NULL);
- 	}
- 	return self;
-@@ -212,7 +213,7 @@ ossl_x509attr_get_value(VALUE self)
-     if(OSSL_X509ATTR_IS_SINGLE(attr)){
- 	length = i2d_ASN1_TYPE(attr->value.single, NULL);
- 	str = rb_str_new(0, length);
--	p = RSTRING_PTR(str);
-+	p = (unsigned char *)RSTRING_PTR(str);
- 	i2d_ASN1_TYPE(attr->value.single, &p);
- 	ossl_str_adjust(str, p);
-     }
-@@ -221,7 +222,7 @@ ossl_x509attr_get_value(VALUE self)
- 			(unsigned char **) NULL, i2d_ASN1_TYPE,
- 			V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
- 	str = rb_str_new(0, length);
--	p = RSTRING_PTR(str);
-+	p = (unsigned char *)RSTRING_PTR(str);
- 	i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p,
- 			i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
- 	ossl_str_adjust(str, p);
-@@ -247,7 +248,7 @@ ossl_x509attr_to_der(VALUE self)
-     if((len = i2d_X509_ATTRIBUTE(attr, NULL)) <= 0)
- 	ossl_raise(eX509AttrError, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
- 	ossl_raise(eX509AttrError, NULL);
-     rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str)); 
diff --git a/lang/ruby18-base/patches/patch-ds b/lang/ruby18-base/patches/patch-ds
deleted file mode 100644
index 851b2f7c4ff..00000000000
--- a/lang/ruby18-base/patches/patch-ds
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ds,v 1.2 2010/09/10 03:29:00 taca Exp $
-
-* r18172: suppress warnings.
-
---- ext/openssl/ossl_x509cert.c.orig	2007-06-08 15:02:04.000000000 +0000
-+++ ext/openssl/ossl_x509cert.c
-@@ -134,7 +134,7 @@ static VALUE 
- ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
- {
-     BIO *in;
--    X509 *x509;
-+    X509 *x509, *x = DATA_PTR(self);;
-     VALUE arg;
- 
-     if (rb_scan_args(argc, argv, "01", &arg) == 0) {
-@@ -143,10 +143,12 @@ ossl_x509_initialize(int argc, VALUE *ar
-     }
-     arg = ossl_to_der_if_possible(arg);
-     in = ossl_obj2bio(arg);
--    x509 = PEM_read_bio_X509(in, (X509 **)&DATA_PTR(self), NULL, NULL);
-+    x509 = PEM_read_bio_X509(in, &x, NULL, NULL);
-+    DATA_PTR(self) = x;
-     if (!x509) {
--	BIO_reset(in);
--	x509 = d2i_X509_bio(in, (X509 **)&DATA_PTR(self));
-+	(void)BIO_reset(in);
-+	x509 = d2i_X509_bio(in, &x);
-+	DATA_PTR(self) = x;
-     }
-     BIO_free(in);
-     if (!x509) ossl_raise(eX509CertError, NULL);
-@@ -190,7 +192,7 @@ ossl_x509_to_der(VALUE self)
-     if ((len = i2d_X509(x509, NULL)) <= 0)
- 	ossl_raise(eX509CertError, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if (i2d_X509(x509, &p) <= 0)
- 	ossl_raise(eX509CertError, NULL);
-     ossl_str_adjust(str, p);
-@@ -690,7 +692,7 @@ static VALUE
- ossl_x509_inspect(VALUE self)
- {
-     VALUE str;
--    char *cname = rb_class2name(rb_obj_class(self));
-+    const char *cname = rb_class2name(rb_obj_class(self));
- 
-     str = rb_str_new2("#<");
-     rb_str_cat2(str, cname);
diff --git a/lang/ruby18-base/patches/patch-dt b/lang/ruby18-base/patches/patch-dt
deleted file mode 100644
index 8c5d784342a..00000000000
--- a/lang/ruby18-base/patches/patch-dt
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-dt,v 1.2 2010/09/10 03:29:00 taca Exp $
-
-* r18172: suppress warnings.
-* r26838: backport the commit from trunk.
-
---- ext/openssl/ossl_x509crl.c.orig	2010-06-21 09:18:59.000000000 +0000
-+++ ext/openssl/ossl_x509crl.c
-@@ -91,7 +91,7 @@ static VALUE 
- ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
- {
-     BIO *in;
--    X509_CRL *crl;
-+    X509_CRL *crl, *x = DATA_PTR(self);
-     VALUE arg;
- 
-     if (rb_scan_args(argc, argv, "01", &arg) == 0) {
-@@ -99,10 +99,12 @@ ossl_x509crl_initialize(int argc, VALUE 
-     }
-     arg = ossl_to_der_if_possible(arg);
-     in = ossl_obj2bio(arg);
--    crl = PEM_read_bio_X509_CRL(in, (X509_CRL **)&DATA_PTR(self), NULL, NULL);
-+    crl = PEM_read_bio_X509_CRL(in, &x, NULL, NULL);
-+    DATA_PTR(self) = x;
-     if (!crl) {
--	BIO_reset(in);
--	crl = d2i_X509_CRL_bio(in, (X509_CRL **)&DATA_PTR(self));
-+	(void)BIO_reset(in);
-+	crl = d2i_X509_CRL_bio(in, &x);
-+	DATA_PTR(self) = x;
-     }
-     BIO_free(in);
-     if (!crl) ossl_raise(eX509CRLError, NULL);
diff --git a/lang/ruby18-base/patches/patch-du b/lang/ruby18-base/patches/patch-du
deleted file mode 100644
index 135c749548e..00000000000
--- a/lang/ruby18-base/patches/patch-du
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-du,v 1.2 2010/09/10 03:29:00 taca Exp $
-
-Constify.
-
---- ext/openssl/ossl_x509ext.c.orig	2010-05-24 23:58:49.000000000 +0000
-+++ ext/openssl/ossl_x509ext.c
-@@ -274,7 +274,7 @@ static VALUE
- ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
- {
-     VALUE oid, value, critical;
--    unsigned char *p;
-+    const unsigned char *p;
-     X509_EXTENSION *ext;
- 
-     GetX509Ext(self, ext);
diff --git a/lang/ruby18-base/patches/patch-dv b/lang/ruby18-base/patches/patch-dv
deleted file mode 100644
index e8cd4f5597b..00000000000
--- a/lang/ruby18-base/patches/patch-dv
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-dv,v 1.2 2010/09/10 03:29:00 taca Exp $
-
-* r18172: suppress warnings.
-* r18943: (ossl_ocspreq_initialize): fix for initialization of r18168.
-* r26835: backport fixes in 1.9.
-* r26840: added X509::Name#hash_old as a wrapper for X509_NAME_hash_old
-	  in OpenSSL 1.0.0.
-
---- ext/openssl/ossl_x509name.c.orig	2010-06-21 09:18:59.000000000 +0000
-+++ ext/openssl/ossl_x509name.c
-@@ -135,7 +135,7 @@ ossl_x509name_initialize(int argc, VALUE
- 	    rb_block_call(tmp, rb_intern("each"), 0, 0, ossl_x509name_init_i, args);
- 	}
- 	else{
--	    unsigned char *p;
-+	    const unsigned char *p;
- 	    VALUE str = ossl_to_der_if_possible(arg);
- 	    X509_NAME *x;
- 	    StringValue(str);
-@@ -167,7 +167,7 @@ VALUE ossl_x509name_add_entry(int argc, 
-     if(NIL_P(type)) type = rb_aref(OBJECT_TYPE_TEMPLATE, oid);
-     GetX509Name(self, name);
-     if (!X509_NAME_add_entry_by_txt(name, RSTRING_PTR(oid), NUM2INT(type),
--		RSTRING_PTR(value), RSTRING_LEN(value), -1, 0)) {
-+		(unsigned char *)RSTRING_PTR(value), RSTRING_LEN(value), -1, 0)) {
- 	ossl_raise(eX509NameError, NULL);
-     }
- 
-@@ -248,7 +248,7 @@ ossl_x509name_to_a(VALUE self)
- 	}
- 	short_name = OBJ_nid2sn(OBJ_ln2nid(long_name));
- 	ary = rb_ary_new3(3, rb_str_new2(short_name),
--        		  rb_str_new(entry->value->data, entry->value->length),
-+        		  rb_str_new((const char *)entry->value->data, entry->value->length),
-         		  INT2FIX(entry->value->type));
- 	rb_ary_push(ret, ary);
-     }
-@@ -343,7 +364,7 @@ ossl_x509name_to_der(VALUE self)
-     if((len = i2d_X509_NAME(name, NULL)) <= 0)
- 	ossl_raise(eX509NameError, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if(i2d_X509_NAME(name, &p) <= 0)
- 	ossl_raise(eX509NameError, NULL);
-     ossl_str_adjust(str, p);
diff --git a/lang/ruby18-base/patches/patch-dy b/lang/ruby18-base/patches/patch-dy
deleted file mode 100644
index cfc09c899a7..00000000000
--- a/lang/ruby18-base/patches/patch-dy
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-dy,v 1.3 2010/09/10 03:29:00 taca Exp $
-
-Additional fix after webrick security fix.
-
---- lib/webrick/httpstatus.rb.orig	2010-06-10 05:23:49.000000000 +0000
-+++ lib/webrick/httpstatus.rb
-@@ -12,7 +12,7 @@ module WEBrick
- 
-   module HTTPStatus
- 
--    class Status      < StandardError
-+    class Status < StandardError
-       def initialize(*args)
-         args[0] = AccessLog.escape(args[0]) unless args.empty?
-         super(*args)
diff --git a/lang/ruby18-base/patches/patch-eb b/lang/ruby18-base/patches/patch-eb
deleted file mode 100644
index b3d7f36077e..00000000000
--- a/lang/ruby18-base/patches/patch-eb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-eb,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* Fix a warning.
-
---- ext/digest/digest.c.orig	2009-12-14 03:19:26.000000000 +0000
-+++ ext/digest/digest.c
-@@ -275,7 +275,7 @@ rb_digest_instance_inspect(VALUE self)
- {
-     VALUE str;
-     size_t digest_len = 32;	/* about this size at least */
--    char *cname;
-+    const char *cname;
- 
-     cname = rb_obj_classname(self);
- 
diff --git a/lang/ruby18-base/patches/patch-ec b/lang/ruby18-base/patches/patch-ec
deleted file mode 100644
index 1b971d236b9..00000000000
--- a/lang/ruby18-base/patches/patch-ec
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ec,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-* r26835: backport fixes in 1.9.
-* r26838: backport the commit from trunk.
-
---- ext/openssl/ossl.h.orig	2010-06-21 09:18:59.000000000 +0000
-+++ ext/openssl/ossl.h
-@@ -114,10 +114,19 @@ extern VALUE eOSSLError;
- #define STACK _STACK
- #endif
- 
-+#if 0
-+/*
-+ * Compatibility
-+ */
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define STACK _STACK
-+#endif
-+#endif
-+
- /*
-  * String to HEXString conversion
-  */
--int string2hex(char *, int, char **, int *);
-+int string2hex(const unsigned char *, int, char **, int *);
- 
- /*
-  * Data Conversion
diff --git a/lang/ruby18-base/patches/patch-ed b/lang/ruby18-base/patches/patch-ed
deleted file mode 100644
index 1074198d08c..00000000000
--- a/lang/ruby18-base/patches/patch-ed
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ed,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-* r26835: backport fixes in 1.9.
-
---- ext/openssl/ossl_bn.c.orig	2010-05-24 23:58:49.000000000 +0000
-+++ ext/openssl/ossl_bn.c
-@@ -131,12 +131,12 @@ ossl_bn_initialize(int argc, VALUE *argv
- 
-     switch (base) {
-     case 0:
--	if (!BN_mpi2bn(RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
-+	if (!BN_mpi2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
- 	    ossl_raise(eBNError, NULL);
- 	}
- 	break;
-     case 2:
--	if (!BN_bin2bn(RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
-+	if (!BN_bin2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
- 	    ossl_raise(eBNError, NULL);
- 	}
- 	break;
-@@ -185,13 +185,13 @@ ossl_bn_to_s(int argc, VALUE *argv, VALU
-     case 0:
- 	len = BN_bn2mpi(bn, NULL);
-         str = rb_str_new(0, len);
--	if (BN_bn2mpi(bn, RSTRING_PTR(str)) != len)
-+	if (BN_bn2mpi(bn, (unsigned char *)RSTRING_PTR(str)) != len)
- 	    ossl_raise(eBNError, NULL);
- 	break;
-     case 2:
- 	len = BN_num_bytes(bn);
-         str = rb_str_new(0, len);
--	if (BN_bn2bin(bn, RSTRING_PTR(str)) != len)
-+	if (BN_bn2bin(bn, (unsigned char *)RSTRING_PTR(str)) != len)
- 	    ossl_raise(eBNError, NULL);
- 	break;
-     case 10:
diff --git a/lang/ruby18-base/patches/patch-ee b/lang/ruby18-base/patches/patch-ee
deleted file mode 100644
index 544b7f9e8f7..00000000000
--- a/lang/ruby18-base/patches/patch-ee
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ee,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-* r23015: (GetDigestPtr): use StringValueCStr instead of STR2CSTR.
-* r23506: (Init_ossl_digest): avoid recursing require.
-
---- ext/openssl/ossl_digest.c.orig	2008-02-25 08:48:57.000000000 +0000
-+++ ext/openssl/ossl_digest.c
-@@ -38,7 +38,7 @@ GetDigestPtr(VALUE obj)
-     const EVP_MD *md;
- 
-     if (TYPE(obj) == T_STRING) {
--    	const char *name = STR2CSTR(obj);
-+    	const char *name = StringValueCStr(obj);
- 
-         md = EVP_get_digestbyname(name);
-         if (!md)
-@@ -96,7 +96,6 @@ ossl_digest_initialize(int argc, VALUE *
- {
-     EVP_MD_CTX *ctx;
-     const EVP_MD *md;
--    char *name;
-     VALUE type, data;
- 
-     rb_scan_args(argc, argv, "11", &type, &data);
-@@ -182,7 +181,7 @@ ossl_digest_finish(int argc, VALUE *argv
-         rb_str_resize(str, EVP_MD_CTX_size(ctx));
-     }
- 
--    EVP_DigestFinal_ex(ctx, RSTRING_PTR(str), NULL);
-+    EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL);
- 
-     return str;
- }
-@@ -234,7 +233,6 @@ ossl_digest_block_length(VALUE self)
- void
- Init_ossl_digest()
- {
--    rb_require("openssl");
-     rb_require("digest");
- 
- #if 0 /* let rdoc know about mOSSL */
diff --git a/lang/ruby18-base/patches/patch-ef b/lang/ruby18-base/patches/patch-ef
deleted file mode 100644
index ee1beb7ff49..00000000000
--- a/lang/ruby18-base/patches/patch-ef
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ef,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-
---- ext/openssl/ossl_pkcs12.c.orig	2007-06-08 15:02:04.000000000 +0000
-+++ ext/openssl/ossl_pkcs12.c
-@@ -137,15 +137,17 @@ ossl_pkcs12_initialize(int argc, VALUE *
-     X509 *x509;
-     STACK_OF(X509) *x509s = NULL;
-     int st = 0;
-+    PKCS12 *pkcs = DATA_PTR(self);
- 
-     if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self;
-     passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass);
-     in = ossl_obj2bio(arg);
--    d2i_PKCS12_bio(in, (PKCS12 **)&DATA_PTR(self));
-+    d2i_PKCS12_bio(in, &pkcs);
-+    DATA_PTR(self) = pkcs;
-     BIO_free(in);
- 
-     pkey = cert = ca = Qnil;
--    if(!PKCS12_parse((PKCS12*)DATA_PTR(self), passphrase, &key, &x509, &x509s))
-+    if(!PKCS12_parse(pkcs, passphrase, &key, &x509, &x509s))
- 	ossl_raise(ePKCS12Error, "PKCS12_parse");
-     pkey = rb_protect((VALUE(*)_((VALUE)))ossl_pkey_new, (VALUE)key,
- 		      &st); /* NO DUP */
-@@ -181,7 +183,7 @@ ossl_pkcs12_to_der(VALUE self)
-     if((len = i2d_PKCS12(p12, NULL)) <= 0)
- 	ossl_raise(ePKCS12Error, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if(i2d_PKCS12(p12, &p) <= 0)
- 	ossl_raise(ePKCS12Error, NULL);
-     ossl_str_adjust(str, p);
diff --git a/lang/ruby18-base/patches/patch-eg b/lang/ruby18-base/patches/patch-eg
deleted file mode 100644
index 366bbec06e8..00000000000
--- a/lang/ruby18-base/patches/patch-eg
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-eg,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-* r26835: backport fixes in 1.9.
-
---- ext/openssl/ossl_pkey.c.orig	2010-05-24 23:58:49.000000000 +0000
-+++ ext/openssl/ossl_pkey.c
-@@ -164,7 +164,7 @@ ossl_pkey_sign(VALUE self, VALUE digest,
- {
-     EVP_PKEY *pkey;
-     EVP_MD_CTX ctx;
--    int buf_len;
-+    unsigned int buf_len;
-     VALUE str;
- 
-     if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) {
-@@ -175,7 +175,7 @@ ossl_pkey_sign(VALUE self, VALUE digest,
-     StringValue(data);
-     EVP_SignUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
-     str = rb_str_new(0, EVP_PKEY_size(pkey)+16);
--    if (!EVP_SignFinal(&ctx, RSTRING_PTR(str), &buf_len, pkey))
-+    if (!EVP_SignFinal(&ctx, (unsigned char *)RSTRING_PTR(str), &buf_len, pkey))
- 	ossl_raise(ePKeyError, NULL);
-     assert((long)buf_len <= RSTRING_LEN(str));
-     rb_str_set_len(str, buf_len);
-@@ -194,7 +194,7 @@ ossl_pkey_verify(VALUE self, VALUE diges
-     StringValue(sig);
-     StringValue(data);
-     EVP_VerifyUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
--    switch (EVP_VerifyFinal(&ctx, RSTRING_PTR(sig), RSTRING_LEN(sig), pkey)) {
-+    switch (EVP_VerifyFinal(&ctx, (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey)) {
-     case 0:
- 	return Qfalse;
-     case 1:
diff --git a/lang/ruby18-base/patches/patch-eh b/lang/ruby18-base/patches/patch-eh
deleted file mode 100644
index 04d61125382..00000000000
--- a/lang/ruby18-base/patches/patch-eh
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-eh,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-* r26835: backport fixes in 1.9.
-
---- ext/openssl/ossl_pkey_dh.c.orig	2010-05-24 23:58:49.000000000 +0000
-+++ ext/openssl/ossl_pkey_dh.c
-@@ -169,7 +169,7 @@ ossl_dh_initialize(int argc, VALUE *argv
- 	in = ossl_obj2bio(arg);
- 	dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
- 	if (!dh){
--	    BIO_reset(in);
-+	    (void)BIO_reset(in);
- 	    dh = d2i_DHparams_bio(in, NULL);
- 	}
- 	BIO_free(in);
-@@ -254,7 +254,7 @@ ossl_dh_to_der(VALUE self)
-     if((len = i2d_DHparams(pkey->pkey.dh, NULL)) <= 0)
- 	ossl_raise(eDHError, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if(i2d_DHparams(pkey->pkey.dh, &p) < 0)
- 	ossl_raise(eDHError, NULL);
-     ossl_str_adjust(str, p);
-@@ -407,7 +407,7 @@ ossl_dh_compute_key(VALUE self, VALUE pu
-     pub_key = GetBNPtr(pub);
-     len = DH_size(dh);
-     str = rb_str_new(0, len);
--    if ((len = DH_compute_key(RSTRING_PTR(str), pub_key, dh)) < 0) {
-+    if ((len = DH_compute_key((unsigned char *)RSTRING_PTR(str), pub_key, dh)) < 0) {
- 	ossl_raise(eDHError, NULL);
-     }
-     rb_str_set_len(str, len);
diff --git a/lang/ruby18-base/patches/patch-ei b/lang/ruby18-base/patches/patch-ei
deleted file mode 100644
index 71e7526cd45..00000000000
--- a/lang/ruby18-base/patches/patch-ei
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ei,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-* r26835: backport fixes in 1.9.
-
---- ext/openssl/ossl_pkey_dsa.c.orig	2010-05-24 23:58:49.000000000 +0000
-+++ ext/openssl/ossl_pkey_dsa.c
-@@ -161,19 +161,19 @@ ossl_dsa_initialize(int argc, VALUE *arg
- 	in = ossl_obj2bio(arg);
- 	dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
- 	if (!dsa) {
--	    BIO_reset(in);
-+	    (void)BIO_reset(in);
- 	    dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
- 	}
- 	if (!dsa) {
--	    BIO_reset(in);
-+	    (void)BIO_reset(in);
- 	    dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
- 	}
- 	if (!dsa) {
--	    BIO_reset(in);
-+	    (void)BIO_reset(in);
- 	    dsa = d2i_DSAPrivateKey_bio(in, NULL);
- 	}
- 	if (!dsa) {
--	    BIO_reset(in);
-+	    (void)BIO_reset(in);
- 	    dsa = d2i_DSA_PUBKEY_bio(in, NULL);
- 	}
- 	BIO_free(in);
-@@ -289,7 +289,7 @@ ossl_dsa_to_der(VALUE self)
-     if((len = i2d_func(pkey->pkey.dsa, NULL)) <= 0)
- 	ossl_raise(eDSAError, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if(i2d_func(pkey->pkey.dsa, &p) < 0)
- 	ossl_raise(eDSAError, NULL);
-     ossl_str_adjust(str, p);
-@@ -387,7 +387,7 @@ static VALUE
- ossl_dsa_sign(VALUE self, VALUE data)
- {
-     EVP_PKEY *pkey;
--    int buf_len;
-+    unsigned int buf_len;
-     VALUE str;
- 
-     GetPKeyDSA(self, pkey);
-@@ -396,7 +396,8 @@ ossl_dsa_sign(VALUE self, VALUE data)
- 	ossl_raise(eDSAError, "Private DSA key needed!");
-     }
-     str = rb_str_new(0, ossl_dsa_buf_size(pkey));
--    if (!DSA_sign(0, RSTRING_PTR(data), RSTRING_LEN(data), RSTRING_PTR(str),
-+    if (!DSA_sign(0, (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data),
-+		  (unsigned char *)RSTRING_PTR(str),
- 		  &buf_len, pkey->pkey.dsa)) { /* type is ignored (0) */
- 	ossl_raise(eDSAError, NULL);
-     }
-@@ -420,8 +421,8 @@ ossl_dsa_verify(VALUE self, VALUE digest
-     StringValue(digest);
-     StringValue(sig);
-     /* type is ignored (0) */
--    ret = DSA_verify(0, RSTRING_PTR(digest), RSTRING_LEN(digest),
--		     RSTRING_PTR(sig), RSTRING_LEN(sig), pkey->pkey.dsa);
-+    ret = DSA_verify(0, (unsigned char *)RSTRING_PTR(digest), RSTRING_LEN(digest),
-+		     (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey->pkey.dsa);
-     if (ret < 0) {
- 	ossl_raise(eDSAError, NULL);
-     }
diff --git a/lang/ruby18-base/patches/patch-ej b/lang/ruby18-base/patches/patch-ej
deleted file mode 100644
index 67a9cb190f0..00000000000
--- a/lang/ruby18-base/patches/patch-ej
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ej,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-* r23015: (GetDigestPtr): use StringValueCStr instead of STR2CSTR.
-* r26835: backport fixes in 1.9.
-* r26837: fix misc documentation along with test_dsa_sign_asn1_FIPS186_3
-
---- ext/openssl/ossl_pkey_ec.c.orig	2010-06-21 09:18:59.000000000 +0000
-+++ ext/openssl/ossl_pkey_ec.c
-@@ -186,22 +186,22 @@ static VALUE ossl_ec_key_initialize(int 
- 
-             ec = PEM_read_bio_ECPrivateKey(in, NULL, NULL, NULL);
-             if (!ec) {
--                BIO_reset(in);
-+                (void)BIO_reset(in);
-                 ec = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
-             }
-             if (!ec) {
--                BIO_reset(in);
-+                (void)BIO_reset(in);
-                 ec = d2i_ECPrivateKey_bio(in, NULL);
-             }
-             if (!ec) {
--                BIO_reset(in);
-+                (void)BIO_reset(in);
-                 ec = d2i_EC_PUBKEY_bio(in, NULL);
-             }
- 
-             BIO_free(in);
- 
-             if (ec == NULL) {
--                const char *name = STR2CSTR(arg);
-+                const char *name = StringValueCStr(arg);
-                 int nid = OBJ_sn2nid(name);
- 
-                 if (nid == NID_undef)
-@@ -778,14 +778,14 @@ static VALUE ossl_ec_group_initialize(in
- 
-             group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
-             if (!group) {
--                BIO_reset(in);
-+                (void)BIO_reset(in);
-                 group = d2i_ECPKParameters_bio(in, NULL);
-             }
- 
-             BIO_free(in);
- 
-             if (!group) {
--                const char *name = STR2CSTR(arg1);
-+                const char *name = StringValueCStr(arg1);
-                 int nid = OBJ_sn2nid(name);
- 
-                 if (nid == NID_undef)
-@@ -1092,7 +1092,7 @@ static VALUE ossl_ec_group_get_seed(VALU
-     if (seed_len == 0)
-         return Qnil;
- 
--    return rb_str_new(EC_GROUP_get0_seed(group), seed_len);
-+    return rb_str_new((const char *)EC_GROUP_get0_seed(group), seed_len);
- }
- 
- /*  call-seq:
-@@ -1107,7 +1107,7 @@ static VALUE ossl_ec_group_set_seed(VALU
-     Require_EC_GROUP(self, group);
-     StringValue(seed);
- 
--    if (EC_GROUP_set_seed(group, RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed))
-+    if (EC_GROUP_set_seed(group, (unsigned char *)RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed))
-         ossl_raise(eEC_GROUP, "EC_GROUP_set_seed");
- 
-     return seed;
diff --git a/lang/ruby18-base/patches/patch-ek b/lang/ruby18-base/patches/patch-ek
deleted file mode 100644
index 8103081f21a..00000000000
--- a/lang/ruby18-base/patches/patch-ek
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-ek,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-* r26835: backport fixes in 1.9.
-
---- ext/openssl/ossl_pkey_rsa.c.orig	2010-05-24 23:58:49.000000000 +0000
-+++ ext/openssl/ossl_pkey_rsa.c
-@@ -151,23 +151,23 @@ ossl_rsa_initialize(int argc, VALUE *arg
- 	in = ossl_obj2bio(arg);
- 	rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
- 	if (!rsa) {
--	    BIO_reset(in);
-+	    (void)BIO_reset(in);
- 	    rsa = PEM_read_bio_RSAPublicKey(in, NULL, NULL, NULL);
- 	}
- 	if (!rsa) {
--	    BIO_reset(in);
-+	    (void)BIO_reset(in);
- 	    rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL);
- 	}
- 	if (!rsa) {
--	    BIO_reset(in);
-+	    (void)BIO_reset(in);
- 	    rsa = d2i_RSAPrivateKey_bio(in, NULL);
- 	}
- 	if (!rsa) {
--	    BIO_reset(in);
-+	    (void)BIO_reset(in);
- 	    rsa = d2i_RSAPublicKey_bio(in, NULL);
- 	}
- 	if (!rsa) {
--	    BIO_reset(in);
-+	    (void)BIO_reset(in);
- 	    rsa = d2i_RSA_PUBKEY_bio(in, NULL);
- 	}
- 	BIO_free(in);
-@@ -288,7 +288,7 @@ ossl_rsa_to_der(VALUE self)
-     if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0)
- 	ossl_raise(eRSAError, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if(i2d_func(pkey->pkey.rsa, &p) < 0)
- 	ossl_raise(eRSAError, NULL);
-     ossl_str_adjust(str, p);
-@@ -315,8 +315,8 @@ ossl_rsa_public_encrypt(int argc, VALUE 
-     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
-     StringValue(buffer);
-     str = rb_str_new(0, ossl_rsa_buf_size(pkey));
--    buf_len = RSA_public_encrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
--				 RSTRING_PTR(str), pkey->pkey.rsa,
-+    buf_len = RSA_public_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
-+				 (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
- 				 pad);
-     if (buf_len < 0) ossl_raise(eRSAError, NULL);
-     rb_str_set_len(str, buf_len);
-@@ -341,8 +341,8 @@ ossl_rsa_public_decrypt(int argc, VALUE 
-     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
-     StringValue(buffer);
-     str = rb_str_new(0, ossl_rsa_buf_size(pkey));
--    buf_len = RSA_public_decrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
--				 RSTRING_PTR(str), pkey->pkey.rsa,
-+    buf_len = RSA_public_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
-+				 (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
- 				 pad);
-     if (buf_len < 0) ossl_raise(eRSAError, NULL);
-     rb_str_set_len(str, buf_len);
-@@ -370,8 +370,8 @@ ossl_rsa_private_encrypt(int argc, VALUE
-     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
-     StringValue(buffer);
-     str = rb_str_new(0, ossl_rsa_buf_size(pkey));
--    buf_len = RSA_private_encrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
--				  RSTRING_PTR(str), pkey->pkey.rsa,
-+    buf_len = RSA_private_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
-+				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
- 				  pad);
-     if (buf_len < 0) ossl_raise(eRSAError, NULL);
-     rb_str_set_len(str, buf_len);
-@@ -400,8 +400,8 @@ ossl_rsa_private_decrypt(int argc, VALUE
-     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
-     StringValue(buffer);
-     str = rb_str_new(0, ossl_rsa_buf_size(pkey));
--    buf_len = RSA_private_decrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
--				  RSTRING_PTR(str), pkey->pkey.rsa,
-+    buf_len = RSA_private_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
-+				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
- 				  pad);
-     if (buf_len < 0) ossl_raise(eRSAError, NULL);
-     rb_str_set_len(str, buf_len);
diff --git a/lang/ruby18-base/patches/patch-el b/lang/ruby18-base/patches/patch-el
deleted file mode 100644
index fd4a391771c..00000000000
--- a/lang/ruby18-base/patches/patch-el
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-el,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-
---- ext/openssl/ossl_rand.c.orig	2008-05-29 18:15:50.000000000 +0000
-+++ ext/openssl/ossl_rand.c
-@@ -99,7 +99,7 @@ ossl_rand_bytes(VALUE self, VALUE len)
-     int n = NUM2INT(len);
- 
-     str = rb_str_new(0, n);
--    if (!RAND_bytes(RSTRING_PTR(str), n)) {
-+    if (!RAND_bytes((unsigned char *)RSTRING_PTR(str), n)) {
- 	ossl_raise(eRandomError, NULL);
-     }
- 
-@@ -118,7 +118,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE
-     int n = NUM2INT(len);
- 
-     str = rb_str_new(0, n);
--    if (!RAND_pseudo_bytes(RSTRING_PTR(str), n)) {
-+    if (!RAND_pseudo_bytes((unsigned char *)RSTRING_PTR(str), n)) {
- 	ossl_raise(eRandomError, NULL);
-     }
- 
diff --git a/lang/ruby18-base/patches/patch-em b/lang/ruby18-base/patches/patch-em
deleted file mode 100644
index 756a7964a86..00000000000
--- a/lang/ruby18-base/patches/patch-em
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-em,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-* r26835: backport fixes in 1.9.
-* r26850: (ossl_ssl_session_{get,set}_time{,out}): fixed a bug introduced by
-	  backporting. (see [ruby-dev:40573])  use long in according to
-	  OpenSSL API. (SSL_SESSION_{get,set}_time{,out})
-* r26861: (ossl_pkcs5_pbkdf2_hmac): follows function definition in
-	  OpenSSL 1.0.0beta5. PKCS5_PBKDF2_HMAC is from 1.0.0 (0.9.8 only
-	  has PKCS5_PBKDF2_HMAC_SHA1)
-
---- ext/openssl/ossl_ssl_session.c.orig	2010-06-21 09:18:59.000000000 +0000
-+++ ext/openssl/ossl_ssl_session.c
-@@ -36,8 +36,6 @@ static VALUE ossl_ssl_session_alloc(VALU
- static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
- {
- 	SSL_SESSION *ctx = NULL;
--	VALUE obj;
--	unsigned char *p;
- 
- 	if (RDATA(self)->data)
- 		ossl_raise(eSSLSession, "SSL Session already initialized");
-@@ -55,7 +53,7 @@ static VALUE ossl_ssl_session_initialize
- 		ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
- 
- 		if (!ctx) {
--			BIO_reset(in);
-+			(void)BIO_reset(in);
- 			ctx = d2i_SSL_SESSION_bio(in, NULL);
- 		}
- 
diff --git a/lang/ruby18-base/patches/patch-en b/lang/ruby18-base/patches/patch-en
deleted file mode 100644
index ae78b555619..00000000000
--- a/lang/ruby18-base/patches/patch-en
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-en,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r18172: suppress warnings.
-
---- ext/openssl/ossl_x509req.c.orig	2007-06-08 15:02:04.000000000 +0000
-+++ ext/openssl/ossl_x509req.c
-@@ -99,7 +99,7 @@ static VALUE 
- ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
- {
-     BIO *in;
--    X509_REQ *req;
-+    X509_REQ *req, *x = DATA_PTR(self);
-     VALUE arg;
- 
-     if (rb_scan_args(argc, argv, "01", &arg) == 0) {
-@@ -107,10 +107,12 @@ ossl_x509req_initialize(int argc, VALUE 
-     }
-     arg = ossl_to_der_if_possible(arg);
-     in = ossl_obj2bio(arg);
--    req = PEM_read_bio_X509_REQ(in, (X509_REQ **)&DATA_PTR(self), NULL, NULL);
-+    req = PEM_read_bio_X509_REQ(in, &x, NULL, NULL);
-+    DATA_PTR(self) = x;
-     if (!req) {
--	BIO_reset(in);
--	req = d2i_X509_REQ_bio(in, (X509_REQ **)&DATA_PTR(self));
-+	(void)BIO_reset(in);
-+	req = d2i_X509_REQ_bio(in, &x);
-+	DATA_PTR(self) = x;
-     }
-     BIO_free(in);
-     if (!req) ossl_raise(eX509ReqError, NULL);
-@@ -171,7 +173,7 @@ ossl_x509req_to_der(VALUE self)
-     if ((len = i2d_X509_REQ(req, NULL)) <= 0)
- 	ossl_raise(eX509CertError, NULL);
-     str = rb_str_new(0, len);
--    p = RSTRING_PTR(str);
-+    p = (unsigned char *)RSTRING_PTR(str);
-     if (i2d_X509_REQ(req, &p) <= 0)
- 	ossl_raise(eX509ReqError, NULL);
-     ossl_str_adjust(str, p);
diff --git a/lang/ruby18-base/patches/patch-eo b/lang/ruby18-base/patches/patch-eo
deleted file mode 100644
index 83620474517..00000000000
--- a/lang/ruby18-base/patches/patch-eo
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-eo,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r26209: rename {addr,name}info functions to ensure those are used on darwin.
-
---- ext/socket/addrinfo.h.orig	2008-06-06 12:19:21.000000000 +0000
-+++ ext/socket/addrinfo.h
-@@ -29,7 +29,6 @@
- 
- #ifndef ADDR_INFO_H
- #define ADDR_INFO_H
--#ifndef HAVE_GETADDRINFO
- 
- /* special compatibility hack */
- #undef EAI_ADDRFAMILY
-@@ -61,17 +60,6 @@
- #undef NI_NUMERICSERV
- #undef NI_DGRAM
- 
--#undef addrinfo
--#define addrinfo addrinfo__compat
--#undef getaddrinfo
--#define getaddrinfo getaddrinfo__compat
--#undef getnameinfo
--#define getnameinfo getnameinfo__compat
--#undef freehostent
--#define freehostent freehostent__compat
--#undef freeaddrinfo
--#define freeaddrinfo freeaddrinfo__compat
--
- #ifndef __P
- # ifdef HAVE_PROTOTYPES
- #  define __P(args) args
-@@ -134,6 +122,7 @@
- #define	NI_NUMERICSERV	0x00000008
- #define	NI_DGRAM	0x00000010
- 
-+#ifndef HAVE_TYPE_STRUCT_ADDRINFO
- struct addrinfo {
- 	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME */
- 	int	ai_family;	/* PF_xxx */
-@@ -144,6 +133,24 @@ struct addrinfo {
- 	struct sockaddr *ai_addr;	/* binary address */
- 	struct addrinfo *ai_next;	/* next structure in linked list */
- };
-+#endif
-+
-+#ifndef HAVE_GETADDRINFO
-+#undef getaddrinfo
-+#define getaddrinfo getaddrinfo__compat
-+#endif
-+#ifndef HAVE_GETNAMEINFO
-+#undef getnameinfo
-+#define getnameinfo getnameinfo__compat
-+#endif
-+#ifndef HAVE_FREEHOSTENT
-+#undef freehostent
-+#define freehostent freehostent__compat
-+#endif
-+#ifndef HAVE_FREEADDRINFO
-+#undef freeaddrinfo
-+#define freeaddrinfo freeaddrinfo__compat
-+#endif
- 
- extern int getaddrinfo __P((
- 	const char *hostname, const char *servname,
-@@ -152,19 +159,20 @@ extern int getaddrinfo __P((
- 
- extern int getnameinfo __P((
- 	const struct sockaddr *sa,
--	size_t salen,
-+	socklen_t salen,
- 	char *host,
--	size_t hostlen,
-+	socklen_t hostlen,
- 	char *serv,
--	size_t servlen,
-+	socklen_t servlen,
- 	int flags));
- 
- extern void freehostent __P((struct hostent *));
- extern void freeaddrinfo __P((struct addrinfo *));
--#if defined __UCLIBC__
-+extern
-+#ifdef GAI_STRERROR_CONST
- const
- #endif
--extern char *gai_strerror __P((int));
-+char *gai_strerror __P((int));
- 
- /* In case there is no definition of offsetof() provided - though any proper
- Standard C system should have one. */
-@@ -174,4 +182,3 @@ Standard C system should have one. */
- #endif
- 
- #endif
--#endif
diff --git a/lang/ruby18-base/patches/patch-ep b/lang/ruby18-base/patches/patch-ep
deleted file mode 100644
index 835799ec744..00000000000
--- a/lang/ruby18-base/patches/patch-ep
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ep,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r26209: rename {addr,name}info functions to ensure those are used on darwin.
-
---- ext/socket/depend.orig	2007-02-12 23:01:19.000000000 +0000
-+++ ext/socket/depend
-@@ -1,3 +1,3 @@
--socket.o : socket.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/rubyio.h $(hdrdir)/rubysig.h sockport.h
-+socket.o : socket.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/rubyio.h $(hdrdir)/rubysig.h addrinfo.h sockport.h
- getnameinfo.o: getnameinfo.c $(topdir)/config.h addrinfo.h sockport.h
- getaddrinfo.o: getaddrinfo.c $(topdir)/config.h addrinfo.h sockport.h
diff --git a/lang/ruby18-base/patches/patch-eq b/lang/ruby18-base/patches/patch-eq
deleted file mode 100644
index 590b88097dd..00000000000
--- a/lang/ruby18-base/patches/patch-eq
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-eq,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r26209: rename {addr,name}info functions to ensure those are used on darwin.
-
---- ext/socket/getaddrinfo.c.orig	2009-02-25 06:06:08.000000000 +0000
-+++ ext/socket/getaddrinfo.c
-@@ -87,10 +87,6 @@
- #include "addrinfo.h"
- #include "sockport.h"
- 
--#if defined(__KAME__) && defined(INET6)
--# define FAITH
--#endif
--
- #define SUCCESS 0
- #define ANY 0
- #define YES 1
-@@ -493,11 +489,7 @@ getaddrinfo(hostname, servname, hints, r
- 				break;
- #ifdef INET6
- 			case AF_INET6:
--#ifdef HAVE_ADDR8
--				pfx = ((struct in6_addr *)pton)->s6_addr8[0];
--#else
- 				pfx = ((struct in6_addr *)pton)->s6_addr[0];
--#endif
- 				if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
- 					pai->ai_flags &= ~AI_CANONNAME;
- 				break;
-@@ -673,9 +665,10 @@ get_addr(hostname, af, res, pai, port0)
- 
- 			GET_AI(cur->ai_next, &afdl[N_INET6], ap, port);
- 			in6 = &((struct sockaddr_in6 *)cur->ai_next->ai_addr)->sin6_addr;
--			memcpy(&in6->s6_addr32[0], &faith_prefix,
--			    sizeof(struct in6_addr) - sizeof(struct in_addr));
--			memcpy(&in6->s6_addr32[3], ap, sizeof(struct in_addr));
-+			memcpy(&in6->s6_addr, &faith_prefix,
-+			       sizeof(struct in6_addr) - sizeof(struct in_addr));
-+			memcpy(&in6->s6_addr + sizeof(struct in_addr), ap,
-+			       sizeof(struct in_addr));
- 		} else
- #endif /* FAITH */
- 		GET_AI(cur->ai_next, afd, ap, port);
diff --git a/lang/ruby18-base/patches/patch-er b/lang/ruby18-base/patches/patch-er
deleted file mode 100644
index 57e6fa55330..00000000000
--- a/lang/ruby18-base/patches/patch-er
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-er,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r26209: rename {addr,name}info functions to ensure those are used on darwin.
-
---- ext/socket/getnameinfo.c.orig	2007-07-22 05:33:47.000000000 +0000
-+++ ext/socket/getnameinfo.c
-@@ -135,11 +135,11 @@ inet_ntop(af, addr, numaddr, numaddr_len
- int
- getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
- 	const struct sockaddr *sa;
--	size_t salen;
-+	socklen_t salen;
- 	char *host;
--	size_t hostlen;
-+	socklen_t hostlen;
- 	char *serv;
--	size_t servlen;
-+	socklen_t servlen;
- 	int flags;
- {
- 	struct afd *afd;
diff --git a/lang/ruby18-base/patches/patch-et b/lang/ruby18-base/patches/patch-et
deleted file mode 100644
index 747125508f1..00000000000
--- a/lang/ruby18-base/patches/patch-et
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-et,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r26424: fix circular requrie in drb.
-
---- lib/drb/eq.rb.orig	2007-02-12 23:01:19.000000000 +0000
-+++ lib/drb/eq.rb
-@@ -1,5 +1,3 @@
--require 'drb/drb'
--
- module DRb
-   class DRbObject
-     def ==(other)
diff --git a/lang/ruby18-base/patches/patch-eu b/lang/ruby18-base/patches/patch-eu
deleted file mode 100644
index 835f5b821c4..00000000000
--- a/lang/ruby18-base/patches/patch-eu
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-eu,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r26783: (Open3#popen3): use Thread.detach instead of double-fork, so that
-	  the exit status can be obtained.
-* r26784: (Open3#popen3): ignore trap and at_exit also when exec failed.
-	  [ruby-dev:30181]
-
---- lib/open3.rb.orig	2009-12-14 04:28:06.000000000 +0000
-+++ lib/open3.rb
-@@ -56,39 +56,40 @@ module Open3
- 
-     pid = fork{
-       # child
--      fork{
--	# grandchild
--	pw[1].close
--	STDIN.reopen(pw[0])
--	pw[0].close
--
--	pr[0].close
--	STDOUT.reopen(pr[1])
--	pr[1].close
--
--	pe[0].close
--	STDERR.reopen(pe[1])
--	pe[1].close
--
--	exec(*cmd)
--      }
--      exit!(0)
-+      pw[1].close
-+      STDIN.reopen(pw[0])
-+      pw[0].close
-+
-+      pr[0].close
-+      STDOUT.reopen(pr[1])
-+      pr[1].close
-+
-+      pe[0].close
-+      STDERR.reopen(pe[1])
-+      pe[1].close
-+
-+      trap("EXIT", "DEFAULT")
-+      at_exit {exit!(false)}
-+      at_exit {raise($!)}
-+      exec(*cmd)
-     }
- 
-     pw[0].close
-     pr[1].close
-     pe[1].close
--    Process.waitpid(pid)
-+    waiter = Process.detach(pid)
-     pi = [pw[1], pr[0], pe[0]]
-+    result = pi + [waiter]
-     pw[1].sync = true
-     if defined? yield
-       begin
--	return yield(*pi)
-+	return yield(*result)
-       ensure
- 	pi.each{|p| p.close unless p.closed?}
-+        waiter.join
-       end
-     end
--    pi
-+    result
-   end
-   module_function :popen3
- end
diff --git a/lang/ruby18-base/patches/patch-ev b/lang/ruby18-base/patches/patch-ev
deleted file mode 100644
index 54394c45d47..00000000000
--- a/lang/ruby18-base/patches/patch-ev
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ev,v 1.1 2010/09/10 03:29:01 taca Exp $
-
-* r26583: don't use NOFOLLOW because /dev/urandom is a symlink in OpenSolaris.
-
---- lib/securerandom.rb.orig	2007-10-10 14:37:42.000000000 +0000
-+++ lib/securerandom.rb
-@@ -57,7 +57,6 @@ module SecureRandom
-       flags = File::RDONLY
-       flags |= File::NONBLOCK if defined? File::NONBLOCK
-       flags |= File::NOCTTY if defined? File::NOCTTY
--      flags |= File::NOFOLLOW if defined? File::NOFOLLOW
-       begin
-         File.open("/dev/urandom", flags) {|f|
-           unless f.stat.chardev?
diff --git a/lang/ruby18-base/patches/patch-ew b/lang/ruby18-base/patches/patch-ew
deleted file mode 100644
index 1ac43cecdd3..00000000000
--- a/lang/ruby18-base/patches/patch-ew
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ew,v 1.2 2011/12/28 16:40:07 taca Exp $
-
-* r26583: don't use O_NOFOLLOW because /dev/urandom is a symlink in OpenSolaris.
-
---- random.c.orig	2011-12-28 12:47:15.000000000 +0000
-+++ random.c
-@@ -276,9 +276,6 @@ fill_random_seed(ptr)
- #ifdef O_NOCTTY
-             |O_NOCTTY
- #endif
--#ifdef O_NOFOLLOW
--            |O_NOFOLLOW
--#endif
-             )) >= 0) {
-         if (fstat(fd, &statbuf) == 0 && S_ISCHR(statbuf.st_mode)) {
-             read(fd, seed, DEFAULT_SEED_LEN);
diff --git a/lang/ruby18-base/patches/patch-ext_openssl_extconf.rb b/lang/ruby18-base/patches/patch-ext_openssl_extconf.rb
deleted file mode 100644
index 95fde1122de..00000000000
--- a/lang/ruby18-base/patches/patch-ext_openssl_extconf.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ext_openssl_extconf.rb,v 1.1 2015/10/14 18:41:42 sevan Exp $
-
-Check for SSLv3 support as it may nolonger be available.
-
---- ext/openssl/extconf.rb.orig	Sat Oct 10 17:37:29 2015
-+++ ext/openssl/extconf.rb
-@@ -103,6 +103,9 @@ end
- have_func("SSLv2_method")
- have_func("SSLv2_server_method")
- have_func("SSLv2_client_method")
-+have_func("SSLv3_method")
-+have_func("SSLv3_server_method")
-+have_func("SSLv3_client_method")
- unless have_func("SSL_set_tlsext_host_name", ['openssl/ssl.h'])
-   have_macro("SSL_set_tlsext_host_name", ['openssl/ssl.h']) && $defs.push("-DHAVE_SSL_SET_TLSEXT_HOST_NAME")
- end
diff --git a/lang/ruby18-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb b/lang/ruby18-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb
deleted file mode 100644
index b71bc10127e..00000000000
--- a/lang/ruby18-base/patches/patch-ext_tk_lib_tkextlib_tktable_tktable.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ext_tk_lib_tkextlib_tktable_tktable.rb,v 1.1 2013/11/24 15:26:30 taca Exp $
-
-Fix wrong parameter from [ruby-list:49643].
-
---- ext/tk/lib/tkextlib/tktable/tktable.rb.orig	2008-05-23 05:22:13.000000000 +0000
-+++ ext/tk/lib/tkextlib/tktable/tktable.rb
-@@ -70,7 +70,7 @@ module Tk::TkTable::ConfigMethod
-   private :__item_strval_optkeys
- 
-   def __item_val2ruby_optkeys(id)  # { key=>method, ... }
--    super(id).update('window'=>proc{|v| window(v)})
-+    super(id).update('window'=>proc{|k, v| window(v)})
-   end
-   private :__item_val2ruby_optkeys
- 
diff --git a/lang/ruby18-base/patches/patch-ga b/lang/ruby18-base/patches/patch-ga
deleted file mode 100644
index 2bd2fe9fd44..00000000000
--- a/lang/ruby18-base/patches/patch-ga
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ga,v 1.1 2010/09/10 03:29:01 taca Exp $
-
---- ext/curses/extconf.rb.orig	2007-11-15 10:51:07.000000000 +0000
-+++ ext/curses/extconf.rb
-@@ -11,9 +11,6 @@ if have_header(*curses=%w"ncurses.h") an
-   make=true
- elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
-   make=true
--elsif have_header(*curses=%w"curses_colr/curses.h") and have_library("cur_colr", "initscr")
--  curses.unshift("varargs.h")
--  make=true
- elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
-   make=true
- end
diff --git a/lang/ruby18-base/patches/patch-gb b/lang/ruby18-base/patches/patch-gb
deleted file mode 100644
index 46de435175f..00000000000
--- a/lang/ruby18-base/patches/patch-gb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-gb,v 1.1 2010/09/10 03:29:01 taca Exp $
-
---- ext/tk/sample/tkbiff.rb.orig	2007-02-12 23:01:19.000000000 +0000
-+++ ext/tk/sample/tkbiff.rb
-@@ -12,7 +12,11 @@ if ARGV.length == 0
-   if ENV['MAIL']
-     $spool = ENV['MAIL']
-   else  
--    $spool = '/var/spool/mail/' + ENV['USER']
-+    dir = '/var/mail'
-+    unless FileTest.directory?(dir)
-+      dir = '/var/spool/mail'
-+    end
-+    $spool = dir + '/' + ENV['USER']
-   end
- else 
-   $spool = ARGV[0]
diff --git a/lang/ruby18-base/patches/patch-lex.c b/lang/ruby18-base/patches/patch-lex.c
deleted file mode 100644
index 2ff60154516..00000000000
--- a/lang/ruby18-base/patches/patch-lex.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-lex.c,v 1.1 2016/02/22 12:53:32 jperkin Exp $
-
-Fix build with Darwin/clang.
-
---- lex.c.orig	2008-05-31 11:44:49.000000000 +0000
-+++ lex.c
-@@ -67,6 +67,9 @@ hash (str, len)
- 
- #ifdef __GNUC__
- __inline
-+#  if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-+__attribute__ ((__gnu_inline__))
-+#  endif
- #endif
- struct kwtable *
- rb_reserved_word (str, len)
diff --git a/lang/ruby18-base/patches/patch-lib_rdoc_options.rb b/lang/ruby18-base/patches/patch-lib_rdoc_options.rb
deleted file mode 100644
index 2b5e5f7665d..00000000000
--- a/lang/ruby18-base/patches/patch-lib_rdoc_options.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_rdoc_options.rb,v 1.1 2011/03/28 14:10:25 taca Exp $
-
-* Ignore none existing files as newer version of rdoc.
-
---- lib/rdoc/options.rb.orig	2008-01-11 01:24:05.000000000 +0000
-+++ lib/rdoc/options.rb
-@@ -573,7 +573,7 @@ class Options
-   
-   def check_files
-     @files.each do |f|
--      stat = File.stat f rescue error("File not found: #{f}")
-+      stat = File.stat f rescue next
-       error("File '#{f}' not readable") unless stat.readable?
-     end
-   end
diff --git a/lang/ruby18-base/patches/patch-lib_rdoc_rdoc.rb b/lang/ruby18-base/patches/patch-lib_rdoc_rdoc.rb
deleted file mode 100644
index 27890e8a20d..00000000000
--- a/lang/ruby18-base/patches/patch-lib_rdoc_rdoc.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_rdoc_rdoc.rb,v 1.1 2011/03/28 14:10:25 taca Exp $
-
-* Ignore none existing files as newer version of rdoc.
-
---- lib/rdoc/rdoc.rb.orig	2007-02-12 23:01:19.000000000 +0000
-+++ lib/rdoc/rdoc.rb
-@@ -174,7 +174,7 @@ module RDoc
- 
-       relative_files.each do |rel_file_name|
-         next if exclude_pattern && exclude_pattern =~ rel_file_name
--        stat = File.stat(rel_file_name)
-+        stat = File.stat(rel_file_name) rescue next
-         case type = stat.ftype
-         when "file"
-           next if @last_created and stat.mtime < @last_created
diff --git a/lang/ruby18-base/patches/patch-lib_rexml_entity.rb b/lang/ruby18-base/patches/patch-lib_rexml_entity.rb
deleted file mode 100644
index fac577dcc18..00000000000
--- a/lang/ruby18-base/patches/patch-lib_rexml_entity.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-lib_rexml_entity.rb,v 1.1 2015/02/16 14:03:32 taca Exp $
-
-Fix for CVE-2015-1426.
-
---- lib/rexml/entity.rb.orig	2009-02-05 00:03:56.000000000 +0000
-+++ lib/rexml/entity.rb
-@@ -138,8 +138,15 @@ module REXML
- 				matches = @value.scan(PEREFERENCE_RE)
- 				rv = @value.clone
- 				if @parent
-+                                  sum = 0
- 					matches.each do |entity_reference|
- 						entity_value = @parent.entity( entity_reference[0] )
-+						if sum + entity_value.bytesize > Document.entity_expansion_text_limit
-+                                                  raise "entity expansion has grown too large"
-+                                                else
-+                                                  sum += entity_value.bytesize
-+                                                end
-+
- 						rv.gsub!( /%#{entity_reference};/um, entity_value )
- 					end
- 				end
author	taca <taca>	2017-04-22 18:23:55 +0000
committer	taca <taca>	2017-04-22 18:23:55 +0000
commit	f551fb2d5c9975fa6462232b1a34b4fe1078acdb (patch)
tree	6cce93775cf8006b8010def8e8180e75dddc9991 /lang
parent	2a878972809b927920bd7a8851975ef5a69a3fad (diff)
download	pkgsrc-f551fb2d5c9975fa6462232b1a34b4fe1078acdb.tar.gz