ALT Linux Sisyphus - Пакет tcl-readline

diff -u -u -r2.4 -r2.5

--- AUTHORS	27 Aug 2000 14:14:37 -0000	2.4
+++ AUTHORS	10 Aug 2001 20:56:14 -0000	2.5
@@ -1,2 +1,3 @@
 Johannes Zellner <johannes@zellner.org> http://www.zellner.org/
 Mark Patton <mpatton@jhu.edu>
+Massimo Dal Zotto  <dz@debian.org>
diff -u -u -r2.1 -r2.2
--- COPYING	25 Mar 2000 20:59:11 -0000	2.1
+++ COPYING	10 Jan 2001 05:32:28 -0000	2.2
@@ -1,5 +1,5 @@
    
-   Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+   Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
    All rights reserved.
    
    Redistribution and use in source and binary forms, with or without
diff -u -u -r2.7 -r2.11
--- ChangeLog	8 Dec 2000 00:45:45 -0000	2.7
+++ ChangeLog	10 Aug 2001 20:56:14 -0000	2.11
@@ -1,3 +1,21 @@
+2001-08-10  Johannes Zellner <johannes@zellner.org>
+
+	* added Massimo to AUTHORS
+
+2001-08-10  Massimo Dal Zotto  <dz@debian.org>
+
+    * In tclreadlineSetup.tcl.in prefixed all global variables with
+      package prefix to avoid polluting the global namespace.
+      Removed also the global unused variable "a".
+
+2001-01-10  Johannes Zellner  <johannes@zellner.org>
+
+	* configure.in: changed the check for readline/readline.h / readline.h
+
+2000-12-08  Johannes Zellner  <johannes@zellner.org>
+
+    * reordered Makefile.am so that it always includes
+    tclshrl.c,wishrl.c into the distribution.
 
 2000-12-08  Johannes Zellner  <johannes@zellner.org>
 
diff -u -u -r2.9 -r2.10
--- README	8 Dec 2000 00:45:45 -0000	2.9
+++ README	10 Jan 2001 05:32:28 -0000	2.10
@@ -1,12 +1,12 @@
 FILE: "/home/joze/src/tclreadline/README"
-LAST MODIFICATION: "Fre, 08 Dez 2000 01:42:39 +0100 (joze)"
-(C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
-$Id: README,v 2.9 2000/12/08 00:45:45 joze Exp $
+LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)"
+(C) 1998 - 2001 by Johannes Zellner, <johannes@zellner.org>
+$Id: README,v 2.10 2001/01/10 05:32:28 joze Exp $
 ---
 
 tclreadline -- gnu readline for tcl
 http://www.zellner.org/tclreadline/
-Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
 
 This software is copyright under the BSD license.
 
diff -u -u -r2.26 -r2.27
--- configure.in	8 Dec 2000 00:45:45 -0000	2.26
+++ configure.in	10 Jan 2001 05:32:28 -0000	2.27
@@ -1,23 +1,23 @@
 dnl -*- autoconf -*-
 dnl FILE: "/home/joze/src/tclreadline/configure.in"
-dnl LAST MODIFICATION: "Fre, 08 Dez 2000 01:36:25 +0100 (joze)"
-dnl (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
-dnl $Id: configure.in,v 2.26 2000/12/08 00:45:45 joze Exp $
+dnl LAST MODIFICATION: "Mit, 10 Jan 2001 06:26:43 +0100 (joze)"
+dnl (C) 1998 - 2001 by Johannes Zellner, <johannes@zellner.org>
+dnl $Id: configure.in,v 2.27 2001/01/10 05:32:28 joze Exp $
 dnl ---
 dnl tclreadline -- gnu readline for tcl
 dnl http://www.zellner.org/tclreadline/
-dnl Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+dnl Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
 dnl This software is copyright under the BSD license.
 
 AC_INIT(tclreadline.c)
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.13)
-AC_REVISION($Revision: 2.26 $)
+AC_REVISION($Revision: 2.27 $)
 AC_CONFIG_AUX_DIR(./aux)
 
 MAJOR=2
 MINOR=1
