diffuse 0.4.1_2 devel =1

A graphical N-way diff and merge tool written in python
Maintained by: marco.broeder@gmx.eu
Port Added: 11 Apr 2009 23:28:15
Also Listed In: python

---

---

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/

CVSWeb : Sources : Main Web Site : Distfiles Availability : PortsMon

---

Required To Build: lang/python26, textproc/intltool, devel/pkg-config, devel/desktop-file-utils, x11-toolkits/py-gtk2
Required To Run: textproc/scrollkeeper, lang/python26, devel/pkg-config, devel/desktop-file-utils, devel/gio-fam-backend, x11-toolkits/py-gtk2
Required Libraries: devel/gettext, accessibility/atk, devel/glib20, x11-toolkits/gtk20, devel/libglade2, textproc/libxml2, x11-toolkits/pango

---

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.1_2:
     MENU=on (default) "Add desktop menu (needs desktop-file-utils)"
     OMF=on (default) "Install OMF manual (needs scrollkeeper)"
     NLS=on (default) "Install some translations (work in progress)"
===> Use 'make config' to modify these settings

---

Master Sites:

http://heanet.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://sunet.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://iweb.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://switch.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://surfnet.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://kent.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://freefr.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://voxel.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://jaist.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://osdn.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://nchc.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://transact.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://softlayer.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://internode.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://biznetnetworks.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

http://ufpr.dl.sourceforge.net/project/diffuse/diffuse/0.4.1/

ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/

- update to jpeg-8

- Fix NOPORT*

PR:             139885
Submitted by:   Marco Bröder <marco.broeder@gmx.eu> (maintainer)

- Update to 0.4.1

Submitted by:   maintainer

- 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)

- Remove remaining SFP references (switch these ports to SF)

Approved by:    portmgr (pav)

- Update to 0.4.0
- Change to SFP macro

Submitted by:   maintainer via xmmp

- Update to 0.3.4

PR:             ports/136398
Submitted by:   Marco Broeder <marco.broeder@gmx.eu> (maintainer)

- Update to 0.3.3

PR:             ports/134023
Submitted by:   Marco Broeder <marco.broeder@gmx.eu> (maintainer)
Approved by:    miwi (mentor)

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>

5 vulnerabilities affecting 16 ports have been reported in the past 14 days

^* - modified, not new

All vulnerabilities