5 files changed, 23 insertions, 62 deletions

diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index c5c22521a47b..db80415c9464 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rkward
-PORTVERSION=	0.5.5
-PORTREVISION=	2
+PORTVERSION=	0.5.6
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/Current_Stable_Releases
 PKGNAMESUFFIX=	-kde4
@@ -34,6 +33,7 @@ USE_CMAKE=	yes
 INSTALLS_ICONS=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/rkward
+MAN1=		rkward.1
 
 .if defined(WITHOUT_NLS)
 NLS=		"@comment "
@@ -52,7 +52,8 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Debug
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|'	\
-		${WRKSRC}/rkward/rkward.sh.template
+		${WRKSRC}/rkward/rkward.sh.template	\
+		${WRKSRC}/rkward/rbackend/rkfrontendtransmitter.cpp
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e 's|ADD_SUBDIRECTORY(doc)|#ADD_SUBDIRECTORY(doc)|'	\
 		${WRKSRC}/CMakeLists.txt
@@ -69,9 +70,6 @@ pre-configure:
 	${ECHO_MSG} "==> ${PKGNAME} requires math/R to be built WITH_LIBR" ; \
 	exit 1; fi)
 
-post-install:
-	${TOUCH} ${LOCALBASE}/lib/R/library/rkwardtests/doc/.empty
-
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	@${ECHO_MSG} "To pass the tests, some CRAN packages like R2HTML"
diff --git a/math/rkward-kde4/distinfo b/math/rkward-kde4/distinfo
index 0cb0fc6dc417..cd5f78d221f5 100644
--- a/math/rkward-kde4/distinfo
+++ b/math/rkward-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rkward-0.5.5.tar.gz) = 7e9e5368a71ed45ea8fa8057151fa5b0632bdf0e16953a4b36cacfea4c71dee7
-SIZE (rkward-0.5.5.tar.gz) = 1221637
+SHA256 (rkward-0.5.6.tar.gz) = 4613284b7f7209847bf925e4885f28d880226cf5797a0044e8f6b8f503eb1c8e
+SIZE (rkward-0.5.6.tar.gz) = 1259150
diff --git a/math/rkward-kde4/files/patch-rkward_rbackend_rkfrontendtransmitter.cpp b/math/rkward-kde4/files/patch-rkward_rbackend_rkfrontendtransmitter.cpp
new file mode 100644
index 000000000000..10252ae0698d
--- /dev/null
+++ b/math/rkward-kde4/files/patch-rkward_rbackend_rkfrontendtransmitter.cpp
@@ -0,0 +1,11 @@
+--- rkward/rbackend/rkfrontendtransmitter.cpp.orig	2011-05-25 10:18:05.000000000 +0200
++++ rkward/rbackend/rkfrontendtransmitter.cpp	2011-06-04 16:09:46.000000000 +0200
+@@ -63,7 +63,7 @@
+ 	args.append ("--data-dir " + RKSettingsModuleGeneral::filesPath ());
+ 	backend->setProcessChannelMode (QProcess::MergedChannels);	// at least for now. Seems difficult to get interleaving right, without this.
+ 	connect (backend, SIGNAL (finished (int, QProcess::ExitStatus)), this, SLOT (backendExit (int)));
+-	QString backend_executable = KStandardDirs::findExe (QDir::toNativeSeparators (QCoreApplication::applicationDirPath () + "/rkward.rbackend"));
++	QString backend_executable = "%%PREFIX%%/lib/kde4/libexec//rkward.rbackend";
+ 	if (backend_executable.isEmpty ()) backend_executable = KStandardDirs::findExe (QDir::toNativeSeparators (QCoreApplication::applicationDirPath () + "/rbackend/rkward.rbackend"));	// for running directly from the build-dir
+ 	RK_ASSERT (!backend_executable.isEmpty ());
+ 	backend->start (backend_executable, args, QIODevice::ReadOnly);
diff --git a/math/rkward-kde4/files/patch-rkward_rbackend_rksignalsupport.cpp b/math/rkward-kde4/files/patch-rkward_rbackend_rksignalsupport.cpp
deleted file mode 100644
index 481f4c9cf230..000000000000
--- a/math/rkward-kde4/files/patch-rkward_rbackend_rksignalsupport.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
---- ./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 1a4305c7e755..0b7e93ebbc77 100644
--- a/math/rkward-kde4/pkg-plist
+++ b/math/rkward-kde4/pkg-plist
@@ -1,6 +1,6 @@
 bin/rkward
-bin/rkward.bin
-bin/rkward.rbackend
+lib/kde4/libexec/rkward.frontend
+lib/kde4/libexec/rkward.rbackend
 share/applications/kde4/rkward.desktop
 share/apps/katepart/syntax/rkward.xml
 share/apps/rkward/00saveload/import/import_csv.js
@@ -387,6 +387,7 @@ share/apps/rkward/icons/rkward_logo.png
 share/apps/rkward/icons/run_all.png
 share/apps/rkward/icons/run_line.png
 share/apps/rkward/icons/run_selection.png
+share/apps/rkward/icons/s4_slots.png
 share/apps/rkward/icons/window_back.png
 share/apps/rkward/icons/window_forward.png
 share/apps/rkward/import_export.pluginmap
@@ -397,6 +398,7 @@ share/apps/rkward/pages/rkward_for_r_users.rkh
 share/apps/rkward/pages/rkward_for_rkward_devs.rkh
 share/apps/rkward/pages/rkward_help.css
 share/apps/rkward/pages/rkward_output.rkh
+share/apps/rkward/pages/rkward_output.css
 share/apps/rkward/pages/rkward_plot_history.rkh
 share/apps/rkward/pages/rkward_public_functions.rkh
 share/apps/rkward/pages/rkward_shortcuts.rkh
@@ -414,6 +416,7 @@ share/apps/rkward/plots/barplot_embed.js
 share/apps/rkward/plots/barplot_embed.rkh
 share/apps/rkward/plots/barplot_embed.xml
 share/apps/rkward/plots/box_plot.js
+share/apps/rkward/plots/box_plot.rkh
 share/apps/rkward/plots/box_plot.xml
 share/apps/rkward/plots/color_chooser.js
 share/apps/rkward/plots/color_chooser.rkh
@@ -510,6 +513,7 @@ share/config/rkward.knsrc
 %%PORTDOCS%%%%DOCSDIR%%/common
 %%PORTDOCS%%%%DOCSDIR%%/index.cache.bz2
 %%PORTDOCS%%%%DOCSDIR%%/index.docbook
+%%PORTDOCS%%%%DOCSDIR%%/man-rkward.1.docbook
 %%PORTDOCS%%%%DOCSDIR%%/menu_hierarchy_example.png
 %%PORTDOCS%%%%DOCSDIR%%/t_test_plugin_example.png
 %%PORTDOCS%%%%DOCSDIR%%/writing_plugins_introduction.docbook
@@ -602,7 +606,6 @@ lib/R/library/rkwardtests/NAMESPACE
 lib/R/library/rkwardtests/R/rkwardtests
 lib/R/library/rkwardtests/R/rkwardtests.rdb
 lib/R/library/rkwardtests/R/rkwardtests.rdx
-lib/R/library/rkwardtests/doc/.empty
 lib/R/library/rkwardtests/help/AnIndex
 lib/R/library/rkwardtests/help/aliases.rds
 lib/R/library/rkwardtests/help/paths.rds
@@ -612,7 +615,6 @@ lib/R/library/rkwardtests/html/00Index.html
 lib/R/library/rkwardtests/html/R.css
 @dirrm lib/R/library/rkwardtests/html
 @dirrm lib/R/library/rkwardtests/help
-@dirrm lib/R/library/rkwardtests/doc
 @dirrm lib/R/library/rkwardtests/R
 @dirrm lib/R/library/rkwardtests/Meta
 @dirrm lib/R/library/rkwardtests