diff options
author | wiz <wiz> | 2001-02-28 12:29:29 +0000 |
---|---|---|
committer | wiz <wiz> | 2001-02-28 12:29:29 +0000 |
commit | c01eaf8e0b7f445c17d43c4c91c7f02cf179a655 (patch) | |
tree | adf7cea4ce44537665da2b00bd975530e4bf5bfa /devel | |
parent | 11ab2e23d5cc628c637529927c7183e43a5b4d9e (diff) | |
download | pkgsrc-c01eaf8e0b7f445c17d43c4c91c7f02cf179a655.tar.gz |
Update tkcvs to 6.4, supplied by Ingolf Steinbach in pkg/11896.
Prominent changes: cvs annotate/log support, new graphical module
browser, tcl'ized rm/mv/cp/awk calls, and lots of others, as well as
bugfixes.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/tkcvs/Makefile | 18 | ||||
-rw-r--r-- | devel/tkcvs/files/md5 | 4 | ||||
-rw-r--r-- | devel/tkcvs/files/patch-sum | 5 | ||||
-rw-r--r-- | devel/tkcvs/patches/patch-aa | 151 | ||||
-rw-r--r-- | devel/tkcvs/patches/patch-ab | 13 | ||||
-rw-r--r-- | devel/tkcvs/pkg/PLIST | 84 |
6 files changed, 160 insertions, 115 deletions
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile index 9d6407076c0..aa26a508aa2 100644 --- a/devel/tkcvs/Makefile +++ b/devel/tkcvs/Makefile @@ -1,29 +1,27 @@ -# $NetBSD: Makefile,v 1.18 2001/02/25 04:17:43 hubertf Exp $ -# FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:24 jseger Exp +# $NetBSD: Makefile,v 1.19 2001/02/28 12:29:29 wiz Exp $ # -DISTNAME= tkcvs-6.0 +DISTNAME= tkcvs-6.4 CATEGORIES= devel -MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/apps/tkcvs-6.0/ \ - http://ftp0.sunet.se/pub/lang/tcl/sorted/apps/tkcvs-6.0/ +MASTER_SITES= http://www.twobarleycorns.net/ \ + ${MASTER_SITE_SOURCEFORGE:=tkcvs/} MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.twobarleycorns.net/tkcvs.html COMMENT= Tcl/Tk frontends to CVS and diff -DEPENDS+= tk-8.3.2:../../x11/tk +DEPENDS+= tk>=8.1:../../x11/tk NO_BUILD= yes post-extract: - ${CP} ${WRKSRC}/tkcvs/tkcvs.n ${WRKSRC}/tkcvs/tkcvs.1 - ${CP} ${WRKSRC}/tkdiff/tkdiff.n ${WRKSRC}/tkdiff/tkdiff.1 + ${MV} ${WRKSRC}/tkcvs/tkcvs.n ${WRKSRC}/tkcvs/tkcvs.1 do-install: - (cd ${WRKSRC}/tkcvs; ${SETENV} ${MAKE_ENV} ${SH} ./doinstall) + (cd ${WRKSRC} && ./doinstall.tcl ${PREFIX}) post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkcvs ${INSTALL_DATA} ${WRKSRC}/README.tkcvs ${PREFIX}/share/doc/tkcvs/ - ${INSTALL_DATA} ${WRKSRC}/tkdiff/README ${PREFIX}/share/doc/tkcvs/README.tkdiff .include "../../mk/bsd.pkg.mk" diff --git a/devel/tkcvs/files/md5 b/devel/tkcvs/files/md5 index 1c57d68b17b..d933298d7ee 100644 --- a/devel/tkcvs/files/md5 +++ b/devel/tkcvs/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/08/07 13:21:26 agc Exp $ +$NetBSD: md5,v 1.3 2001/02/28 12:29:30 wiz Exp $ -MD5 (tkcvs-6.0.tar.gz) = e04f38cc344f9ea222fa48cb774ab7a5 +MD5 (tkcvs-6.4.tar.gz) = dec18bb61e49a4b3eceacfd83ca07a36 diff --git a/devel/tkcvs/files/patch-sum b/devel/tkcvs/files/patch-sum index 9e4140a94dd..c29af6e0c6b 100644 --- a/devel/tkcvs/files/patch-sum +++ b/devel/tkcvs/files/patch-sum @@ -1,4 +1,3 @@ -$NetBSD: patch-sum,v 1.2 2000/08/30 19:15:59 jwise Exp $ +$NetBSD: patch-sum,v 1.3 2001/02/28 12:29:30 wiz Exp $ -MD5 (patch-aa) = ad291a3000da28291e4465f075557e61 -MD5 (patch-ab) = 9424ecdf1d1e8523f174627fcd736a8c +MD5 (patch-aa) = 5c1d0b0d2ec961ffe4931e3ee6a27e27 diff --git a/devel/tkcvs/patches/patch-aa b/devel/tkcvs/patches/patch-aa index b0ba1f871e1..577d052dbbb 100644 --- a/devel/tkcvs/patches/patch-aa +++ b/devel/tkcvs/patches/patch-aa @@ -1,67 +1,98 @@ -$NetBSD: patch-aa,v 1.4 2000/08/30 19:15:59 jwise Exp $ +$NetBSD: patch-aa,v 1.5 2001/02/28 12:29:30 wiz Exp $ ---- tkcvs/doinstall.orig Tue Jan 9 22:17:52 1996 -+++ tkcvs/doinstall Fri Oct 31 09:21:23 1997 -@@ -5,31 +5,31 @@ +--- doinstall.tcl.orig Fri Sep 29 06:44:53 2000 ++++ doinstall.tcl +@@ -2,5 +2,5 @@ + #-*-tcl-*- + # the next line restarts using wish \ +-exec wish "$0" -- ${1+"$@"} ++exec tclsh "$0" "$@" - # Some rational and reasonable defaults. - --INSTALLDIR=/usr/local/lib --BINDIR=/usr/local/bin --MANDIR=/usr/local/man/mann -+INSTALLDIR=${PREFIX}/share -+BINDIR=${PREFIX}/bin -+MANDIR=${PREFIX}/man/man1 - - INSTALL_PROG=./install-sh - - # This must be an X based editor -- do NOT use vi except via an xterm - # or shelltool. + # +@@ -19,23 +19,6 @@ + } else { + set BINDIR [file join $INSTALLROOT bin] +- set LIBDIR [file join $INSTALLROOT lib] +- set MANDIR [file join $INSTALLROOT man mann] +- } +- +- set msg(1) [file join $BINDIR $TKCVS] +- set msg(2) [file join $BINDIR $TKDIFF] +- set msg(3) [file join $LIBDIR tkcvs *.tcl] +- set msg(4) [file join $LIBDIR tkcvs bitmaps *.gif] +- if {$tcl_platform(platform) == "unix"} { +- set msg(5) [file join $MANDIR tkcvs.n] +- } +- foreach m [lsort [array names msg]] { +- if {[winfo exists .messages.$m]} { +- destroy .messages.$m +- } +- global var$m +- set var$m $msg($m) +- label .messages.$m -text $msg($m) -justify left -textvariable var$m +- pack .messages.$m -side top -anchor w ++ set LIBDIR [file join $INSTALLROOT share] ++ set MANDIR [file join $INSTALLROOT man man1] + } + } +@@ -76,6 +59,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 + } --EDITOR=nedit -+EDITOR="xedit" +@@ -95,9 +78,4 @@ + cd .. + puts "Finished!" +- +- destroy .bottom.do +- destroy .bottom.not +- button .bottom.done -text "Finished!" -command {destroy .} +- pack .bottom.done + } - # Find a Tk interpreter. - --WISH=`which wish4.0` -+WISH=`which wish` - if [ ! -f $WISH ]; then -- WISH=`which wish4.1` -+ WISH=`which wish4.1` - fi - if [ ! -f $WISH ]; then -- echo "I cant find a Tk interpreter on your system" -+ echo "I cant find a usefull Tk interpreter on your system" - exit 1 - fi +@@ -105,10 +83,5 @@ - # Find where the global bitmaps are. + # 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 +-} ++# This is done by the package Makefile --for GDIR in /usr/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps /usr/local/include/bitmaps -+for GDIR in /usr/X11R6/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps ${PREFIX}/include/bitmaps - do - if [ -d "$GDIR" ]; then - break -@@ -62,10 +62,10 @@ - - # Some directories we have to create. - --LDIR=${INSTALLDIR}/bitmaps - TCDIR=${INSTALLDIR}/tkcvs --mkdir -p $LDIR $TCDIR --for dir in $LDIR $TCDIR -+LDIR=${TCDIR}/bitmaps -+mkdir -p $LDIR $TCDIR -+for dir in $TCDIR $LDIR - do - if [ ! -d $dir ]; then - echo "I cant create the directory $dir" -@@ -99,7 +99,7 @@ - fi - done + # Some rational and reasonable defaults. +@@ -128,27 +101,5 @@ + set INSTALLROOT [lindex $argv 0] + } +-frame .title +-label .title.lbl -text "TkCVS Installer" -font {Helvetica -14 bold} +-pack .title -side top +-pack .title.lbl -side top +-frame .entry +-label .entry.instlbl -text "Installation Root" +-entry .entry.instent -textvariable INSTALLROOT +-bind .entry.instent <Return> {show_paths $INSTALLROOT} +-pack .entry -side top -pady 10 +-pack .entry.instlbl -side left +-pack .entry.instent -side left +- +-frame .messages -relief groove -bd 2 +-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 +- +-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 --for f in *.n ../tkdiff/*.n -+for f in *.1 ../tkdiff/*.1 - do - $INSTALL_PROG -m 444 $f $MANDIR - done ++show_paths $INSTALLROOT ++doinstall $INSTALLROOT diff --git a/devel/tkcvs/patches/patch-ab b/devel/tkcvs/patches/patch-ab deleted file mode 100644 index 1d3b5372c08..00000000000 --- a/devel/tkcvs/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:29 agc Exp $ - ---- tkcvs/cvs.tcl.orig Sun May 10 14:49:20 1998 -+++ tkcvs/cvs.tcl Sun May 10 14:49:37 1998 -@@ -285,7 +285,7 @@ - # -sj - set errstr "You must select files to be committed with CVS version" - set errstr "$errstr $cvscfg(cvsver)." -- set errstr "$errstr\n\nEither select a list of files or upgrade -+ set errstr "$errstr\n\nEither select a list of files or upgrade" - set errstr "$errstr your CVS to version 1.3" - cvserror "$errstr" - return diff --git a/devel/tkcvs/pkg/PLIST b/devel/tkcvs/pkg/PLIST index c0b8320a282..711decfd3db 100644 --- a/devel/tkcvs/pkg/PLIST +++ b/devel/tkcvs/pkg/PLIST @@ -1,49 +1,79 @@ -@comment $NetBSD: PLIST,v 1.3 2000/09/02 16:36:33 wiz Exp $ -bin/cvscheck +@comment $NetBSD: PLIST,v 1.4 2001/02/28 12:29:30 wiz Exp $ bin/tkcvs bin/tkdiff +man/man1/tkcvs.1 share/doc/tkcvs/README.tkcvs -share/doc/tkcvs/README.tkdiff -share/tkcvs/bindings.tcl -share/tkcvs/checkout.tcl +share/tkcvs/bitmaps/add.gif +share/tkcvs/bitmaps/adir.gif +share/tkcvs/bitmaps/amod.gif +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/branchtag.gif +share/tkcvs/bitmaps/checkin.gif +share/tkcvs/bitmaps/checkout.gif +share/tkcvs/bitmaps/clean.gif +share/tkcvs/bitmaps/clear.gif +share/tkcvs/bitmaps/conflict.gif +share/tkcvs/bitmaps/delete.gif +share/tkcvs/bitmaps/diff.gif +share/tkcvs/bitmaps/dir.gif +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/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/mdir.gif +share/tkcvs/bitmaps/mergebranch.gif +share/tkcvs/bitmaps/mergediff.gif +share/tkcvs/bitmaps/mod.gif +share/tkcvs/bitmaps/modbrowse.gif +share/tkcvs/bitmaps/modbrowse.xbm +share/tkcvs/bitmaps/modules.gif +share/tkcvs/bitmaps/patches.gif +share/tkcvs/bitmaps/patchfile.gif +share/tkcvs/bitmaps/refresh.gif +share/tkcvs/bitmaps/remove.gif +share/tkcvs/bitmaps/tag.gif +share/tkcvs/bitmaps/tags.gif +share/tkcvs/bitmaps/tclfish.gif +share/tkcvs/bitmaps/tclfish.xbm +share/tkcvs/bitmaps/tclfish_fly.xbm +share/tkcvs/bitmaps/tkcvs32.xbm +share/tkcvs/bitmaps/tkcvs32_mask.xbm +share/tkcvs/bitmaps/tkcvs48.xbm +share/tkcvs/bitmaps/trace.xbm +share/tkcvs/bitmaps/unedit.gif +share/tkcvs/bitmaps/who.gif share/tkcvs/commit.tcl share/tkcvs/cvs.tcl +share/tkcvs/dialog.tcl share/tkcvs/errors.tcl share/tkcvs/filebrowse.tcl +share/tkcvs/gen_log.tcl share/tkcvs/help.tcl share/tkcvs/import.tcl share/tkcvs/logcanvas.tcl share/tkcvs/merge.tcl +share/tkcvs/modbrowse.tcl +share/tkcvs/modtree.tcl share/tkcvs/modules.tcl share/tkcvs/reports.tcl share/tkcvs/search.tcl share/tkcvs/static.tcl -share/tkcvs/tag.tcl share/tkcvs/tclIndex share/tkcvs/tkcvs_def.tcl share/tkcvs/tooltips.tcl -share/tkcvs/update.tcl -share/tkcvs/venget.tcl share/tkcvs/workdir.tcl -share/tkcvs/bitmaps/add.xbm -share/tkcvs/bitmaps/check.xbm -share/tkcvs/bitmaps/checkin.xbm -share/tkcvs/bitmaps/clean.xbm -share/tkcvs/bitmaps/clear.xbm -share/tkcvs/bitmaps/delete.xbm -share/tkcvs/bitmaps/diff.xbm -share/tkcvs/bitmaps/import.xbm -share/tkcvs/bitmaps/logfile.xbm -share/tkcvs/bitmaps/notebook.xbm -share/tkcvs/bitmaps/refresh.xbm -share/tkcvs/bitmaps/remove.xbm -share/tkcvs/bitmaps/tkcvs16.xbm -share/tkcvs/bitmaps/tkcvs32.xbm -share/tkcvs/bitmaps/tkcvs32_mask.xbm -share/tkcvs/bitmaps/tree16.xbm -share/tkcvs/bitmaps/update.xbm -man/man1/tkcvs.1 -man/man1/tkdiff.1 @dirrm share/tkcvs/bitmaps @dirrm share/tkcvs @dirrm share/doc/tkcvs |