Update to 0.4.0: Diffuse 0.4.0 - 2009-08-17 - changed the default hotkeys for merging to reflect the direction text "moves" - added format menu with new items for changing case, sorting, and manipulating white space - replaced 'Hide end of line characters' preference with 'Show white space characters' - errors are now reported in a dialogue instead of printing to stderr - optimised redraws when only the cursor position has changed - input methods that use pre-editing can now be used when editing text - dead keys can now be used when editing text - updated Monotone support to use 'mtn automate inventory' - Git support now handles files flagged as 'unmerged' - graceful handling of and non-zero exit codes from 'git status' - added version control section to the manual - minor bug fixesdiff -r1.13 -r1.14 pkgsrc/devel/diffuse/Makefile
(wiz)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.13 2009/08/17 18:33:22 hasso Exp $ | 1 | # $NetBSD: Makefile,v 1.14 2009/08/20 09:06:40 wiz Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= diffuse-0.3.4 | 4 | DISTNAME= diffuse-0.4.0 | |
5 | CATEGORIES= devel | 5 | CATEGORIES= devel | |
6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=diffuse/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=diffuse/} | |
7 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://diffuse.sourceforge.net/ | 10 | HOMEPAGE= http://diffuse.sourceforge.net/ | |
11 | COMMENT= Graphical tool for merging and comparing text files | 11 | COMMENT= Graphical tool for merging and comparing text files | |
12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
13 | 13 | |||
14 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
15 | 15 | |||
16 | USE_TOOLS+= msgfmt | 16 | USE_TOOLS+= msgfmt | |
17 | USE_LANGUAGES= # none | 17 | USE_LANGUAGES= # none |
@@ -1,22 +1,23 @@ | @@ -1,22 +1,23 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.5 2009/08/06 21:52:07 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.6 2009/08/20 09:06:40 wiz Exp $ | |
2 | bin/diffuse | 2 | bin/diffuse | |
3 | man/man1/diffuse.1 | 3 | man/man1/diffuse.1 | |
4 | share/applications/diffuse.desktop | 4 | share/applications/diffuse.desktop | |
5 | share/diffuse/syntax/bash.syntax | 5 | share/diffuse/syntax/bash.syntax | |
6 | share/diffuse/syntax/c++.syntax | 6 | share/diffuse/syntax/c++.syntax | |
7 | share/diffuse/syntax/csh.syntax | 7 | share/diffuse/syntax/csh.syntax | |
8 | share/diffuse/syntax/csharp.syntax | 8 | share/diffuse/syntax/csharp.syntax | |
9 | share/diffuse/syntax/css.syntax | 9 | share/diffuse/syntax/css.syntax | |
10 | share/diffuse/syntax/fortran.syntax | |||
10 | share/diffuse/syntax/gettext.syntax | 11 | share/diffuse/syntax/gettext.syntax | |
11 | share/diffuse/syntax/glsl.syntax | 12 | share/diffuse/syntax/glsl.syntax | |
12 | share/diffuse/syntax/html.syntax | 13 | share/diffuse/syntax/html.syntax | |
13 | share/diffuse/syntax/ini.syntax | 14 | share/diffuse/syntax/ini.syntax | |
14 | share/diffuse/syntax/java.syntax | 15 | share/diffuse/syntax/java.syntax | |
15 | share/diffuse/syntax/javascript.syntax | 16 | share/diffuse/syntax/javascript.syntax | |
16 | share/diffuse/syntax/jsp.syntax | 17 | share/diffuse/syntax/jsp.syntax | |
17 | share/diffuse/syntax/makefile.syntax | 18 | share/diffuse/syntax/makefile.syntax | |
18 | share/diffuse/syntax/objective-c++.syntax | 19 | share/diffuse/syntax/objective-c++.syntax | |
19 | share/diffuse/syntax/octave.syntax | 20 | share/diffuse/syntax/octave.syntax | |
20 | share/diffuse/syntax/pascal.syntax | 21 | share/diffuse/syntax/pascal.syntax | |
21 | share/diffuse/syntax/patch.syntax | 22 | share/diffuse/syntax/patch.syntax | |
22 | share/diffuse/syntax/perl.syntax | 23 | share/diffuse/syntax/perl.syntax |
@@ -1,6 +1,5 @@ | @@ -1,6 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2009/08/06 21:52:07 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.6 2009/08/20 09:06:40 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (diffuse-0.3.4.tar.bz2) = f221d248b44d978fc031cb739e382d9058ca4efc | 3 | SHA1 (diffuse-0.4.0.tar.bz2) = d143c5415c71ac07e9b57ff8b3b79f196bf810ca | |
4 | RMD160 (diffuse-0.3.4.tar.bz2) = 54f8ffaed9bc2153e1ed3acb64a3e9fd000ee2a1 | 4 | RMD160 (diffuse-0.4.0.tar.bz2) = 91cd8f13e40eb25bccab57c47ea3311e53ed38d9 | |
5 | Size (diffuse-0.3.4.tar.bz2) = 102845 bytes | 5 | Size (diffuse-0.4.0.tar.bz2) = 109438 bytes | |
6 | SHA1 (patch-aa) = d314791a740b878af9041c70920562fa6385708d |