-PATCHLEVEL=0
+PATCHLEVEL=1
 VERSION=$MAJOR.$MINOR
 PATCHLEVEL_STR=$VERSION.$PATCHLEVEL
 
@@ -156,26 +156,33 @@
             [  --with-readline-includes=DIR readline include files in DIR],
             rl_includes=$withval, rl_includes="")
 
+dnl look for readline/readline.h
+dnl          ^^^^^^^^
 AC_MSG_CHECKING([where to look for readline.h])
 READLINE_INCLUDE_DIR=""
-for dir in $rl_includes /usr/local/include/readline /usr/local/include /usr/include/readline /usr/include ; do
-    if test -r $dir/readline.h; then
+for dir in $rl_includes /usr/local/include /usr/include ; do
+    if test -r $dir/readline/readline.h; then
         READLINE_INCLUDE_DIR=$dir
         break
     fi
 done
 
+dnl look directly in the include dirs for readline.h
+if test -z "$READLINE_INCLUDE_DIR"; then
+    for dir in $rl_includes /usr/local/include /usr/include ; do
+	if test -r $dir/readline.h; then
+	    READLINE_INCLUDE_DIR=$dir
+	    AC_DEFINE_UNQUOTED(READLINE_LIBRARY, 1, [ Define if we have libreadline. ])
+	    break
+	fi
+    done
+fi
+
 if test -z "$READLINE_INCLUDE_DIR"; then
     AC_MSG_ERROR([
   Can't find readline.h.
   Use --with-readline-includes to specify the directory
   containing readline.h on your system.])
-else
-    AC_MSG_RESULT($READLINE_INCLUDE_DIR/readline.h)
-	base="`(basename ${READLINE_INCLUDE_DIR}) 2>/dev/null`"
-	if test "x${base}" != "xreadline"; then
-		AC_DEFINE_UNQUOTED(READLINE_LIBRARY, 1, [ Define if we have libreadline. ])
-	fi
 fi
 
 AC_ARG_WITH(readline-library,
diff -u -u -r2.3 -r2.4
--- pkgIndex.tcl.in	1 Jul 2000 22:18:08 -0000	2.3
+++ pkgIndex.tcl.in	10 Jan 2001 05:32:28 -0000	2.4
@@ -1,12 +1,12 @@
 #!/usr/local/bin/tclsh
 # FILE: "/home/joze/src/tclreadline/pkgIndex.tcl.in"
-# LAST MODIFICATION: "Sat, 01 Jul 2000 21:53:04 +0200 (joze)"
-# (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
-# $Id: pkgIndex.tcl.in,v 2.3 2000/07/01 22:18:08 joze Exp $
+# LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)"
+# (C) 1998 - 2001 by Johannes Zellner, <johannes@zellner.org>
+# $Id: pkgIndex.tcl.in,v 2.4 2001/01/10 05:32:28 joze Exp $
 # ---
 # tclreadline -- gnu readline for tcl
 # http://www.zellner.org/tclreadline/
-# Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+# Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
 # This software is copyright under the BSD license.
 
 package ifneeded tclreadline @VERSION@ \
diff -u -u -r2.19 -r2.20
--- tclreadline.c	20 Sep 2000 17:44:34 -0000	2.19
+++ tclreadline.c	10 Jan 2001 05:32:28 -0000	2.20
@@ -1,13 +1,13 @@
 
  /* ==================================================================
     FILE: "/home/joze/src/tclreadline/tclreadline.c"
-    LAST MODIFICATION: "Mit, 20 Sep 2000 19:27:47 +0200 (joze)"
-    (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
-    $Id: tclreadline.c,v 2.19 2000/09/20 17:44:34 joze Exp $
+    LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)"
+    (C) 1998 - 2001 by Johannes Zellner, <johannes@zellner.org>
+    $Id: tclreadline.c,v 2.20 2001/01/10 05:32:28 joze Exp $
     ---
     tclreadline -- gnu readline for tcl
     http://www.zellner.org/tclreadline/
-    Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+    Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
     This software is copyright under the BSD license.
     ================================================================== */  
 
diff -u -u -r2.5 -r2.6
--- tclreadline.h.in	20 Sep 2000 17:44:34 -0000	2.5
+++ tclreadline.h.in	10 Jan 2001 05:32:28 -0000	2.6
@@ -1,14 +1,14 @@
 
  /* ==================================================================
     FILE: "/home/joze/src/tclreadline/tclreadline.h.in"
-    LAST MODIFICATION: "Mit, 20 Sep 2000 17:18:12 +0200 (joze)"
-    (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
-    $Id: tclreadline.h.in,v 2.5 2000/09/20 17:44:34 joze Exp $
+    LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)"
+    (C) 1998 - 2001 by Johannes Zellner, <johannes@zellner.org>
+    $Id: tclreadline.h.in,v 2.6 2001/01/10 05:32:28 joze Exp $
     vim:set ft=c:
     ---
     tclreadline -- gnu readline for tcl
     http://www.zellner.org/tclreadline/
-    Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+    Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
     This software is copyright under the BSD license.
     ================================================================== */  
 
diff -u -u -r2.9 -r2.10
--- tclreadline.n.in	27 Aug 2000 13:25:24 -0000	2.9
+++ tclreadline.n.in	10 Jan 2001 05:32:28 -0000	2.10
@@ -1,13 +1,13 @@
 .TH tclreadline n "@PATCHLEVEL_STR@" "Johannes Zellner"
 
 .\" FILE: "/home/joze/src/tclreadline/tclreadline.n.in"
-.\" LAST MODIFICATION: "Don, 20 Jul 2000 03:29:13 +0200 (joze)"
-.\" (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
-.\" $Id: tclreadline.n.in,v 2.9 2000/08/27 13:25:24 msp Exp $
+.\" LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)"
+.\" (C) 1998 - 2001 by Johannes Zellner, <johannes@zellner.org>
+.\" $Id: tclreadline.n.in,v 2.10 2001/01/10 05:32:28 joze Exp $
 .\" ---
 .\" tclreadline -- gnu readline for tcl
 .\" http://www.zellner.org/tclreadline/
-.\" Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+.\" Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
 .\" This software is copyright under the BSD license.
 
 
diff -u -u -r2.23 -r2.24
--- tclreadlineCompleter.tcl	1 Jul 2000 14:23:17 -0000	2.23
+++ tclreadlineCompleter.tcl	10 Jan 2001 05:32:28 -0000	2.24
@@ -1,14 +1,14 @@
 # -*- tclsh -*-
 # FILE: "/home/joze/src/tclreadline/tclreadlineCompleter.tcl"
-# LAST MODIFICATION: "Sat, 01 Jul 2000 16:15:55 +0200 (joze)"
-# (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
-# $Id: tclreadlineCompleter.tcl,v 2.23 2000/07/01 14:23:17 joze Exp $
+# LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)"
+# (C) 1998 - 2001 by Johannes Zellner, <johannes@zellner.org>
+# $Id: tclreadlineCompleter.tcl,v 2.24 2001/01/10 05:32:28 joze Exp $
 # vim:set ts=4:
 # ---
 #
 # tclreadline -- gnu readline for tcl
 # http://www.zellner.org/tclreadline/
-# Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+# Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
 #
 # This software is copyright under the BSD license.
 #
diff -u -u -r2.6 -r2.7
--- tclreadlineInit.tcl.in	20 Sep 2000 17:44:34 -0000	2.6
+++ tclreadlineInit.tcl.in	10 Jan 2001 05:32:28 -0000	2.7
@@ -1,12 +1,12 @@
 #!/usr/local/bin/tclsh
 # FILE: "/home/joze/src/tclreadline/tclreadlineInit.tcl.in"
-# LAST MODIFICATION: "Mit, 20 Sep 2000 19:29:26 +0200 (joze)"
-# (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
-# $Id: tclreadlineInit.tcl.in,v 2.6 2000/09/20 17:44:34 joze Exp $
+# LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:33 +0100 (joze)"
+# (C) 1998 - 2001 by Johannes Zellner, <johannes@zellner.org>
+# $Id: tclreadlineInit.tcl.in,v 2.7 2001/01/10 05:32:28 joze Exp $
 # ---
 # tclreadline -- gnu readline for tcl
 # http://www.zellner.org/tclreadline/
-# Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+# Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
 # This software is copyright under the BSD license.
 
 package provide tclreadline @VERSION@
diff -u -u -r2.9 -r2.11
--- tclreadlineSetup.tcl.in	1 Jul 2000 22:18:08 -0000	2.9
+++ tclreadlineSetup.tcl.in	10 Aug 2001 20:05:53 -0000	2.11
@@ -1,12 +1,12 @@
 #!/usr/locanl/bin/tclsh
 # FILE: "/home/joze/src/tclreadline/tclreadlineSetup.tcl.in"
-# LAST MODIFICATION: "Sat, 01 Jul 2000 21:53:28 +0200 (joze)"
-# (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
-# $Id: tclreadlineSetup.tcl.in,v 2.9 2000/07/01 22:18:08 joze Exp $
+# LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:34 +0100 (joze)"
+# (C) 1998 - 2001 by Johannes Zellner, <johannes@zellner.org>
+# $Id: tclreadlineSetup.tcl.in,v 2.11 2001/08/10 20:05:53 dizzi Exp $
 # ---
 # tclreadline -- gnu readline for tcl
 # http://www.zellner.org/tclreadline/
-# Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+# Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
 # This software is copyright under the BSD license.
 
 
@@ -136,7 +136,7 @@
 	    ::tclreadline::Init
 	}
 
