Update ruby-base packages to 1.6.8. This is bug fix release of ruby

programming language.  Since change from ruby 1.6.7 to 1.6.8 are to
huge (>= 47K bytes), I omit includes here.

This update implicitly includes ruby-digest and ruby-tcltklib.

Here is pkgsrc change.

- Support pkgsrc on Solaris.

	* change RUBY_ARCH default value to
	  ${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF} for fixing Solairs
	  support.
	* Add RUBY_NOSHLIBMAJOR. (needs more better scheme..?)
	* Change RUBY_SHLIBVER.

- Change RUBY_COMMENT to meaningful names; RUBY_NOEXT_CURSES and
  RUBY_NOEXT_DBM.
- Remove patch-ak since it was fixed in original source.

9 files changed, 58 insertions, 73 deletions

diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
index 748c62c8b6a..f1a626d9870 100644
--- a/lang/ruby-base/Makefile
+++ b/lang/ruby-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/03/16 19:44:30 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/24 14:49:37 taca Exp $
 # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}base-${RUBY_VERSION}
-PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -33,10 +32,11 @@ EXT_DOCS=	ext/etc/etc.txt ext/etc/etc.txt.ja ext/pty/README \
 		ext/pty/README.expect ext/pty/README.expect.ja \
 		ext/pty/README.ja ext/syslog/syslog.txt
 
-REPLACE_RUBY=	ext/curses/hello.rb ext/curses/rain.rb ext/curses/view.rb \
+REPLACE_RUBY=	bin/irb \
+		ext/curses/hello.rb ext/curses/rain.rb ext/curses/view.rb \
 		lib/matrix.rb sample/biorhythm.rb sample/cal.rb \
 		sample/exyacc.rb sample/from.rb sample/fullpath.rb \
-		sample/goodfriday.rb sample/irb.rb sample/less.rb \
+		sample/goodfriday.rb sample/less.rb \
 		sample/mine.rb sample/mpart.rb sample/observ.rb \
 		sample/pi.rb sample/rcs.rb sample/test.rb \
 		sample/time.rb sample/trojan.rb sample/uumerge.rb
