kcalc: update to 19.08.3 qt5/kf5 version

7 files changed, 125 insertions, 95 deletions

diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 1bffa158f53..6b7857957cb 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -1,17 +1,22 @@
-# $NetBSD: Makefile,v 1.41 2019/08/22 12:23:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2019/11/17 04:28:49 markd Exp $
 
-DISTNAME=	kcalc-${_KDE_VERSION}
-PKGREVISION=	15
+DISTNAME=	kcalc-${KAPPSVER}
 CATEGORIES=	math
+
+HOMEPAGE=	http://kde.org/applications/utilities/kcalc/
 COMMENT=	KDE scientific calculator
+LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
+
+.include "../../meta-pkgs/kde/applications.mk"
 
-.include "../../meta-pkgs/kde4/Makefile.kde4"
+BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
+DEPENDS+=	kinit>=5.21.0:../../x11/kinit
 
-.include "../../meta-pkgs/kde4/kde4.mk"
+USE_TOOLS+=	msgmerge
 
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../math/mpfr/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-
+.include "../../devel/kio/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/kcalc/PLIST b/math/kcalc/PLIST
index 8f6090967b5..df4a51086b5 100644
--- a/math/kcalc/PLIST
+++ b/math/kcalc/PLIST
@@ -1,12 +1,108 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/20 05:25:38 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/11/17 04:28:49 markd Exp $
 bin/kcalc
