Update to 0.9.96

KDE4 version.

7 files changed, 101 insertions, 220 deletions

diff --git a/devel/kdiff3/Makefile b/devel/kdiff3/Makefile
index 2ca1e819968..e47ebfc1d70 100644
--- a/devel/kdiff3/Makefile
+++ b/devel/kdiff3/Makefile
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.18 2012/03/03 00:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2012/03/21 23:10:54 markd Exp $
+#
 
-DISTNAME=		kdiff3-0.9.91
-PKGREVISION=		14
-CATEGORIES=		devel kde
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kdiff3/}
+DISTNAME=	kdiff3-0.9.96
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kdiff3/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://kdiff3.sourceforge.net/
-COMMENT=		File and directory diff and merge tool
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://kdiff3.sourceforge.net/
+COMMENT=	File and directory diff and merge tool (KDE4)
+LICENSE=	gnu-gpl-v2
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+BUILD_DEPENDS+=	automoc4>=0.9.83:../../devel/automoc4
 
-USE_TOOLS+=		msgfmt
+PKG_DESTDIR_SUPPORT=	user-destdir
+USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-SET_LIBDIR=		yes
-CONFIGURE_ARGS+=	--without-arts
 
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
+USE_TOOLS+=	msgfmt pkg-config
 
+.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/kde-baseapps4/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdiff3/PLIST b/devel/kdiff3/PLIST
index 0553c142f73..687c325eeb6 100644
--- a/devel/kdiff3/PLIST
+++ b/devel/kdiff3/PLIST
@@ -1,218 +1,158 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:50 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/03/21 23:10:54 markd Exp $
 bin/kdiff3
-lib/kde3/libkdiff3part.la
-man/man1/kdiff3.1
+lib/kde4/kdiff3fileitemaction.so
+lib/kde4/libkdiff3part.so
+share/applications/kde4/kdiff3.desktop
 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/kde4/services/kdiff3fileitemaction.desktop
+share/kde4/services/kdiff3part.desktop
+share/locale/ar/LC_MESSAGES/kdiff3.mo
 share/locale/bg/LC_MESSAGES/kdiff3.mo
 share/locale/br/LC_MESSAGES/kdiff3.mo
+share/locale/bs/LC_MESSAGES/kdiff3.mo
+share/locale/bs/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/bs/LC_MESSAGES/kdiff3plugin.mo
 share/locale/ca/LC_MESSAGES/kdiff3.mo
+share/locale/ca/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/ca/LC_MESSAGES/kdiff3plugin.mo
+share/locale/ca@valencia/LC_MESSAGES/kdiff3.mo
+share/locale/ca@valencia/LC_MESSAGES/kdiff3plugin.mo
 share/locale/cs/LC_MESSAGES/kdiff3.mo
+share/locale/cs/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/cs/LC_MESSAGES/kdiff3plugin.mo
 share/locale/cy/LC_MESSAGES/kdiff3.mo
 share/locale/da/LC_MESSAGES/kdiff3.mo
+share/locale/da/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/da/LC_MESSAGES/kdiff3plugin.mo
 share/locale/de/LC_MESSAGES/kdiff3.mo
+share/locale/de/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/de/LC_MESSAGES/kdiff3plugin.mo
 share/locale/el/LC_MESSAGES/kdiff3.mo
+share/locale/el/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/el/LC_MESSAGES/kdiff3plugin.mo
 share/locale/en_GB/LC_MESSAGES/kdiff3.mo
+share/locale/en_GB/LC_MESSAGES/kdiff3plugin.mo
+share/locale/eo/LC_MESSAGES/kdiff3.mo
+share/locale/eo/LC_MESSAGES/kdiff3plugin.mo
 share/locale/es/LC_MESSAGES/kdiff3.mo
+share/locale/es/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/es/LC_MESSAGES/kdiff3plugin.mo
 share/locale/et/LC_MESSAGES/kdiff3.mo
+share/locale/et/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/et/LC_MESSAGES/kdiff3plugin.mo
 share/locale/fr/LC_MESSAGES/kdiff3.mo
+share/locale/fr/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/fr/LC_MESSAGES/kdiff3plugin.mo
 share/locale/ga/LC_MESSAGES/kdiff3.mo
+share/locale/ga/LC_MESSAGES/kdiff3plugin.mo
+share/locale/gl/LC_MESSAGES/kdiff3.mo
+share/locale/gl/LC_MESSAGES/kdiff3plugin.mo
 share/locale/hi/LC_MESSAGES/kdiff3.mo
+share/locale/hne/LC_MESSAGES/kdiff3.mo
+share/locale/hr/LC_MESSAGES/kdiff3.mo
+share/locale/hr/LC_MESSAGES/kdiff3plugin.mo
 share/locale/hu/LC_MESSAGES/kdiff3.mo
+share/locale/hu/LC_MESSAGES/kdiff3plugin.mo
 share/locale/is/LC_MESSAGES/kdiff3.mo
+share/locale/is/LC_MESSAGES/kdiff3plugin.mo
 share/locale/it/LC_MESSAGES/kdiff3.mo
+share/locale/it/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/it/LC_MESSAGES/kdiff3plugin.mo
 share/locale/ja/LC_MESSAGES/kdiff3.mo
+share/locale/ja/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/ja/LC_MESSAGES/kdiff3plugin.mo
 share/locale/ka/LC_MESSAGES/kdiff3.mo
 share/locale/lt/LC_MESSAGES/kdiff3.mo
+share/locale/lt/LC_MESSAGES/kdiff3plugin.mo
+share/locale/mai/LC_MESSAGES/kdiff3.mo
+share/locale/ml/LC_MESSAGES/kdiff3.mo
+share/locale/ml/LC_MESSAGES/kdiff3plugin.mo
 share/locale/nb/LC_MESSAGES/kdiff3.mo
+share/locale/nb/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/nb/LC_MESSAGES/kdiff3plugin.mo
+share/locale/nds/LC_MESSAGES/kdiff3.mo
+share/locale/nds/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/nds/LC_MESSAGES/kdiff3plugin.mo
 share/locale/nl/LC_MESSAGES/kdiff3.mo
+share/locale/nl/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/nl/LC_MESSAGES/kdiff3plugin.mo
+share/locale/nn/LC_MESSAGES/kdiff3.mo
+share/locale/nn/LC_MESSAGES/kdiff3plugin.mo
 share/locale/pl/LC_MESSAGES/kdiff3.mo
+share/locale/pl/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/pl/LC_MESSAGES/kdiff3plugin.mo
 share/locale/pt/LC_MESSAGES/kdiff3.mo
+share/locale/pt/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/pt/LC_MESSAGES/kdiff3plugin.mo
 share/locale/pt_BR/LC_MESSAGES/kdiff3.mo
+share/locale/pt_BR/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/pt_BR/LC_MESSAGES/kdiff3plugin.mo
 share/locale/ro/LC_MESSAGES/kdiff3.mo
+share/locale/ro/LC_MESSAGES/kdiff3plugin.mo
 share/locale/ru/LC_MESSAGES/kdiff3.mo
+share/locale/ru/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/ru/LC_MESSAGES/kdiff3plugin.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/sk/LC_MESSAGES/kdiff3.mo
+share/locale/sk/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/sk/LC_MESSAGES/kdiff3plugin.mo
 share/locale/sv/LC_MESSAGES/kdiff3.mo
+share/locale/sv/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/sv/LC_MESSAGES/kdiff3plugin.mo
 share/locale/ta/LC_MESSAGES/kdiff3.mo
 share/locale/tg/LC_MESSAGES/kdiff3.mo
 share/locale/tr/LC_MESSAGES/kdiff3.mo
+share/locale/tr/LC_MESSAGES/kdiff3plugin.mo
+share/locale/ug/LC_MESSAGES/kdiff3.mo
+share/locale/ug/LC_MESSAGES/kdiff3plugin.mo
+share/locale/uk/LC_MESSAGES/kdiff3.mo
+share/locale/uk/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/uk/LC_MESSAGES/kdiff3plugin.mo
 share/locale/zh_CN/LC_MESSAGES/kdiff3.mo
+share/locale/zh_CN/LC_MESSAGES/kdiff3plugin.mo
+share/locale/zh_TW/LC_MESSAGES/kdiff3.mo
+share/locale/zh_TW/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/zh_TW/LC_MESSAGES/kdiff3plugin.mo
diff --git a/devel/kdiff3/distinfo b/devel/kdiff3/distinfo
index daac4743b82..c3560736d40 100644
--- a/devel/kdiff3/distinfo
+++ b/devel/kdiff3/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.2 2011/01/30 02:08:18 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/03/21 23:10:54 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
-SHA1 (patch-ab) = 7e9160cba637e0978c39964a1cd49d6f7b84959c
-SHA1 (patch-ac) = 884bae88e6a3004ab49e5155308de237d121788c
-SHA1 (patch-ad) = 596732f071a92c504c437dcd336b399fcb16fcfb
+SHA1 (kdiff3-0.9.96.tar.gz) = d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5
+RMD160 (kdiff3-0.9.96.tar.gz) = c0cfd2e7e30f58c9d6d058c2d8168ef97f1a33b7
+Size (kdiff3-0.9.96.tar.gz) = 1796595 bytes
diff --git a/devel/kdiff3/patches/patch-aa b/devel/kdiff3/patches/patch-aa
deleted file mode 100644
index 5eaf20d5dc3..00000000000
--- a/devel/kdiff3/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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:
diff --git a/devel/kdiff3/patches/patch-ab b/devel/kdiff3/patches/patch-ab
deleted file mode 100644
index b503a57098a..00000000000
--- a/devel/kdiff3/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2011/01/30 02:08:19 markd Exp $
-
-Fix build with gcc4.3
-
---- src/difftextwindow.cpp.orig	2006-07-16 02:07:06.000000000 +0000
-+++ src/difftextwindow.cpp
-@@ -35,6 +35,7 @@
- #include <qdragobject.h>
- #include <klocale.h>
- #include <kfiledialog.h>
-+#include <cstdlib>
- 
- class DiffTextWindowData
- {
diff --git a/devel/kdiff3/patches/patch-ac b/devel/kdiff3/patches/patch-ac
deleted file mode 100644
index 42a0ffdac33..00000000000
--- a/devel/kdiff3/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2011/01/30 02:08:19 markd Exp $
-
-Fix build with gcc4.3
-
---- src/diff.cpp.orig	2006-10-30 22:24:29.000000000 +0000
-+++ src/diff.cpp
-@@ -17,6 +17,7 @@
- 
- #include <stdio.h>
- #include <iostream>
-+#include <cstdlib>
- 
- #include "diff.h"
- #include "fileaccess.h"
diff --git a/devel/kdiff3/patches/patch-ad b/devel/kdiff3/patches/patch-ad
deleted file mode 100644
index cf38225d389..00000000000
--- a/devel/kdiff3/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2011/01/30 02:08:19 markd Exp $
-
-Fix build with gcc4.3
-
---- src/fileaccess.cpp.orig	2006-10-28 20:02:05.000000000 +0000
-+++ src/fileaccess.cpp
-@@ -10,6 +10,7 @@
- 
- #include "fileaccess.h"
- #include <iostream>
-+#include <cstdlib>
- #include <kio/global.h>
- #include <kmessagebox.h>
- #include "optiondialog.h"