Updating Ruby to 1.8.6; ruby18-base

- discontinue use of RUBY_PATCH_DATE.
- Introduce RUBY_PATCH_LEVEL.

pkgsrc's ruby tracks Ruby's patch release and avoid to maintain
its own patch files (with RUBY_PATCH_DATE).

Changes are too much, please see ChangeLog file.

7 files changed, 29 insertions, 309 deletions

diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 9b166b39ec6..5a221ef35ff 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,16 +1,11 @@
-# $NetBSD: Makefile,v 1.30 2007/01/28 15:15:58 taca Exp $
+# $NetBSD: Makefile,v 1.31 2007/03/15 16:41:29 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
-PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCHFILES=	ruby-1.8.5-base-${RUBY18_PATCH_DATE}.patch.bz2
-PATCH_DIST_STRIP= -p1
-
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby 1.8 based release minimum package
@@ -31,7 +26,7 @@ CONFIGURE_ARGS+= --enable-shared \
 		--with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \
 		--with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib"
 CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
-WRKSRC=			${RUBY_WRKSRC}
+WRKSRC=		${RUBY_WRKSRC}
 
 # Ruby build process depends on config.status's content
 CONFIG_STATUS_OVERRIDE=	# empty
@@ -63,12 +58,12 @@ PLIST_SUBST+=	HAS_IO=
 CONFIGURE_ARGS+=	--enable-wide-getaddrinfo
 .endif
 
-DOCS=		COPYING COPYING.ja ChangeLog README \
+DOCS=		COPYING COPYING.ja ChangeLog NEWS README \
 		README.EXT README.EXT.ja README.ja ToDo \
-		doc/ChangeLog-1.8.0 doc/NEWS \
+		doc/ChangeLog-1.8.0 doc/NEWS-1.8.0 \
 		doc/forwardable.rd doc/forwardable.rd.ja \
-		doc/shell.rd doc/shell.rd.ja doc/irb/irb-tools.rd.ja \
-		doc/irb/irb.rd doc/irb/irb.rd.ja
+		doc/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 enumerator/enumerator.txt \
 		etc/etc.txt etc/etc.txt.ja syslog/syslog.txt \
diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST
index f81030e6cbe..0b53c1cc200 100644
--- a/lang/ruby18-base/PLIST
+++ b/lang/ruby18-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/12/06 16:24:27 taca Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/03/15 16:41:30 taca Exp $
 bin/erb${RUBY_VER}
 bin/h2rb${RUBY_VER}
 bin/irb${RUBY_VER}
@@ -26,8 +26,8 @@ ${RUBY_LIBDIR}/cgi-lib.rb
 ${RUBY_LIBDIR}/cgi.rb
 ${RUBY_LIBDIR}/complex.rb
 ${RUBY_LIBDIR}/csv.rb
+${RUBY_LIBDIR}/digest/sha2.rb
 ${RUBY_LIBDIR}/digest.rb
-${RUBY_LIBDIR}/digest/digest/sha2.rb
 ${RUBY_LIBDIR}/date/format.rb
 ${RUBY_LIBDIR}/date.rb
 ${RUBY_LIBDIR}/date2.rb
@@ -103,6 +103,7 @@ ${RUBY_ARCHLIBDIR}/stringio.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/strscan.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/syck.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/syslog.${RUBY_DLEXT}
+${RUBY_ARCHLIBDIR}/thread.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/util.h
 ${RUBY_ARCHLIBDIR}/version.h
 ${RUBY_ARCHLIBDIR}/zlib.${RUBY_DLEXT}
@@ -587,6 +588,7 @@ ${RUBY_DOCDIR}/COPYING.ja
 ${RUBY_DOCDIR}/ChangeLog
 ${RUBY_DOCDIR}/ChangeLog-1.8.0
 ${RUBY_DOCDIR}/NEWS
+${RUBY_DOCDIR}/NEWS-1.8.0
 ${RUBY_DOCDIR}/README
 ${RUBY_DOCDIR}/README.EXT
 ${RUBY_DOCDIR}/README.EXT.ja
