- Reset PKGREVISION by updating Ruby 1.8.3.

- Don't simply assign to CONFIGURE_ARGS with "=" but "+=".
- Add one fix from ruby_1_8 branch.

3 files changed, 44 insertions, 96 deletions

diff --git a/x11/ruby-tcltklib/Makefile b/x11/ruby-tcltklib/Makefile
index 130e62e0c3f..c06ff4c351c 100644
--- a/x11/ruby-tcltklib/Makefile
+++ b/x11/ruby-tcltklib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:31 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/11/02 08:59:24 taca Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-tcltklib-${RUBY_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11 ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -16,7 +15,7 @@ USE_RUBY_EXTCONF=	yes
 EXTRACT_ELEMENTS=	${RUBY_DISTNAME}/ext/tcltklib
 WRKSRC=			${RUBY_WRKSRC}/ext/tcltklib
 
-CONFIGURE_ARGS=	--with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
+CONFIGURE_ARGS+= --with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
 		--with-tcl-lib="${BUILDLINK_PREFIX.tcl}/lib/${TCL_DIR}" \
 		--with-tk-lib="${BUILDLINK_PREFIX.tk}/lib/${TK_DIR}" \
 		--with-tcl-include="${BUILDLINK_PREFIX.tcl}/include/${TCL_DIR}" \
diff --git a/x11/ruby-tcltklib/distinfo b/x11/ruby-tcltklib/distinfo
index 6a6ce3c46a2..9a94460f031 100644
--- a/x11/ruby-tcltklib/distinfo
+++ b/x11/ruby-tcltklib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 17:36:20 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/11/02 08:59:24 taca Exp $
 
-SHA1 (ruby/ruby-1.8.2.tar.gz) = 409a917d3a0aba41f45bd053b767c85b2bc35ffa
-RMD160 (ruby/ruby-1.8.2.tar.gz) = fc4dcdc2dda9bfbcf8ca19ca090aa55a18ea06a4
-Size (ruby/ruby-1.8.2.tar.gz) = 3627349 bytes
-SHA1 (patch-aa) = 9dd0e2297b6ead2a54e618c0ee7c0cb5540883f3
+SHA1 (ruby/ruby-1.8.3.tar.gz) = 407e70377214fcb812cdbb86a3e1b735e69b7cff
+RMD160 (ruby/ruby-1.8.3.tar.gz) = b4244a288d04fca29556144636b5e093b78a8cd5
+Size (ruby/ruby-1.8.3.tar.gz) = 4227276 bytes
+SHA1 (patch-aa) = 38bb9fd3e20c680cb05d766527f19591a76ae133
diff --git a/x11/ruby-tcltklib/patches/patch-aa b/x11/ruby-tcltklib/patches/patch-aa
index 4d91dd89d34..0cd3d1de234 100644
--- a/x11/ruby-tcltklib/patches/patch-aa
+++ b/x11/ruby-tcltklib/patches/patch-aa
@@ -1,105 +1,54 @@
-$NetBSD: patch-aa,v 1.2 2005/01/24 03:06:57 taca Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/02 08:59:24 taca Exp $
 
---- tcltklib.c.orig	2004-12-23 13:16:42.000000000 +0900
+--- tcltklib.c.orig	2005-08-09 15:15:57.000000000 +0900
 +++ tcltklib.c
 @@ -4,7 +4,7 @@
   *              Oct. 24, 1997   Y. Matsumoto
   */
  
--#define TCLTKLIB_RELEASE_DATE "2004-12-23"
-+#define TCLTKLIB_RELEASE_DATE "2004-12-27"
+-#define TCLTKLIB_RELEASE_DATE "2005-08-09"
++#define TCLTKLIB_RELEASE_DATE "2005-09-28"
  
  #include "ruby.h"
  #include "rubysig.h"
-@@ -70,9 +70,13 @@ fprintf(stderr, ARG1, ARG2); fprintf(std
- /* release date */
- const char tcltklib_release_date[] = TCLTKLIB_RELEASE_DATE;
- 
--/*finalize_proc_name */
-+/* finalize_proc_name */
- static char *finalize_hook_name = "INTERP_FINALIZE_HOOK";
- 
-+/* to cancel remained after-scripts when deleting IP */
-+#define REMAINED_AFTER_IDS_VAR "__ruby_tcltklib_remained_after_script_list__"
-+#define CANCEL_REMAINED_AFTER_IDS "foreach id $__ruby_tcltklib_remained_after_script_list__ {after cancel $id}"
-+
- /* for callback break & continue */
- static VALUE eTkCallbackReturn;
- static VALUE eTkCallbackBreak;
-@@ -3312,12 +3316,16 @@ delete_slaves(ip)
- 
-         Tcl_Preserve(slave);
- 
--#if TCL_MAJOR_VERSION < 8 || ( TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4)
--#else
-         if (!Tcl_InterpDeleted(slave)) {
--            Tcl_Eval(slave, "foreach i [after info] { after cancel $i }");
-+            if (Tcl_Eval(slave, "after info") == TCL_OK
-+                && Tcl_SetVar(slave, 
-+                              REMAINED_AFTER_IDS_VAR, 
-+                              Tcl_GetStringResult(slave), 
-+                              TCL_GLOBAL_ONLY) != (char *)NULL) {
-+                DUMP1("cancel after scripts");
-+                Tcl_Eval(slave, CANCEL_REMAINED_AFTER_IDS);
-+            }
-         }
--#endif
- 
-         /* delete slaves of slave */
-         delete_slaves(slave);
-@@ -3360,18 +3368,20 @@ ip_free(ptr)
- 
-             Tcl_ResetResult(ptr->ip);
- 
-+            if (Tcl_Eval(ptr->ip, "after info") == TCL_OK
-+                && Tcl_SetVar(ptr->ip, 
-+                              REMAINED_AFTER_IDS_VAR, 
-+                              Tcl_GetStringResult(ptr->ip), 
-+                              TCL_GLOBAL_ONLY) != (char *)NULL) {
-+                DUMP1("cancel after scripts");
-+                Tcl_Eval(ptr->ip, CANCEL_REMAINED_AFTER_IDS);
-+            }
-+
-             if (Tcl_GetCommandInfo(ptr->ip, finalize_hook_name, &info)) {
-                 DUMP2("call finalize hook proc '%s'", finalize_hook_name);
-                 Tcl_Eval(ptr->ip, finalize_hook_name);
-             }
+@@ -171,11 +171,11 @@ Tcl_GetVar2Ex(interp, name1, name2, flag
+ {
+     Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj;
+ 
+-    nameObj1 = Tcl_NewStringObj(name1, -1);
++    nameObj1 = Tcl_NewStringObj((char*)name1, -1);
+     Tcl_IncrRefCount(nameObj1);
+ 
+     if (name2) {
+-        nameObj2 = Tcl_NewStringObj(name2, -1);
++        nameObj2 = Tcl_NewStringObj((char*)name2, -1);
+         Tcl_IncrRefCount(nameObj2);
+     }
  
--#if TCL_MAJOR_VERSION < 8 || ( TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4)
--#else
--            if (!Tcl_InterpDeleted(ptr->ip)) {
--                Tcl_Eval(ptr->ip, "foreach i [after info] {after cancel $i}");
--            }
--#endif
+@@ -197,14 +197,14 @@ Tcl_SetVar2Ex(interp, name1, name2, newV
+     CONST char *name2;
+     Tcl_Obj *newValObj;
+     int flags;
 -
-             del_root(ptr->ip);
++{
+     Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj;
  
-             DUMP1("delete interp");
-@@ -3838,12 +3848,14 @@ ip_delete(self)
-     /* Tcl_Preserve(ptr->ip); */
-     rbtk_preserve_ip(ptr);
+-    nameObj1 = Tcl_NewStringObj(name1, -1);
++     nameObj1 = Tcl_NewStringObj((char*)name1, -1);
+     Tcl_IncrRefCount(nameObj1);
  
--#if TCL_MAJOR_VERSION < 8 || ( TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4)
--#else
--    if (!Tcl_InterpDeleted(ptr->ip)) {
--        Tcl_Eval(ptr->ip, "foreach i [after info] { after cancel $i }");
-+    if (Tcl_Eval(ptr->ip, "after info") == TCL_OK
-+        && Tcl_SetVar(ptr->ip, 
-+                      REMAINED_AFTER_IDS_VAR, 
-+                      Tcl_GetStringResult(ptr->ip), 
-+                      TCL_GLOBAL_ONLY) != (char *)NULL) {
-+        DUMP1("cancel after scripts");
-+        Tcl_Eval(ptr->ip, CANCEL_REMAINED_AFTER_IDS);
+     if (name2) {
+-        nameObj2 = Tcl_NewStringObj(name2, -1);
++        nameObj2 = Tcl_NewStringObj((char*)name2, -1);
+         Tcl_IncrRefCount(nameObj2);
      }
--#endif
  
-     del_root(ptr->ip);
+@@ -5254,7 +5254,7 @@ get_obj_from_str(str)
+     const char *s = StringValuePtr(str);
  
-@@ -4188,6 +4200,7 @@ ip_eval(self, str)
-         rb_thread_stop();
-     }
-     DUMP2("back from handler (current thread:%lx)", current);
-+    DUMP1("ip_eval back:111");
+ #if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
+-    return Tcl_NewStringObj(s, RSTRING(str)->len);
++    return Tcl_NewStringObj((char*)s, RSTRING(str)->len);
+ #else /* TCL_VERSION >= 8.1 */
+     VALUE enc = rb_attr_get(str, ID_at_enc);
  
-     /* get result & free allocated memory */
-     ret = RARRAY(result)->ptr[0];