Initial import of diffuse-0.2.15:

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

4 files changed, 121 insertions, 0 deletions

diff --git a/devel/diffuse/DESCR b/devel/diffuse/DESCR
new file mode 100644
index 00000000000..7468289ea7e
--- /dev/null
+++ b/devel/diffuse/DESCR
@@ -0,0 +1,18 @@
+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
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
new file mode 100644
index 00000000000..f41b848ad0e
--- /dev/null
+++ b/devel/diffuse/Makefile
@@ -0,0 +1,57 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/12/09 14:19:21 wiz Exp $
+#
+
+DISTNAME=	diffuse-0.2.15
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=diffuse/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://diffuse.sourceforge.net/
+COMMENT=	Graphical tool for merging and comparing text files
+
+USE_LANGUAGES=	# none
+USE_DIRS=	xdg-1.4 gnome2-1.6
+
+INSTALLATION_DIRS=	bin share/diffuse/syntax share/examples/diffuse
+INSTALLATION_DIRS+=	share/gnome/help/diffuse
+
+CONF_FILES+=	${PREFIX}/share/examples/diffuse/diffuserc \
+		${PKG_SYSCONFDIR}/diffuserc
+
+REPLACE_PYTHON=		src/usr/bin/diffuse
+
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths+=	src/etc/diffuserc
+SUBST_FILES.paths+=	src/usr/bin/diffuse
+SUBST_FILES.paths+=	src/usr/share/omf/diffuse/diffuse-C.omf
+SUBST_FILES.paths+=	src/usr/share/man/man1/diffuse.1
+SUBST_SED.paths+=	-e "s,/usr,${PREFIX},"
+SUBST_SED.paths+=	-e "s,/etc,${PKG_SYSCONFDIR},"
+SUBST_STAGE.paths=	post-patch
+SUBST_MESSAGE.paths=	Fixing hardcoded paths.
+
+do-build:
+	# nothing
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/diffuse ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/diffuse.png \
+		${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/src/usr/share/gnome/help/diffuse/C/diffuse.xml \
+		${DESTDIR}${PREFIX}/share/gnome/help/diffuse/C
+	${INSTALL_DATA} ${WRKSRC}/src/usr/share/omf/diffuse/diffuse-C.omf \
+		${DESTDIR}${PREFIX}/share/omf/diffuse
+	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/diffuse.desktop \
+		${DESTDIR}${PREFIX}/share/applications
+	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/diffuse.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/src/usr/share/diffuse/syntax/* \
+		${DESTDIR}${PREFIX}/share/diffuse/syntax
+	${INSTALL_DATA} ${WRKSRC}/src/etc/diffuserc \
+		${DESTDIR}${PREFIX}/share/examples/diffuse
+
+.include "../../lang/python/application.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/py-gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/diffuse/PLIST b/devel/diffuse/PLIST
new file mode 100644
index 00000000000..fe53b8f0360
--- /dev/null
+++ b/devel/diffuse/PLIST
@@ -0,0 +1,41 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/09 14:19:21 wiz Exp $
+bin/diffuse
+man/man1/diffuse.1
+share/applications/diffuse.desktop
+share/diffuse/syntax/bash.syntax
+share/diffuse/syntax/c++.syntax
+share/diffuse/syntax/csh.syntax
+share/diffuse/syntax/csharp.syntax
+share/diffuse/syntax/css.syntax
+share/diffuse/syntax/gettext.syntax
+share/diffuse/syntax/html.syntax
+share/diffuse/syntax/ini.syntax
+share/diffuse/syntax/java.syntax
+share/diffuse/syntax/javascript.syntax
+share/diffuse/syntax/jsp.syntax
+share/diffuse/syntax/makefile.syntax
+share/diffuse/syntax/octave.syntax
+share/diffuse/syntax/pascal.syntax
+share/diffuse/syntax/patch.syntax
+share/diffuse/syntax/perl.syntax
+share/diffuse/syntax/php.syntax
+share/diffuse/syntax/python.syntax
+share/diffuse/syntax/ruby.syntax
+share/diffuse/syntax/sql.syntax
+share/diffuse/syntax/tcl.syntax
+share/diffuse/syntax/vb.syntax
+share/diffuse/syntax/verilog.syntax
+share/diffuse/syntax/vhdl.syntax
+share/diffuse/syntax/xml.syntax
+share/examples/diffuse/diffuserc
+share/gnome/help/diffuse/C
+share/omf/diffuse
+share/pixmaps/diffuse.png
+@comment in xdg-dirs: @dirrm share/pixmaps
+@comment in rarian: @dirrm share/omf
+@dirrm share/gnome/help/diffuse
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@dirrm share/examples/diffuse
+@dirrm share/diffuse/syntax
+@dirrm share/diffuse
+@comment in xdg-dirs: @dirrm share/applications
diff --git a/devel/diffuse/distinfo b/devel/diffuse/distinfo
new file mode 100644
index 00000000000..b2fbf523d4a
--- /dev/null
+++ b/devel/diffuse/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2008/12/09 14:19:21 wiz Exp $
+
+SHA1 (diffuse-0.2.15.tar.bz2) = 4f5869ec8aed35d875566e7fc52fa7e981dcf8a2
+RMD160 (diffuse-0.2.15.tar.bz2) = ad87a8c30ec9915d5d632429b41c666494863eb7
+Size (diffuse-0.2.15.tar.bz2) = 67417 bytes