diff --git a/lang/ruby18-base/PLIST.common_end b/lang/ruby18-base/PLIST.common_end
index bc676d7f6ce..514ed2d4961 100644
--- a/lang/ruby18-base/PLIST.common_end
+++ b/lang/ruby18-base/PLIST.common_end
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST.common_end,v 1.3 2007/01/28 15:15:58 taca Exp $
+@comment $NetBSD: PLIST.common_end,v 1.4 2007/03/15 16:41:30 taca Exp $
 @dirrm ${RUBY_LIBDIR}/bigdecimal
 @dirrm ${RUBY_LIBDIR}/cgi/session
 @dirrm ${RUBY_LIBDIR}/cgi
 @dirrm ${RUBY_LIBDIR}/date
-@dirrm ${RUBY_LIBDIR}/digest/digest
 @dirrm ${RUBY_LIBDIR}/digest
 @dirrm ${RUBY_LIBDIR}/dl
 @dirrm ${RUBY_LIBDIR}/drb
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index ec0058bdb83..86de521a6d5 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.18 2007/01/19 19:50:46 minskim Exp $
+$NetBSD: distinfo,v 1.19 2007/03/15 16:41:30 taca Exp $
 
-SHA1 (ruby-1.8.5-base-20061205.patch.bz2) = 48596c5f528b36093d2cf84d5ea449939152a15c
-RMD160 (ruby-1.8.5-base-20061205.patch.bz2) = e13915938f5429d00498690960471eac36c68c7a
-Size (ruby-1.8.5-base-20061205.patch.bz2) = 107370 bytes
-SHA1 (ruby-1.8.5.tar.gz) = 0638ea26e1088fc9f4237abde8c85331689ce77c
-RMD160 (ruby-1.8.5.tar.gz) = 991899146c23c9ea30ac09f41b7077fa0c8686b6
-Size (ruby-1.8.5.tar.gz) = 4438603 bytes
-SHA1 (patch-aa) = c5413c506b93657d909bc3cbdcdb51e7c216491e
-SHA1 (patch-ab) = a1a76abd093a08e76be61678febd5f8c8cba164d
+SHA1 (ruby-1.8.6.tar.bz2) = 5c2e10c3f5f0cbbd72c9b8df8f402e7613de641b
+RMD160 (ruby-1.8.6.tar.bz2) = b5be823179def82eff8436ce2bffef2e453cc8d2
+Size (ruby-1.8.6.tar.bz2) = 3946186 bytes
+SHA1 (patch-aa) = c8c7539433a61a772b6e9a03fb237335816c1cea
+SHA1 (patch-ab) = c2be88bed22ea671ef0fa4c47b081fee067a1dd1
 SHA1 (patch-ac) = b84bc931ab3dd7fe619cca846a300673fa71f48e
 SHA1 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228
-SHA1 (patch-af) = 165c8b564311d1ce03722c7c3cf455bbaf1b1a3a
diff --git a/lang/ruby18-base/patches/patch-aa b/lang/ruby18-base/patches/patch-aa
index d4cbfd3951c..ff3968357ef 100644
--- a/lang/ruby18-base/patches/patch-aa
+++ b/lang/ruby18-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2006/10/29 02:45:42 taca Exp $
+$NetBSD: patch-aa,v 1.8 2007/03/15 16:41:30 taca Exp $
 
---- configure.in.orig	2006-10-29 11:16:01.000000000 +0900
+--- configure.in.orig	2007-02-28 22:23:42.000000000 +0900
 +++ configure.in
-@@ -409,6 +409,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
+@@ -416,6 +416,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
  		;;
  bsdi*)          LIBS="-lm $LIBS"
                  ac_cv_sizeof_rlim_t=8;;
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.7 2006/10/29 02:45:42 taca Exp $
  freebsd*)	LIBS="-lm $LIBS"
  		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
  		  rb_cv_lib_xpg4_needed,
-@@ -1004,6 +1007,13 @@ if test "$with_dln_a_out" != yes; then
+@@ -1021,6 +1024,13 @@ if test "$with_dln_a_out" != yes; then
  			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
  			fi
  			rb_cv_dlopen=yes ;;
@@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.7 2006/10/29 02:45:42 taca Exp $
  	interix*) 	: ${LDSHARED="$CC -shared"}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
  			LIBPATHFLAG=" -L'%1\$-s'"
-@@ -1371,6 +1381,14 @@ if test "$enable_shared" = 'yes'; then
+@@ -1383,6 +1393,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'
  	;;
