Pullup ticket 1943 - requested by taca

security update for ruby18

Revisions pulled up:
- pkgsrc/lang/ruby/Makefile				1.41
- pkgsrc/lang/ruby/rubyversion.mk			1.29, 1.30
- pkgsrc/lang/ruby18-base/Makefile			1.29
- pkgsrc/lang/ruby18-base/PLIST				1.9
- pkgsrc/lang/ruby18-base/PLIST.common_end		1.2
- pkgsrc/lang/ruby18-base/distinfo			1.17
- pkgsrc/lang/ruby18-base/options.mk			1.1
- pkgsrc/lang/ruby18-base/patches/patch-af		1.1
- pkgsrc/lang/ruby18-base/patches/patch-bl		removed
- pkgsrc/lang/ruby18/Makefile				1.15
- pkgsrc/databases/ruby-gdbm/Makefile			1.15
- pkgsrc/databases/ruby-gdbm/distinfo			1.1
- pkgsrc/devel/ruby-curses/Makefile			1.10
- pkgsrc/devel/ruby-curses/distinfo			1.7
- pkgsrc/devel/ruby-mode/Makefile			1.15
- pkgsrc/devel/ruby-mode/distinfo			1.6
- pkgsrc/devel/ruby-readline/Makefile			1.20
- pkgsrc/devel/ruby-readline/distinfo			1.13
- pkgsrc/devel/ruby-readline/patches/patch-aa		1.5
- pkgsrc/x11/ruby-tk/Makefile				1.25, 1.26
- pkgsrc/x11/ruby-tk/PLIST				1.7
- pkgsrc/x11/ruby-tk/distinfo				1.11
- pkgsrc/mk/defaults/options.description		1.130

   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 16:25:26 UTC 2006

   Modified Files:
   	pkgsrc/databases/ruby-gdbm: Makefile
   Added Files:
   	pkgsrc/databases/ruby-gdbm: distinfo

   Log Message:
   Update ruby-gdbm package to 1.8.5.20061205:

   - rdoc addition and trivial change.
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 16:28:18 UTC 2006

   Modified Files:
   	pkgsrc/devel/ruby-curses: Makefile distinfo

   Log Message:
   Update ruby-curses package to 1.8.5.20061205:

   - Fixed colose_set method always returns false.
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 16:36:41 UTC 2006

   Modified Files:
   	pkgsrc/devel/ruby-mode: Makefile
   Added Files:
   	pkgsrc/devel/ruby-mode: distinfo

   Log Message:
   Update ruby-mode package to 1.8.5.20061205.

   Tue Dec  5 00:59:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>

   	* misc/ruby-mode.el (ruby-parse-partial): need to parse "/=" as
   	  self assignment operator, not regex.  [ruby-talk:227324]

   Wed Sep 13 18:25:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>

   	* misc/ruby-mode.el (ruby-parse-partial): better here-doc support.
   	  a patch from Marshall T. Vandegrift <llasram at gmail.com>.
   	  [ruby-core:08804]
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 16:31:34 UTC 2006

   Modified Files:
   	pkgsrc/devel/ruby-readline: Makefile distinfo
   	pkgsrc/devel/ruby-readline/patches: patch-aa

   Log Message:
   Update ruby-readline package to 1.8.5.20061205:

   - No change with 20061205 patch.
   - Disable checking rl_filename_completion_function() to prevent compile
     error.
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 16:34:42 UTC 2006

   Modified Files:
   	pkgsrc/lang/ruby: Makefile

   Log Message:
   Update ruby package to 1.8.5.20061205.  No change for this wrapper package.
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 16:17:17 UTC 2006

   Modified Files:
   	pkgsrc/lang/ruby: rubyversion.mk

   Log Message:
   - Handle patchlevel which has introduced to Ruby.
   - Introduce RUBY_PATCH_DATE and RUBY_VERSION_SUFFIX.
   - Change _RUBY_VERS_TEENY to _RUBY_VER_TEENY as other version variable
     like RUBY_VER_MAJOR.
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 16:19:50 UTC 2006

   Modified Files:
   	pkgsrc/lang/ruby: rubyversion.mk

   Log Message:
   Update RUBY18_PATCH_DATE to 20061205, starting update of Ruby.
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 16:34:09 UTC 2006

   Modified Files:
   	pkgsrc/lang/ruby18: Makefile

   Log Message:
   Update ruby18 package to 1.8.5.20061205.  No change for this meta pacakge
   itself.
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 16:24:27 UTC 2006

   Modified Files:
   	pkgsrc/lang/ruby18-base: Makefile PLIST PLIST.common_end distinfo
   Added Files:
   	pkgsrc/lang/ruby18-base: options.mk
   	pkgsrc/lang/ruby18-base/patches: patch-af
   Removed Files:
   	pkgsrc/lang/ruby18-base/patches: patch-bl

   Log Message:
   o Update ruby18-base pacakge to Ruby 1.8 branch 2006/12/05.

   	- Many changes from 2006/9/6; see Changes file, please.
   	- Fixes another cgi.rb vulnerability:
   		http://jvn.jp/jp/JVN%2384798830/index.html

   o Introduce ruby-build-ri-db PKG_OPTION which enable installing database
     for Ruby's ri utility.  Default is disabled and should be fix
     PR pkg/34587.
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 17:00:54 UTC 2006

   Modified Files:
   	pkgsrc/mk/defaults: options.description

   Log Message:
   Add description of ruby-build-ri-db.
---
   Module Name:		pkgsrc
   Committed By:	tv
   Date:		Fri Nov 10 16:54:54 UTC 2006

   Modified Files:
   	pkgsrc/x11/ruby-tk: Makefile

   Log Message:
   Use find -print | xargs rather than find -exec.
---
   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Dec  6 16:33:16 UTC 2006

   Modified Files:
   	pkgsrc/x11/ruby-tk: Makefile PLIST distinfo

   Log Message:
   Update ruby-tk package to 1.8.5.20061205:

   Changes are huge, please see Changes.

   - pkgsrc change; fix permission of a image file.

10 files changed, 81 insertions, 59 deletions

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 54b4830a201..96cd3e8f522 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2006/01/03 14:39:51 taca Exp $
+# $NetBSD: Makefile,v 1.40.6.1 2006/12/09 10:17:47 salo Exp $
 
-DISTNAME=	ruby-${RUBY_VERSION}
+DISTNAME=	ruby-${RUBY_VERSION}.${RUBY_PATCH_DATE}
 CATEGORIES=	lang ruby
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index dc60dab158c..c1655746d94 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.27.2.1 2006/10/07 02:55:16 salo Exp $
+# $NetBSD: rubyversion.mk,v 1.27.2.2 2006/12/09 10:17:47 salo Exp $
 #
 
 .if !defined(_RUBYVERSION_MK)
@@ -7,10 +7,10 @@ _RUBYVERSION_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 # current supported Ruby's version
-RUBY18_VERSION?=	1.8.5
+RUBY18_VERSION=		1.8.5
 
-#
-RUBY18_PATCH_DATE=	20060906
+# patch date
+RUBY18_PATCH_DATE=	20061205
 
 # RUBY_VERSION_DEFAULT defines default version for Ruby related
 #	packages and user can define in mk.conf.  (1.6 or 1.8)
@@ -23,11 +23,12 @@ RUBY_VERSION_DEFAULT?=	1.8
 #
 #	Default value is set to ${RUBY_VERSION_DEFAULT}
 #
-.if !defined(RUBY_VERSION)
 .if ${RUBY_VERSION_DEFAULT} == "1.8"
 RUBY_VERSION?=		${RUBY18_VERSION}
+RUBY_PATCH_DATE?=	${RUBY18_PATCH_DATE}
 .endif
-.endif
+
+RUBY_VERSION_SUFFIX=	${RUBY_VERSION}.${RUBY_PATCH_DATE}
 
 # RUBY_VERSION_SUPPORTED defines the list of ${RUBY_VER} which is
 #	supported by the package.  It should be defined by the packages
@@ -50,13 +51,15 @@ RUBY_VERSION_LIST= 18
 #
 RUBY_NOVERSION?=	No
 
-# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VERS_TEENY is defined from
-#	version of Ruby.  It could be used in packages' Makefile but
-#	it isn't recommended.
+# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VER_TEENY and _RUBY_PATCHLEVEL
+# is defined from version of Ruby.  It should not be used in packages'
+# Makefile.
 #
-_RUBY_VER_MAJOR=	${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
-_RUBY_VER_MINOR=	${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
-_RUBY_VERS_TEENY=	${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
+_RUBY_VER=		${RUBY_VERSION:C/(-.*)//}
+_RUBY_VER_MAJOR=	${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
+_RUBY_VER_MINOR=	${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
+_RUBY_VER_TEENY=	${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
+_RUBY_PATCHLEVEL=	${RUBY_VERSION:C/(.*-)//}
 
 # RUBY_VER defines Ruby base release.
 #
@@ -128,13 +131,13 @@ RUBY_SHLIBVER?=		${RUBY_VERSION}
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"
 RUBY_SHLIBMAJOR=	${RUBY_VER}
-RUBY_SHLIBVER=		${RUBY_VER}.${_RUBY_VERS_TEENY}
+RUBY_SHLIBVER=		${RUBY_VER}.${_RUBY_VER_TEENY}
 .elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 RUBY_SHLIBMAJOR=	# unused
 RUBY_SHLIBVER=		${RUBY_VER}
 .elif ${OPSYS} == "OpenBSD"
 RUBY_SHLIBMAJOR=	# unused
-RUBY_SHLIBVER=		${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_VERS_TEENY}
+RUBY_SHLIBVER=		${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_VER_TEENY}
 .elif ${OPSYS} == "IRIX"
 RUBY_SHLIBMAJOR=	# unused
 .elif ${OPSYS} == "Linux"
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 656a2cfc10c..f173fb8bacc 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,32 +1,33 @@
-# $NetBSD: Makefile,v 1.26.2.2 2006/11/05 19:28:55 salo Exp $
+# $NetBSD: Makefile,v 1.26.2.3 2006/12/09 10:17:47 salo Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
-PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=	3
+PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
+#PKGREVISION=
 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
 
-RUBY_VERSION=		${RUBY18_VERSION}
-RUBY_DYNAMIC_DIRS=	${RUBY_RIDIR:S,${PREFIX}/,,}
+RUBY_VERSION=	${RUBY18_VERSION}
 
-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]*
+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_LANGUAGES=		c
-GNU_CONFIGURE=		yes
-TEST_TARGET=		test
-CONFIGURE_ARGS+=	--enable-shared --enable-install-doc \
+USE_LANGUAGES=	c
+USE_TOOLS+=	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"
 CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
@@ -43,6 +44,8 @@ MAKE_DIRS+=	${RUBY_SITERIDIR}
 CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q}
 .endif
 
+.include "options.mk"
+
 FILES_SUBST+=	DATE=${DATE:Q}
 
 #
@@ -68,7 +71,6 @@ DOCS=		COPYING COPYING.ja ChangeLog README \
 		doc/shell.rd doc/shell.rd.ja doc/irb/irb-tools.rd.ja \
 		doc/irb/irb.rd doc/irb/irb.rd.ja
 EXT_DOCS=	bigdecimal/bigdecimal_en.html bigdecimal/bigdecimal_ja.html \
-		digest/digest.txt digest/digest.txt.ja \
 		dl/doc/dl.txt enumerator/enumerator.txt \
 		etc/etc.txt etc/etc.txt.ja syslog/syslog.txt \
 		zlib/doc/zlib.rd
@@ -92,7 +94,8 @@ pre-configure:
 	${RM} -f ${WRKSRC}/ext/tk/extconf.rb
 
 pre-install:
-	cd ${WRKSRC}; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;
+	cd ${WRKSRC}; ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \
+		-exec ${RM} -f {} \;
 
 post-install:
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/irb
diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST
index e1aa7c0cfd9..9933f3e98f7 100644
--- a/lang/ruby18-base/PLIST
+++ b/lang/ruby18-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/09/07 15:40:00 taca Exp $
+@comment $NetBSD: PLIST,v 1.8.2.1 2006/12/09 10:17:47 salo Exp $
 bin/erb${RUBY_VER}
 bin/h2rb${RUBY_VER}
 bin/irb${RUBY_VER}
@@ -26,6 +26,8 @@ ${RUBY_LIBDIR}/cgi-lib.rb
 ${RUBY_LIBDIR}/cgi.rb
 ${RUBY_LIBDIR}/complex.rb
 ${RUBY_LIBDIR}/csv.rb
+${RUBY_LIBDIR}/digest.rb
+${RUBY_LIBDIR}/digest/digest/sha2.rb
 ${RUBY_LIBDIR}/date/format.rb
 ${RUBY_LIBDIR}/date.rb
 ${RUBY_LIBDIR}/date2.rb
@@ -63,8 +65,10 @@ ${RUBY_LIBDIR}/gserver.rb
 ${RUBY_ARCHLIBDIR}/bigdecimal.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/config.h
 ${RUBY_ARCHLIBDIR}/defines.h
+${RUBY_ARCHLIBDIR}/digest.h
 ${RUBY_ARCHLIBDIR}/dbm.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/digest.${RUBY_DLEXT}
+${RUBY_ARCHLIBDIR}/digest/bubblebabble.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/digest/md5.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/digest/rmd160.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/digest/sha1.${RUBY_DLEXT}
@@ -590,8 +594,6 @@ ${RUBY_DOCDIR}/README.ja
 ${RUBY_DOCDIR}/ToDo
 ${RUBY_DOCDIR}/bigdecimal_en.html
 ${RUBY_DOCDIR}/bigdecimal_ja.html
-${RUBY_DOCDIR}/digest.txt
-${RUBY_DOCDIR}/digest.txt.ja
 ${RUBY_DOCDIR}/dl.txt
 ${RUBY_DOCDIR}/enumerator.txt
 ${RUBY_DOCDIR}/etc.txt
diff --git a/lang/ruby18-base/PLIST.common_end b/lang/ruby18-base/PLIST.common_end
index 46ff73414ef..fa8b5af8d50 100644
--- a/lang/ruby18-base/PLIST.common_end
+++ b/lang/ruby18-base/PLIST.common_end
@@ -1,7 +1,10 @@
+@comment $NetBSD: PLIST.common_end,v 1.1.2.1 2006/12/09 10:17:48 salo 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
 @dirrm ${RUBY_ARCHLIBDIR}/digest
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index 15a41ce73cc..78e6588e055 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.14.2.2 2006/11/05 19:28:55 salo Exp $
+$NetBSD: distinfo,v 1.14.2.3 2006/12/09 10:17:48 salo Exp $
 
-SHA1 (ruby-1.8.5-base-20060906.patch.bz2) = 99c283e6d9df4f90ab6d765041b91d37c70dd3ee
-RMD160 (ruby-1.8.5-base-20060906.patch.bz2) = 3b51a6b1d9badd76dc50735971411fa0800d2e85
-Size (ruby-1.8.5-base-20060906.patch.bz2) = 27294 bytes
+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 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228
-SHA1 (patch-bl) = cfb31ebef08aebf9ce3bc6e44c83e1727950ef76
+SHA1 (patch-af) = 165c8b564311d1ce03722c7c3cf455bbaf1b1a3a
diff --git a/lang/ruby18-base/options.mk b/lang/ruby18-base/options.mk
new file mode 100644
index 00000000000..23b0ca7098e
--- /dev/null
+++ b/lang/ruby18-base/options.mk
@@ -0,0 +1,11 @@
+# $NetBSD: options.mk,v 1.1.2.2 2006/12/09 10:17:48 salo Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.ruby
+PKG_SUPPORTED_OPTIONS=		ruby-build-ri-db
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mruby-build-ri-db)
+CONFIGURE_ARGS+=	--enable-install-doc
+RUBY_DYNAMIC_DIRS+=	${RUBY_RIDIR:S,${PREFIX}/,,}
+.endif
diff --git a/lang/ruby18-base/patches/patch-af b/lang/ruby18-base/patches/patch-af
new file mode 100644
index 00000000000..8987a9f7d07
--- /dev/null
+++ b/lang/ruby18-base/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.2.2 2006/12/09 10:17:48 salo 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
+ 
diff --git a/lang/ruby18-base/patches/patch-bl b/lang/ruby18-base/patches/patch-bl
deleted file mode 100644
index 1f1ef8ee6bd..00000000000
--- a/lang/ruby18-base/patches/patch-bl
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bl,v 1.2.6.1 2006/11/05 19:28:55 salo Exp $
-
---- lib/cgi.rb.orig	2006-11-02 22:44:37.000000000 +0900
-+++ lib/cgi.rb
-@@ -1018,7 +1018,7 @@ class CGI
-               else
-                 stdinput.read(content_length)
-               end
--          if c.nil?
-+          if c.nil? || c.empty?
-             raise EOFError, "bad content body"
-           end
-           buf.concat(c)
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 1245d1d7e42..ec4f2352761 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/09/07 15:40:00 taca Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2006/12/09 10:17:47 salo Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
-PKGNAME=	${RUBY_PKGPREFIX}-${RUBY_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-${RUBY_VERSION_SUFFIX}
 #PKGREVISION=
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
@@ -17,10 +17,10 @@ DEPENDS+= ${RUBY_PKGPREFIX}-curses>=${RUBY_VERSION}:../../devel/ruby-curses
 DEPENDS+= ${RUBY_PKGPREFIX}-readline>=${RUBY_VERSION}:../../devel/ruby-readline
 DEPENDS+= ${RUBY_PKGPREFIX}-tk>=${RUBY_VERSION}:../../x11/ruby-tk
 
-RUBY_VERSION=		${RUBY18_VERSION}
-NO_CHECKSUM=		yes
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
+RUBY_VERSION=	${RUBY18_VERSION}
+NO_CHECKSUM=	yes
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
 
 do-install:
 	@${ECHO_MSG} This is only a meta package.