5 files changed, 19 insertions, 56 deletions

diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 9ce2c484fa29..5e5c73550121 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -1,9 +1,9 @@
 # Created by: thierry@pompo.net
 
 PORTNAME=	rkward
-PORTVERSION=	0.7.3
+PORTVERSION=	0.7.4
 CATEGORIES=	math
-MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION:C/b//}/src
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	IDE/GUI for the R-project
@@ -12,6 +12,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libR.so:math/R
 RUN_DEPENDS=	kbibtex:databases/kbibtex	\
+		pandoc:textproc/hs-pandoc	\
 		${LR_MOD_DIR}/R2HTML/INDEX:textproc/R-cran-R2HTML	\
 		${LR_MOD_DIR}/rmarkdown/INDEX:textproc/R-cran-rmarkdown
 TEST_DEPENDS=	${LR_MOD_DIR}/FAdist/INDEX:science/R-cran-FAdist
@@ -21,7 +22,7 @@ USES=		cmake compiler:c++11-lang desktop-file-utils gettext fortran	\
 USE_QT=		buildtools concurrent core dbus declarative gui location	\
 		network printsupport qmake script webchannel webengine webkit	\
 		widgets xml
-USE_XORG=	x11
+USE_XORG=	ice x11 xext
 USE_KDE=	archive auth bookmarks codecs completion config configwidgets coreaddons\
 		crash doctools ecm i18n itemviews jobwidgets kate_run kdewebkit kio	\
 		notifications parts service solid sonnet syntaxhighlighting texteditor	\