-lib/libkdeinit4_kcalc.so
-share/applications/kde4/kcalc.desktop
-share/doc/kde/HTML/en/kcalc/commands.docbook
-share/doc/kde/HTML/en/kcalc/common
-share/doc/kde/HTML/en/kcalc/index.cache.bz2
-share/doc/kde/HTML/en/kcalc/index.docbook
-share/kde/apps/kcalc/kcalcui.rc
-share/kde/apps/kcalc/scienceconstants.xml
-share/kde/apps/kconf_update/kcalcrc.upd
-share/kde/config.kcfg/kcalc.kcfg
+lib/libkdeinit5_kcalc.so
+share/applications/org.kde.kcalc.desktop
+share/config.kcfg/kcalc.kcfg
+share/doc/HTML/de/kcalc/commands.docbook
+share/doc/HTML/de/kcalc/index.cache.bz2
+share/doc/HTML/de/kcalc/index.docbook
+share/doc/HTML/en/kcalc/commands.docbook
+share/doc/HTML/en/kcalc/index.cache.bz2
+share/doc/HTML/en/kcalc/index.docbook
+share/doc/HTML/es/kcalc/commands.docbook
+share/doc/HTML/es/kcalc/index.cache.bz2
+share/doc/HTML/es/kcalc/index.docbook
+share/doc/HTML/et/kcalc/commands.docbook
+share/doc/HTML/et/kcalc/index.cache.bz2
+share/doc/HTML/et/kcalc/index.docbook
+share/doc/HTML/fr/kcalc/commands.docbook
+share/doc/HTML/fr/kcalc/index.cache.bz2
+share/doc/HTML/fr/kcalc/index.docbook
+share/doc/HTML/gl/kcalc/commands.docbook
+share/doc/HTML/gl/kcalc/index.cache.bz2
+share/doc/HTML/gl/kcalc/index.docbook
+share/doc/HTML/it/kcalc/commands.docbook
+share/doc/HTML/it/kcalc/index.cache.bz2
+share/doc/HTML/it/kcalc/index.docbook
+share/doc/HTML/lt/kcalc/commands.docbook
+share/doc/HTML/lt/kcalc/index.cache.bz2
+share/doc/HTML/lt/kcalc/index.docbook
+share/doc/HTML/nl/kcalc/commands.docbook
+share/doc/HTML/nl/kcalc/index.cache.bz2
+share/doc/HTML/nl/kcalc/index.docbook
+share/doc/HTML/pt/kcalc/commands.docbook
+share/doc/HTML/pt/kcalc/index.cache.bz2
+share/doc/HTML/pt/kcalc/index.docbook
+share/doc/HTML/pt_BR/kcalc/commands.docbook
+share/doc/HTML/pt_BR/kcalc/index.cache.bz2
+share/doc/HTML/pt_BR/kcalc/index.docbook
+share/doc/HTML/ru/kcalc/commands.docbook
+share/doc/HTML/ru/kcalc/index.cache.bz2
+share/doc/HTML/ru/kcalc/index.docbook
+share/doc/HTML/sr/kcalc/commands.docbook
+share/doc/HTML/sr/kcalc/index.cache.bz2
+share/doc/HTML/sr/kcalc/index.docbook
+share/doc/HTML/sv/kcalc/commands.docbook
+share/doc/HTML/sv/kcalc/index.cache.bz2
+share/doc/HTML/sv/kcalc/index.docbook
+share/doc/HTML/uk/kcalc/commands.docbook
+share/doc/HTML/uk/kcalc/index.cache.bz2
+share/doc/HTML/uk/kcalc/index.docbook
+share/kcalc/scienceconstants.xml
+share/kconf_update/kcalcrc.upd
+share/kxmlgui5/kcalc/kcalcui.rc
+share/locale/ar/LC_MESSAGES/kcalc.mo
+share/locale/bg/LC_MESSAGES/kcalc.mo
+share/locale/bs/LC_MESSAGES/kcalc.mo
+share/locale/ca/LC_MESSAGES/kcalc.mo
+share/locale/ca@valencia/LC_MESSAGES/kcalc.mo
+share/locale/cs/LC_MESSAGES/kcalc.mo
+share/locale/da/LC_MESSAGES/kcalc.mo
+share/locale/de/LC_MESSAGES/kcalc.mo
+share/locale/el/LC_MESSAGES/kcalc.mo
+share/locale/en_GB/LC_MESSAGES/kcalc.mo
+share/locale/eo/LC_MESSAGES/kcalc.mo
+share/locale/es/LC_MESSAGES/kcalc.mo
+share/locale/et/LC_MESSAGES/kcalc.mo
+share/locale/eu/LC_MESSAGES/kcalc.mo
+share/locale/fa/LC_MESSAGES/kcalc.mo
+share/locale/fi/LC_MESSAGES/kcalc.mo
+share/locale/fr/LC_MESSAGES/kcalc.mo
+share/locale/ga/LC_MESSAGES/kcalc.mo
+share/locale/gl/LC_MESSAGES/kcalc.mo
+share/locale/he/LC_MESSAGES/kcalc.mo
+share/locale/hi/LC_MESSAGES/kcalc.mo
+share/locale/hr/LC_MESSAGES/kcalc.mo
+share/locale/hu/LC_MESSAGES/kcalc.mo
+share/locale/ia/LC_MESSAGES/kcalc.mo
+share/locale/id/LC_MESSAGES/kcalc.mo
+share/locale/is/LC_MESSAGES/kcalc.mo
+share/locale/it/LC_MESSAGES/kcalc.mo
+share/locale/ja/LC_MESSAGES/kcalc.mo
+share/locale/kk/LC_MESSAGES/kcalc.mo
+share/locale/km/LC_MESSAGES/kcalc.mo
+share/locale/ko/LC_MESSAGES/kcalc.mo
+share/locale/lt/LC_MESSAGES/kcalc.mo
+share/locale/lv/LC_MESSAGES/kcalc.mo
+share/locale/mr/LC_MESSAGES/kcalc.mo
+share/locale/nb/LC_MESSAGES/kcalc.mo
+share/locale/nds/LC_MESSAGES/kcalc.mo
+share/locale/nl/LC_MESSAGES/kcalc.mo
+share/locale/nn/LC_MESSAGES/kcalc.mo
+share/locale/pa/LC_MESSAGES/kcalc.mo
+share/locale/pl/LC_MESSAGES/kcalc.mo
+share/locale/pt/LC_MESSAGES/kcalc.mo
+share/locale/pt_BR/LC_MESSAGES/kcalc.mo
+share/locale/ro/LC_MESSAGES/kcalc.mo
+share/locale/ru/LC_MESSAGES/kcalc.mo
+share/locale/sk/LC_MESSAGES/kcalc.mo
+share/locale/sl/LC_MESSAGES/kcalc.mo
+share/locale/sr/LC_MESSAGES/kcalc.mo
+share/locale/sv/LC_MESSAGES/kcalc.mo
+share/locale/tr/LC_MESSAGES/kcalc.mo
+share/locale/ug/LC_MESSAGES/kcalc.mo
+share/locale/uk/LC_MESSAGES/kcalc.mo
+share/locale/wa/LC_MESSAGES/kcalc.mo
+share/locale/zh_CN/LC_MESSAGES/kcalc.mo
+share/locale/zh_TW/LC_MESSAGES/kcalc.mo
+share/metainfo/org.kde.kcalc.appdata.xml
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index 562b806f6f1..8214b44c21e 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.10 2018/05/17 11:01:23 jperkin Exp $
+$NetBSD: distinfo,v 1.11 2019/11/17 04:28:49 markd Exp $
 