@@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.7 2006/10/29 02:45:42 taca Exp $
      interix*)
  	LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
  	;;
-@@ -1381,8 +1399,10 @@ fi
+@@ -1393,8 +1411,10 @@ fi
  if test "$enable_rpath" = yes; then
      if test "$GCC" = yes; then
         LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
diff --git a/lang/ruby18-base/patches/patch-ab b/lang/ruby18-base/patches/patch-ab
index ab160cc2f4f..8a182490da1 100644
--- a/lang/ruby18-base/patches/patch-ab
+++ b/lang/ruby18-base/patches/patch-ab
@@ -1,167 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2006/10/29 02:45:42 taca Exp $
+$NetBSD: patch-ab,v 1.8 2007/03/15 16:41:30 taca Exp $
 
---- configure.orig	2006-08-25 17:34:16.000000000 +0900
+--- configure.orig	2007-03-05 00:11:03.000000000 +0900
 +++ configure
-@@ -11310,13 +11310,21 @@ _ACEOF
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for noreturn" >&5
--echo $ECHO_N "checking for noreturn... $ECHO_C" >&6; }
--if test "${rb_cv_noreturn+set}" = set; then
-+
-+
-+    { echo "$as_me:$LINENO: checking for noreturn function attribute" >&5
-+echo $ECHO_N "checking for noreturn function attribute... $ECHO_C" >&6; }
-+if test "${rb_cv_func_noreturn+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  rb_cv_noreturn=x
--for mac in "x __attribute__ ((noreturn))" "__declspec(noreturn) x" x; do
-+  rb_cv_func_noreturn=x
-+if test "${ac_c_werror_flag+set}"; then
-+  rb_c_werror_flag="$ac_c_werror_flag"
-+else
-+  unset rb_c_werror_flag
-+fi
-+ac_c_werror_flag=yes
-+for mac in "__attribute__ ((noreturn)) x" "x __attribute__ ((noreturn))" "__declspec(noreturn) x" x; do
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11324,7 +11332,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #define NORETURN(x) $mac
--NORETURN(void exit(int x));
-+    NORETURN(void conftest_attribute_check(void));
- int
- main ()
- {
-@@ -11367,7 +11375,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  rb_cv_noreturn="$mac"; break
-+  rb_cv_func_noreturn="$mac"; break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11377,12 +11385,110 @@ fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-+if test "${rb_c_werror_flag+set}"; then
-+  ac_c_werror_flag="$rb_c_werror_flag"
-+else
-+  unset ac_c_werror_flag
- fi
--{ echo "$as_me:$LINENO: result: $rb_cv_noreturn" >&5
--echo "${ECHO_T}$rb_cv_noreturn" >&6; }
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $rb_cv_func_noreturn" >&5
-+echo "${ECHO_T}$rb_cv_func_noreturn" >&6; }
- cat >>confdefs.h <<_ACEOF
--#define NORETURN(x) $rb_cv_noreturn
-+#define NORETURN(x) $rb_cv_func_noreturn
-+_ACEOF
-+
-+
-+
-+
-+    { echo "$as_me:$LINENO: checking for noinline function attribute" >&5
-+echo $ECHO_N "checking for noinline function attribute... $ECHO_C" >&6; }
-+if test "${rb_cv_func_noinline+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  rb_cv_func_noinline=x
-+if test "${ac_c_werror_flag+set}"; then
-+  rb_c_werror_flag="$ac_c_werror_flag"
-+else
-+  unset rb_c_werror_flag
-+fi
-+ac_c_werror_flag=yes
-+for mac in "__attribute__ ((noinline)) x" "x __attribute__ ((noinline))" "__declspec(noinline) x" x; do
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#define NOINLINE(x) $mac
-+    NOINLINE(void conftest_attribute_check(void));
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
- _ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  rb_cv_func_noinline="$mac"; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+if test "${rb_c_werror_flag+set}"; then
-+  ac_c_werror_flag="$rb_c_werror_flag"
-+else
-+  unset ac_c_werror_flag
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $rb_cv_func_noinline" >&5
-+echo "${ECHO_T}$rb_cv_func_noinline" >&6; }
-+cat >>confdefs.h <<_ACEOF
-+#define NOINLINE(x) $rb_cv_func_noinline
-+_ACEOF
-+
-+
-+
- 
- 
- { echo "$as_me:$LINENO: checking for RUBY_EXTERN" >&5
-@@ -11629,6 +11735,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
+@@ -10346,6 +10346,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
  		;;
  bsdi*)          LIBS="-lm $LIBS"
                  ac_cv_sizeof_rlim_t=8;;