-	if {[catch {set a [::tclreadline::prompt1]}] && [info nameofexecutable] != ""} {
+	if {[catch {::tclreadline::prompt1}] && [info nameofexecutable] != ""} {
 
 	    namespace eval ::tclreadline {
 		variable prompt_string
@@ -263,22 +263,28 @@
 
 	while {1} {
 
+	    # Try to transform {puts -nonewline stdout =>} into {concat =>}
 	    if [info exists tcl_prompt2] {
-		set prompt2 $tcl_prompt2
-	    } else {
-		set prompt2 ">"
+		regsub "puts\[ \t]*(-nonewline)?\[ \t](stdout)?" $tcl_prompt2 \
+			"concat" tcl_prompt2
 	    }
 
 	    if {[catch {
 		if {"" != [namespace eval ::tclreadline {info procs prompt1}]} {
-		    set LINE [::tclreadline::readline read \
+		    set ::tclreadline::LINE [::tclreadline::readline read \
 		    [::tclreadline::prompt1]]
 		} else {
-		    set LINE [::tclreadline::readline read %]
+		    set ::tclreadline::LINE [::tclreadline::readline read %]
 		}
-		while {![::tclreadline::readline complete $LINE]} {
-		    append LINE "\n"
-		    append LINE [tclreadline::readline read ${prompt2}]
+		while {![::tclreadline::readline complete $::tclreadline::LINE]} {
+		    append ::tclreadline::LINE "\n"
+		    append ::tclreadline::LINE [::tclreadline::readline read [
+		        if [info exists tcl_prompt2] {
+			    eval $tcl_prompt2
+			} else {
+			    concat ">"
+			}
+		    ]]
 		}
 	    } ::tclreadline::errorMsg]} {
 		puts stderr [list tclreadline::Loop: error. \
@@ -294,19 +300,19 @@
 	    # from tcsh's behaviour, but I found it quite convenient
 	    # while using mshell on os9.
 	    #
-	    if {[string length $LINE] && [history event 0] != $LINE} {
-		history add $LINE
+	    if {[string length $::tclreadline::LINE] && [history event 0] != $::tclreadline::LINE} {
+		history add $::tclreadline::LINE
 	    }
 
 	    if [catch {
-		set result [eval $LINE]
-		if {$result != "" && [tclreadline::Print]} {
-		    puts $result
+		set ::tclreadline::result [eval $::tclreadline::LINE]
+		if {$::tclreadline::result != "" && [::tclreadline::Print]} {
+		    puts $::tclreadline::result
 		}
-		set result ""
+		set ::tclreadline::result ""
 	    } ::tclreadline::errorMsg] {
 		puts stderr $::tclreadline::errorMsg
-		puts stderr [list while evaluating $LINE]
+		puts stderr [list while evaluating $::tclreadline::LINE]
 	    }
 
 	}
diff -u -u -r1.3 -r1.4
--- tclshrl.c	25 Mar 2000 20:59:12 -0000	1.3
+++ tclshrl.c	10 Jan 2001 05:32:28 -0000	1.4
@@ -2,14 +2,14 @@
  /* ==================================================================
 
     FILE: "/home/joze/src/tclreadline/tclshrl.c"
-    LAST MODIFICATION: "Sat, 25 Mar 2000 20:51:39 +0100 (joze)"
-    (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
-    $Id: tclshrl.c,v 1.3 2000/03/25 20:59:12 joze Exp $
+    LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:34 +0100 (joze)"
+    (C) 1998 - 2001 by Johannes Zellner, <johannes@zellner.org>
+    $Id: tclshrl.c,v 1.4 2001/01/10 05:32:28 joze Exp $
     ---
 
     tclreadline -- gnu readline for tcl
     http://www.zellner.org/tclreadline/
-    Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+    Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
 
     This software is copyright under the BSD license.
 
diff -u -u -r1.3 -r1.4
--- wishrl.c	25 Mar 2000 20:59:12 -0000	1.3
+++ wishrl.c	10 Jan 2001 05:32:28 -0000	1.4
@@ -2,14 +2,14 @@
  /* ==================================================================
 
     FILE: "/home/joze/src/tclreadline/wishrl.c"
-    LAST MODIFICATION: "Sat, 25 Mar 2000 20:52:13 +0100 (joze)"
-    (C) 1998 - 2000 by Johannes Zellner, <johannes@zellner.org>
-    $Id: wishrl.c,v 1.3 2000/03/25 20:59:12 joze Exp $
+    LAST MODIFICATION: "Mit, 10 Jan 2001 06:29:34 +0100 (joze)"
+    (C) 1998 - 2001 by Johannes Zellner, <johannes@zellner.org>
+    $Id: wishrl.c,v 1.4 2001/01/10 05:32:28 joze Exp $
     ---
 
     tclreadline -- gnu readline for tcl
     http://www.zellner.org/tclreadline/
-    Copyright (c) 1998 - 2000, Johannes Zellner <johannes@zellner.org>
+    Copyright (c) 1998 - 2001, Johannes Zellner <johannes@zellner.org>
 
     This software is copyright under the BSD license.
 
diff -u configure.orig configure
--- configure.orig	Fri Dec  8 02:48:06 2000
+++ configure	Wed Jun  5 16:21:45 2002
@@ -574,7 +574,7 @@
 
 MAJOR=2
 MINOR=1
-PATCHLEVEL=0
+PATCHLEVEL=1
 VERSION=$MAJOR.$MINOR
 PATCHLEVEL_STR=$VERSION.$PATCHLEVEL
 

S:	2.3.8-alt1
5.1:	2.1.1-alt7
4.1:	2.1.1-alt7
4.0:	2.1.1-alt7
3.0:	2.1.1-alt6