FreshPorts -- The Place For Ports If you buy from Amazon USA, please support us by using this link.
Follow us
Blog
Twitter

I am looking for an LTO tape library. Do you have one to spare?
Port details
diffuse 0.4.8 devel on this many watch lists=2 search for ports that depend on this port
Graphical N-way diff and merge tool written in python
Maintained by: marco.broeder@posteo.eu search for ports maintained by this maintainer
Port Added: 11 Apr 2009 22:28:15
Also Listed In: python
License: GPLv2 GPLv3


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/
SVNWeb : Main Web Site : Distfiles Availability : PortsMon

NOTE: FreshPorts displays only information on required and default dependencies. Optional dependencies are not covered.

Required To Build:
  1. lang/python27
  2. lang/python2
  3. devel/desktop-file-utils
  4. graphics/gtk-update-icon-cache
  5. textproc/intltool
  6. devel/py-gobject
  7. x11-toolkits/py-gtk2
Required To Run:
  1. lang/python27
  2. lang/python2
  3. devel/desktop-file-utils
  4. graphics/gtk-update-icon-cache
  5. devel/py-gobject
  6. x11-toolkits/py-gtk2
Required Libraries:
  1. devel/gettext
  2. accessibility/atk
  3. graphics/gdk-pixbuf2
  4. devel/glib20
  5. devel/pcre
  6. x11-toolkits/gtk20
  7. devel/libglade2
  8. textproc/libxml2
  9. x11-toolkits/pango
There are no ports dependent upon this port

To install the port: cd /usr/ports/devel/diffuse/ && make install clean
To add the package: pkg install devel/diffuse


Configuration Options
===> The following configuration options are available for diffuse-0.4.8:
     DATA=on: Enable syntax highlighting support
     DOCS=on: Build and/or install documentation
     MENU=on: Enable a desktop program menu entry
     NLS=on: Native Language Support
===> Use 'make config' to modify these settings

Master Sites:
  1. http://aarnet.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  2. http://distcache.FreeBSD.org/ports-distfiles/
  3. http://downloads.sourceforge.net/project/diffuse/diffuse/0.4.8/
  4. http://freefr.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  5. http://garr.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  6. http://heanet.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  7. http://hivelocity.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  8. http://ignum.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  9. http://internode.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  10. http://iweb.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  11. http://jaist.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  12. http://kaz.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  13. http://kent.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  14. http://master.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  15. http://nchc.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  16. http://ncu.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  17. http://netcologne.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  18. http://sunet.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  19. http://superb-dca3.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  20. http://switch.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  21. http://tenet.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  22. http://ufpr.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/
  23. http://waix.dl.sourceforge.net/project/diffuse/diffuse/0.4.8/

Number of commits found: 27

Commit History - (may be incomplete: see SVNWeb link above for full details)
DateByDescription
19 Jul 2014 23:10:29
Original commit files touched by this commit  0.4.8
Revision:362285
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>
03 Mar 2014 19:00:12
Original commit files touched by this commit  0.4.7
Revision:346954
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
22 Oct 2013 13:52:24
Original commit files touched by this commit  0.4.7
Revision:331268
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)
14 Oct 2013 12:00:23
Original commit files touched by this commit  0.4.7
Revision:330307
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
Refresh Original commit files touched by this commit
Revision:327722  Sanity Test Failure
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)
15 May 2013 07:51:30
Original commit files touched by this commit  0.4.7
Revision:318217
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)
24 Apr 2013 18:10:32
Original commit files touched by this commit  0.4.6_3
Revision:316464
ak search for other commits by this committer
- Convert USE_GETTEXT to USES (part 3)

Approved by:	portmgr (bapt)
31 Dec 2012 13:11:03
Original commit files touched by this commit  0.4.6_3
Revision:309738
tota search for other commits by this committer
- Define PORTDATA conditionally

PR:		ports/174806
Submitted by:	Marco Broder <marco.broeder@gmx.eu> (maintainer)
30 Dec 2012 12:56:40
Original commit files touched by this commit  0.4.6_3
Revision:309666
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)
06 Jun 2012 20:57:59
Original commit files touched by this commit  0.4.6_2
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)
01 Jun 2012 05:26:28
Original commit files touched by this commit  0.4.6_1
dinoex search for other commits by this committer
- update png to 1.5.10
03 Nov 2011 16:38:12
Original commit files touched by this commit  0.4.6
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)
01 Aug 2011 16:38:18
Original commit files touched by this commit  0.4.5
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)
03 Jul 2011 14:59:23
Original commit files touched by this commit  0.4.4
ohauer search for other commits by this committer
-remove MD5
23 Oct 2010 05:47:15
Original commit files touched by this commit  0.4.4
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)
31 May 2010 02:01:56
Original commit files touched by this commit  0.4.3_1
ade search for other commits by this committer
Bounce PORTREVISION for gettext-related ports.  Have fun, ya'll.
17 Apr 2010 19:29:19
Original commit files touched by this commit  0.4.3
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)
28 Mar 2010 06:47:48
Original commit files touched by this commit  0.4.1_3
dinoex search for other commits by this committer
- update to 1.4.1
Reviewed by:    exp8 run on pointyhat
Supported by:   miwi
05 Feb 2010 11:46:55
Original commit files touched by this commit  0.4.1_2
dinoex search for other commits by this committer
- update to jpeg-8
22 Dec 2009 11:39:08
Original commit files touched by this commit  0.4.1_1
miwi search for other commits by this committer
- Fix NOPORT*

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

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

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

Submitted by:   maintainer via xmmp
08 Jul 2009 15:32:35
Original commit files touched by this commit  0.3.4
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)
27 Apr 2009 18:29:22
Original commit files touched by this commit  0.3.3
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)
11 Apr 2009 22:27:51
Original commit files touched by this commit  0.3.1
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: 27

Login
User Login
Create account

Servers and bandwidth provided by
New York Internet, SuperNews, and RootBSD

This site
What is FreshPorts?
About the authors
FAQ
How big is it?
The latest upgrade!
Privacy
Forums
Blog
Contact

Search
Enter Keywords:
 
more...

Latest Vulnerabilities
asterisk11Sep 18
squidSep 18
squid33Sep 18
dbusSep 17
nginxSep 16
nginx-develSep 16
phpmyadminSep 13
ossec-hids-clientSep 11
ossec-hids-localSep 11
ossec-hids-serverSep 11
chromiumSep 09
trafficserverSep 05
apache22*Sep 03
apache22-event-mpm*Sep 03
apache22-itk-mpm*Sep 03

8 vulnerabilities affecting 19 ports have been reported in the past 14 days

* - modified, not new

All vulnerabilities


Ports
Home
Categories
Deleted ports
Sanity Test Failures
Newsfeeds


Statistics
Graphs
NEW Graphs (Javascript)
Traffic

Calculated hourly:
Port count 24062
Broken 118
Deprecated 53
Ignore 370
Forbidden 4
Restricted 203
No CDROM 94
Vulnerable 21
Expired 5
Set to expire 48
Interactive 0
new 24 hours 6
new 48 hours8
new 7 days37
new fortnight68
new month233

Servers and bandwidth provided by
New York Internet, SuperNews, and RootBSD
Valid HTML, CSS, and RSS.
Copyright © 2000-2014 Dan Langille. All rights reserved.