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/ Fix: Patch attached with submission follows:
Hello, in the meantime there was an update of Diffuse upstream. Please test and commit the newly attached shell archive for version 0.3.1. Since the port is new and does not exists yet, please use my provided pkg-descr for commit message instead of a change log. Thanks in advance! -- Regard Marco Bröder <marco.broeder@gmx.eu> OpenPGP key fingerprint 5615106E031AF3D364CC0F9E4DCE6524F595082F
Responsible Changed From-To: freebsd-ports-bugs->miwi I'll take it.
Attached is a new shell archive. It replaces everything before. Please use pkg-descr as commit message. Thanks! My changes explained: 1. Move 'INSTALLS_OMF' into right place. Change port options defaults. Port options are just a convenient way for experienced ports users to set certain options for saving disk space or for avoiding dependencies and so on. But all selectable options here also reduce application functionality. This should be avoided for official package builds and therefor these options have to default to 'on', because users of official packages should always get a non stripped but functional complete application. 2. Only install a desktop icon when installing a desktop menu. Users who do not want to install a desktop menu file most likely also do not want to install a desktop icon file. Fix 'pkg-plist' accordingly by making desktop icon lines also %%MENU%% conditional. -- Regards, Marco Bröder <marco.broeder@gmx.eu> OpenPGP key fingerprint: 5615 106E 031A F3D3 64CC 0F9E 4DCE 6524 F595 082F
State Changed From-To: open->closed New port added. Thanks!
miwi 2009-04-11 22:27:51 UTC FreeBSD ports repository Modified files: devel Makefile Added files: devel/diffuse Makefile distinfo pkg-descr pkg-plist Log: 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> Revision Changes Path 1.3465 +1 -0 ports/devel/Makefile 1.1 +106 -0 ports/devel/diffuse/Makefile (new) 1.1 +3 -0 ports/devel/diffuse/distinfo (new) 1.1 +19 -0 ports/devel/diffuse/pkg-descr (new) 1.1 +48 -0 ports/devel/diffuse/pkg-plist (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"