@@ -65,9 +65,6 @@ pre-configure:
 pre-build:
 	@${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
 
-post-build:
-	${MV} -f ${WRKSRC}/sample/irb.rb ${WRKDIR}/irb.rb
-
 post-install:
 	strip ${RUBY}
 .if empty(RUBY_SUFFIX)
@@ -79,7 +76,7 @@ post-install:
 .endif
 	${LN} -fs ruby${_RUBY_SUFFIX}.1 ${PREFIX}/man/man1/ruby.1
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/irb.rb ${PREFIX}/bin/irb
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/irb ${PREFIX}/bin/irb
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/curses
 	${INSTALL_DATA} ${RUBY_WRKSRC}/ext/curses/hello.rb \
diff --git a/lang/ruby-base/Makefile.common b/lang/ruby-base/Makefile.common
index ec431777c7a..1a200c6847f 100644
--- a/lang/ruby-base/Makefile.common
+++ b/lang/ruby-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2003/03/16 19:44:30 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.12 2003/03/24 14:49:37 taca Exp $
 # FreeBSD: ports/Mk/bsd.ruby.mk,v 1.11 2000/11/16 17:59:40 knu Exp
 # Makefile.common: ruby common makefile, based on FreeBSD's bsd.ruby.mk.
 
@@ -65,7 +65,7 @@ RUBY_VER?=		1.6
 RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 
 .if ${RUBY_VER} < 1.7
-RUBY_VERSION?=		1.6.7
+RUBY_VERSION?=		1.6.8
 RUBY_SUFFIX?=		# empty
 .else
 RUBY_VERSION?=		1.7			# current, not tested.
@@ -75,7 +75,7 @@ RUBY_SUFFIX?=		${_RUBY_SUFFIX}
 .if ${OPSYS} == "Linux"
 RUBY_ARCH?=		${LOWER_ARCH}-${LOWER_OPSYS}
 .else
-RUBY_ARCH?=		${MACHINE_GNU_PLATFORM:S/--/-/}
+RUBY_ARCH?=		${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF}
 .endif
 RUBY_NAME?=		ruby${RUBY_SUFFIX}
 
@@ -83,17 +83,22 @@ RUBY_DISTNAME?=		ruby-${RUBY_VERSION}
 RUBY_WRKSRC?=		${WRKDIR}/${RUBY_DISTNAME}
 
 .if ${OPSYS} == "Linux"
-RUBY_COMMENT=		"@comment "
+RUBY_NOEXT_CURSES=	"@comment "
+RUBY_NOEXT_DBM=		"@comment "
 _RUBY_SUFFIX=		${RUBY_VER}
 .else
 _RUBY_SUFFIX=		${RUBY_VER:S/.//}
 .endif
 
+.if ${OPSYS} == "SunOS"
+RUBY_NOSHLIBMAJOR=	"@comment "
+.endif
+
 RUBY_PKGNAMEPREFIX?=	ruby${RUBY_SUFFIX}-	# could be rb${RUBY_SUFFIX}-
-.if ${OPSYS} == "Linux"
-RUBY_SHLIBVER?=		${RUBY_VERSION}
-.else
+.if ${OPSYS} == "NetBSD"
 RUBY_SHLIBVER?=		${RUBY_VERSION:S/.//}
+.else
+RUBY_SHLIBVER?=		${RUBY_VERSION}
 .endif
 RUBY_SHLIBMAJOR?=	${_RUBY_SUFFIX}
 
@@ -126,6 +131,9 @@ PLIST_SUBST+=		RUBY_VERSION="${RUBY_VERSION}" \
 			_RUBY_SUFFIX="${_RUBY_SUFFIX}" \
 			RUBY_SUFFIX="${RUBY_SUFFIX}" \
 			RUBY_NAME="${RUBY_NAME}" \
+			RUBY_NOEXT_CURSES=${RUBY_NOEXT_CURSES} \
+			RUBY_NOEXT_DBM=${RUBY_NOEXT_DBM} \
+			RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR} \
 			RUBY_COMMENT=${RUBY_COMMENT} \
 			${PLIST_RUBY_DIRS:S,DIR="${LOCALBASE}/,DIR=",}
 
diff --git a/lang/ruby-base/PLIST b/lang/ruby-base/PLIST
index f0a6246b168..0b82da9d547 100644
--- a/lang/ruby-base/PLIST
+++ b/lang/ruby-base/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.6 2003/03/16 19:44:30 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/03/24 14:49:37 taca Exp $
 bin/irb
 bin/ruby
 bin/ruby${_RUBY_SUFFIX}
 lib/lib${RUBY_NAME}.so
-lib/lib${RUBY_NAME}.so.${RUBY_SHLIBMAJOR}
+${RUBY_NOSHLIBMAJOR}lib/lib${RUBY_NAME}.so.${RUBY_SHLIBMAJOR}
 lib/lib${RUBY_NAME}.so.${RUBY_SHLIBVER}
 ${RUBY_ARCHLIBDIR}/config.h
-${RUBY_COMMENT}${RUBY_ARCHLIBDIR}/curses.so
-${RUBY_COMMENT}${RUBY_ARCHLIBDIR}/dbm.so
+${RUBY_NOEXT_CURSES}${RUBY_ARCHLIBDIR}/curses.so
+${RUBY_NOEXT_DBM}${RUBY_ARCHLIBDIR}/dbm.so
 ${RUBY_ARCHLIBDIR}/defines.h
 ${RUBY_ARCHLIBDIR}/dln.h
 ${RUBY_ARCHLIBDIR}/env.h
diff --git a/lang/ruby-base/distinfo b/lang/ruby-base/distinfo
index 4743156d9b2..1e9cb64fe9b 100644
--- a/lang/ruby-base/distinfo
+++ b/lang/ruby-base/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.7 2003/03/16 19:44:30 jschauma Exp $
+$NetBSD: distinfo,v 1.8 2003/03/24 14:49:37 taca Exp $
 
-SHA1 (ruby/ruby-1.6.7.tar.gz) = fd1523f17e64fd80741f2e6a77050fde16164053
-Size (ruby/ruby-1.6.7.tar.gz) = 998151 bytes
-SHA1 (patch-aa) = 62f1bd7d422a1e644896fb6548f182b709d57f23
-SHA1 (patch-ab) = 7038f4fdde2147ad698f3546512fc31c336f97f0
+SHA1 (ruby/ruby-1.6.8.tar.gz) = 4b475ac1c837cd62b6dfe85359e1502a71b08cd1
+Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes
+SHA1 (patch-aa) = 654efb008caadf7973c78cabc70f76c8eab09266
+SHA1 (patch-ab) = 909ab681b64bfcc49e5592c38b34049f67211993
 SHA1 (patch-ac) = 5b897041345ec4077fa2165e3c4c58a6671b942d
-SHA1 (patch-ae) = 294af53a7509372f0d7c17230c605d790f1e7bb2
-SHA1 (patch-af) = 0eb2fd9784b5924bcc233d3b81128821130c578c
+SHA1 (patch-ae) = 8c9925dcb7d4fdb9aad5432befbc3b21c56eb884
+SHA1 (patch-af) = 33aa9f1e524e2f4a6dd2f1310ce7358744b83a8c
 SHA1 (patch-ag) = 4b5893b55253526af687bc81a9acea3686a00d39
+SHA1 (patch-ai) = f863d34b93088732ebf274aa654026f5b5e6ab45
 SHA1 (patch-aj) = d61950c108cda41a7a5227f02c583bc6e85e43bb
-SHA1 (patch-ak) = 7a2bcb46c1a7818f226e552bfd4f19acedba6733
diff --git a/lang/ruby-base/patches/patch-aa b/lang/ruby-base/patches/patch-aa
index 9a52e069529..5c850241c08 100644
--- a/lang/ruby-base/patches/patch-aa
+++ b/lang/ruby-base/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2002/05/13 15:00:02 yyamano Exp $
+$NetBSD: patch-aa,v 1.5 2003/03/24 14:49:38 taca Exp $
 
---- configure.in.orig	Wed Feb  6 18:13:15 2002
+--- configure.in.orig	2002-11-14 03:59:18.000000000 +0900
 +++ configure.in
-@@ -872,7 +872,7 @@
-     darwin*)
- 	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
- 	LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
--	LIBRUBY_DLDFLAGS='-install_name lib$(RUBY_INSTALL_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
-+	LIBRUBY_DLDFLAGS='-install_name $(prefix)/lib/lib$(RUBY_INSTALL_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
- 	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
- 	;;
-     *)
-@@ -951,6 +951,7 @@
+@@ -990,6 +990,7 @@ case "$target_os" in
  	;;	
  esac
  
diff --git a/lang/ruby-base/patches/patch-ab b/lang/ruby-base/patches/patch-ab
index 9e36afd8446..41f4e66798d 100644
--- a/lang/ruby-base/patches/patch-ab
+++ b/lang/ruby-base/patches/patch-ab
@@ -1,26 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2003/03/16 19:44:30 jschauma Exp $
+$NetBSD: patch-ab,v 1.5 2003/03/24 14:49:38 taca Exp $
 
---- configure.orig	Sun Feb 10 13:05:48 2002
-+++ configure	Sat Mar 15 19:57:03 2003
-@@ -4410,8 +4410,6 @@
-   if test "$rb_cv_binary_elf" = no; then
-     with_dln_a_out=yes
-     target_os=${target_os}-a_out
--  else
--    LDFLAGS="-rdynamic"
-   fi;;
- netbsd*)
-     if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-@@ -5054,7 +5052,7 @@
-     darwin*)
- 	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
- 	LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
--	LIBRUBY_DLDFLAGS='-install_name lib$(RUBY_INSTALL_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
-+	LIBRUBY_DLDFLAGS='-install_name $(prefix)/lib/lib$(RUBY_INSTALL_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
- 	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
- 	;;
-     *)
-@@ -5444,6 +5442,7 @@
+--- configure.orig	2002-11-19 20:49:26.000000000 +0900
++++ configure
+@@ -5516,6 +5516,7 @@ s%@EXTSTATIC@%$EXTSTATIC%g
  s%@setup@%$setup%g
  s%@MINIRUBY@%$MINIRUBY%g
  s%@PREP@%$PREP%g
diff --git a/lang/ruby-base/patches/patch-ae b/lang/ruby-base/patches/patch-ae
index 0409c05f03e..8207faccc07 100644
--- a/lang/ruby-base/patches/patch-ae
+++ b/lang/ruby-base/patches/patch-ae
@@ -1,14 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
+$NetBSD: patch-ae,v 1.2 2003/03/24 14:49:38 taca Exp $
 
---- instruby.rb.orig	Tue May  1 17:43:15 2001
+--- instruby.rb.orig	2002-12-03 01:53:03.000000000 +0900
 +++ instruby.rb
-@@ -76,27 +76,25 @@
- end
- Dir.chdir CONFIG["srcdir"]
- 
--File.install "sample/irb.rb", "#{bindir}/irb", 0755, true
--
- Find.find("lib") do |f|
+@@ -117,21 +117,21 @@ Find.find("lib") do |f|
    next unless /\.rb$/ =~ f || /help-message$/ =~ f
    dir = rubylibdir+"/"+File.dirname(f[4..-1])
    File.makedirs dir, true unless File.directory? dir
diff --git a/lang/ruby-base/patches/patch-af b/lang/ruby-base/patches/patch-af
index cdad219b262..cfc1f846976 100644
--- a/lang/ruby-base/patches/patch-af
+++ b/lang/ruby-base/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2002/03/02 09:10:55 taca Exp $
+$NetBSD: patch-af,v 1.4 2003/03/24 14:49:39 taca Exp $
 
---- lib/mkmf.rb.orig	Fri Feb  1 15:00:49 2002
+--- lib/mkmf.rb.orig	2002-12-24 17:29:10.000000000 +0900
 +++ lib/mkmf.rb
-@@ -163,7 +163,7 @@
+@@ -452,7 +452,7 @@ def install_rb(mfile, dest, srcdir = nil
    for f in path
      d = '/' + File::dirname(f)
      d = '' if d == '/.' 
diff --git a/lang/ruby-base/patches/patch-ai b/lang/ruby-base/patches/patch-ai
new file mode 100644
index 00000000000..d2596242fa2
--- /dev/null
+++ b/lang/ruby-base/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2003/03/24 14:49:39 taca Exp $
+
+--- config.sub.orig	2002-05-02 16:49:44.000000000 +0900
++++ config.sub
+@@ -995,7 +995,7 @@ case $os in
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+ 	-solaris)
+-		os=-solaris2
++		os=-solaris
+ 		;;
+ 	-svr4*)
+ 		os=-sysv4