./wip/xxdiff, Graphical file comparator and merge tool

[ CVSweb ] [ Homepage ] [ RSS ] [ Required by ] [ Add to tracker ]


Branch: CURRENT, Version: 3.1nb2, Package name: xxdiff-3.1nb2, Maintainer: pkgsrc-users

xxdiff is a graphical file and directories comparator and merge tool.

Features

* Comparing two files, three files, or two directories (shallow and
recursive);
* Horizontal diffs highlighting; Files can be merged interactively and
* resulting output visualized and saved;
* Has features to assist in performing merge reviews/policing; Can
* unmerge CVS conflicts in automatically merged file and display
them as two files, to help resolve conflicts;
* Uses external diff program to compute differences: works with GNU
diff, SGI diff and ClearCase's cleardiff, and any other diff whose
output is similar to those;
* Fully customizable with a resource file; Look-and-feel similar to
* Rudy Wortel's/SGI xdiff, it is desktop agnostic (i.e. will work
equally well with KDE or Gnome);
* Features and output that ease integration with scripts.

xxdiff does not support comparing files encoded with Unicode. Also, it
does not support inline editing of the diffed files. If you need these
features, you could try emacs or Meld (although both of these lack some
of the most interesting features of xxdiff).


Required to run:
[x11/qt3-libs]

Required to build:
[pkgtools/x11-links] [devel/tmake] [x11/glproto] [x11/renderproto] [x11/xproto] [x11/xf86vidmodeproto] [x11/xf86driproto] [x11/damageproto] [x11/inputproto] [x11/xextproto] [x11/randrproto] [x11/qt3-tools] [x11/dri2proto] [x11/fixesproto4] [pkgtools/cwrappers]

Master sites:

SHA1: 90e503cf05bdfab960cc57b55b31e345277a6aaf
RMD160: 3b6c2955ebc5d22b7fde4a81fb5deffde65f1427
Filesize: 1048.975 KB

Version history: (Expand)


CVS history: (Expand)


   2013-04-13 09:58:29 by Geert Hendrickx | Files touched by this commit (5)
Log message:
Hand in maintainership.
   2012-10-07 22:11:06 by Aleksej Saushev | Files touched by this commit (137)
Log message:
Drop superfluous PKG_DESTDIR_SUPPORT, "user-destdir" is default these days.
Mark packages that don't or might probably not have staged installation.
   2010-06-14 00:47:10 by Thomas Klausner | Files touched by this commit (235) | Package updated
Log message:
Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.
   2010-01-18 10:38:31 by Thomas Klausner | Files touched by this commit (75)
Log message:
Second try at recursive PKGREVISION bump for jpeg shlib major bump (jpeg-8).
   2009-08-12 01:00:30 by Kamel Derouiche | Files touched by this commit (2)
Log message:

	pkgsrc-changes:
	--------------
	o DESTDIR Support
	o LICENSE=gnu-gpl-v2
   2006-09-14 21:13:30 by David Howland | Files touched by this commit (1)
Log message:
USE_LANGUAGES= c c++
   2006-03-08 11:56:14 by Geert Hendrickx | Files touched by this commit (2)
Log message:
Install html documentation as well.  
   2006-03-08 09:49:40 by Geert Hendrickx | Files touched by this commit (1)
Log message:
The homepage moved.