FreshPorts -- The Place For Ports notbug Wed, 8 Feb 2012 5:06 PM GMT
Port details
diffuse 0.4.6 devel on this many watch lists=2 search for ports that depend on this port
A graphical N-way diff and merge tool written in python
Maintained by: marco.broeder@gmx.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/
CVSWeb : Sources : Main Web Site : Distfiles Availability : PortsMon
NOTE: FreshPorts displays only required dependencies information. Optional dependencies are not covered.
Required To Build: lang/python27, textproc/intltool, devel/pkg-config, devel/desktop-file-utils, devel/py-gobject, x11-toolkits/py-gtk2
Required To Run: lang/python27, devel/pkg-config, devel/desktop-file-utils, devel/gio-fam-backend, devel/py-gobject, x11-toolkits/py-gtk2
Required Libraries: devel/gettext, accessibility/atk, devel/glib20, x11-toolkits/gtk20, devel/libglade2, textproc/libxml2, 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_add -r diffuse


Configuration Options
===> The following configuration options are available for diffuse-0.4.6:
     MENU=on (default) "Install a desktop menu entry"
     NLS=on (default) "Install translations (work in progress)"
===> Use 'make config' to modify these settings

Master Sites:
http://heanet.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://sunet.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://iweb.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://switch.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://surfnet.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://kent.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://freefr.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://voxel.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://jaist.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://osdn.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://nchc.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://ncu.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://transact.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://softlayer.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://internode.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://ufpr.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
http://waix.dl.sourceforge.net/project/diffuse/diffuse/0.4.6/
ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/

Number of commits found: 16

Commit History - (may be incomplete: see CVSWeb link above for full details)
DateByDescription
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: 16

Login
User Login
Create account

Servers and bandwidth provided by
New York Internet
SuperNews

Search
Enter Keywords:
 
more...

Latest Vulnerabilities
drupal6Feb 07
drupal7Feb 07
bugzillaFeb 06
bugzilla2Feb 06
bugzilla3Feb 06
php5*Feb 06
mathopdFeb 03
firefoxFeb 01
linux-firefoxFeb 01
linux-seamonkeyFeb 01
linux-thunderbirdFeb 01
seamonkeyFeb 01
seamonkey2Feb 01
thunderbirdFeb 01
thunderbird3Feb 01

14 vulnerabilities affecting 33 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 23141
Broken 190
Deprecated 96
Ignore 726
Forbidden 2
Restricted 329
No CDROM 109
Vulnerable 1
Expired 7
Set to expire 93
Interactive 63
new 24 hours 13
new 48 hours27
new 7 days49
new fortnight82
new month139

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

Servers and bandwidth provided by
New York Internet
SuperNews
Valid HTML, CSS, and RSS.
Copyright © 2000-2012 DVL Software Limited. All rights reserved.
This page created in 0.163 seconds.