[pkgsrc/trunk]: pkgsrc/devel/kdiff3 kdiff3: update to 1.8.1 (Qt5 port)

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47ec281c654f
branches:  trunk
changeset: 417029:47ec281c654f
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Sun Nov 03 02:19:16 2019 +0000

description:
kdiff3: update to 1.8.1 (Qt5 port)

Change log:

[No change log entries for 1.8.1 available.]

Version 1.8 - 2019-03-22
===========================
-Don't enable "Choose C for Everthing" on two way merge.
-cleanup code.

Version 1.7.90 - 2017-01-23
============================
-ported to QT5/KDEFramework5
-require cmake 3.1
-abandonded Konqueror specific plugin no longer applicable.
-kde4 support dropped due to extensive changes needed for QT5/KDEFramework5
  -QT5 now required because of above changes.
-bugfix: Show Indentical files setting not applied after rescan.
-Change parameter errors to use dialog on Linux as well as console output.
-Don't sort twice when sorting in reverse order.
-fix memmory leak introduced in 0.9.91.
-change version numbering.
-scrap ClearCase support
-implement Cut/Paste.

diffstat:

 devel/kdiff3/DESCR    |   17 ++--
 devel/kdiff3/Makefile |   39 +++++++----
 devel/kdiff3/PLIST    |  169 +++++++++++++++++++++++++------------------------
 devel/kdiff3/distinfo |   10 +-
 4 files changed, 124 insertions(+), 111 deletions(-)

diffs (truncated from 337 to 300 lines):

diff -r ebb9ef92cacb -r 47ec281c654f devel/kdiff3/DESCR
--- a/devel/kdiff3/DESCR        Sun Nov 03 01:48:56 2019 +0000
+++ b/devel/kdiff3/DESCR        Sun Nov 03 02:19:16 2019 +0000
@@ -1,8 +1,11 @@
-KDiff3 is a program that
+KDiff3 is a file and directory diff and merge tool which
 
-    * 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.
+    * compares and merges two or three text input files or directories,
+    * shows the differences line by line and character by character(!),
+    * provides an automatic merge-facility,
+    * has an editor for comfortable solving of merge-conflicts,
+    * provides network transparency via KIO,
+    * has options to highlight or hide changes in white-space or comments,
+    * supports Unicode, UTF-8 and other file encodings,
+    * prints differences,
+    * supports version control keyword and history merging.
diff -r ebb9ef92cacb -r 47ec281c654f devel/kdiff3/Makefile
--- a/devel/kdiff3/Makefile     Sun Nov 03 01:48:56 2019 +0000
+++ b/devel/kdiff3/Makefile     Sun Nov 03 02:19:16 2019 +0000
@@ -1,26 +1,35 @@
-# $NetBSD: Makefile,v 1.56 2019/08/22 12:23:02 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.57 2019/11/03 02:19:16 gutteridge Exp $
 
-DISTNAME=      kdiff3-0.9.98
-PKGREVISION=   14
+VERSION=       1.8.1
+DISTNAME=      kdiff3-${VERSION}
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=kdiff3/}
+MASTER_SITES=  ${MASTER_SITE_KDE:=kdiff3/}
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://kdiff3.sourceforge.net/
-COMMENT=       File and directory diff and merge tool (KDE4)
+HOMEPAGE=      https://kde.org/applications/development/org.kde.kdiff3
+COMMENT=       File and directory diff and merge tool
 LICENSE=       gnu-gpl-v2
 
-BUILD_DEPENDS+=        automoc4>=0.9.83:../../devel/automoc4
+USE_CMAKE=     yes
+USE_LANGUAGES= c c++
 
-USE_PKGLOCALEDIR=      yes
-USE_LANGUAGES=         c c++
+BUILDLINK_TRANSFORM+=  rm:-Wl,--fatal-warnings
 
-USE_TOOLS+=    msgfmt pkg-config
+BUILD_DEPENDS+=        extra-cmake-modules>=5.10.0:../../devel/extra-cmake-modules
+TOOLS_DEPENDS.cmake=   cmake>=3.0:../../devel/cmake
 
