notbugAs an Amazon Associate I earn from qualifying purchases.
Want a good read? Try FreeBSD Mastery: Jails (IT Mastery Book 15)
Want a good monitor light? See my photosAll times are UTC
Ukraine
This referral link gives you 10% off a Fastmail.com account and gives me a discount on my Fastmail account.

Get notified when packages are built

A new feature has been added. FreshPorts already tracks package built by the FreeBSD project. This information is displayed on each port page. You can now get an email when FreshPorts notices a new package is available for something on one of your watch lists. However, you must opt into that. Click on Report Subscriptions on the right, and New Package Notification box, and click on Update.

FInally, under Watch Lists, click on ABI Package Subscriptions to select your ABI (e.g. FreeBSD:14:amd64) & package set (latest/quarterly) combinatio for a given watch list. This is what FreshPorts will look for.

Port details
diffuse Graphical n-way diff and merge tool written in Python
0.4.8_1 devel Deleted on this many watch lists=2 search for ports that depend on this port Find issues related to this port Report an issue related to this port View this port on Repology. pkg-fallout 0.4.8_1Version of this port present on the latest quarterly branch.
Deprecated DEPRECATED: Old, uses EOLed python27
Expired This port expired on: 2020-03-01
Maintainer: marco.broeder@posteo.eu search for ports maintained by this maintainer
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/
Homepage    cgit ¦ GitHub ¦ GitHub ¦ GitLab ¦ SVNWeb

Manual pages:
pkg-plist: as obtained via: make generate-plist
Expand this list (28 items)
Collapse this list.
  1. @desktop-file-utils
  2. /usr/local/share/licenses/diffuse-0.4.8_1/catalog.mk
  3. /usr/local/share/licenses/diffuse-0.4.8_1/LICENSE
  4. /usr/local/share/licenses/diffuse-0.4.8_1/GPLv2
  5. /usr/local/share/licenses/diffuse-0.4.8_1/GPLv3
  6. bin/diffuse
  7. etc/diffuserc
  8. man/man1/diffuse.1.gz
  9. share/applications/diffuse.desktop
  10. share/icons/hicolor/16x16/apps/diffuse.png
  11. share/icons/hicolor/22x22/apps/diffuse.png
  12. share/icons/hicolor/24x24/apps/diffuse.png
  13. share/icons/hicolor/256x256/apps/diffuse.png
  14. share/icons/hicolor/32x32/apps/diffuse.png
  15. share/icons/hicolor/48x48/apps/diffuse.png
  16. man/cs/man1/diffuse.1.gz
  17. man/it/man1/diffuse.1.gz
  18. man/ru/man1/diffuse.1.gz
  19. share/locale/cs/LC_MESSAGES/diffuse.mo
  20. share/locale/de/LC_MESSAGES/diffuse.mo
  21. share/locale/es/LC_MESSAGES/diffuse.mo
  22. share/locale/it/LC_MESSAGES/diffuse.mo
  23. share/locale/ja/LC_MESSAGES/diffuse.mo
  24. share/locale/ko/LC_MESSAGES/diffuse.mo
  25. share/locale/pl/LC_MESSAGES/diffuse.mo
  26. share/locale/ru/LC_MESSAGES/diffuse.mo
  27. share/locale/zh_CN/LC_MESSAGES/diffuse.mo
  28. share/locale/zh_TW/LC_MESSAGES/diffuse.mo
Collapse this list.
Dependency lines:
  • diffuse>0:devel/diffuse
Conflicts:
CONFLICTS_INSTALL:
  • tinker-[0-9]*
Conflicts Matches:
There are no Conflicts Matches for this port. This is usually an error.
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.
Dependencies
NOTE: FreshPorts displays only information on required and default dependencies. Optional dependencies are not covered.
Build dependencies:
  1. update-desktop-database : devel/desktop-file-utils
  2. gtk-update-icon-cache : graphics/gtk-update-icon-cache
  3. pygobject-codegen-2.0 : devel/py-gobject
  4. pygtk-2.0.pc : x11-toolkits/py-gtk2
  5. python2.7 : lang/python27
  6. msgfmt : devel/gettext-tools
Runtime dependencies:
  1. update-desktop-database : devel/desktop-file-utils
  2. gtk-update-icon-cache : graphics/gtk-update-icon-cache
  3. pygobject-codegen-2.0 : devel/py-gobject
  4. pygtk-2.0.pc : x11-toolkits/py-gtk2
  5. python2.7 : lang/python27
Library dependencies:
  1. libatk-1.0.so : accessibility/atk
  2. libgdk_pixbuf-2.0.so : graphics/gdk-pixbuf2
  3. libglib-2.0.so : devel/glib20
  4. libintl.so : devel/gettext-runtime
  5. libgtk-x11-2.0.so : x11-toolkits/gtk20
  6. libglade-2.0.so : devel/libglade2
  7. libxml2.so : textproc/libxml2
  8. libpango-1.0.so : x11-toolkits/pango
  9. 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:
