aboutsummaryrefslogtreecommitdiffstats
path: root/math
diff options
context:
space:
mode:
authorthierry <thierry@FreeBSD.org>2011-05-01 22:57:06 +0800
committerthierry <thierry@FreeBSD.org>2011-05-01 22:57:06 +0800
commit91dd3240f79cc4be6f99b8b38ee216d7d789ede1 (patch)
tree3f7a4c36c225ef00a1f69a147d4810c6c67dfd24 /math
parent84257d3267ac2a0eace91e1dc8441dd79deca014 (diff)
downloadfreebsd-ports-gnome-91dd3240f79cc4be6f99b8b38ee216d7d789ede1.tar.gz
freebsd-ports-gnome-91dd3240f79cc4be6f99b8b38ee216d7d789ede1.tar.zst
freebsd-ports-gnome-91dd3240f79cc4be6f99b8b38ee216d7d789ede1.zip
Upgrade to 0.5.5.
Changelog at <https://sourceforge.net/apps/mediawiki/rkward/index.php?title=News#RKWard_0.5.5_-_Enhanced_robustness_and_many_small_improvements>
Diffstat (limited to 'math')
-rw-r--r--math/rkward-kde4/Makefile9
-rw-r--r--math/rkward-kde4/distinfo4
-rw-r--r--math/rkward-kde4/files/patch-rkward_rbackend_rksignalsupport.cpp50
-rw-r--r--math/rkward-kde4/pkg-plist2
4 files changed, 56 insertions, 9 deletions
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index 1a381fbcee5f..7f1c107e6358 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= rkward
-PORTVERSION= 0.5.4
-PORTREVISION= 2
+PORTVERSION= 0.5.5
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}/Current_Stable_Releases
PKGNAMESUFFIX= -kde4
@@ -45,11 +44,11 @@ PLIST_SUB+= NLS=${NLS}
BUILD_DEPENDS+= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
.endif
-PHP2FIX= rkward/settings/rksettingsmodulephp.cpp
+.if defined(WITH_DEBUG)
+CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
+.endif
pre-configure:
- ${REINPLACE_CMD} -e 's|/usr/bin/php|${LOCALBASE}/bin/php|' \
- ${PHP2FIX:S|^|${WRKSRC}/|}
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
${WRKSRC}/rkward/rkward.sh.template
.if defined(NOPORTDOCS)
diff --git a/math/rkward-kde4/distinfo b/math/rkward-kde4/distinfo
index 2e5417053de7..0cb0fc6dc417 100644
--- a/math/rkward-kde4/distinfo
+++ b/math/rkward-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rkward-0.5.4.tar.gz) = d324b7992c997d75d393b1bf4be79ee9f28ae46582ed2c7bfef839064c08162b
-SIZE (rkward-0.5.4.tar.gz) = 1185270
+SHA256 (rkward-0.5.5.tar.gz) = 7e9e5368a71ed45ea8fa8057151fa5b0632bdf0e16953a4b36cacfea4c71dee7
+SIZE (rkward-0.5.5.tar.gz) = 1221637
diff --git a/math/rkward-kde4/files/patch-rkward_rbackend_rksignalsupport.cpp b/math/rkward-kde4/files/patch-rkward_rbackend_rksignalsupport.cpp
new file mode 100644
index 000000000000..481f4c9cf230
--- /dev/null
+++ b/math/rkward-kde4/files/patch-rkward_rbackend_rksignalsupport.cpp
@@ -0,0 +1,50 @@
+--- ./rkward/rbackend/rksignalsupport.cpp.orig 2011-02-23 12:43:20.000000000 +0100
++++ ./rkward/rbackend/rksignalsupport.cpp 2011-05-01 15:38:25.000000000 +0200
+@@ -23,18 +23,18 @@
+
+ #include "../debug.h"
+
+-#ifndef __sighandler_t
+- typedef void (*__sighandler_t) (int);
+-#endif
++// On some platforms sighandler_t is defined, on others it is not, but it's required to be the same everywhere, anyway.
++// To avoid re-definition errors, we just use our own "type".
++typedef void (*rk_sighandler_t) (int);
+
+ namespace RKSignalSupportPrivate {
+ #ifdef Q_WS_WIN
+- __sighandler_t r_sigsegv_handler = 0;
+- __sighandler_t default_sigsegv_handler = 0;
+- __sighandler_t r_sigill_handler = 0;
+- __sighandler_t default_sigill_handler = 0;
+- __sighandler_t r_sigabrt_handler = 0;
+- __sighandler_t default_sigabrt_handler = 0;
++ rk_sighandler_t r_sigsegv_handler = 0;
++ rk_sighandler_t default_sigsegv_handler = 0;
++ rk_sighandler_t r_sigill_handler = 0;
++ rk_sighandler_t default_sigill_handler = 0;
++ rk_sighandler_t r_sigabrt_handler = 0;
++ rk_sighandler_t default_sigabrt_handler = 0;
+ #else
+ struct sigaction r_sigsegv_handler;
+ struct sigaction default_sigsegv_handler;
+@@ -43,7 +43,7 @@
+ struct sigaction r_sigabrt_handler;
+ struct sigaction default_sigabrt_handler;
+ #endif
+- __sighandler_t r_sigint_handler = 0;
++ rk_sighandler_t r_sigint_handler = 0;
+ void (*new_sigint_handler) (void) = 0;
+ void internal_sigint_handler (int num) {
+ new_sigint_handler ();
+@@ -52,8 +52,8 @@
+
+ #ifdef Q_WS_WIN
+ void signal_proxy (int signum) {
+- __sighandler_t r_handler = r_sigsegv_handler;
+- __sighandler_t default_handler = default_sigsegv_handler;
++ rk_sighandler_t r_handler = r_sigsegv_handler;
++ rk_sighandler_t default_handler = default_sigsegv_handler;
+ #else
+ void signal_proxy (int signum, siginfo_t *info, void *context) {
+ struct sigaction r_handler = r_sigsegv_handler;
diff --git a/math/rkward-kde4/pkg-plist b/math/rkward-kde4/pkg-plist
index 6df73a3cf419..b63bb4fcebbc 100644
--- a/math/rkward-kde4/pkg-plist
+++ b/math/rkward-kde4/pkg-plist
@@ -404,8 +404,6 @@ share/apps/rkward/pages/rkward_welcome.rkh
share/apps/rkward/pages/rkward_workspace_browser.rkh
share/apps/rkward/php2js.js
share/apps/rkward/phpfiles/common.js
-share/apps/rkward/phpfiles/common.php
-share/apps/rkward/phpfiles/php.ini
share/apps/rkward/phpfiles/rkcomponentscripting.js
share/apps/rkward/plots.pluginmap
share/apps/rkward/plots/barplot.js