- 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
- 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 Bröder <marco.broeder@gmx.eu> (maintainer)
- 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)
- 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)
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)
- 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)
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>