diff --git a/math/rkward/distinfo b/math/rkward/distinfo
index a908aa16fb31..6d8e838876ea 100644
--- a/math/rkward/distinfo
+++ b/math/rkward/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651044867
-SHA256 (rkward-0.7.3.tar.gz) = 49b118c11c41605e05434e4214f06bbf3a45c8bbc5ab54499dca117ca9efe7da
-SIZE (rkward-0.7.3.tar.gz) = 5486401
+TIMESTAMP = 1654545611
+SHA256 (rkward-0.7.4.tar.gz) = 7633f3b269f6cf2c067b3b09cbe3da3e0ffdcd9dc3ecb9a9fa63b4f865e8161e
+SIZE (rkward-0.7.4.tar.gz) = 5677112
diff --git a/math/rkward/files/patch-rkward_windows_rkhtmlwindow.cpp b/math/rkward/files/patch-rkward_windows_rkhtmlwindow.cpp
deleted file mode 100644
index f03863cfaacf..000000000000
--- a/math/rkward/files/patch-rkward_windows_rkhtmlwindow.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- rkward/windows/rkhtmlwindow.cpp.orig	2022-04-16 22:02:17 UTC
-+++ rkward/windows/rkhtmlwindow.cpp
-@@ -109,8 +109,9 @@ class RKWebPage : public QWebEnginePage { (public)
- 	QUrl url () {
- 		return mainFrame ()->url ();
- 	}
--	void setHtml (const QString &html) {
--		mainFrame ()->setHtml (html);
-+	void setHtmlWrapper(const QString &html, const QUrl &baseurl) {
-+		direct_load = true;
-+		mainFrame()->setHtml(html, baseurl);
- 	}
- 	QPointF scrollPosition () const {
- 		return mainFrame ()->scrollPosition ();
-@@ -127,6 +128,10 @@ class RKWebPage : public QWebEnginePage { (public)
- 		});
- 	}
- #else
-+	void setHtmlWrapper(const QString &html, const QUrl &baseurl) {
-+		direct_load = true;
-+		setHtml(html, baseurl);
-+	}
- 	bool supportsContentType (const QString &name) {
- 		if (name.startsWith("text")) return true;
- #ifdef __GNUC__
-@@ -617,7 +622,7 @@ bool RKHTMLWindow::openURL (const QUrl &url) {
- 				RK_DEBUG (APP, DL_WARNING, "Applying workaround for https://bugs.kde.org/show_bug.cgi?id=405386");
- 				QFile f (url.toLocalFile ());
- 				f.open (QIODevice::ReadOnly);
--				page->setHtml (f.readAll());
-+				page->setHtmlWrapper(f.readAll(), url.adjusted(QUrl::RemoveFilename));
- 				f.close ();
- 			} else {
- 				page->load (url);
diff --git a/math/rkward/files/patch-tests_all__tests.R b/math/rkward/files/patch-tests_all__tests.R
deleted file mode 100644
index 36e754821c0e..000000000000
--- a/math/rkward/files/patch-tests_all__tests.R
+++ /dev/null
@@ -1,16 +0,0 @@
---- tests/all_tests.R.orig	2022-04-11 21:08:17 UTC
-+++ tests/all_tests.R
-@@ -2,10 +2,10 @@ require (rkwardtests)
- 
- ## add your test suite files, to this vector:
- testsuites <- c (
--	"rkward_application_tests.R"
--	"import_export_plugins.R"
-+	"rkward_application_tests.R",
-+	"import_export_plugins.R",
- 	"item_response_theory.R",
--	"analysis_plugins.R"
-+	"analysis_plugins.R",
- 	"distributions.R",
- 	"plots.R",
- 	"data_plugin_tests.R"
diff --git a/math/rkward/pkg-plist b/math/rkward/pkg-plist
index c61f65ea2b16..833bd9561ddd 100644
--- a/math/rkward/pkg-plist
+++ b/math/rkward/pkg-plist
@@ -75,6 +75,8 @@ share/ktexteditor_snippets/data/RKWardRMd.xml
 %%NLS%%share/locale/tr/LC_MESSAGES/rkward.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/rkward.mo
 share/metainfo/org.kde.rkward.appdata.xml
+share/mime/packages/vnd.kde.rkward-output.xml
+share/mime/packages/vnd.kde.rmarkdown.xml
 share/mime/packages/vnd.rkward.r.xml
 share/org.kde.syntax-highlighting/syntax/rkward.xml
 %%DATADIR%%/00saveload/import/convert_encoding.js
@@ -82,6 +84,9 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml
 %%DATADIR%%/00saveload/import/import_csv.js
 %%DATADIR%%/00saveload/import/import_csv.rkh
 %%DATADIR%%/00saveload/import/import_csv.xml
+%%DATADIR%%/00saveload/import/import_generic_rio.js
+%%DATADIR%%/00saveload/import/import_generic_rio.rkh
+%%DATADIR%%/00saveload/import/import_generic_rio.xml
 %%DATADIR%%/00saveload/import/import_spss.js
 %%DATADIR%%/00saveload/import/import_spss.rkh
 %%DATADIR%%/00saveload/import/import_spss.xml
@@ -462,6 +467,7 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml
 %%DATADIR%%/distributions/wilcoxon.rkh
 %%DATADIR%%/distributions/wilcoxon.xml
 %%DATADIR%%/embedded.pluginmap
+%%DATADIR%%/icons/64-apps-rkward.png
 %%DATADIR%%/icons/data-factor.png
 %%DATADIR%%/icons/data-logical.png
 %%DATADIR%%/icons/data-numeric.png
@@ -479,6 +485,9 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml
 %%DATADIR%%/icons/window_back.png
 %%DATADIR%%/icons/window_forward.png
 %%DATADIR%%/import_export.pluginmap
+%%DATADIR%%/internal/Installfromgit.js
+%%DATADIR%%/internal/Installfromgit.rkh
+%%DATADIR%%/internal/Installfromgit.xml
 %%DATADIR%%/irt.pluginmap
 %%DATADIR%%/menu.pluginmap
 %%DATADIR%%/pages/rkward_addons.rkh
@@ -681,11 +690,14 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml
 %%DATADIR%%/po/pt_BR/LC_MESSAGES/rkward__item_response_theory.mo
 %%DATADIR%%/po/pt_BR/LC_MESSAGES/rkward__pages.mo
 %%DATADIR%%/po/pt_BR/LC_MESSAGES/rkward__plots.mo
+%%DATADIR%%/po/sl/LC_MESSAGES/rkward__analysis.mo
 %%DATADIR%%/po/sl/LC_MESSAGES/rkward__data.mo
 %%DATADIR%%/po/sl/LC_MESSAGES/rkward__distributions.mo
 %%DATADIR%%/po/sl/LC_MESSAGES/rkward__embedded.mo
 %%DATADIR%%/po/sl/LC_MESSAGES/rkward__graphics_device.mo
 %%DATADIR%%/po/sl/LC_MESSAGES/rkward__import_export.mo
+%%DATADIR%%/po/sl/LC_MESSAGES/rkward__item_response_theory.mo
+%%DATADIR%%/po/sl/LC_MESSAGES/rkward__pages.mo
 %%DATADIR%%/po/sl/LC_MESSAGES/rkward__plots.mo
 %%DATADIR%%/po/sv/LC_MESSAGES/rkward__analysis.mo
 %%DATADIR%%/po/sv/LC_MESSAGES/rkward__data.mo