-SHA1 (kcalc-4.14.3.tar.xz) = 0990a35d1fe97b4d4157b6ce6d8e13d199934dad
-RMD160 (kcalc-4.14.3.tar.xz) = 81822b452042f23e85216ad3e662e797050e0592
-SHA512 (kcalc-4.14.3.tar.xz) = ec8090b6bc8c78e7a63286c797e67617e4d9e335f6b29dce1dcbd41073465e6cf313d485f27f84a06d7cd04acc024051709b00f7be1dc8170e9531281d2deb16
-Size (kcalc-4.14.3.tar.xz) = 81392 bytes
-SHA1 (patch-CMakeLists.txt) = 41012666b695fbaad04261cbf566d875d9f83ed8
-SHA1 (patch-kcalc.cpp) = a318b81b381454fcf1570450c41d6bb7b58cf685
-SHA1 (patch-knumber_knumber_float.cpp) = 678e8d62df1a615f1117c58737da23a95d0e15a9
-SHA1 (patch-knumber_tests_CMakeLists.txt) = 7d159f617903b778e65615cb73a81f40f1d262df
+SHA1 (kcalc-19.08.3.tar.xz) = 66598d3a0527f12682d0c936fd1dfcc346db09ed
+RMD160 (kcalc-19.08.3.tar.xz) = 9c92305ab8181886d4ff3a44808978e677bb8b6e
+SHA512 (kcalc-19.08.3.tar.xz) = e27eefd90f3b32db383305e1eecade41545dfe8f9dd9a6c5b4f48b2082a7323e5a7d812ee54b45cea28c76ba6e82104e1fd2d001060f1588b4b1d62241421e7f
+Size (kcalc-19.08.3.tar.xz) = 372080 bytes
diff --git a/math/kcalc/patches/patch-CMakeLists.txt b/math/kcalc/patches/patch-CMakeLists.txt
deleted file mode 100644
index c500da324c2..00000000000
--- a/math/kcalc/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2013/11/07 11:59:59 markd Exp $
-
-use mpfr (alternate code doesnt build on BSD)
-
---- CMakeLists.txt.orig	2013-04-01 23:12:26.000000000 +0000
-+++ CMakeLists.txt
-@@ -36,6 +36,9 @@ if(NOT GMP_FOUND)
-     endif()
- endif(NOT GMP_FOUND)
- 
-+find_package (MPFR REQUIRED)
-+add_definitions (-DKNUMBER_USE_MPFR)
-+
- include(CheckTypeSize)
- include(CheckIncludeFiles)
- 
diff --git a/math/kcalc/patches/patch-kcalc.cpp b/math/kcalc/patches/patch-kcalc.cpp
deleted file mode 100644
index f2e6322bc5d..00000000000
--- a/math/kcalc/patches/patch-kcalc.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-kcalc.cpp,v 1.1 2018/05/17 11:01:23 jperkin Exp $
-
-Avoid 'version' namespace issue.
-
---- kcalc.cpp.orig	2014-07-17 13:35:22.000000000 +0000
-+++ kcalc.cpp
-@@ -64,7 +64,7 @@ along with this program.  If not, see <h
- 
- namespace {
- const char description[] = I18N_NOOP("KDE Calculator");
--const char version[]	 = KCALCVERSION;
-+const char myversion[]	 = KCALCVERSION;
- const int maxprecision   = 1000;
- }
- 
-@@ -2284,7 +2284,7 @@ extern "C" KDE_EXPORT int kdemain(int ar
- 	KAboutData aboutData("kcalc",
- 		0,
- 		ki18n("KCalc"),
--		version,
-+		myversion,
- 		ki18n(description),
- 		KAboutData::License_GPL,
- 		ki18n(
diff --git a/math/kcalc/patches/patch-knumber_knumber_float.cpp b/math/kcalc/patches/patch-knumber_knumber_float.cpp
deleted file mode 100644
index cd5ced3723b..00000000000
--- a/math/kcalc/patches/patch-knumber_knumber_float.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-knumber_knumber_float.cpp,v 1.3 2014/02/01 02:20:49 markd Exp $
-
-use namespace std for isinf() and isnan()
-
---- knumber/knumber_float.cpp.orig	2014-01-02 19:33:27.000000000 +0000
-+++ knumber/knumber_float.cpp
-@@ -25,6 +25,8 @@ along with this program.  If not, see <h
- #include <QDebug>
- #include <math.h>
- 
-+using namespace std;
-+
- #ifdef _MSC_VER
- double log2(double x) { return log(x) / log(2); }
- double exp2(double x) { return exp(x * log(2)); }
diff --git a/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt b/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt
deleted file mode 100644
index 1875ebacb93..00000000000
--- a/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-knumber_tests_CMakeLists.txt,v 1.1 2013/04/03 10:52:24 markd Exp $
-
-use mpfr (alternate code doesnt build on BSD)
-
---- knumber/tests/CMakeLists.txt.orig	2013-03-01 07:05:02.000000000 +0000
-+++ knumber/tests/CMakeLists.txt
-@@ -5,4 +5,4 @@ set(knumbertest_SRCS knumbertest.cpp ${l
- 
- kde4_add_unit_test(knumbertest TESTNAME KNumber ${knumbertest_SRCS})
- 
--target_link_libraries(knumbertest ${KDE4_KDECORE_LIBS} ${GMP_LIBRARIES})
-+target_link_libraries(knumbertest ${KDE4_KDECORE_LIBS} ${GMP_LIBRARIES} ${MPFR_LIBRARIES})