summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminskim <minskim>2004-04-29 15:17:02 +0000
committerminskim <minskim>2004-04-29 15:17:02 +0000
commit9812b72b6f1687d05c4d8a9942c1fccec55d8c8c (patch)
tree348e089c58f78d7c19fa70c0a982471322d027cc
parentc26345c9d859ab2f17f32cae0c2692e2e7116e8a (diff)
downloadpkgsrc-9812b72b6f1687d05c4d8a9942c1fccec55d8c8c.tar.gz
Update tkcvs to 7.2.1.
Changes: - Vendor Merge is back, rehabilitated by Eugene Lee, its author. - Bug fixes: 892051 apply the tag ignores user input 892050 merge changes to current doesn't do that (No report) Clear entry containing tag instead of appending, so tag doesn't grow if dialog is re-opened. Fixed a few problems with defaults in tkcvs_def.tcl. - The installer no longer hardcodes the library path in tkcvs. The program now figures out where it is at runtime. - You can now configure how many lines to keep in the trace window with $cvscfg(trace_savelines) - Import dialog has better defaults. Version default is the same as you get if you don't supply the -b option on the command line. - Don't show stderr in CVS Commit dialog, since if there are many directories they may make too much output and make you miss what you were interested in.
-rw-r--r--devel/tkcvs/Makefile10
-rw-r--r--devel/tkcvs/PLIST6
-rw-r--r--devel/tkcvs/distinfo8
-rw-r--r--devel/tkcvs/patches/patch-aa16
-rw-r--r--doc/CHANGES3
-rw-r--r--doc/TODO3
6 files changed, 21 insertions, 25 deletions
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index d95e74cf68e..a55202dde45 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2004/03/09 22:49:48 minskim Exp $
+# $NetBSD: Makefile,v 1.31 2004/04/29 15:17:02 minskim Exp $
#
-DISTNAME= tkcvs_7_2
-PKGNAME= tkcvs-7.2
+DISTNAME= tkcvs_7_2_1
+PKGNAME= tkcvs-7.2.1
CATEGORIES= devel
MASTER_SITES= http://www.twobarleycorns.net/ \
${MASTER_SITE_SOURCEFORGE:=tkcvs/}
@@ -23,8 +23,4 @@ USE_LANGUAGES= # empty
do-install:
(cd ${WRKSRC} && ./doinstall.tcl ${PREFIX})
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkcvs
- ${INSTALL_DATA} ${WRKSRC}/README.tkcvs ${PREFIX}/share/doc/tkcvs/
-
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/tkcvs/PLIST b/devel/tkcvs/PLIST
index 8f25c177bba..400ae64fee1 100644
--- a/devel/tkcvs/PLIST
+++ b/devel/tkcvs/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/09 22:49:48 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/04/29 15:17:02 minskim Exp $
bin/tkcvs
bin/tkdiff
man/man1/tkcvs.1
-share/doc/tkcvs/README.tkcvs
share/tkcvs/bitmaps/add.gif
share/tkcvs/bitmaps/adir.gif
share/tkcvs/bitmaps/amod.gif
@@ -75,6 +74,7 @@ share/tkcvs/bitmaps/tick.xbm
share/tkcvs/bitmaps/ticklefish_med.gif
share/tkcvs/bitmaps/tkcvs-ghost.xbm
share/tkcvs/bitmaps/tkcvs-help.xbm
+share/tkcvs/bitmaps/tkcvs16.xbm
share/tkcvs/bitmaps/tkcvs48.xbm
share/tkcvs/bitmaps/trace.xbm
share/tkcvs/bitmaps/unedit.gif
@@ -92,6 +92,7 @@ share/tkcvs/filebrowse.tcl
share/tkcvs/gen_log.tcl
share/tkcvs/help.tcl
share/tkcvs/import.tcl
+share/tkcvs/import2.tcl
share/tkcvs/joincanvas.tcl
share/tkcvs/logcanvas.tcl
share/tkcvs/merge.tcl
@@ -109,4 +110,3 @@ share/tkcvs/tooltips.tcl
share/tkcvs/workdir.tcl
@dirrm share/tkcvs/bitmaps
@dirrm share/tkcvs
-@dirrm share/doc/tkcvs
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index 25495dcaea8..0126f47e941 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2004/03/30 01:36:54 minskim Exp $
+$NetBSD: distinfo,v 1.11 2004/04/29 15:17:02 minskim Exp $
-SHA1 (tkcvs_7_2.tar.gz) = 1f2f2e745545ed42fd677bafd4682103e7f86bc4
-Size (tkcvs_7_2.tar.gz) = 279525 bytes
-SHA1 (patch-aa) = 21bb6f92541aba3eef7559a1d4aa86a2fa98c181
+SHA1 (tkcvs_7_2_1.tar.gz) = fd5bc8687748e6b62ff84fd08ded7bf09e653101
+Size (tkcvs_7_2_1.tar.gz) = 1083178 bytes
+SHA1 (patch-aa) = 2d17baf8a66a0c8ab4034c1c822af21488367731
diff --git a/devel/tkcvs/patches/patch-aa b/devel/tkcvs/patches/patch-aa
index a5f54db7e76..b0ca7cacc8c 100644
--- a/devel/tkcvs/patches/patch-aa
+++ b/devel/tkcvs/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.10 2004/03/30 01:36:54 minskim Exp $
+$NetBSD: patch-aa,v 1.11 2004/04/29 15:17:02 minskim Exp $
---- doinstall.tcl.orig 2003-10-16 02:23:32.000000000 -0500
+--- doinstall.tcl.orig 2004-03-15 23:40:54.000000000 -0600
+++ doinstall.tcl
@@ -2,5 +2,5 @@
#-*-tcl-*-
# the next line restarts using wish \
--if [ -z "$DISPLAY" ]; then exec tclsh "$0" -- ${1+"$@"}; else exec wish "$0" -- ${1+"$@"}; fi
+-if [ -z "$DISPLAY" -o "X$1" = "X-nox" ]; then exec tclsh "$0" -- ${1+"$@"}; else exec wish "$0" -- ${1+"$@"}; fi
+exec tclsh "$0" -- ${1+"$@"}
#
-@@ -30,5 +30,5 @@ proc set_paths {INSTALLROOT} {
+@@ -23,5 +23,5 @@ proc set_paths {INSTALLROOT} {
} else {
set BINDIR [file join $INSTALLROOT bin]
- set LIBDIR [file join $INSTALLROOT lib]
+ set LIBDIR [file join $INSTALLROOT share]
set MANDIR [file join $INSTALLROOT man man1]
}
-@@ -41,21 +41,4 @@ proc show_paths {INSTALLROOT} {
+@@ -34,21 +34,4 @@ proc show_paths {INSTALLROOT} {
set_paths $INSTALLROOT
-
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.10 2004/03/30 01:36:54 minskim Exp $
- }
}
-@@ -118,11 +101,4 @@ proc doinstall { INSTALLROOT } {
+@@ -100,11 +83,4 @@ proc doinstall { INSTALLROOT } {
cd ..
puts "Finished!"
-
@@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.10 2004/03/30 01:36:54 minskim Exp $
- }
}
-@@ -133,10 +109,5 @@ set X 1
+@@ -115,10 +91,5 @@ set X 1
# Check Tcl/TK version
-if {$tcl_version < 8.3} {
@@ -61,4 +61,4 @@ $NetBSD: patch-aa,v 1.10 2004/03/30 01:36:54 minskim Exp $
-}
+# This is done by the package Makefile
- # Do this after checking tcl version, because 7.x doesn't have it.
+ # See if the user changed them with command-line args
diff --git a/doc/CHANGES b/doc/CHANGES
index 539a05c4d4e..0523a79f07f 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5770 2004/04/29 13:15:57 wiz Exp $
+$NetBSD: CHANGES,v 1.5771 2004/04/29 15:17:02 minskim Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -2289,3 +2289,4 @@ Changes to the packages collection and infrastructure in 2004:
Updated qt3-mysql to 3.3.2 [markd 2004-04-29]
Updated qt3 to 3.3.2 [markd 2004-04-29]
Updated automake to 1.8.4 [wiz 2004-04-29]
+ Updated tkcvs to 7.2.1 [minskim 2004-04-29]
diff --git a/doc/TODO b/doc/TODO
index 65cd57bdc86..d5189770799 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.1682 2004/04/29 13:23:39 grant Exp $
+$NetBSD: TODO,v 1.1683 2004/04/29 15:17:02 minskim Exp $
Suggested new packages
======================
@@ -350,7 +350,6 @@ Suggested package updates
o texi2html-1.70
o texinfo-4.7
o thy-0.9.0 [pkg/25318]
- o tkcvs-7.2.1
o tkdesk-2.0
o tkman-2.2
o tmda-1.0.2