Port details |
- diffuse Graphical n-way diff and merge tool written in Python
- 0.4.8_1 devel
=2 0.4.8_1Version of this port present on the latest quarterly branch.
- DEPRECATED: Old, uses EOLed python27
This port expired on: 2020-03-01
- Maintainer: marco.broeder@posteo.eu
- Port Added: 2009-04-11 22:28:15
- Last Update: 2020-03-01 17:19:40
- SVN Revision: 527561
- People watching this port, also watch:: screen, coreutils, sysinfo, monit, mailutils
- Also Listed In: python
- License: GPLv2 GPLv3
- WWW:
- http://diffuse.sourceforge.net/
- Description:
- 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/
-
cgit ¦ GitHub ¦ GitHub ¦ GitLab ¦
- Manual pages:
-
- pkg-plist: as obtained via:
make generate-plist - Dependency lines:
-
- Conflicts:
- CONFLICTS_INSTALL:
- No installation instructions:
- This port has been deleted.
- PKGNAME: diffuse
- Flavors: there is no flavor information for this port.
- distinfo:
- SHA256 (diffuse-0.4.8.tar.bz2) = c1d3b79bba9352fcb9aa4003537d3fece248fb824781c5e21f3fcccafd42df2b
SIZE (diffuse-0.4.8.tar.bz2) = 557966
No package information for this port in our database- Sometimes this happens. Not all ports have packages. Perhaps there is a build error. Check the fallout link:
- Dependencies
- NOTE: FreshPorts displays only information on required and default dependencies. Optional dependencies are not covered.
- Build dependencies:
-
- update-desktop-database : devel/desktop-file-utils
- gtk-update-icon-cache : graphics/gtk-update-icon-cache
- pygobject-codegen-2.0 : devel/py-gobject
- pygtk-2.0.pc : x11-toolkits/py-gtk2
- python2.7 : lang/python27
- msgfmt : devel/gettext-tools
- Runtime dependencies:
-
- update-desktop-database : devel/desktop-file-utils
- gtk-update-icon-cache : graphics/gtk-update-icon-cache
- pygobject-codegen-2.0 : devel/py-gobject
- pygtk-2.0.pc : x11-toolkits/py-gtk2
- python2.7 : lang/python27
- Library dependencies:
-
- libatk-1.0.so : accessibility/atk
- libgdk_pixbuf-2.0.so : graphics/gdk-pixbuf2
- libglib-2.0.so : devel/glib20
- libintl.so : devel/gettext-runtime
- libgtk-x11-2.0.so : x11-toolkits/gtk20
- libglade-2.0.so : devel/libglade2
- libxml2.so : textproc/libxml2
- libpango-1.0.so : x11-toolkits/pango
- libintl.so : devel/gettext-runtime
- There are no ports dependent upon this port
Configuration Options:
- ===> 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
- Options name:
- N/A
- USES:
- desktop-file-utils gnome python:2.7 tar:bzip2 gettext
- FreshPorts was unable to extract/find any pkg message
- Master Sites:
|
Commit History - (may be incomplete: for full details, see links to repositories near top of page) |
Commit | Credits | Log message |
0.4.8_1 01 Mar 2020 17:19:40 |
rene |
Remove expired ports:
2020-03-01 audio/idjc: Old, uses EOLed python27
2020-03-01 cad/py-pycam: Old, uses EOLed python27
2020-02-27 chinese/gimp-help-zh_CN: Broken
2020-03-01 databases/emma: Old, uses EOLed python27
2020-03-01 deskutils/anamnesis: Old, uses EOLed python27
2020-02-28 deskutils/cherrytree: Old, uses EOLed python27
2020-03-01 deskutils/gbirthday: Old, uses EOLed python27
2020-03-01 deskutils/gtg: Old, uses EOLed python27
2020-03-01 deskutils/nemo-extensions: Old, uses EOLed python27
2020-03-01 deskutils/pybookreader: Old, uses EOLed python27
2020-03-01 devel/diffuse: Old, uses EOLed python27
2020-02-28 devel/dreampie: Old, uses EOLed python27
2020-03-01 devel/gtkparasite: Old, uses EOLed python27 (Only the first 15 lines of the commit message are shown above ) |
0.4.8_1 28 Jan 2020 21:57:19 |
antoine |
Deprecate some pygtk2 ports
With hat: portmgr |
0.4.8_1 08 Nov 2019 11:39:00 |
tobik |
devel: Add missing USES={gl,gnome,php,sdl} |
0.4.8_1 19 Feb 2018 11:10:43 |
antoine |
Reduce dependency on the python2 metaport
PR: 225752
Submitted by: Yasuhiro KIMURA |
0.4.8 15 Apr 2016 14:24:30 |
danfe |
- 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 |
0.4.8 27 Oct 2014 10:10:59 |
bapt |
Cleanup plist |
0.4.8 20 Oct 2014 16:04:14 |
mva |
- Convert ports of devel/ to USES=python
Approved by: portmgr (implicit) |
0.4.8 19 Jul 2014 23:10:29 |
danilo |
- 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> |
0.4.7 03 Mar 2014 19:00:12 |
pawel |
- 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 |
0.4.7 22 Oct 2013 13:52:24 |
amdmi3 |
- Remove manual creation and removal of share/applications, as it's now in the
mtree (categories starting with d)
Approved by: portmgr (bdrewery) |
0.4.7 14 Oct 2013 12:00:23 |
wg |
devel/diffuse: allow staging
- Allow staging
- Use options helpers
PR: ports/182745
Submitted by: Marco Broder <marco.broeder gmx.eu> (maintainer) |
20 Sep 2013 17:03:27
|
bapt |
Add NO_STAGE all over the place in preparation for the staging support (cat:
devel part 1) |
0.4.7 15 May 2013 07:51:30 |
miwi |
- 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) |
0.4.6_3 24 Apr 2013 18:10:32 |
ak |
- Convert USE_GETTEXT to USES (part 3)
Approved by: portmgr (bapt) |
0.4.6_3 31 Dec 2012 13:11:03 |
tota |
- Define PORTDATA conditionally
PR: ports/174806
Submitted by: Marco Broder <marco.broeder@gmx.eu> (maintainer) |
0.4.6_3 30 Dec 2012 12:56:40 |
tota |
- 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) |
0.4.6_2 06 Jun 2012 20:57:59 |
sylvio |
- 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) |
0.4.6_1 01 Jun 2012 05:26:28 |
dinoex |
- update png to 1.5.10 |
0.4.6 03 Nov 2011 16:38:12 |
pawel |
Update to version 0.4.6
PR: ports/162257
Submitted by: Marco Bröder <marco.broeder@gmx.eu> (maintainer) |
0.4.5 01 Aug 2011 16:38:18 |
jlaffaye |
Update to 0.4.5
PR: ports/158872
Submitted by: Marco Bröder <marco.broeder@gmx.eu> (maintainer) |
0.4.4 03 Jul 2011 14:59:23 |
ohauer |
-remove MD5 |
0.4.4 23 Oct 2010 05:47:15 |
sunpoet |
- 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) |
0.4.3_1 31 May 2010 02:01:56 |
ade |
Bounce PORTREVISION for gettext-related ports. Have fun, ya'll. |
0.4.3 17 Apr 2010 19:29:19 |
sylvio |
- Update to 0.4.3
PR: ports/145677
Submitted by: Marco Broder <marco.broeder@gmx.eu> (maintainer)
Approved by: itetcu (mentor, implicit) |
0.4.1_3 28 Mar 2010 06:47:48 |
dinoex |
- update to 1.4.1
Reviewed by: exp8 run on pointyhat
Supported by: miwi |
0.4.1_2 05 Feb 2010 11:46:55 |
dinoex |
- update to jpeg-8 |
0.4.1_1 22 Dec 2009 11:39:08 |
miwi |
- Fix NOPORT*
PR: 139885
Submitted by: Marco Bröder <marco.broeder@gmx.eu> (maintainer) |
0.4.1 21 Oct 2009 10:31:54 |
miwi |
- Update to 0.4.1
Submitted by: maintainer |
0.4.0_1 01 Sep 2009 00:07:48 |
amdmi3 |
- 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) |
0.4.0 27 Aug 2009 15:04:16 |
amdmi3 |
- Remove remaining SFP references (switch these ports to SF)
Approved by: portmgr (pav) |
0.4.0 17 Aug 2009 19:55:27 |
miwi |
- Update to 0.4.0
- Change to SFP macro
Submitted by: maintainer via xmmp |
0.3.4 08 Jul 2009 15:32:35 |
dhn |
- Update to 0.3.4
PR: ports/136398
Submitted by: Marco Broeder <marco.broeder@gmx.eu> (maintainer) |
0.3.3 27 Apr 2009 18:29:22 |
dhn |
- Update to 0.3.3
PR: ports/134023
Submitted by: Marco Broeder <marco.broeder@gmx.eu> (maintainer)
Approved by: miwi (mentor) |
0.3.1 11 Apr 2009 22:27:51 |
miwi |
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> |