Install .tcl files into lib/ instead of share/, as other Tcl packages

do.  It also reduces patches.

Skip PKGREVISION bump since this package was updated minites ago.

3 files changed, 112 insertions, 119 deletions

diff --git a/devel/tkcvs/PLIST b/devel/tkcvs/PLIST
index 400ae64fee1..41260ca801a 100644
--- a/devel/tkcvs/PLIST
+++ b/devel/tkcvs/PLIST
@@ -1,112 +1,112 @@
-@comment $NetBSD: PLIST,v 1.5 2004/04/29 15:17:02 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/29 15:46:00 minskim Exp $
 bin/tkcvs
 bin/tkdiff
+lib/tkcvs/bitmaps/add.gif
+lib/tkcvs/bitmaps/adir.gif
+lib/tkcvs/bitmaps/amod.gif
+lib/tkcvs/bitmaps/annotate.gif
+lib/tkcvs/bitmaps/annotate.xbm
+lib/tkcvs/bitmaps/arrow.gif
+lib/tkcvs/bitmaps/arrow_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_dn.gif
+lib/tkcvs/bitmaps/arrow_hl_up.gif
+lib/tkcvs/bitmaps/arrow_up.gif
+lib/tkcvs/bitmaps/ball.gif
+lib/tkcvs/bitmaps/branch.gif
+lib/tkcvs/bitmaps/branch.xbm
+lib/tkcvs/bitmaps/branchtag.gif
+lib/tkcvs/bitmaps/check.gif
+lib/tkcvs/bitmaps/checkin.gif
+lib/tkcvs/bitmaps/checkout.gif
+lib/tkcvs/bitmaps/checkout_opts.gif
+lib/tkcvs/bitmaps/conflict.gif
+lib/tkcvs/bitmaps/cvs-says.xbm
+lib/tkcvs/bitmaps/cvsdir.gif
+lib/tkcvs/bitmaps/delete.gif
+lib/tkcvs/bitmaps/diff.gif
+lib/tkcvs/bitmaps/dir.gif
+lib/tkcvs/bitmaps/dir.xbm
+lib/tkcvs/bitmaps/dir_new.gif
+lib/tkcvs/bitmaps/dirbranch.gif
+lib/tkcvs/bitmaps/dirbranch.xbm
+lib/tkcvs/bitmaps/edit.gif
+lib/tkcvs/bitmaps/export.gif
+lib/tkcvs/bitmaps/fileedit.gif
+lib/tkcvs/bitmaps/files.gif
+lib/tkcvs/bitmaps/fileview.gif
+lib/tkcvs/bitmaps/folder.gif
+lib/tkcvs/bitmaps/folderopen.gif
+lib/tkcvs/bitmaps/import.gif
+lib/tkcvs/bitmaps/logfile.gif
+lib/tkcvs/bitmaps/loop-glasses.gif
+lib/tkcvs/bitmaps/loop-half.gif
+lib/tkcvs/bitmaps/loop.gif
+lib/tkcvs/bitmaps/man.gif
+lib/tkcvs/bitmaps/mdir.gif
+lib/tkcvs/bitmaps/merge.gif
+lib/tkcvs/bitmaps/merge_changes.gif
+lib/tkcvs/bitmaps/mod.gif
+lib/tkcvs/bitmaps/modbrowse.gif
+lib/tkcvs/bitmaps/paper.gif
+lib/tkcvs/bitmaps/patches.gif
+lib/tkcvs/bitmaps/patchfile.gif
+lib/tkcvs/bitmaps/rcsdir.gif
+lib/tkcvs/bitmaps/rdiff.gif
+lib/tkcvs/bitmaps/refresh.gif
+lib/tkcvs/bitmaps/remove.gif
+lib/tkcvs/bitmaps/stat_conf.gif
+lib/tkcvs/bitmaps/stat_ex.gif
+lib/tkcvs/bitmaps/stat_kb.gif
+lib/tkcvs/bitmaps/stat_merge.gif
+lib/tkcvs/bitmaps/stat_minus.gif
+lib/tkcvs/bitmaps/stat_mod.gif
+lib/tkcvs/bitmaps/stat_ok.gif
+lib/tkcvs/bitmaps/stat_ood.gif
+lib/tkcvs/bitmaps/stat_plus.gif
+lib/tkcvs/bitmaps/stat_plus_kb.gif
+lib/tkcvs/bitmaps/stat_ques.gif
+lib/tkcvs/bitmaps/stat_rcs.gif
+lib/tkcvs/bitmaps/stat_rcs_mod.gif
+lib/tkcvs/bitmaps/tag.gif
+lib/tkcvs/bitmaps/tags.gif
+lib/tkcvs/bitmaps/tick.xbm
+lib/tkcvs/bitmaps/ticklefish_med.gif
+lib/tkcvs/bitmaps/tkcvs-ghost.xbm
+lib/tkcvs/bitmaps/tkcvs-help.xbm
+lib/tkcvs/bitmaps/tkcvs16.xbm
+lib/tkcvs/bitmaps/tkcvs48.xbm
+lib/tkcvs/bitmaps/trace.xbm
+lib/tkcvs/bitmaps/unedit.gif
+lib/tkcvs/bitmaps/updir.gif
+lib/tkcvs/bitmaps/who.gif
+lib/tkcvs/annotate.tcl
+lib/tkcvs/cde_params.tcl
+lib/tkcvs/commit.tcl
+lib/tkcvs/cvs.tcl
+lib/tkcvs/dialog.tcl
+lib/tkcvs/dircanvas.tcl
+lib/tkcvs/errors.tcl
+lib/tkcvs/exec.tcl
+lib/tkcvs/filebrowse.tcl
+lib/tkcvs/gen_log.tcl
+lib/tkcvs/help.tcl
+lib/tkcvs/import.tcl
+lib/tkcvs/import2.tcl
+lib/tkcvs/joincanvas.tcl
+lib/tkcvs/logcanvas.tcl
+lib/tkcvs/merge.tcl
+lib/tkcvs/modbrowse.tcl
+lib/tkcvs/modtree.tcl
+lib/tkcvs/modules.tcl
+lib/tkcvs/picklist.tcl
+lib/tkcvs/reports.tcl
+lib/tkcvs/scrollbindings.tcl
+lib/tkcvs/search.tcl
+lib/tkcvs/static.tcl
+lib/tkcvs/tclIndex
+lib/tkcvs/tkcvs_def.tcl
+lib/tkcvs/tooltips.tcl
+lib/tkcvs/workdir.tcl
 man/man1/tkcvs.1
-share/tkcvs/bitmaps/add.gif
-share/tkcvs/bitmaps/adir.gif
-share/tkcvs/bitmaps/amod.gif
-share/tkcvs/bitmaps/annotate.gif
-share/tkcvs/bitmaps/annotate.xbm
-share/tkcvs/bitmaps/arrow.gif
-share/tkcvs/bitmaps/arrow_dn.gif
-share/tkcvs/bitmaps/arrow_hl_dn.gif
-share/tkcvs/bitmaps/arrow_hl_up.gif
-share/tkcvs/bitmaps/arrow_up.gif
-share/tkcvs/bitmaps/ball.gif
-share/tkcvs/bitmaps/branch.gif
-share/tkcvs/bitmaps/branch.xbm
-share/tkcvs/bitmaps/branchtag.gif
-share/tkcvs/bitmaps/check.gif
-share/tkcvs/bitmaps/checkin.gif
-share/tkcvs/bitmaps/checkout.gif
-share/tkcvs/bitmaps/checkout_opts.gif
-share/tkcvs/bitmaps/conflict.gif
-share/tkcvs/bitmaps/cvs-says.xbm
-share/tkcvs/bitmaps/cvsdir.gif
-share/tkcvs/bitmaps/delete.gif
-share/tkcvs/bitmaps/diff.gif
-share/tkcvs/bitmaps/dir.gif
-share/tkcvs/bitmaps/dir.xbm
-share/tkcvs/bitmaps/dir_new.gif
-share/tkcvs/bitmaps/dirbranch.gif
-share/tkcvs/bitmaps/dirbranch.xbm
-share/tkcvs/bitmaps/edit.gif
-share/tkcvs/bitmaps/export.gif
-share/tkcvs/bitmaps/fileedit.gif
-share/tkcvs/bitmaps/files.gif
-share/tkcvs/bitmaps/fileview.gif
-share/tkcvs/bitmaps/folder.gif
-share/tkcvs/bitmaps/folderopen.gif
-share/tkcvs/bitmaps/import.gif
-share/tkcvs/bitmaps/logfile.gif
-share/tkcvs/bitmaps/loop-glasses.gif
-share/tkcvs/bitmaps/loop-half.gif
-share/tkcvs/bitmaps/loop.gif
-share/tkcvs/bitmaps/man.gif
-share/tkcvs/bitmaps/mdir.gif
-share/tkcvs/bitmaps/merge.gif
-share/tkcvs/bitmaps/merge_changes.gif
-share/tkcvs/bitmaps/mod.gif
-share/tkcvs/bitmaps/modbrowse.gif
-share/tkcvs/bitmaps/paper.gif
-share/tkcvs/bitmaps/patches.gif
-share/tkcvs/bitmaps/patchfile.gif
-share/tkcvs/bitmaps/rcsdir.gif
-share/tkcvs/bitmaps/rdiff.gif
-share/tkcvs/bitmaps/refresh.gif
-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_ood.gif
-share/tkcvs/bitmaps/stat_plus.gif
-share/tkcvs/bitmaps/stat_plus_kb.gif
-share/tkcvs/bitmaps/stat_ques.gif
-share/tkcvs/bitmaps/stat_rcs.gif
-share/tkcvs/bitmaps/stat_rcs_mod.gif
-share/tkcvs/bitmaps/tag.gif
-share/tkcvs/bitmaps/tags.gif
-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
-share/tkcvs/bitmaps/updir.gif
-share/tkcvs/bitmaps/who.gif
-share/tkcvs/annotate.tcl
-share/tkcvs/cde_params.tcl
-share/tkcvs/commit.tcl
-share/tkcvs/cvs.tcl
-share/tkcvs/dialog.tcl
-share/tkcvs/dircanvas.tcl
-share/tkcvs/errors.tcl
-share/tkcvs/exec.tcl
-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
-share/tkcvs/modbrowse.tcl
-share/tkcvs/modtree.tcl
-share/tkcvs/modules.tcl
-share/tkcvs/picklist.tcl
-share/tkcvs/reports.tcl
-share/tkcvs/scrollbindings.tcl
-share/tkcvs/search.tcl
-share/tkcvs/static.tcl
-share/tkcvs/tclIndex
-share/tkcvs/tkcvs_def.tcl
-share/tkcvs/tooltips.tcl
-share/tkcvs/workdir.tcl
-@dirrm share/tkcvs/bitmaps
-@dirrm share/tkcvs
+@dirrm lib/tkcvs/bitmaps
+@dirrm lib/tkcvs
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index 0126f47e941..f041e3280bc 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2004/04/29 15:17:02 minskim Exp $
+$NetBSD: distinfo,v 1.12 2004/04/29 15:46:00 minskim Exp $
 
 SHA1 (tkcvs_7_2_1.tar.gz) = fd5bc8687748e6b62ff84fd08ded7bf09e653101
 Size (tkcvs_7_2_1.tar.gz) = 1083178 bytes
-SHA1 (patch-aa) = 2d17baf8a66a0c8ab4034c1c822af21488367731
+SHA1 (patch-aa) = 4a033f1416d9500a166e114cc829741df6152cd6
diff --git a/devel/tkcvs/patches/patch-aa b/devel/tkcvs/patches/patch-aa
index b0ca7cacc8c..8db6515f2d6 100644
--- a/devel/tkcvs/patches/patch-aa
+++ b/devel/tkcvs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2004/04/29 15:17:02 minskim Exp $
+$NetBSD: patch-aa,v 1.12 2004/04/29 15:46:00 minskim Exp $
 
 --- doinstall.tcl.orig	2004-03-15 23:40:54.000000000 -0600
 +++ doinstall.tcl
@@ -9,13 +9,6 @@ $NetBSD: patch-aa,v 1.11 2004/04/29 15:17:02 minskim Exp $
 +exec tclsh "$0" -- ${1+"$@"}
  
  #
-@@ -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]
-   }
 @@ -34,21 +34,4 @@ proc show_paths {INSTALLROOT} {
  
    set_paths $INSTALLROOT