Expand this list (26 items)
Collapse this list.
  1. http://cytranet.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  2. http://downloads.sourceforge.net/project/diffuse/diffuse/0.4.8/
  3. http://excellmedia.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  4. http://freefr.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  5. http://jaist.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  6. http://kent.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  7. http://nchc.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  8. http://netcologne.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  9. http://netix.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  10. http://superb-dca2.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  11. http://superb-sea2.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  12. http://ufpr.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  13. http://vorboss.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  14. https://cytranet.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  15. https://downloads.sourceforge.net/project/diffuse/diffuse/0.4.8/
  16. https://excellmedia.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  17. https://freefr.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  18. https://jaist.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  19. https://kent.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  20. https://nchc.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  21. https://netcologne.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  22. https://netix.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  23. https://superb-dca2.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  24. https://superb-sea2.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  25. https://ufpr.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  26. https://vorboss.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
Collapse this list.

Number of commits found: 34

Commit History - (may be incomplete: for full details, see links to repositories near top of page)
CommitCreditsLog message
0.4.8_1
01 Mar 2020 17:19:40
Revision:527561Original commit files touched by this commit
rene search for other commits by this committer
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 View all of this commit message)
0.4.8_1
28 Jan 2020 21:57:19
Revision:524518Original commit files touched by this commit
antoine search for other commits by this committer
Deprecate some pygtk2 ports

With hat:	portmgr
0.4.8_1
08 Nov 2019 11:39:00
Revision:517048Original commit files touched by this commit
tobik search for other commits by this committer
devel: Add missing USES={gl,gnome,php,sdl}
0.4.8_1
19 Feb 2018 11:10:43
Revision:462307Original commit files touched by this commit
antoine search for other commits by this committer
Reduce dependency on the python2 metaport

PR:		225752
Submitted by:	Yasuhiro KIMURA
0.4.8
15 Apr 2016 14:24:30
Revision:413347Original commit files touched by this commit
danfe search for other commits by this committer
- 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
Revision:371544Original commit files touched by this commit
bapt search for other commits by this committer
Cleanup plist
0.4.8
20 Oct 2014 16:04:14
Revision:371280Original commit files touched by this commit
mva search for other commits by this committer
- Convert ports of devel/ to USES=python

Approved by:	portmgr (implicit)
0.4.8
19 Jul 2014 23:10:29
Revision:362285Original commit files touched by this commit
danilo search for other commits by this committer
- 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
Revision:346954Original commit files touched by this commit
pawel search for other commits by this committer
- 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
Revision:331268Original commit files touched by this commit
amdmi3 search for other commits by this committer
- 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
Revision:330307Original commit files touched by this commit
wg search for other commits by this committer
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
Revision:327722Original commit files touched by this commit Sanity Test Failure Refresh
bapt search for other commits by this committer
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
Revision:318217Original commit files touched by this commit
miwi search for other commits by this committer
- 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
Revision:316464Original commit files touched by this commit
ak search for other commits by this committer
- Convert USE_GETTEXT to USES (part 3)

Approved by:	portmgr (bapt)
0.4.6_3
31 Dec 2012 13:11:03
Revision:309738Original commit files touched by this commit
tota search for other commits by this committer
- 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
Revision:309666Original commit files touched by this commit
tota search for other commits by this committer
- 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
Original commit files touched by this commit
sylvio search for other commits by this committer
- 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
Original commit files touched by this commit
dinoex search for other commits by this committer
- update png to 1.5.10
0.4.6
03 Nov 2011 16:38:12
Original commit files touched by this commit
pawel search for other commits by this committer
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
Original commit files touched by this commit
jlaffaye search for other commits by this committer
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
Original commit files touched by this commit
ohauer search for other commits by this committer
-remove MD5
0.4.4
23 Oct 2010 05:47:15
Original commit files touched by this commit
sunpoet search for other commits by this committer
- 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
Original commit files touched by this commit
ade search for other commits by this committer
Bounce PORTREVISION for gettext-related ports.  Have fun, ya'll.
0.4.3
17 Apr 2010 19:29:19
Original commit files touched by this commit
sylvio search for other commits by this committer
- 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
Original commit files touched by this commit
dinoex search for other commits by this committer
- update to 1.4.1
Reviewed by:    exp8 run on pointyhat
Supported by:   miwi
0.4.1_2
05 Feb 2010 11:46:55
Original commit files touched by this commit
dinoex search for other commits by this committer
- update to jpeg-8
0.4.1_1
22 Dec 2009 11:39:08
Original commit files touched by this commit
miwi search for other commits by this committer
- Fix NOPORT*

PR:             139885
Submitted by:   Marco Bröder <marco.broeder@gmx.eu> (maintainer)
0.4.1
21 Oct 2009 10:31:54
Original commit files touched by this commit
miwi search for other commits by this committer
- Update to 0.4.1

Submitted by:   maintainer
0.4.0_1
01 Sep 2009 00:07:48
Original commit files touched by this commit
amdmi3 search for other commits by this committer
- 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
Original commit files touched by this commit
amdmi3 search for other commits by this committer
- Remove remaining SFP references (switch these ports to SF)

Approved by:    portmgr (pav)
0.4.0
17 Aug 2009 19:55:27
Original commit files touched by this commit
miwi search for other commits by this committer
- Update to 0.4.0
- Change to SFP macro

Submitted by:   maintainer via xmmp
0.3.4
08 Jul 2009 15:32:35
Original commit files touched by this commit
dhn search for other commits by this committer
- 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
Original commit files touched by this commit
dhn search for other commits by this committer
- 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
Original commit files touched by this commit
miwi search for other commits by this committer
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>

Number of commits found: 34