From 8a704957fef2cdf0a193592ca25a9079e19099ec Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Wed, 3 Apr 2013 10:51:43 +0000
Subject: Update to KDE SC 4.10.2

bugfixes, other quality improvements, new and improved KDE Applications
---
 math/kcalc/Makefile                                   |  4 ++--
 math/kcalc/distinfo                                   | 11 +++++++----
 math/kcalc/patches/patch-CMakeLists.txt               | 16 ++++++++++++++++
 math/kcalc/patches/patch-knumber_knumber_float.cpp    | 15 +++++++++++++++
 math/kcalc/patches/patch-knumber_tests_CMakeLists.txt | 12 ++++++++++++
 5 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 math/kcalc/patches/patch-CMakeLists.txt
 create mode 100644 math/kcalc/patches/patch-knumber_knumber_float.cpp
 create mode 100644 math/kcalc/patches/patch-knumber_tests_CMakeLists.txt

(limited to 'math/kcalc')

diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index dc70bf0923d..696df979a78 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:24 markd Exp $
 
 DISTNAME=	kcalc-${_KDE_VERSION}
-PKGREVISION=	7
 CATEGORIES=	math
 COMMENT=	KDE scientific calculator
 
@@ -10,6 +9,7 @@ COMMENT=	KDE scientific calculator
 .include "../../meta-pkgs/kde4/kde4.mk"
 
 .include "../../devel/gmp/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index 850e0828aff..a8661629e84 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:31 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:24 markd Exp $
 
-SHA1 (kcalc-4.8.4.tar.xz) = f1cb6cda210c67fd19eca387df2d2224393d45ef
-RMD160 (kcalc-4.8.4.tar.xz) = b291c9a62b9cd129a936301ec0875581ee8d56f6
-Size (kcalc-4.8.4.tar.xz) = 89360 bytes
+SHA1 (kcalc-4.10.2.tar.xz) = 45f2a3eb557891e3c47a00dafb9ad3bd64bde4d8
+RMD160 (kcalc-4.10.2.tar.xz) = 863148b798a1ab09eb137545fd7ce8ce395ee3c8
+Size (kcalc-4.10.2.tar.xz) = 93980 bytes
+SHA1 (patch-CMakeLists.txt) = 3267b41b6a6a25a18b3dc450747beedb2976b45e
+SHA1 (patch-knumber_knumber_float.cpp) = 413c778069c0d38272e67b00eaca1a76a933e5cb
+SHA1 (patch-knumber_tests_CMakeLists.txt) = 7d159f617903b778e65615cb73a81f40f1d262df
diff --git a/math/kcalc/patches/patch-CMakeLists.txt b/math/kcalc/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..9a98ee0945b
--- /dev/null
+++ b/math/kcalc/patches/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2013/04/03 10:52:24 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(CheckFunctionExists)
+ include(CheckIncludeFiles)
diff --git a/math/kcalc/patches/patch-knumber_knumber_float.cpp b/math/kcalc/patches/patch-knumber_knumber_float.cpp
new file mode 100644
index 00000000000..2005cec6fb1
--- /dev/null
+++ b/math/kcalc/patches/patch-knumber_knumber_float.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-knumber_knumber_float.cpp,v 1.1 2013/04/03 10:52:24 markd Exp $
+
+use namespace std for isinf() and isnan()
+
+--- knumber/knumber_float.cpp.orig	2013-03-01 07:05:02.000000000 +0000
++++ knumber/knumber_float.cpp
+@@ -25,6 +25,8 @@ along with this program.  If not, see <h
+ #include <QDebug>
+ #include <cmath>
+ 
++using namespace std;
++
+ // NOTE: these assume IEEE floats..
+ #ifndef HAVE_FUNC_ISINF
+ #define isinf(x) ((x) != 0.0 && (x) + (x) == (x))
diff --git a/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt b/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt
new file mode 100644
index 00000000000..1875ebacb93
--- /dev/null
+++ b/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt
@@ -0,0 +1,12 @@
+$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})
-- 
cgit v1.2.3