@@ -171,107 +12,7 @@ $NetBSD: patch-ab,v 1.7 2006/10/29 02:45:42 taca Exp $
  freebsd*)	LIBS="-lm $LIBS"
  		{ echo "$as_me:$LINENO: checking whether -lxpg4 has to be linked" >&5
  echo $ECHO_N "checking whether -lxpg4 has to be linked... $ECHO_C" >&6; }
-@@ -16865,6 +16974,90 @@ _ACEOF
- fi
- 
- 
-+if test x"$target_cpu" = xia64; then
-+    case " $LIBOBJS " in
-+  *" ia64.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS ia64.$ac_objext"
-+ ;;
-+esac
-+
-+    { echo "$as_me:$LINENO: checking for __libc_ia64_register_backing_store_base" >&5
-+echo $ECHO_N "checking for __libc_ia64_register_backing_store_base... $ECHO_C" >&6; }
-+if test "${rb_cv___libc_ia64_register_backing_store_base+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  rb_cv___libc_ia64_register_backing_store_base=no
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+extern unsigned long __libc_ia64_register_backing_store_base;
-+int
-+main ()
-+{
-+unsigned long p = __libc_ia64_register_backing_store_base;
-+       printf("%ld\n", p);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  rb_cv___libc_ia64_register_backing_store_base=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $rb_cv___libc_ia64_register_backing_store_base" >&5
-+echo "${ECHO_T}$rb_cv___libc_ia64_register_backing_store_base" >&6; }
-+    if test $rb_cv___libc_ia64_register_backing_store_base = yes; then
-+      cat >>confdefs.h <<\_ACEOF
-+#define HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE 1
-+_ACEOF
-+
-+    fi
-+fi
-+
- { echo "$as_me:$LINENO: checking whether right shift preserve sign bit" >&5
- echo $ECHO_N "checking whether right shift preserve sign bit... $ECHO_C" >&6; }
- if test "${rb_cv_rshift_sign+set}" = set; then
-@@ -17849,7 +18042,7 @@ _ACEOF
-     fi
- fi
- if test x"$ac_cv_header_ucontext_h" = xyes; then
--    if test x"$target_cpu" = xia64 -o x"$rb_with_pthread" = xyes; then
-+    if test x"$rb_with_pthread" = xyes; then
- 
- 
- for ac_func in getcontext setcontext
-@@ -18149,6 +18342,13 @@ echo $ECHO_N "checking whether OS depend
+@@ -15947,6 +15950,13 @@ echo $ECHO_N "checking whether OS depend
  			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
  			fi
  			rb_cv_dlopen=yes ;;
@@ -285,7 +26,7 @@ $NetBSD: patch-ab,v 1.7 2006/10/29 02:45:42 taca Exp $
  	interix*) 	: ${LDSHARED="$CC -shared"}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
  			LIBPATHFLAG=" -L'%1\$-s'"
-@@ -19007,6 +19207,14 @@ if test "$enable_shared" = 'yes'; then
+@@ -16714,6 +16724,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'
  	;;
@@ -300,7 +41,7 @@ $NetBSD: patch-ab,v 1.7 2006/10/29 02:45:42 taca Exp $
      interix*)
  	LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
  	;;
-@@ -19017,8 +19225,10 @@ fi
+@@ -16724,8 +16742,10 @@ fi
  if test "$enable_rpath" = yes; then
      if test "$GCC" = yes; then
         LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
diff --git a/lang/ruby18-base/patches/patch-af b/lang/ruby18-base/patches/patch-af
deleted file mode 100644
index ca36fb433e0..00000000000
--- a/lang/ruby18-base/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/12/06 16:24:27 taca Exp $
-
---- common.mk.orig	2006-12-06 00:02:32.000000000 +0900
-+++ common.mk
-@@ -3,7 +3,7 @@ lib: $(LIBRUBY)
- dll: $(LIBRUBY_SO)
- 
- RUBYOPT       =
--NULLCMD       =
-+NULLCMD       = :
- 
- STATIC_RUBY   = static-ruby
-