From owner-cvs-all@FreeBSD.ORG  Sat Apr 11 22:27:52 2009
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2298B1065670;
	Sat, 11 Apr 2009 22:27:52 +0000 (UTC)
	(envelope-from miwi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1199B8FC18;
	Sat, 11 Apr 2009 22:27:52 +0000 (UTC)
	(envelope-from miwi@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3BMRpSi019373;
	Sat, 11 Apr 2009 22:27:51 GMT
	(envelope-from miwi@repoman.freebsd.org)
Received: (from miwi@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3BMRpHh019372;
	Sat, 11 Apr 2009 22:27:51 GMT (envelope-from miwi)
Message-Id: <200904112227.n3BMRpHh019372@repoman.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 11 Apr 2009 22:27:51 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/devel Makefile ports/devel/diffuse Makefile
 distinfo pkg-descr pkg-plist
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Apr 2009 22:27:52 -0000

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)