head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.36 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.34 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.32 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.30 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.28 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.26 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.24 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.22 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.20 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.18 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.16 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.14 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.12 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.10 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.8 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.6 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2; locks; strict; comment @# @; 1.4 date 2006.01.03.14.41.49; author taca; state dead; branches; next 1.3; 1.3 date 2005.11.02.08.59.24; author taca; state Exp; branches; next 1.2; 1.2 date 2005.01.24.03.06.57; author taca; state Exp; branches; next 1.1; 1.1 date 2005.01.23.17.36.59; author taca; state Exp; branches; next ; desc @@ 1.4 log @Remove ruby-tcltk pacakge since this package was merged to ruby-tk now. @ text @$NetBSD: patch-aa,v 1.3 2005/11/02 08:59:24 taca Exp $ --- 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 "2005-08-09" +#define TCLTKLIB_RELEASE_DATE "2005-09-28" #include "ruby.h" #include "rubysig.h" @@@@ -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); } @@@@ -197,14 +197,14 @@@@ Tcl_SetVar2Ex(interp, name1, name2, newV CONST char *name2; Tcl_Obj *newValObj; int flags; - +{ 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); } @@@@ -5254,7 +5254,7 @@@@ get_obj_from_str(str) const char *s = StringValuePtr(str); #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); @ 1.3 log @- 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. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Oops, fix path name in patch-aa. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2005/01/23 17:36:59 taca Exp $ d3 1 a3 1 --- tcltklib.c.orig 2004-12-23 13:16:42.000000000 +0900 d9 2 a10 2 -#define TCLTKLIB_RELEASE_DATE "2004-12-23" +#define TCLTKLIB_RELEASE_DATE "2004-12-27" d14 18 a31 60 @@@@ -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); } -#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 d33 2 a34 1 del_root(ptr->ip); d36 8 a43 16 DUMP1("delete interp"); @@@@ -3838,12 +3848,14 @@@@ ip_delete(self) /* Tcl_Preserve(ptr->ip); */ rbtk_preserve_ip(ptr); -#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); a44 1 -#endif d46 2 a47 1 del_root(ptr->ip); d49 5 a53 5 @@@@ -4188,6 +4200,7 @@@@ ip_eval(self, str) rb_thread_stop(); } DUMP2("back from handler (current thread:%lx)", current); + DUMP1("ip_eval back:111"); a54 2 /* get result & free allocated memory */ ret = RARRAY(result)->ptr[0]; @ 1.1 log @Update to Ruby 1.8.2 base and this change: * ext/tcltklib/tcltklib.c: fix SEGV bug when deleting Tk interp @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- ext/tcltklib/tcltklib.c.orig 2004-12-23 13:16:42.000000000 +0900 +++ ext/tcltklib/tcltklib.c @