Diffuse is a graphical tool for merging and comparing text files. Diffuse is
able to compare an arbitrary number of files side-by-side and gives users the
ability to manually adjust line matching and directly edit files. Diffuse can
also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,
Monotone, RCS, Subversion, and SVK repositories for comparison and merging.
Some key features of Diffuse:
- ability to compare and merge an arbitrary number of files side-by-side
(n-way merges)
- line matching can be manually corrected by the user
- ability to directly edit files
- syntax highlighting
- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, SVK support
- support for UTF-8 encoded unicode
- unlimited undo
- easy keyboard navigation
WWW: http://diffuse.sourceforge.net/
===> The following configuration options are available for diffuse-0.4.8_1:
DATA=on: Syntax highlighting support
DOCS=on: Build and/or install documentation
NLS=on: Native Language Support
===> Use 'make config' to modify these settings
- Do not capitalize "n-way", as its position is not the beginning of a
sentence and COMMENT is not a formal title; capitalize "Python" as it
is a proper noun (official language name)
- Retire MENU option: it served a little good, meant to conditionalize
having `desktop-file-utils' in USES, whereas its sole purpose is to
handle MimeType in .desktop files that are installed in ${DESKTOPDIR}
while the port installs *.desktop files unconditionally (it was even
more confusing since it was used in pkg-plist to guard icon entries,
but the port sets INSTALLS_ICONS, also unconditionally)
- Use option helpers for targets and drop .include <bsd.port.options.mk>
- Mute in-place patching commands like we always do
- Do not attempt to create ${STAGEDIR}${DESKTOPDIR}: `share/applications'
was added to mtree (Templates/BSD.local.dist) in r331266 2.5 years ago
- When calling ${COPYTREE_SHARE}, do not use escaped wild-card argument
(`\*') when simple dot (`.') is sufficient, shorter, does not require
escaping and thus less error-prone
- Drop TRANSLATIONS and MANUALS variables which are only referenced once;
these language lists are hardcoded in pkg-plist anyway, so there is no
benefit to factor them out as variables in port's Makefile
- Update from 0.4.7 to 0.4.8
- Convert USE_BZIP2 to USES
- Change CONFLICTS to CONFLICTS_INSTALL
PR: ports/191965
Submitted by: Marco Broder <marco.broeder@posteo.eu>
- Update maintainer's email address
- Remove DOCS and NLS options from OPTIONS_DEFAULT. They are on by default.
- Remove PORT_OPTIONS handling for safe cases, where STAGE already takes care
of it through pkg-plist. But leave it for the special NLS translations
build step, because it is required there.
- Rearrange some lines for better readability.
PR: ports/187171
Submitted by: maintainer
- Update to 0.4.7 release
- Convert USE_GNOME to USES for desktop-file-utils
- Remove update-desktop-database call which is now invoked by USES feature
- Add two new translations
- Update and sort pkg-plis
PR: 178625
Submitted by: Marco BrAPder <marco.broeder@gmx.eu> (maintainer)
- Trim Makefile header
- Limit python version up to 2.7
- Use a space character instead of a tab in 'pkg-descr' file
- Define PORTDOCS unconditionally (regardless of DOCS option)
- Remove 'COPYING' from PORTDOCS (redundant with LICENSE)
- Remove NO_OPTIONS_SORT (does not matter with only four options)
- Remove DOCS_DESC and use standard description
- Convert 'for' loops from shell to make syntax
- Resort and whitespace cleanup
- Bump PORTREVISION
PR: ports/174806 (based on)
Submitted by: Marco Broder <marco.broeder@gmx.eu> (maintainer)
- Convert to new options framework
- Add two additional options and disable automatic sorting
- Add necessary checks for conflicting options vs. make.conf settings
(NOPORTDOCS, NOPORTDATA, WITHOUT_NLS)
- Port passes all tests of all combinations of options, including potentially
conflicting make.conf settings (NOPORTDOCS, NOPORTDATA, WITHOUT_NLS)
- Mark conflict with biology/tinker, both ports install ${PREFIX}/bin/diffuse
- Bump PORTREVISION
PR: ports/168707
Submitted by: Marco Bröder <marco.broeder@gmx.eu> (maintainer)
- Update to 0.4.4
Changes:
- Git support now recognises conflicts when re-applying the stash
- double clicking on text can now select full words with non-English
characters
- search dialog is now automatically populated with the currently
selected text
- fixed a bug that prevented opening files with non-ASCII characters
in their path
- added Oleg Pakhtusov's Russian translation
- added Kang Bundo's Korean translation
- pane headers tooltips
- Shift-ScrollWheel can now be used to scroll horizontally
PR: ports/151631
Submitted by: Marco Broder <marco.broeder@gmx.eu> (maintainer)
Approved by: pgollucci (mentor, implicit)
- Correct wrong path in omf file
- While here, fix plist (share/pixmaps is in the mtree, should not be removed)
PR: 138308
Submitted by: Marco Bröder <marco.broeder@gmx.eu> (maintainer)
Diffuse is a graphical tool for merging and comparing text files. Diffuse is
able to compare an arbitrary number of files side-by-side and gives users the
ability to manually adjust line matching and directly edit files. Diffuse can
also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,
Monotone, Subversion, and SVK repositories for comparison and merging.
Some key features of Diffuse:
- ability to compare and merge an arbitrary number of files side-by-side
(n-way merges)
- line matching can be manually corrected by the user
- ability to directly edit files
- syntax highlighting
- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK support
- support for UTF-8 encoded unicode
- unlimited undo
- easy keyboard navigation
WWW: http://diffuse.sourceforge.net/
PR: ports/132027
Submitted by: Marco Broeder <marco.broeder at gmx.eu>
