>Number:         15361
>Category:       pkg
>Synopsis:       tkcvs-7.0.3 (bugfix release) available
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Jan 25 09:08:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Ingolf Steinbach
>Release:        pkgsrc as of 2002-01-25
>Organization:
none
>Environment:
System: NetBSD helios 1.5.3_ALPHA NetBSD 1.5.3_ALPHA (HELIOS) #0: Sat Dec 8 16:32:24 CET 2001 ingolf@helios:/usr/obj/sys/arch/i386/compile/HELIOS i386


>Description:
	TkCVS 7.0.2 (bugfix release) is available. pkgsrc currently
	is 7.0.2. From the change log:

- Improved the algorithm for building the tree in the module browser, making
  it less error-prone.

- Recursive add respects .cvsignore and $cvscfg(ignore_file_filter)

- The Working Directory Browser parses the "Sticky Options" field and uses
  a different icon if a locally-added or up-to-date file is binary (-kb).

- The Log Browser color-codes the selected revisions so you can visually
  match the log text with the box in the branching diagram.

- The dialog for module-level tagging (cvs rtag) is a little more
  informative (and the code is a little less rococo).

- The installer has a new option "-finaldest", to facilitate building
  debian-style packages.

- The man page is installed in man1 instead of mann.

- The tooltips no longer persist until the operation started by the button
  is finished.

>How-To-Repeat:
	n/a
>Fix:
	Apply the following patch in devel/tkcvs:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/tkcvs/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	2001/10/21 10:02:03	1.22
+++ Makefile	2002/01/25 16:46:12
@@ -1,7 +1,8 @@
 # $NetBSD: Makefile,v 1.22 2001/10/21 10:02:03 wiz Exp $
 #
 
-DISTNAME=	tkcvs-7.0.2
+DISTNAME=	tkcvs-7_03
+PKGNAME=	tkcvs-7.0.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.twobarleycorns.net/ \
 		${MASTER_SITE_SOURCEFORGE:=tkcvs/}
@@ -12,9 +13,6 @@
 
 USE_BUILDLINK_ONLY=	YES
 NO_BUILD=		YES
-
-post-extract:
-	${MV} ${WRKSRC}/tkcvs/tkcvs.n ${WRKSRC}/tkcvs/tkcvs.1
 
 do-install:
 	(cd ${WRKSRC} && ./doinstall.tcl ${PREFIX})
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/tkcvs/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- PLIST	2001/11/01 01:27:01	1.1
+++ PLIST	2002/01/25 16:46:12
@@ -49,12 +49,15 @@
 share/tkcvs/bitmaps/remove.gif
 share/tkcvs/bitmaps/stat_conf.gif
 share/tkcvs/bitmaps/stat_ex.gif
+share/tkcvs/bitmaps/stat_kb.gif
 share/tkcvs/bitmaps/stat_merge.gif
 share/tkcvs/bitmaps/stat_minus.gif
 share/tkcvs/bitmaps/stat_mod.gif
 share/tkcvs/bitmaps/stat_ok.gif
+share/tkcvs/bitmaps/stat_okay.gif
 share/tkcvs/bitmaps/stat_ood.gif
 share/tkcvs/bitmaps/stat_plus.gif
+share/tkcvs/bitmaps/stat_plus_kb.gif
 share/tkcvs/bitmaps/stat_ques.gif
 share/tkcvs/bitmaps/tag.gif
 share/tkcvs/bitmaps/tags.gif
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/tkcvs/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	2001/10/21 10:02:03	1.5
+++ distinfo	2002/01/25 16:46:12
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.5 2001/10/21 10:02:03 wiz Exp $
 
-SHA1 (tkcvs-7.0.2.tar.gz) = ce3749e7df8b4ee2ecaf1b4d8a8041f8bd47d1c9
-Size (tkcvs-7.0.2.tar.gz) = 218271 bytes
-SHA1 (patch-aa) = 21daa6567d1c36ce0adf3a50ab9b4b231fee92cb
+SHA1 (tkcvs-7_03.tar.gz) = 751137d7a4067b30a12fd5da2d34ed7b58b982aa
+Size (tkcvs-7_03.tar.gz) = 218921 bytes
+SHA1 (patch-aa) = 698b041bb86759c16c536931209758a67e2f616a
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/devel/tkcvs/patches/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- patch-aa	2001/07/03 20:59:40	1.6
+++ patch-aa	2002/01/25 16:46:13
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2001/07/03 20:59:40 zuntum Exp $
+$NetBSD$
 
---- doinstall.tcl.orig	Sun Dec 31 04:28:19 2000
+--- doinstall.tcl.orig	Wed Jan 23 18:18:03 2002
 +++ doinstall.tcl
 @@ -2,5 +2,5 @@
  #-*-tcl-*-
@@ -9,16 +9,14 @@
 +exec tclsh "$0" -- ${1+"$@"}
  
  #
-@@ -20,6 +20,6 @@
+@@ -29,5 +29,5 @@
    } else {
      set BINDIR [file join $INSTALLROOT bin]
 -    set LIBDIR [file join $INSTALLROOT lib]
--    set MANDIR [file join $INSTALLROOT man mann]
 +    set LIBDIR [file join $INSTALLROOT share]
-+    set MANDIR [file join $INSTALLROOT man man1]
+     set MANDIR [file join $INSTALLROOT man man1]
    }
- }
-@@ -31,21 +31,4 @@
+@@ -40,21 +40,4 @@
  
    set_paths $INSTALLROOT
 -
@@ -27,7 +25,7 @@
 -  set msg(3) [file join $LIBDIR tkcvs *.tcl]
 -  set msg(4) [file join $LIBDIR tkcvs bitmaps *.gif,xbm]
 -  if {$tcl_platform(platform) == "unix"} {
--     set msg(5) [file join $MANDIR tkcvs.n]
+-     set msg(5) [file join $MANDIR tkcvs.1]
 -  }
 -  foreach m [lsort [array names msg]] {
 -    if {[winfo exists .messages.$m]} {
@@ -39,17 +37,8 @@
 -    pack .messages.$m -side top -anchor w
 -  }
  }
- 
-@@ -84,6 +67,6 @@
-     file attributes [file join $BINDIR $TKDIFF] -permissions 0755
-     file mkdir $MANDIR
--    puts "Installing manpage tkcvs.n in $MANDIR"
--    file copy -force [file join tkcvs tkcvs.n] $MANDIR
-+    puts "Installing manpage tkcvs.1 in $MANDIR"
-+    file copy -force [file join tkcvs tkcvs.1] $MANDIR
-   }
  
-@@ -103,11 +86,4 @@
+@@ -117,11 +100,4 @@
    cd ..
    puts "Finished!"
 -
@@ -61,7 +50,7 @@
 -  }
  }
  
-@@ -122,10 +98,5 @@
+@@ -136,10 +112,5 @@
  
  # Check Tcl/TK version
 -if {$tcl_version < 8.1} {
>Release-Note:
>Audit-Trail:
>Unformatted: