Upgrade to 8.5.1.

Changelog at
<http://puzzle.dl.sourceforge.net/project/rkward/Current_Stable_Releases/Notes_0.5.1.html>

8 files changed, 21 insertions, 64 deletions

diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index 5a16cc8516c9..9d44dc222806 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	rkward
-DISTVERSION=	0.5.0d
-PORTREVISION=	1
+PORTVERSION=	0.5.1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITE_SUBDIR=	../project/${PORTNAME}/Current_Stable_Releases
 PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	IDE/GUI for the R-project
 
 LIB_DEPENDS=	R.0:${PORTSDIR}/math/R
+RUN_DEPENDS=	seq2:${PORTSDIR}/misc/seq2
 
 CONFLICTS=	rkward-0.4.*
 
diff --git a/math/rkward-kde4/distinfo b/math/rkward-kde4/distinfo
index 2391af7e6602..979746dcb86b 100644
--- a/math/rkward-kde4/distinfo
+++ b/math/rkward-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (rkward-0.5.0d.tar.gz) = ecc6bd1f3066b2a3b5f6020daaf5c1ad
-SHA256 (rkward-0.5.0d.tar.gz) = 2c98c0033047b2a382c5a47b789d7940f12ad19b1c288046587a163f1a3aba69
-SIZE (rkward-0.5.0d.tar.gz) = 892758
+MD5 (rkward-0.5.1.tar.gz) = 9c959465fecfa823b526f2e18813ee40
+SHA256 (rkward-0.5.1.tar.gz) = 1bf290f9ba164f00e9897108766bd5b5ecbf99cf7af16c30bc813eabb7a797c9
+SIZE (rkward-0.5.1.tar.gz) = 964724
diff --git a/math/rkward-kde4/files/patch-rkward_CMakeLists.txt b/math/rkward-kde4/files/patch-rkward_CMakeLists.txt
deleted file mode 100644
index a1445ddc87d0..000000000000
--- a/math/rkward-kde4/files/patch-rkward_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- rkward/CMakeLists.txt.orig	2008-01-25 15:49:35.000000000 +0100
-+++ rkward/CMakeLists.txt	2009-05-10 23:45:06.000000000 +0200
-@@ -11,7 +11,7 @@
- ADD_SUBDIRECTORY( windows )
- ADD_SUBDIRECTORY( syntax )
- 
--INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
-+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${X11_X11_INCLUDE_PATH} )
- 
- SET(RKWard_Sources
- 	rkward.cpp
diff --git a/math/rkward-kde4/files/patch-rkward_rbackend_DetectPthreads.cmake b/math/rkward-kde4/files/patch-rkward_rbackend_DetectPthreads.cmake
deleted file mode 100644
index 7cf6dd9ff8e6..000000000000
--- a/math/rkward-kde4/files/patch-rkward_rbackend_DetectPthreads.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./rkward/rbackend/DetectPthreads.cmake.orig	2008-01-21 19:58:24.000000000 +0100
-+++ ./rkward/rbackend/DetectPthreads.cmake	2009-05-06 23:51:31.000000000 +0200
-@@ -1,7 +1,7 @@
- INCLUDE(CheckIncludeFile)
- INCLUDE(CheckFunctionExists)
- 
--CHECK_INCLUDE_FILE(phthread_np.h HAVE_PTHREAD_NP_H)
-+CHECK_INCLUDE_FILE(pthread_np.h HAVE_PTHREAD_NP_H)
- 
- SET (CMAKE_REQUIRED_FLAGS ${CMAKE_THREAD_LIBS_INIT})
- CHECK_FUNCTION_EXISTS (pthread_getattr_np HAVE_PTHREAD_GETATTR_NP)
-@@ -9,4 +9,4 @@
- CHECK_FUNCTION_EXISTS (pthread_get_stacksize_np HAVE_PTHREAD_GET_STACKSIZE_NP)
- CHECK_FUNCTION_EXISTS (pthread_get_stackaddr_np HAVE_PTHREAD_GET_STACKADDR_NP)
- 
--CONFIGURE_FILE(pthread_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/pthread_config.h)
-\ No newline at end of file
-+CONFIGURE_FILE(pthread_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/pthread_config.h)
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 59285a7d76e0..000000000000
--- a/math/rkward-kde4/files/patch-rkward_rbackend_rksignalsupport.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- rkward/rbackend/rksignalsupport.cpp.orig	2008-01-21 19:58:24.000000000 +0100
-+++ rkward/rbackend/rksignalsupport.cpp	2009-05-07 19:35:28.000000000 +0200
-@@ -23,10 +23,6 @@
- 
- #include "../debug.h"
- 
--#ifndef __sighandler_t
--typedef void (*__sighandler_t) (int);
--#endif
--
- namespace RKSignalSupportPrivate {
- 	struct sigaction r_sigsegv_action;
- 	struct sigaction default_sigsegv_action;
diff --git a/math/rkward-kde4/files/patch-rkward_rbackend_rthread.cpp b/math/rkward-kde4/files/patch-rkward_rbackend_rthread.cpp
deleted file mode 100644
index 967f915dc290..000000000000
--- a/math/rkward-kde4/files/patch-rkward_rbackend_rthread.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- rkward/rbackend/rthread.cpp.orig	2008-11-21 16:31:14.000000000 +0100
-+++ rkward/rbackend/rthread.cpp	2009-05-06 23:40:25.000000000 +0200
-@@ -33,6 +33,7 @@
- #include <QDBusConnection>
- #include <QList>
- 
-+#include <pthread.h>
- #include <signal.h>		// needed for pthread_kill
- 
- #define MAX_BUF_LENGTH 4000
diff --git a/math/rkward-kde4/files/patch-rkward_rkward.sh.template b/math/rkward-kde4/files/patch-rkward_rkward.sh.template
index 39b4a3adf93a..c30c83813e65 100644
--- a/math/rkward-kde4/files/patch-rkward_rkward.sh.template
+++ b/math/rkward-kde4/files/patch-rkward_rkward.sh.template
@@ -1,8 +1,17 @@
---- rkward/rkward.sh.template.orig	2008-01-21 19:58:24.000000000 +0100
-+++ rkward/rkward.sh.template	2009-05-07 23:31:23.000000000 +0200
-@@ -69,4 +69,5 @@
+--- rkward/rkward.sh.template.orig	2009-07-31 16:43:07.000000000 +0200
++++ rkward/rkward.sh.template	2009-08-06 20:47:41.000000000 +0200
+@@ -30,7 +30,7 @@
+ }
+ 
+ debugger=
+-for i in `seq $#`
++for i in `seq2 $#`
+ do
+   arg=$(eval echo \$\{`echo ${i}`\})
+   if [ "${arg}" = "--debugger" ]; then
+@@ -45,4 +45,5 @@
  export LC_NUMERIC="C"
  
  ## Start rkward. Running through R CMD to set all the relevant R enviroment variables
 +cd %%PREFIX%%/share/apps && \
- exec $R_binary CMD $debugger $0.bin ${args}
+ exec $R_binary CMD $debugger $0.bin "$@"
diff --git a/math/rkward-kde4/pkg-plist b/math/rkward-kde4/pkg-plist
index 500f69a1e3ed..898b63c6b866 100644
--- a/math/rkward-kde4/pkg-plist
+++ b/math/rkward-kde4/pkg-plist
@@ -461,6 +461,7 @@ share/apps/rkward/plots/stem.rkh
 share/apps/rkward/plots/stem.xml
 share/apps/rkward/plots/stripchart_plot.php
 share/apps/rkward/plots/stripchart_plot.xml
+share/apps/rkward/resource.ver
 share/apps/rkward/rkcatchedx11windowpart.rc
 share/apps/rkward/rkcommandeditorwindowpart.rc
 share/apps/rkward/rkcommandlogpart.rc
@@ -469,6 +470,7 @@ share/apps/rkward/rkdummypart.rc
 share/apps/rkward/rkeditordataframepart.rc
 share/apps/rkward/rkhelpwindow.rc
 share/apps/rkward/rkoutputwindow.rc
+share/apps/rkward/rkstandardactions.rc
 share/apps/rkward/rktoplevelwindowgui.rc
 share/apps/rkward/rkwardui.rc
 share/apps/rkward/simple_anova/code.php
@@ -565,10 +567,8 @@ lib/R/library/rkward/help/public
 lib/R/library/rkward/html/00Index.html
 lib/R/library/rkward/html/public.html
 lib/R/library/rkward/latex/public.tex
-lib/R/library/rkward/libs/rkward.so
 lib/R/library/rkward/man/rkward.Rd.gz
 @dirrm lib/R/library/rkward/man
-@dirrm lib/R/library/rkward/libs
 @dirrm lib/R/library/rkward/latex
 @dirrm lib/R/library/rkward/html
 @dirrm lib/R/library/rkward/help