[pkgsrc/trunk]: pkgsrc Update tkinfo to 2.8. Patch provided by guru at nscl ...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28297dded857
branches:  trunk
changeset: 475213:28297dded857
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed May 12 15:08:13 2004 +0000

description:
Update tkinfo to 2.8.  Patch provided by guru at nscl dot msu dot edu
in PR pkg/25528.  While here, switch to Tk 8.4.

Changes since 2.5:

Version 2.8 (22-March-2004): Removed a subtle bug found by Haakon
Riiser; now works correctly with identically named info files in
different directories.

Version 2.7 (21-March-2004): Will now also accept a menu item of the
dir file on the command line (closes Debian bug #149387). Included
/usr/share/info in default directory list (for Debian). Some
documentation updates. Now includes TkInfo.xpm from Debian (under
GPL). Options are now read from system-wide app-defaults file as
advertised.

Version 2.6 (25-June-2003): Minor fixes needed for Tcl/Tk 8.4. This
still works with older versions of Tcl/Tk.

diffstat:

 doc/CHANGES                 |   3 ++-
 x11/tkinfo/Makefile         |  10 ++++------
 x11/tkinfo/distinfo         |   8 ++++----
 x11/tkinfo/patches/patch-aa |  16 ++++++++--------
 4 files changed, 18 insertions(+), 19 deletions(-)

diffs (85 lines):

diff -r 8d707c50e46a -r 28297dded857 doc/CHANGES
--- a/doc/CHANGES       Wed May 12 14:10:18 2004 +0000
+++ b/doc/CHANGES       Wed May 12 15:08:13 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5908 2004/05/11 18:28:32 sjg Exp $
+$NetBSD: CHANGES,v 1.5909 2004/05/12 15:08:13 minskim Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2480,3 +2480,4 @@
        Updated libgdiplus to 0.5 [recht 2004-05-11]
        Updated winelib to 0.2 [recht 2004-05-11]
        Updated bmake to 20040511 [sjg 2004-05-11]
+       Updated tkinfo to 2.8 [minskim 2004-05-12]
diff -r 8d707c50e46a -r 28297dded857 x11/tkinfo/Makefile
--- a/x11/tkinfo/Makefile       Wed May 12 14:10:18 2004 +0000
+++ b/x11/tkinfo/Makefile       Wed May 12 15:08:13 2004 +0000
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.18 2004/03/08 20:27:17 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/12 15:08:20 minskim Exp $
 # FreeBSD Id: Makefile,v 1.15 1997/12/16 09:26:12 tg Exp
 #
 
-DISTNAME=      tkinfo-2.5
+DISTNAME=      tkinfo-2.8
 CATEGORIES=    x11
-MASTER_SITES=  ${MASTER_SITE_SUNSITE:=apps/doctools/info/} \
-               http://math-www.uni-paderborn.de/~axel/tkinfo/
+MASTER_SITES=  http://math-www.uni-paderborn.de/~axel/tkinfo/
 
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 HOMEPAGE=      http://math-www.uni-paderborn.de/~axel/tkinfo/
 COMMENT=       Tk script to read and display GNU "info" files
 
-DEPENDS=       tk>=8.3.2:../../x11/tk83
+DEPENDS=       tk>=8.3.2:../../x11/tk
 
-USE_X11=       yes
 NO_BUILD=      yes
 
 post-patch:
diff -r 8d707c50e46a -r 28297dded857 x11/tkinfo/distinfo
--- a/x11/tkinfo/distinfo       Wed May 12 14:10:18 2004 +0000
+++ b/x11/tkinfo/distinfo       Wed May 12 15:08:13 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:45 skrll Exp $
+$NetBSD: distinfo,v 1.3 2004/05/12 15:08:20 minskim Exp $
 
-SHA1 (tkinfo-2.5.tar.gz) = 3d2ac8c187b59585e8038779b66f69ebcd3216e1
-Size (tkinfo-2.5.tar.gz) = 54752 bytes
-SHA1 (patch-aa) = de0d921c1cd757e66aa5a2bb1533bfc1e1b4452b
+SHA1 (tkinfo-2.8.tar.gz) = 1653290ae887e99bd71980a848ed0e6a5224d6ee
+Size (tkinfo-2.8.tar.gz) = 56234 bytes
+SHA1 (patch-aa) = 3fe8c55edf9f47d5604e3786e3b87e5d35896f31
diff -r 8d707c50e46a -r 28297dded857 x11/tkinfo/patches/patch-aa
--- a/x11/tkinfo/patches/patch-aa       Wed May 12 14:10:18 2004 +0000
+++ b/x11/tkinfo/patches/patch-aa       Wed May 12 15:08:13 2004 +0000
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.5 2000/08/30 23:35:42 jwise Exp $
+$NetBSD: patch-aa,v 1.6 2004/05/12 15:08:20 minskim Exp $
 
---- tkinfo.orig        Wed Apr 29 17:53:41 1998
-+++ tkinfo     Fri Oct  1 14:39:53 1999
-@@ -509,11 +509,9 @@
- proc tkiInit { } {
-     global tki env auto_path tkiEmbed geometry
+--- tkinfo.orig        2004-03-22 17:56:39.000000000 -0600
++++ tkinfo
+@@ -510,11 +510,9 @@ proc tkiInit { } {
+     # No need to do this if we have been called before
+     if { [info exist tki(sn)] } return
  
 -    set defInfoPath [list . \
--      /usr/info /usr/local/info /usr/local/gnu/info \
+-      /usr/info /usr/share/info /usr/local/info /usr/local/gnu/info \
 -      /usr/local/emacs/info /usr/local/lib/emacs/info \
 -      /usr/lib/xemacs/info /usr/local/lib/xemacs/info \
 -      /usr/gnu/info \
 +    set defInfoPath [list . /usr/share/info \
 +      @LOCALBASE@/info @X11BASE@/info \
-+      /usr/info /usr/local/info \
++        /usr/info /usr/local/info \
        ]
  
      set defInfoSuffix [list .info -info ""]