-.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.kcoreaddons+=    kcoreaddons>=5.61.0
+.include "../../devel/kcoreaddons/buildlink3.mk"
+.include "../../devel/kcrash/buildlink3.mk"
+.include "../../devel/kdoctools/buildlink3.mk"
+BUILDLINK_API_DEPENDS.ki18n+=  ki18n>=5.61.0
+.include "../../devel/ki18n/buildlink3.mk"
+.include "../../devel/kio/buildlink3.mk"
+.include "../../devel/kparts/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/kde-baseapps4/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../graphics/kiconthemes/buildlink3.mk"
+.include "../../x11/kwidgetsaddons/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ebb9ef92cacb -r 47ec281c654f devel/kdiff3/PLIST
--- a/devel/kdiff3/PLIST        Sun Nov 03 01:48:56 2019 +0000
+++ b/devel/kdiff3/PLIST        Sun Nov 03 02:19:16 2019 +0000
@@ -1,157 +1,158 @@
-@comment $NetBSD: PLIST,v 1.4 2013/04/06 10:20:43 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/11/03 02:19:16 gutteridge Exp $
 bin/kdiff3
-lib/kde4/kdiff3fileitemaction.so
-share/applications/kde4/kdiff3.desktop
-share/doc/kde/HTML/da/kdiff3/common
-share/doc/kde/HTML/da/kdiff3/index.cache.bz2
-share/doc/kde/HTML/da/kdiff3/index.docbook
-share/doc/kde/HTML/de/kdiff3/common
-share/doc/kde/HTML/de/kdiff3/index.cache.bz2
-share/doc/kde/HTML/de/kdiff3/index.docbook
-share/doc/kde/HTML/en/kdiff3/common
-share/doc/kde/HTML/en/kdiff3/dirbrowser.png
-share/doc/kde/HTML/en/kdiff3/dirmergebig.png
-share/doc/kde/HTML/en/kdiff3/index.cache.bz2
-share/doc/kde/HTML/en/kdiff3/index.docbook
-share/doc/kde/HTML/en/kdiff3/iteminfo.png
-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/new.png
-share/doc/kde/HTML/en/kdiff3/open_dialog.png
-share/doc/kde/HTML/en/kdiff3/screenshot_diff.png
-share/doc/kde/HTML/en/kdiff3/screenshot_merge.png
-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/index.cache.bz2
-share/doc/kde/HTML/es/kdiff3/index.docbook
-share/doc/kde/HTML/et/kdiff3/common
-share/doc/kde/HTML/et/kdiff3/index.cache.bz2
-share/doc/kde/HTML/et/kdiff3/index.docbook
-share/doc/kde/HTML/fr/kdiff3/common
-share/doc/kde/HTML/fr/kdiff3/index.cache.bz2
-share/doc/kde/HTML/fr/kdiff3/index.docbook
-share/doc/kde/HTML/it/kdiff3/common
-share/doc/kde/HTML/it/kdiff3/index.cache.bz2
-share/doc/kde/HTML/it/kdiff3/index.docbook
-share/doc/kde/HTML/nl/kdiff3/common
-share/doc/kde/HTML/nl/kdiff3/index.cache.bz2
-share/doc/kde/HTML/nl/kdiff3/index.docbook
-share/doc/kde/HTML/pt/kdiff3/common
-share/doc/kde/HTML/pt/kdiff3/index.cache.bz2
-share/doc/kde/HTML/pt/kdiff3/index.docbook
+lib/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so
+lib/plugins/kf5/parts/kdiff3part.so
+man/de/man1/kdiff3.1
+man/it/man1/kdiff3.1
+man/man1/kdiff3.1
+man/nl/man1/kdiff3.1
+man/uk/man1/kdiff3.1
+share/applications/org.kde.kdiff3.desktop
+share/doc/HTML/en/kdiff3/dirbrowser.png
+share/doc/HTML/en/kdiff3/dirmergebig.png
+share/doc/HTML/en/kdiff3/index.cache.bz2
+share/doc/HTML/en/kdiff3/index.docbook
+share/doc/HTML/en/kdiff3/iteminfo.png
+share/doc/HTML/en/kdiff3/letter_by_letter.png
+share/doc/HTML/en/kdiff3/merge_current.png
+share/doc/HTML/en/kdiff3/new.png
+share/doc/HTML/en/kdiff3/open_dialog.png
+share/doc/HTML/en/kdiff3/screenshot_diff.png
+share/doc/HTML/en/kdiff3/screenshot_merge.png
+share/doc/HTML/en/kdiff3/triple_diff.png
+share/doc/HTML/en/kdiff3/white_space.png
+share/doc/HTML/it/kdiff3/index.cache.bz2
+share/doc/HTML/it/kdiff3/index.docbook
+share/doc/HTML/nl/kdiff3/index.cache.bz2
+share/doc/HTML/nl/kdiff3/index.docbook
+share/doc/HTML/uk/kdiff3/index.cache.bz2
+share/doc/HTML/uk/kdiff3/index.docbook
+share/icons/hicolor/128x128/apps/kdiff3.png
 share/icons/hicolor/16x16/apps/kdiff3.png
