Upgrade to 0.6.2.

Changelog at <http://rkward.sourceforge.net/wiki/News>.

5 files changed, 71 insertions, 153 deletions

diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index e99ac17aedf6..6c39b59c7e91 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rkward
-PORTVERSION=	0.6.1
-PORTREVISION=	7
+PORTVERSION=	0.6.2
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/Current_Stable_Releases
 PKGNAMESUFFIX=	-kde4
@@ -21,7 +20,7 @@ CONFLICTS=	rkward-0.4.*
 
 USE_QT4=	qmake_build moc_build rcc_build uic_build phonon
 
-USE_KDE4=	kdehier kdeprefix automoc4 kdelibs
+USE_KDE4=	kdeprefix automoc4 kdelibs
 USE_PHP=	yes
 WANT_PHP_CLI=	yes
 USES=		cmake gettext fortran
diff --git a/math/rkward-kde4/distinfo b/math/rkward-kde4/distinfo
index 9be050541ec5..4b3d633fbdf8 100644
--- a/math/rkward-kde4/distinfo
+++ b/math/rkward-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rkward-0.6.1.tar.gz) = 7887bc22645a8e6de278da55e31a61acd91aca0ade777af11a110d0dfcfffde7
-SIZE (rkward-0.6.1.tar.gz) = 1529612
+SHA256 (rkward-0.6.2.tar.gz) = 3534e58a6246f2be18e6158cf486ecfef6531fee4f0060d7ea1955a823b5add6
+SIZE (rkward-0.6.2.tar.gz) = 1605751
diff --git a/math/rkward-kde4/files/patch-rkward_rbackend_rkfrontendtransmitter.cpp b/math/rkward-kde4/files/patch-rkward_rbackend_rkfrontendtransmitter.cpp
index 10252ae0698d..8cfc7d62be87 100644
--- a/math/rkward-kde4/files/patch-rkward_rbackend_rkfrontendtransmitter.cpp
+++ b/math/rkward-kde4/files/patch-rkward_rbackend_rkfrontendtransmitter.cpp
@@ -1,11 +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);
+--- rkward/rbackend/rkfrontendtransmitter.cpp.orig	2014-10-13 21:22:11.000000000 +0200
++++ rkward/rbackend/rkfrontendtransmitter.cpp	2014-10-31 22:13:56.000000000 +0100
+@@ -41,7 +41,7 @@
+ #ifdef Q_WS_WIN
+ 	QString ret = dir.filePath ("rkward.rbackend.exe");
+ #else
+-	QString ret = dir.filePath ("rkward.rbackend");
++	QString ret = "%%PREFIX%%/lib/kde4/libexec/rkward.rbackend";
+ #endif
+ 	RK_DEBUG (RBACKEND, DL_DEBUG, "Looking for backend at %s", qPrintable (ret));
+ 	QFileInfo fi (ret);
diff --git a/math/rkward-kde4/files/patch-rkward_rbackend_rkstructuregetter.cpp b/math/rkward-kde4/files/patch-rkward_rbackend_rkstructuregetter.cpp
deleted file mode 100644
index 53ddefc109a3..000000000000
--- a/math/rkward-kde4/files/patch-rkward_rbackend_rkstructuregetter.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- rkward/rbackend/rkstructuregetter.cpp.orig	2013-03-26 17:21:34.000000000 +0100
-+++ rkward/rbackend/rkstructuregetter.cpp	2014-03-10 21:03:17.000000000 +0100
-@@ -193,22 +193,27 @@
- 
- 	// get classes
- 	SEXP classes_s;
-+	QStringList classes;
- 
- 	if ((TYPEOF (value) == LANGSXP) || (TYPEOF (value) == SYMSXP)) {	// if it's a call, we should NEVER send it through eval
--		extern SEXP R_data_class (SEXP, Rboolean);
--		classes_s = R_data_class (value, (Rboolean) 0);
-+		// stripped down and adjusted from R_data_class
-+		classes = RKRSupport::SEXPToStringList(Rf_getAttrib (value, R_ClassSymbol));
-+		if (classes.isEmpty ()) {
-+			if (TYPEOF (value) == LANGSXP) {
-+				QString cl = RKRSupport::SEXPToString (PRINTNAME (value));
-+				if ((cl != "if") && (cl != "while") && (cl != "for") && (cl != "=") && (cl != "<-") && (cl != "(") && (cl != "{")) cl = "call";
-+				classes = QStringList (cl);
-+			} else {
-+				classes = QStringList ("name");
-+			}
-+		}
- 
- 		REPROTECT (value = Rf_coerceVector (value, EXPRSXP), value_index);	// make sure the object is safe for everything to come
--
--		PROTECT (classes_s);
- 	} else {
- 		classes_s = RKRSupport::callSimpleFun (class_fun, value, baseenv);
--		PROTECT (classes_s);
-+		classes = RKRSupport::SEXPToStringList (classes_s);
- 	}
- 
--	QStringList classes = RKRSupport::SEXPToStringList (classes_s);
--	UNPROTECT (1);	/* classes_s */
--
- 	// store classes
- 	RData *classdata = new RData;
- 	classdata->setData (classes);
diff --git a/math/rkward-kde4/pkg-plist b/math/rkward-kde4/pkg-plist
index e11313f6e611..7fb1997d41f9 100644
--- a/math/rkward-kde4/pkg-plist
+++ b/math/rkward-kde4/pkg-plist
@@ -1,9 +1,49 @@
-bin/rkward
+%%QT_BINDIR%%/rkward
+lib/R/library/rkward/CITATION
+lib/R/library/rkward/DESCRIPTION
+lib/R/library/rkward/INDEX
+lib/R/library/rkward/Meta/Rd.rds
+lib/R/library/rkward/Meta/hsearch.rds
+lib/R/library/rkward/Meta/links.rds
+lib/R/library/rkward/Meta/nsInfo.rds
+lib/R/library/rkward/Meta/package.rds
+lib/R/library/rkward/NAMESPACE
+lib/R/library/rkward/R/rkward
+lib/R/library/rkward/R/rkward.rdb
+lib/R/library/rkward/R/rkward.rdx
+lib/R/library/rkward/help/AnIndex
+lib/R/library/rkward/help/aliases.rds
+lib/R/library/rkward/help/paths.rds
+lib/R/library/rkward/help/rkward.rdb
+lib/R/library/rkward/help/rkward.rdx
+lib/R/library/rkward/html/00Index.html
+lib/R/library/rkward/html/R.css
+lib/R/library/rkwardtests/CITATION
+lib/R/library/rkwardtests/DESCRIPTION
+lib/R/library/rkwardtests/INDEX
+lib/R/library/rkwardtests/Meta/Rd.rds
+lib/R/library/rkwardtests/Meta/hsearch.rds
+lib/R/library/rkwardtests/Meta/links.rds
+lib/R/library/rkwardtests/Meta/nsInfo.rds
+lib/R/library/rkwardtests/Meta/package.rds
+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/help/AnIndex
+lib/R/library/rkwardtests/help/aliases.rds
+lib/R/library/rkwardtests/help/paths.rds
+lib/R/library/rkwardtests/help/rkwardtests.rdb
+lib/R/library/rkwardtests/help/rkwardtests.rdx
+lib/R/library/rkwardtests/html/00Index.html
+lib/R/library/rkwardtests/html/R.css
 lib/kde4/libexec/rkward.frontend
 lib/kde4/libexec/rkward.rbackend
 man/man1/rkward.1.gz
 share/applications/kde4/rkward.desktop
 share/apps/katepart/syntax/rkward.xml
+share/apps/rkward/00saveload/import/convert_encoding.js
+share/apps/rkward/00saveload/import/convert_encoding.xml
 share/apps/rkward/00saveload/import/import_csv.js
 share/apps/rkward/00saveload/import/import_csv.rkh
 share/apps/rkward/00saveload/import/import_csv.xml
@@ -159,12 +199,19 @@ share/apps/rkward/analysis/wilcoxon/wilcoxon_tests.xml
 share/apps/rkward/data.pluginmap
 share/apps/rkward/data/generate_random.js
 share/apps/rkward/data/generate_random.xml
+share/apps/rkward/data/level_select.js
+share/apps/rkward/data/level_select.xml
 share/apps/rkward/data/limit_vector_length.js
 share/apps/rkward/data/limit_vector_length.rkh
 share/apps/rkward/data/limit_vector_length.xml
+share/apps/rkward/data/multi_input.js
+share/apps/rkward/data/multi_input.xml
 share/apps/rkward/data/one_var_tabulation.js
 share/apps/rkward/data/one_var_tabulation.rkh
 share/apps/rkward/data/one_var_tabulation.xml
+share/apps/rkward/data/recode_categorical.js
+share/apps/rkward/data/recode_categorical.rkh
+share/apps/rkward/data/recode_categorical.xml
 share/apps/rkward/data/sort.js
 share/apps/rkward/data/sort.rkh
 share/apps/rkward/data/sort.xml
@@ -520,6 +567,8 @@ share/apps/rkward/testing/test1.js
 share/apps/rkward/testing/test1.xml
 share/apps/rkward/testing/test2.js
 share/apps/rkward/testing/test2.xml
+share/apps/rkward/testing/valueselect1.js
+share/apps/rkward/testing/valueselect1.xml
 share/apps/rkward/under_development.pluginmap
 share/apps/rkward/uni1.2/code.js
 share/apps/rkward/uni1.2/description.xml
@@ -534,11 +583,11 @@ share/apps/rkward/x11device/grid.xml
 %%PORTDOCS%%%%DOCSDIR%%/index.cache.bz2
 %%PORTDOCS%%%%DOCSDIR%%/index.docbook
 %%PORTDOCS%%%%DOCSDIR%%/man-rkward.1.docbook
-%%PORTDOCS%%share/doc/HTML/en/rkwardplugins/common
-%%PORTDOCS%%share/doc/HTML/en/rkwardplugins/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/en/rkwardplugins/index.docbook
-%%PORTDOCS%%share/doc/HTML/en/rkwardplugins/menu_hierarchy_example.png
-%%PORTDOCS%%share/doc/HTML/en/rkwardplugins/t_test_plugin_example.png
+%%PORTDOCS%%%%DOCSDIR%%plugins/common
+%%PORTDOCS%%%%DOCSDIR%%plugins/index.cache.bz2
+%%PORTDOCS%%%%DOCSDIR%%plugins/index.docbook
+%%PORTDOCS%%%%DOCSDIR%%plugins/menu_hierarchy_example.png
+%%PORTDOCS%%%%DOCSDIR%%plugins/t_test_plugin_example.png
 share/icons/hicolor/128x128/apps/rkward.png
 share/icons/hicolor/16x16/apps/rkward.png
 share/icons/hicolor/22x22/apps/rkward.png
@@ -550,97 +599,5 @@ share/icons/hicolor/scalable/apps/rkward.svgz
 %%NLS%%share/locale/de/LC_MESSAGES/rkward.mo
 %%NLS%%share/locale/es/LC_MESSAGES/rkward.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/rkward.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/rkward.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/rkward.mo
-%%PORTDOCS%%@dirrm share/doc/HTML/en/rkwardplugins
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrmtry share/doc/HTML/en
-%%PORTDOCS%%@dirrmtry share/doc/HTML
-@dirrm share/apps/rkward/x11device
-@dirrm share/apps/rkward/uni1.2
-@dirrm share/apps/rkward/testing
-@dirrm share/apps/rkward/simple_anova
-@dirrm share/apps/rkward/rkwarddev_scripts
-@dirrm share/apps/rkward/pages
-@dirrm share/apps/rkward/plots/irt/tests
-@dirrm share/apps/rkward/plots/irt/polytomous
-@dirrm share/apps/rkward/plots/irt/dichotomous
-@dirrm share/apps/rkward/plots/irt
-@dirrm share/apps/rkward/plots
-@dirrm share/apps/rkward/phpfiles
-@dirrm share/apps/rkward/icons
-@dirrm share/apps/rkward/descriptive
-@dirrm share/apps/rkward/distributions/tests
-@dirrm share/apps/rkward/distributions/clt
-@dirrm share/apps/rkward/distributions
-@dirrm share/apps/rkward/data
-@dirrm share/apps/rkward/analysis/wilcoxon
-@dirrm share/apps/rkward/analysis/variances
-@dirrm share/apps/rkward/analysis/time_series
-@dirrm share/apps/rkward/analysis/regression
-@dirrm share/apps/rkward/analysis/outliers
-@dirrm share/apps/rkward/analysis/moments
-@dirrm share/apps/rkward/analysis/irt/tests
-@dirrm share/apps/rkward/analysis/irt/polytomous
-@dirrm share/apps/rkward/analysis/irt/dichotomous
-@dirrm share/apps/rkward/analysis/irt
-@dirrm share/apps/rkward/analysis/ansari_bradley
-@dirrm share/apps/rkward/analysis/TESTS
-@dirrm share/apps/rkward/analysis
-@dirrm share/apps/rkward/00saveload/save/skeleton
-@dirrm share/apps/rkward/00saveload/save
-@dirrm share/apps/rkward/00saveload/import
-@dirrm share/apps/rkward/00saveload
-@dirrm share/apps/rkward
-@dirrmtry share/apps/katepart/syntax
-@dirrmtry share/apps/katepart
-@dirrmtry share/apps
-@cwd %%LOCALBASE%%
-lib/R/library/rkward/CITATION
-lib/R/library/rkward/DESCRIPTION
-lib/R/library/rkward/INDEX
-lib/R/library/rkward/Meta/Rd.rds
-lib/R/library/rkward/Meta/hsearch.rds
-lib/R/library/rkward/Meta/links.rds
-lib/R/library/rkward/Meta/nsInfo.rds
-lib/R/library/rkward/Meta/package.rds
-lib/R/library/rkward/NAMESPACE
-lib/R/library/rkward/R/rkward
-lib/R/library/rkward/R/rkward.rdb
-lib/R/library/rkward/R/rkward.rdx
-lib/R/library/rkward/help/AnIndex
-lib/R/library/rkward/help/aliases.rds
-lib/R/library/rkward/help/paths.rds
-lib/R/library/rkward/help/rkward.rdb
-lib/R/library/rkward/help/rkward.rdx
-lib/R/library/rkward/html/00Index.html
-lib/R/library/rkward/html/R.css
-lib/R/library/rkwardtests/CITATION
-lib/R/library/rkwardtests/DESCRIPTION
-lib/R/library/rkwardtests/INDEX
-lib/R/library/rkwardtests/LICENSE
-lib/R/library/rkwardtests/Meta/Rd.rds
-lib/R/library/rkwardtests/Meta/hsearch.rds
-lib/R/library/rkwardtests/Meta/links.rds
-lib/R/library/rkwardtests/Meta/nsInfo.rds
-lib/R/library/rkwardtests/Meta/package.rds
-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/help/AnIndex
-lib/R/library/rkwardtests/help/aliases.rds
-lib/R/library/rkwardtests/help/paths.rds
-lib/R/library/rkwardtests/help/rkwardtests.rdb
-lib/R/library/rkwardtests/help/rkwardtests.rdx
-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/R
-@dirrm lib/R/library/rkwardtests/Meta
-@dirrm lib/R/library/rkwardtests
-@dirrm lib/R/library/rkward/html
-@dirrm lib/R/library/rkward/help
-@dirrm lib/R/library/rkward/R
-@dirrm lib/R/library/rkward/Meta
-@dirrm lib/R/library/rkward