CVS commit: pkgsrc/devel/kdiff3

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Jul  6 10:53:14 UTC 2020

Modified Files:
        pkgsrc/devel/kdiff3: Makefile PLIST distinfo

Log Message:
kdiff3: update to version 1.8.3

Version 1.8.3 - 2020-06-24
===========================
Bug 423001 fixed reload on Windows.
15f1cc4e - Fixed error handling during directory compare.
065a3997, 2d56cd94, 42b3b5e4 - Only give one error message per directory compare opperation.
Bug 419722 - Fix crash when clipboard is available. Mainly affects some network setups.
f2d89bbc - Rework intial window display and full screen toggling.
BUG:421048 - Treat /dev/null as non-existant as git expects.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/kdiff3/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/kdiff3/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/kdiff3/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/kdiff3/Makefile
diff -u pkgsrc/devel/kdiff3/Makefile:1.66 pkgsrc/devel/kdiff3/Makefile:1.67
--- pkgsrc/devel/kdiff3/Makefile:1.66   Fri Jun 19 17:39:54 2020
+++ pkgsrc/devel/kdiff3/Makefile        Mon Jul  6 10:53:14 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2020/06/19 17:39:54 gutteridge Exp $
+# $NetBSD: Makefile,v 1.67 2020/07/06 10:53:14 gutteridge Exp $
 
-VERSION=       1.8.2
+VERSION=       1.8.3
 DISTNAME=      kdiff3-${VERSION}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_KDE:=kdiff3/}
@@ -20,11 +20,11 @@ BUILD_DEPENDS+=             extra-cmake-modules>=5.
 TOOLS_DEPENDS.cmake=   cmake>=3.1:../../devel/cmake
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.kcoreaddons+=    kcoreaddons>=5.61.0
+BUILDLINK_API_DEPENDS.kcoreaddons+=    kcoreaddons>=5.70.0
 .include "../../devel/kcoreaddons/buildlink3.mk"
 .include "../../devel/kcrash/buildlink3.mk"
 .include "../../devel/kdoctools/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ki18n+=  ki18n>=5.61.0
+BUILDLINK_API_DEPENDS.ki18n+=  ki18n>=5.70.0
 .include "../../devel/ki18n/buildlink3.mk"
 .include "../../devel/kio/buildlink3.mk"
 .include "../../devel/kparts/buildlink3.mk"

Index: pkgsrc/devel/kdiff3/PLIST
diff -u pkgsrc/devel/kdiff3/PLIST:1.6 pkgsrc/devel/kdiff3/PLIST:1.7
--- pkgsrc/devel/kdiff3/PLIST:1.6       Fri Jun 19 17:39:54 2020
+++ pkgsrc/devel/kdiff3/PLIST   Mon Jul  6 10:53:14 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/06/19 17:39:54 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/07/06 10:53:14 gutteridge Exp $
 bin/kdiff3
 lib/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so
 lib/plugins/kf5/parts/kdiff3part.so
@@ -82,7 +82,9 @@ share/locale/es/LC_MESSAGES/kdiff3.mo
 share/locale/es/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/et/LC_MESSAGES/kdiff3.mo
 share/locale/et/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/eu/LC_MESSAGES/diff_ext.mo
 share/locale/eu/LC_MESSAGES/kdiff3.mo
+share/locale/eu/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/fi/LC_MESSAGES/diff_ext.mo
 share/locale/fi/LC_MESSAGES/kdiff3.mo
 share/locale/fi/LC_MESSAGES/kdiff3fileitemactionplugin.mo
@@ -102,7 +104,6 @@ share/locale/hu/LC_MESSAGES/kdiff3fileit
 share/locale/ia/LC_MESSAGES/diff_ext.mo
 share/locale/ia/LC_MESSAGES/kdiff3.mo
 share/locale/ia/LC_MESSAGES/kdiff3fileitemactionplugin.mo
-share/locale/is/LC_MESSAGES/kdiff3.mo
 share/locale/it/LC_MESSAGES/diff_ext.mo
 share/locale/it/LC_MESSAGES/kdiff3.mo
 share/locale/it/LC_MESSAGES/kdiff3fileitemactionplugin.mo
@@ -127,6 +128,7 @@ share/locale/nl/LC_MESSAGES/diff_ext.mo
 share/locale/nl/LC_MESSAGES/kdiff3.mo
 share/locale/nl/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/nn/LC_MESSAGES/kdiff3.mo
+share/locale/nn/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/pl/LC_MESSAGES/diff_ext.mo
 share/locale/pl/LC_MESSAGES/kdiff3.mo
 share/locale/pl/LC_MESSAGES/kdiff3fileitemactionplugin.mo
@@ -138,6 +140,7 @@ share/locale/pt_BR/LC_MESSAGES/kdiff3.mo
 share/locale/pt_BR/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/ro/LC_MESSAGES/kdiff3.mo
 share/locale/ro/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/ru/LC_MESSAGES/diff_ext.mo
 share/locale/ru/LC_MESSAGES/kdiff3.mo
 share/locale/ru/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 share/locale/rw/LC_MESSAGES/kdiff3.mo

Index: pkgsrc/devel/kdiff3/distinfo
diff -u pkgsrc/devel/kdiff3/distinfo:1.10 pkgsrc/devel/kdiff3/distinfo:1.11
--- pkgsrc/devel/kdiff3/distinfo:1.10   Fri Jun 19 17:39:54 2020
+++ pkgsrc/devel/kdiff3/distinfo        Mon Jul  6 10:53:14 2020
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2020/06/19 17:39:54 gutteridge Exp $
+$NetBSD: distinfo,v 1.11 2020/07/06 10:53:14 gutteridge Exp $
 
-SHA1 (kdiff3-1.8.2.tar.xz) = a0ade8bc56ec4a01ef0a42ad08a165914986cd61
-RMD160 (kdiff3-1.8.2.tar.xz) = 953f3b6e3cc8cbd0b8a31e7142e044a1c64a36bc
-SHA512 (kdiff3-1.8.2.tar.xz) = c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
-Size (kdiff3-1.8.2.tar.xz) = 1039304 bytes
+SHA1 (kdiff3-1.8.3.tar.xz) = ee8af1d5bd357aecbe32952856b4e31db2cb355a
+RMD160 (kdiff3-1.8.3.tar.xz) = c89350259e3fbc62006ed8bfa205945730b12e82
+SHA512 (kdiff3-1.8.3.tar.xz) = 5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d
+Size (kdiff3-1.8.3.tar.xz) = 1038904 bytes