+share/icons/hicolor/22x22/apps/kdiff3.png
+share/icons/hicolor/256x256/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/apps/kdiff3/kdiff3_shell.rc
-share/kde/apps/kdiff3part/kdiff3_part.rc
-share/kde4/services/kdiff3fileitemaction.desktop
-share/kde4/services/kdiff3part.desktop
+share/icons/hicolor/48x48/apps/kdiff3.png
+share/icons/hicolor/64x64/apps/kdiff3.png
+share/icons/hicolor/scalable/apps/kdiff3.svgz
+share/kservices5/kdiff3part.desktop
+share/kxmlgui5/kdiff3/kdiff3_shell.rc
+share/kxmlgui5/kdiff3part/kdiff3_part.rc
 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/diff_ext.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/diff_ext.mo
 share/locale/ca@valencia/LC_MESSAGES/kdiff3.mo
-share/locale/ca@valencia/LC_MESSAGES/kdiff3plugin.mo
+share/locale/ca@valencia/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/cs/LC_MESSAGES/diff_ext.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/diff_ext.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/diff_ext.mo
 share/locale/en_GB/LC_MESSAGES/kdiff3.mo
-share/locale/en_GB/LC_MESSAGES/kdiff3plugin.mo
+share/locale/en_GB/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/eo/LC_MESSAGES/kdiff3.mo
-share/locale/eo/LC_MESSAGES/kdiff3plugin.mo
+share/locale/es/LC_MESSAGES/diff_ext.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/eu/LC_MESSAGES/kdiff3.mo
+share/locale/fi/LC_MESSAGES/diff_ext.mo
+share/locale/fi/LC_MESSAGES/kdiff3.mo
+share/locale/fi/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/fr/LC_MESSAGES/diff_ext.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/ga/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/gl/LC_MESSAGES/diff_ext.mo
 share/locale/gl/LC_MESSAGES/kdiff3.mo
-share/locale/gl/LC_MESSAGES/kdiff3plugin.mo
+share/locale/gl/LC_MESSAGES/kdiff3fileitemactionplugin.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/hu/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/is/LC_MESSAGES/kdiff3.mo
-share/locale/is/LC_MESSAGES/kdiff3plugin.mo
+share/locale/it/LC_MESSAGES/diff_ext.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/diff_ext.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/ko/LC_MESSAGES/diff_ext.mo
+share/locale/ko/LC_MESSAGES/kdiff3.mo
+share/locale/ko/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/lt/LC_MESSAGES/kdiff3.mo
-share/locale/lt/LC_MESSAGES/kdiff3plugin.mo
+share/locale/lt/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/mai/LC_MESSAGES/kdiff3.mo
 share/locale/ml/LC_MESSAGES/kdiff3.mo
-share/locale/ml/LC_MESSAGES/kdiff3plugin.mo
+share/locale/mr/LC_MESSAGES/kdiff3.mo
+share/locale/mr/LC_MESSAGES/kdiff3fileitemactionplugin.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/diff_ext.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/diff_ext.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/diff_ext.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/diff_ext.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/ro/LC_MESSAGES/kdiff3fileitemactionplugin.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/sk/LC_MESSAGES/diff_ext.mo
 share/locale/sk/LC_MESSAGES/kdiff3.mo
 share/locale/sk/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-share/locale/sk/LC_MESSAGES/kdiff3plugin.mo
+share/locale/sl/LC_MESSAGES/kdiff3.mo
+share/locale/sl/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/sr/LC_MESSAGES/kdiff3.mo
+share/locale/sr/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/sr@ijekavian/LC_MESSAGES/kdiff3.mo
+share/locale/sr@ijekavian/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/kdiff3.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/sr@latin/LC_MESSAGES/kdiff3.mo
+share/locale/sr@latin/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/sv/LC_MESSAGES/diff_ext.mo
 share/locale/sv/LC_MESSAGES/kdiff3.mo