Initial import of kdiff3 0.9.91.

From Kimura Fuyuki in PR pkg/35914

KDiff3 is a program that

    * compares and merges two or three input files or directories,
    * shows the differences line by line and character by character (!),
    * provides an automatic merge-facility and
    * an integrated editor for comfortable solving of merge-conflicts
    * has support for KDE-KIO (ftp, sftp, http, fish, smb)
    * and has an intuitive graphical user interface.

5 files changed, 297 insertions, 0 deletions

diff --git a/devel/kdiff3/DESCR b/devel/kdiff3/DESCR
new file mode 100644
index 00000000000..1726997be06
--- /dev/null
+++ b/devel/kdiff3/DESCR
@@ -0,0 +1,8 @@
+KDiff3 is a program that
+
+    * compares and merges two or three input files or directories,
+    * shows the differences line by line and character by character (!),
+    * provides an automatic merge-facility and
+    * an integrated editor for comfortable solving of merge-conflicts
+    * has support for KDE-KIO (ftp, sftp, http, fish, smb)
+    * and has an intuitive graphical user interface.
diff --git a/devel/kdiff3/Makefile b/devel/kdiff3/Makefile
new file mode 100644
index 00000000000..12d8f952a39
--- /dev/null
+++ b/devel/kdiff3/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/03/24 14:22:24 markd Exp $
+
+DISTNAME=		kdiff3-0.9.91
+CATEGORIES=		devel kde
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kdiff3/}
+
+MAINTAINER=		fuyuki@hadaly.org
+HOMEPAGE=		http://kdiff3.sourceforge.net/
+COMMENT=		File and directory diff and merge tool
+
+USE_TOOLS+=		msgfmt
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-arts
+
+.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdiff3/PLIST b/devel/kdiff3/PLIST
new file mode 100644
index 00000000000..0c2b5d6caf8
--- /dev/null
+++ b/devel/kdiff3/PLIST
@@ -0,0 +1,249 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/24 14:22:24 markd Exp $
+bin/kdiff3
+lib/kde3/libkdiff3part.la
+man/man1/kdiff3.1
+share/doc/kde/HTML/da/kdiff3/common
+share/doc/kde/HTML/da/kdiff3/dirbrowser.png
+share/doc/kde/HTML/da/kdiff3/dirmergebig.png
+share/doc/kde/HTML/da/kdiff3/index.cache.bz2
+share/doc/kde/HTML/da/kdiff3/index.docbook
+share/doc/kde/HTML/da/kdiff3/iteminfo.png
+share/doc/kde/HTML/da/kdiff3/letter_by_letter.png
+share/doc/kde/HTML/da/kdiff3/merge_current.png
+share/doc/kde/HTML/da/kdiff3/new.png
+share/doc/kde/HTML/da/kdiff3/open_dialog.png
+share/doc/kde/HTML/da/kdiff3/screenshot_diff.png
+share/doc/kde/HTML/da/kdiff3/screenshot_merge.png
+share/doc/kde/HTML/da/kdiff3/triple_diff.png
+share/doc/kde/HTML/da/kdiff3/white_space.png
+share/doc/kde/HTML/de/kdiff3/common
+share/doc/kde/HTML/de/kdiff3/dirbrowser.png
+share/doc/kde/HTML/de/kdiff3/dirmergebig.png
+share/doc/kde/HTML/de/kdiff3/index.cache.bz2
+share/doc/kde/HTML/de/kdiff3/index.docbook
+share/doc/kde/HTML/de/kdiff3/iteminfo.png
+share/doc/kde/HTML/de/kdiff3/letter_by_letter.png
+share/doc/kde/HTML/de/kdiff3/merge_current.png
+share/doc/kde/HTML/de/kdiff3/new.png
+share/doc/kde/HTML/de/kdiff3/open_dialog.png
+share/doc/kde/HTML/de/kdiff3/screenshot_diff.png
+share/doc/kde/HTML/de/kdiff3/screenshot_merge.png
+share/doc/kde/HTML/de/kdiff3/triple_diff.png
+share/doc/kde/HTML/de/kdiff3/white_space.png
+share/doc/kde/HTML/en/kdiff3/common
+share/doc/kde/HTML/en/kdiff3/compilation.html
+share/doc/kde/HTML/en/kdiff3/credits.html
+share/doc/kde/HTML/en/kdiff3/dirbrowser.png
+share/doc/kde/HTML/en/kdiff3/dirmerge.html
+share/doc/kde/HTML/en/kdiff3/dirmergebig.png
+share/doc/kde/HTML/en/kdiff3/dirmergeoptions.html
+share/doc/kde/HTML/en/kdiff3/dirmergevisible.html
+share/doc/kde/HTML/en/kdiff3/documentation.html
+share/doc/kde/HTML/en/kdiff3/dothemerge.html
+share/doc/kde/HTML/en/kdiff3/faq.html
+share/doc/kde/HTML/en/kdiff3/features.html
+share/doc/kde/HTML/en/kdiff3/find.html
+share/doc/kde/HTML/en/kdiff3/index.cache.bz2
+share/doc/kde/HTML/en/kdiff3/index.docbook
+share/doc/kde/HTML/en/kdiff3/index.html
+share/doc/kde/HTML/en/kdiff3/installation.html
+share/doc/kde/HTML/en/kdiff3/interpretinginformation.html
+share/doc/kde/HTML/en/kdiff3/introduction.html
+share/doc/kde/HTML/en/kdiff3/iteminfo.png
+share/doc/kde/HTML/en/kdiff3/kdiff3.1
+share/doc/kde/HTML/en/kdiff3/kpart.html
+share/doc/kde/HTML/en/kdiff3/letter_by_letter.png
+share/doc/kde/HTML/en/kdiff3/merge_current.png
+share/doc/kde/HTML/en/kdiff3/merging.html
+share/doc/kde/HTML/en/kdiff3/misc.html
+share/doc/kde/HTML/en/kdiff3/navigation.html
+share/doc/kde/HTML/en/kdiff3/new.png
+share/doc/kde/HTML/en/kdiff3/open_dialog.png
+share/doc/kde/HTML/en/kdiff3/opendialog.html
+share/doc/kde/HTML/en/kdiff3/options.html
+share/doc/kde/HTML/en/kdiff3/other.html
+share/doc/kde/HTML/en/kdiff3/pasteinput.html
+share/doc/kde/HTML/en/kdiff3/preprocessors.html
+share/doc/kde/HTML/en/kdiff3/printing.html
+share/doc/kde/HTML/en/kdiff3/requirements.html
+share/doc/kde/HTML/en/kdiff3/saving.html
+share/doc/kde/HTML/en/kdiff3/screenshot_diff.png
+share/doc/kde/HTML/en/kdiff3/screenshot_merge.png
+share/doc/kde/HTML/en/kdiff3/screenshots.html
+share/doc/kde/HTML/en/kdiff3/selections.html
+share/doc/kde/HTML/en/kdiff3/startingdirmerge.html
+share/doc/kde/HTML/en/kdiff3/triple_diff.png
+share/doc/kde/HTML/en/kdiff3/white_space.png
+share/doc/kde/HTML/es/kdiff3/common
+share/doc/kde/HTML/es/kdiff3/dirbrowser.png
+share/doc/kde/HTML/es/kdiff3/dirmergebig.png
+share/doc/kde/HTML/es/kdiff3/index.cache.bz2
+share/doc/kde/HTML/es/kdiff3/index.docbook
+share/doc/kde/HTML/es/kdiff3/iteminfo.png
+share/doc/kde/HTML/es/kdiff3/letter_by_letter.png
+share/doc/kde/HTML/es/kdiff3/merge_current.png
+share/doc/kde/HTML/es/kdiff3/new.png
+share/doc/kde/HTML/es/kdiff3/open_dialog.png
+share/doc/kde/HTML/es/kdiff3/screenshot_diff.png
+share/doc/kde/HTML/es/kdiff3/screenshot_merge.png
+share/doc/kde/HTML/es/kdiff3/triple_diff.png
+share/doc/kde/HTML/es/kdiff3/white_space.png
+share/doc/kde/HTML/et/kdiff3/common
+share/doc/kde/HTML/et/kdiff3/dirbrowser.png
+share/doc/kde/HTML/et/kdiff3/dirmergebig.png
+share/doc/kde/HTML/et/kdiff3/index.cache.bz2
+share/doc/kde/HTML/et/kdiff3/index.docbook
+share/doc/kde/HTML/et/kdiff3/iteminfo.png
+share/doc/kde/HTML/et/kdiff3/letter_by_letter.png
+share/doc/kde/HTML/et/kdiff3/merge_current.png
+share/doc/kde/HTML/et/kdiff3/new.png
+share/doc/kde/HTML/et/kdiff3/open_dialog.png
+share/doc/kde/HTML/et/kdiff3/screenshot_diff.png
+share/doc/kde/HTML/et/kdiff3/screenshot_merge.png
+share/doc/kde/HTML/et/kdiff3/triple_diff.png
+share/doc/kde/HTML/et/kdiff3/white_space.png
+share/doc/kde/HTML/fr/kdiff3/common
+share/doc/kde/HTML/fr/kdiff3/dirbrowser.png
+share/doc/kde/HTML/fr/kdiff3/dirmergebig.png
+share/doc/kde/HTML/fr/kdiff3/index.cache.bz2
+share/doc/kde/HTML/fr/kdiff3/index.docbook
+share/doc/kde/HTML/fr/kdiff3/iteminfo.png
+share/doc/kde/HTML/fr/kdiff3/letter_by_letter.png
+share/doc/kde/HTML/fr/kdiff3/merge_current.png
+share/doc/kde/HTML/fr/kdiff3/new.png
+share/doc/kde/HTML/fr/kdiff3/open_dialog.png
+share/doc/kde/HTML/fr/kdiff3/screenshot_diff.png
+share/doc/kde/HTML/fr/kdiff3/screenshot_merge.png
+share/doc/kde/HTML/fr/kdiff3/triple_diff.png
+share/doc/kde/HTML/fr/kdiff3/white_space.png
+share/doc/kde/HTML/it/kdiff3/common
+share/doc/kde/HTML/it/kdiff3/dirbrowser.png
+share/doc/kde/HTML/it/kdiff3/dirmergebig.png
+share/doc/kde/HTML/it/kdiff3/index.cache.bz2
+share/doc/kde/HTML/it/kdiff3/index.docbook
+share/doc/kde/HTML/it/kdiff3/iteminfo.png
+share/doc/kde/HTML/it/kdiff3/letter_by_letter.png
+share/doc/kde/HTML/it/kdiff3/merge_current.png
+share/doc/kde/HTML/it/kdiff3/new.png
+share/doc/kde/HTML/it/kdiff3/open_dialog.png
+share/doc/kde/HTML/it/kdiff3/screenshot_diff.png
+share/doc/kde/HTML/it/kdiff3/screenshot_merge.png
+share/doc/kde/HTML/it/kdiff3/triple_diff.png
+share/doc/kde/HTML/it/kdiff3/white_space.png
+share/doc/kde/HTML/nl/kdiff3/common
+share/doc/kde/HTML/nl/kdiff3/dirbrowser.png
+share/doc/kde/HTML/nl/kdiff3/dirmergebig.png
+share/doc/kde/HTML/nl/kdiff3/index.cache.bz2
+share/doc/kde/HTML/nl/kdiff3/index.docbook
+share/doc/kde/HTML/nl/kdiff3/iteminfo.png
+share/doc/kde/HTML/nl/kdiff3/letter_by_letter.png
+share/doc/kde/HTML/nl/kdiff3/merge_current.png
+share/doc/kde/HTML/nl/kdiff3/new.png
+share/doc/kde/HTML/nl/kdiff3/open_dialog.png
+share/doc/kde/HTML/nl/kdiff3/screenshot_diff.png
+share/doc/kde/HTML/nl/kdiff3/screenshot_merge.png
+share/doc/kde/HTML/nl/kdiff3/triple_diff.png
+share/doc/kde/HTML/nl/kdiff3/white_space.png
+share/doc/kde/HTML/pt/kdiff3/common
+share/doc/kde/HTML/pt/kdiff3/dirbrowser.png
+share/doc/kde/HTML/pt/kdiff3/dirmergebig.png
+share/doc/kde/HTML/pt/kdiff3/index.cache.bz2
+share/doc/kde/HTML/pt/kdiff3/index.docbook
+share/doc/kde/HTML/pt/kdiff3/iteminfo.png
+share/doc/kde/HTML/pt/kdiff3/letter_by_letter.png
+share/doc/kde/HTML/pt/kdiff3/merge_current.png
+share/doc/kde/HTML/pt/kdiff3/new.png
+share/doc/kde/HTML/pt/kdiff3/open_dialog.png
+share/doc/kde/HTML/pt/kdiff3/screenshot_diff.png
+share/doc/kde/HTML/pt/kdiff3/screenshot_merge.png
+share/doc/kde/HTML/pt/kdiff3/triple_diff.png
+share/doc/kde/HTML/pt/kdiff3/white_space.png
+share/doc/kde/HTML/sv/kdiff3/common
+share/doc/kde/HTML/sv/kdiff3/dirbrowser.png
+share/doc/kde/HTML/sv/kdiff3/dirmergebig.png
+share/doc/kde/HTML/sv/kdiff3/index.cache.bz2
+share/doc/kde/HTML/sv/kdiff3/index.docbook
+share/doc/kde/HTML/sv/kdiff3/iteminfo.png
+share/doc/kde/HTML/sv/kdiff3/letter_by_letter.png
+share/doc/kde/HTML/sv/kdiff3/merge_current.png
+share/doc/kde/HTML/sv/kdiff3/new.png
+share/doc/kde/HTML/sv/kdiff3/open_dialog.png
+share/doc/kde/HTML/sv/kdiff3/screenshot_diff.png
+share/doc/kde/HTML/sv/kdiff3/screenshot_merge.png
+share/doc/kde/HTML/sv/kdiff3/triple_diff.png
+share/doc/kde/HTML/sv/kdiff3/white_space.png
+share/icons/hicolor/16x16/apps/kdiff3.png
+share/icons/hicolor/32x32/apps/kdiff3.png
+share/icons/locolor/16x16/apps/kdiff3.png
+share/icons/locolor/32x32/apps/kdiff3.png
+share/kde/applnk/Development/kdiff3.desktop
+share/kde/apps/kdiff3/kdiff3_shell.rc
+share/kde/apps/kdiff3part/kdiff3_part.rc
+share/kde/services/kdiff3part.desktop
+share/locale/az/LC_MESSAGES/kdiff3.mo
+share/locale/bg/LC_MESSAGES/kdiff3.mo
+share/locale/br/LC_MESSAGES/kdiff3.mo
+share/locale/ca/LC_MESSAGES/kdiff3.mo
+share/locale/cs/LC_MESSAGES/kdiff3.mo
+share/locale/cy/LC_MESSAGES/kdiff3.mo
+share/locale/da/LC_MESSAGES/kdiff3.mo
+share/locale/de/LC_MESSAGES/kdiff3.mo
+share/locale/el/LC_MESSAGES/kdiff3.mo
+share/locale/en_GB/LC_MESSAGES/kdiff3.mo
+share/locale/es/LC_MESSAGES/kdiff3.mo
+share/locale/et/LC_MESSAGES/kdiff3.mo
+share/locale/fr/LC_MESSAGES/kdiff3.mo
+share/locale/ga/LC_MESSAGES/kdiff3.mo
+share/locale/hi/LC_MESSAGES/kdiff3.mo
+share/locale/hu/LC_MESSAGES/kdiff3.mo
+share/locale/is/LC_MESSAGES/kdiff3.mo
+share/locale/it/LC_MESSAGES/kdiff3.mo
+share/locale/ja/LC_MESSAGES/kdiff3.mo
+share/locale/ka/LC_MESSAGES/kdiff3.mo
+share/locale/lt/LC_MESSAGES/kdiff3.mo
+share/locale/nb/LC_MESSAGES/kdiff3.mo
+share/locale/nl/LC_MESSAGES/kdiff3.mo
+share/locale/pl/LC_MESSAGES/kdiff3.mo
+share/locale/pt/LC_MESSAGES/kdiff3.mo
+share/locale/pt_BR/LC_MESSAGES/kdiff3.mo
+share/locale/ro/LC_MESSAGES/kdiff3.mo
+share/locale/ru/LC_MESSAGES/kdiff3.mo
+share/locale/rw/LC_MESSAGES/kdiff3.mo
+share/locale/sr/LC_MESSAGES/kdiff3.mo
+share/locale/sr@Latn/LC_MESSAGES/kdiff3.mo
+share/locale/sv/LC_MESSAGES/kdiff3.mo
+share/locale/ta/LC_MESSAGES/kdiff3.mo
+share/locale/tg/LC_MESSAGES/kdiff3.mo
+share/locale/tr/LC_MESSAGES/kdiff3.mo
+share/locale/zh_CN/LC_MESSAGES/kdiff3.mo
+@comment in kde: @dirrm share/kde/services
+@dirrm share/kde/apps/kdiff3part
+@dirrm share/kde/apps/kdiff3
+@comment in kde: @dirrm share/kde/apps
+@comment in kde: @dirrm share/kde/applnk/Development
+@comment in kde: @dirrm share/icons/locolor/32x32/apps
+@comment in kde: @dirrm share/icons/locolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@dirrm share/doc/kde/HTML/sv/kdiff3
+@comment in kde: @dirrm share/doc/kde/HTML/sv
+@dirrm share/doc/kde/HTML/pt/kdiff3
+@comment in kde: @dirrm share/doc/kde/HTML/pt
+@dirrm share/doc/kde/HTML/nl/kdiff3
+@comment in kde: @dirrm share/doc/kde/HTML/nl
+@dirrm share/doc/kde/HTML/it/kdiff3
+@comment in kde: @dirrm share/doc/kde/HTML/it
+@dirrm share/doc/kde/HTML/fr/kdiff3
+@comment in kde: @dirrm share/doc/kde/HTML/fr
+@dirrm share/doc/kde/HTML/et/kdiff3
+@comment in kde: @dirrm share/doc/kde/HTML/et
+@dirrm share/doc/kde/HTML/es/kdiff3
+@comment in kde: @dirrm share/doc/kde/HTML/es
+@dirrm share/doc/kde/HTML/en/kdiff3
+@comment in kde: @dirrm share/doc/kde/HTML/en
+@dirrm share/doc/kde/HTML/de/kdiff3
+@comment in kde: @dirrm share/doc/kde/HTML/de
+@dirrm share/doc/kde/HTML/da/kdiff3
+@comment in kde: @dirrm share/doc/kde/HTML/da
+@comment in kde: @dirrm share/doc/kde/HTML
+@comment in kde: @dirrm lib/kde3
diff --git a/devel/kdiff3/distinfo b/devel/kdiff3/distinfo
new file mode 100644
index 00000000000..7f69044295b
--- /dev/null
+++ b/devel/kdiff3/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/03/24 14:22:24 markd Exp $
+
+SHA1 (kdiff3-0.9.91.tar.gz) = e92778473d7267ea1c38855979840e74b261b31b
+RMD160 (kdiff3-0.9.91.tar.gz) = 5e30c0c40b6ad4775db7cddcd6725dfd503e2e36
+Size (kdiff3-0.9.91.tar.gz) = 2173290 bytes
+SHA1 (patch-aa) = 4269af8f2796b860650f696e6e16ec521bb97ea5
diff --git a/devel/kdiff3/patches/patch-aa b/devel/kdiff3/patches/patch-aa
new file mode 100644
index 00000000000..5eaf20d5dc3
--- /dev/null
+++ b/devel/kdiff3/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/03/24 14:22:24 markd Exp $
+
+--- doc/Makefile.in.orig	2006-05-14 20:34:22.000000000 +0900
++++ doc/Makefile.in
+@@ -561,7 +561,7 @@ install-data: install-data-recursive
+ uninstall: uninstall-nls  uninstall-recursive
+ 
+ install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ 
+ installcheck: installcheck-recursive
+ install-strip: