From ak03@gte.com  Tue Dec  5 14:13:16 2000
Return-Path: <ak03@gte.com>
Received: from h132-197-97-45.gte.com (h132-197-97-45.gte.com [132.197.97.45])
	by hub.freebsd.org (Postfix) with ESMTP id 3C37737B400
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Dec 2000 14:13:15 -0800 (PST)
Received: (from ak03@localhost)
	by h132-197-97-45.gte.com (8.11.1/8.11.1) id eB5MDEX99192;
	Tue, 5 Dec 2000 17:13:14 -0500 (EST)
	(envelope-from ak03)
Message-Id: <200012052213.eB5MDEX99192@h132-197-97-45.gte.com>
Date: Tue, 5 Dec 2000 17:13:14 -0500 (EST)
From: <Alexander.N.Kabaev " <ak03@gte.com>"@gte.com>
Sender: ak03@gte.com
To: FreeBSD-gnats-submit@freebsd.org
Cc: shanee@augusta.de
Subject: Upgrade TkCVS to version 6.4 
X-Send-Pr-Version: 3.2

>Number:         23307
>Category:       ports
>Synopsis:       Upgrade TkCVS to version 6.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 05 14:20:00 PST 2000
>Closed-Date:    Sun Dec 10 19:02:29 PST 2000
>Last-Modified:  Sun Dec 10 19:03:20 PST 2000
>Originator:     Alexander N. Kabaev
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
GTE Laboratories Inc.
>Environment:

	N/A

>Description:

	Upgrade TkCVS to the latest version, while there, make sure
 	that port is easily switchable to the newest Tk 8.3 - all
	user needs now is to replace 2s in Makefile by 3s

>How-To-Repeat:

	N/A

>Fix:

Index: Makefile
===================================================================
RCS file: /usr/ncvs/ports/devel/tkcvs/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	2000/09/13 20:23:51	1.19
+++ Makefile	2000/12/05 22:12:35
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tkcvs
-PORTVERSION=	6.3
+PORTVERSION=	6.4
 CATEGORIES=	devel tk82
 MASTER_SITES=	http://www.twobarleycorns.net/
 
@@ -23,6 +23,7 @@
 post-patch:
 	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/tkcvs/tkcvs.blank
 	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/tkdiff/tkdiff
+	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/doinstall.tcl
 
 do-install:
 	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${TCLSH} doinstall.tcl)
Index: distinfo
===================================================================
RCS file: /usr/ncvs/ports/devel/tkcvs/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	2000/09/13 20:23:56	1.3
+++ distinfo	2000/12/05 17:47:07
@@ -1 +1 @@
-MD5 (tkcvs-6.3.tar.gz) = 59b141fcc658330939c9512033e15894
+MD5 (tkcvs-6.4.tar.gz) = dec18bb61e49a4b3eceacfd83ca07a36
Index: files/patch-aa
===================================================================
RCS file: /usr/ncvs/ports/devel/tkcvs/files/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- files/patch-aa	2000/09/13 20:23:56	1.6
+++ files/patch-aa	2000/12/05 22:03:37
@@ -1,8 +1,5 @@
---- doinstall.tcl.orig	Sun May  7 01:12:41 2000
-+++ doinstall.tcl	Mon Sep  4 17:06:32 2000
-@@ -4,1 +4,1 @@
--exec wish "$0" -- ${1+"$@"}
-+exec wish8.2 "$0" -- ${1+"$@"}
+--- doinstall.tcl.orig	Fri Sep 29 00:44:53 2000
++++ doinstall.tcl	Tue Dec  5 12:55:13 2000
 @@ -30,13 +30,9 @@
       set msg(5) [file join $MANDIR tkcvs.n]
    }
@@ -18,7 +15,7 @@
    }
  }
  
-@@ -94,11 +90,6 @@
+@@ -94,23 +90,10 @@
    }
    cd ..
    puts "Finished!"
@@ -29,11 +26,23 @@
 -  pack .bottom.done
  }
  
- #
-@@ -115,28 +106,6 @@
-   set TKDIFF "tkdiff"
- }
+ ################################################################################
+ 
+-# Check Tcl/TK version
+-if {$tk_version < 8.1} {
+-   tk_dialog .wrongversion "Tcl/Tk too old" \
+-   "TkCVS requires Tcl/Tk 8.1 or better!" \
+-   error 0 {Bye Bye}
+-   exit 1
+-}
+-
+ # Some rational and reasonable defaults.
  
+ if {$tcl_platform(platform) == "windows"} {
+@@ -127,28 +110,8 @@
+ if {[llength $argv] == 1} {
+   set INSTALLROOT [lindex $argv 0]
+ }
 -frame .title
 -label .title.lbl -text "TkCVS Installer" -font {Helvetica -14 bold}
 -pack .title -side top
@@ -50,14 +59,15 @@
 -pack .messages -side top -expand y -fill x
 -label .messages.adv -text "These files will be installed:"
 -pack .messages.adv -side top
- show_paths $INSTALLROOT
--
+-show_paths $INSTALLROOT
+ 
 -frame .bottom
 -button .bottom.do -text "Install" -command {doinstall $INSTALLROOT}
 -button .bottom.not -text "Cancel" -command {destroy .}
 -pack .bottom -side top
 -pack .bottom.do -side left
 -pack .bottom.not -side left
--
++show_paths $INSTALLROOT
 +doinstall $INSTALLROOT
 +exit 0
+ 

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Sun Dec 10 19:02:29 PST 2000 
State-Changed-Why:  
Update committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23307 
>Unformatted:
