Update to 0.9.96

KDE4 version.

1 files changed, 80 insertions, 140 deletions

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