diff options
| author | recht <recht@pkgsrc.org> | 2004-02-16 16:34:02 +0000 |
|---|---|---|
| committer | recht <recht@pkgsrc.org> | 2004-02-16 16:34:02 +0000 |
| commit | 0fecd92903c9a910a21f360ee5507e057c63f013 (patch) | |
| tree | 1c3bebea78a6e876decc2542787240640ceb4507 | |
| parent | b7309f0f9cbcec7c3e88a65190d5940bacf4c7ae (diff) | |
| download | pkgsrc-0fecd92903c9a910a21f360ee5507e057c63f013.tar.gz | |
update to 3.09
take maintainership
ok'd by sakamoto@
3.09 changes (5/24/2001):
* Removed use of the user name in temp file path. This removed a problem
on Windows when the user name had a space in it.
* Made diff "edge detection" smarter by using the new smarter overlap code
for cases where diff decided to treat whitespace slightly different
on missing-EOL files when doing 3-way diffs.
* Added the "..." back to the Save options in the merge result window
when appropriate.
3.08 changes (1/15/2001):
* Made overlap detection smarter
3.07 changes (12/17/2000):
* Highlight overlaps in bright yellow during 3-way merge
* Added "Exit" and "Save & Exit" buttons to merge preview window
* Removed error that popped up when doing a merge that was
not necessary.
3.06 changes (unreleased):
* Minor changes for AccuRev integration
| -rw-r--r-- | devel/tkdiff/Makefile | 20 | ||||
| -rw-r--r-- | devel/tkdiff/distinfo | 6 |
2 files changed, 11 insertions, 15 deletions
diff --git a/devel/tkdiff/Makefile b/devel/tkdiff/Makefile index 45bff85ded2..56bc93308ba 100644 --- a/devel/tkdiff/Makefile +++ b/devel/tkdiff/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.10 2003/07/17 21:34:10 grant Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/16 16:34:02 recht Exp $ # -DISTNAME= tkdiff-3.05.tcl.txt -PKGNAME= tkdiff-3.05 +DISTNAME= tkdiff_3_09 +PKGNAME= tkdiff-3.09 CATEGORIES= devel -MASTER_SITES= ftp://ftp.accurev.com/pub/free/tkdiff/ -EXTRACT_SUFX= # Nothing +MASTER_SITES= http://www.accurev.com/ftp/free/tkdiff/ +EXTRACT_SUFX= .zip -MAINTAINER= sakamoto@NetBSD.org +MAINTAINER= recht@NetBSD.org HOMEPAGE= http://www.accurev.com/free/tkdiff/ COMMENT= Graphical 2-way diff/merge tool @@ -15,13 +15,9 @@ DEPENDS+= tk>=8.3.2:../../x11/tk NO_BUILD= yes NO_CONFIGURE= yes -CMDNAME= tkdiff3 - -EXTRACT_CMD= ${CAT} ${DISTDIR}/${DISTNAME} | \ - ${SED} -e 's|^exec wish |exec wish |' | \ - ${TR} -d '\015' > ${WRKDIR}/${CMDNAME} +NO_BUILDLINK= yes do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${CMDNAME} ${LOCALBASE}/bin/${CMDNAME} + ${INSTALL_SCRIPT} ${WRKDIR}/tkdiff.tcl ${LOCALBASE}/bin/tkdiff3 .include "../../mk/bsd.pkg.mk" diff --git a/devel/tkdiff/distinfo b/devel/tkdiff/distinfo index f36188fcd28..9040cf9c6c9 100644 --- a/devel/tkdiff/distinfo +++ b/devel/tkdiff/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/04/21 00:44:48 wiz Exp $ +$NetBSD: distinfo,v 1.4 2004/02/16 16:34:02 recht Exp $ -SHA1 (tkdiff-3.05.tcl.txt) = e13fa966b6a10154973e56d5c402444ed2558d57 -Size (tkdiff-3.05.tcl.txt) = 249773 bytes +SHA1 (tkdiff_3_09.zip) = 5c30883b81c7ad4b413d7b218b76271635efd76a +Size (tkdiff_3_09.zip) = 63247 bytes |