Date: Tue, 28 Jan 2020 18:15:00 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524507 - in head/math/rkward-kde: . files Message-ID: <202001281815.00SIF069013762@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Tue Jan 28 18:15:00 2020 New Revision: 524507 URL: https://svnweb.freebsd.org/changeset/ports/524507 Log: Upgrade RWward to 0.7.1. Changelog at <https://rkward.kde.org/News.html>. Deleted: head/math/rkward-kde/files/patch-rkward_rkward.cpp head/math/rkward-kde/files/patch-rkward_windows_rkworkplace.cpp Modified: head/math/rkward-kde/Makefile head/math/rkward-kde/distinfo head/math/rkward-kde/pkg-plist Modified: head/math/rkward-kde/Makefile ============================================================================== --- head/math/rkward-kde/Makefile Tue Jan 28 18:13:38 2020 (r524506) +++ head/math/rkward-kde/Makefile Tue Jan 28 18:15:00 2020 (r524507) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rkward -DISTVERSION= 0.7.0b -PORTREVISION= 6 +PORTVERSION= 0.7.1 CATEGORIES= math MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION:C/b//}/src PKGNAMESUFFIX= -kde @@ -14,6 +13,7 @@ COMMENT= IDE/GUI for the R-project LICENSE= GPLv2 LIB_DEPENDS= libR.so:math/R +TEST_DEPENDS= ${LR_MOD_DIR}/FAdist/INDEX:science/R-cran-FAdist USES= cmake compiler:c++11-lang desktop-file-utils gettext fortran \ kde:5 php:cli qt:5 shared-mime-info xorg @@ -27,42 +27,38 @@ USE_KDE= auth bookmarks codecs completion config confi CFLAGS+= -I${LOCALBASE}/include +LR_MOD_DIR= ${LOCALBASE}/lib/R/library DOCSDIR= ${PREFIX}/share/doc/HTML/en/rkward -OPTIONS_DEFINE= RECDEP DOCS NLS +OPTIONS_DEFINE= DOCS NLS INSTTEST RECDEP +INSTTEST_DESC= Install rkwardtests R package RECDEP_DESC= Recommended runtime dependencies OPTIONS_DEFAULT=RECDEP +OPTIONS_SUB= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MNLS} -NLS= "" -.else -NLS= "@comment " -.endif -PLIST_SUB+= NLS=${NLS} - .if ${PORT_OPTIONS:MRECDEP} -LR_MOD_DIR= ${LOCALBASE}/lib/R/library RUN_DEPENDS+= ${LR_MOD_DIR}/R2HTML/INDEX:textproc/R-cran-R2HTML \ ${LR_MOD_DIR}/XML/INDEX:textproc/R-cran-XML \ ${LR_MOD_DIR}/gdata/INDEX:devel/R-cran-gdata \ ${LR_MOD_DIR}/mvtnorm/INDEX:math/R-cran-mvtnorm \ + ${LR_MOD_DIR}/nortest/INDEX:math/R-cran-nortest \ ${LR_MOD_DIR}/outliers/INDEX:math/R-cran-outliers \ + ${LR_MOD_DIR}/qcc/INDEX:graphics/R-cran-qcc \ ${LR_MOD_DIR}/tseries/INDEX:finance/R-cran-tseries \ ${LR_MOD_DIR}/car/INDEX:math/R-cran-car .endif +.if ${PORT_OPTIONS:MINSTTEST} +R_LIB_DIR= lib/R/library +R_COMMAND= ${LOCALBASE}/bin/R +.endif + pre-configure: - ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ - ${WRKSRC}/rkward/rbackend/rkfrontendtransmitter.cpp .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e 's|ADD_SUBDIRECTORY(doc)|#ADD_SUBDIRECTORY(doc)|' \ ${WRKSRC}/CMakeLists.txt -.else -#Fix build with kdelibs>=4.5.0 - ${REINPLACE_CMD} -e 's,V4.1-Based Variant V1.0,V4.2-Based Variant V1.1,g' \ - ${WRKSRC}/doc/rkward/index.docbook .endif .if ! ${PORT_OPTIONS:MNLS} ${REINPLACE_CMD} -e 's|ADD_SUBDIRECTORY(po)|#ADD_SUBDIRECTORY(po)|' \ @@ -74,12 +70,17 @@ pre-configure: post-install: ${RM} ${STAGEDIR}${PREFIX}/share/apps/katepart/syntax/r.xml # Conflicts with kate +.if ${PORT_OPTIONS:MINSTTEST} + ${MKDIR} ${STAGEDIR}${PREFIX}/${R_LIB_DIR} + (cd ${WRKSRC}/rkward/rbackend/rpackages/rkwardtests && \ + ${SETENV} ${MAKE_ENV} _R_CHECK_FORCE_SUGGESTS_=FALSE && \ + ${R_COMMAND} CMD INSTALL -l ${STAGEDIR}${PREFIX}/${R_LIB_DIR} . ) +.endif .if defined(MAINTAINER_MODE) regression-test: install - @${ECHO_MSG} "To pass the tests, some CRAN packages like R2HTML" - @${ECHO_MSG} "must be installed." - (cd ${WRKSRC}/tests && KDE_LANG=en_US make plugintests) + (cd ${WRKSRC}/tests && \ + KDE_LANG=en_US ${PREFIX}/bin/${PORTNAME} --evaluate source\(\"all_tests.R\"\) ) .endif .include <bsd.port.mk> Modified: head/math/rkward-kde/distinfo ============================================================================== --- head/math/rkward-kde/distinfo Tue Jan 28 18:13:38 2020 (r524506) +++ head/math/rkward-kde/distinfo Tue Jan 28 18:15:00 2020 (r524507) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524079402 -SHA256 (rkward-0.7.0b.tar.gz) = 556e7bc8d3b8383e60c20c630f899075a6d39a04d29e56f4278191bb6ff853f4 -SIZE (rkward-0.7.0b.tar.gz) = 3978972 +TIMESTAMP = 1579970115 +SHA256 (rkward-0.7.1.tar.gz) = 02a96450ef4275d38b9ff6fd13d98bcf353c5388399a813a111b640d7c61c834 +SIZE (rkward-0.7.1.tar.gz) = 4605097 Modified: head/math/rkward-kde/pkg-plist ============================================================================== --- head/math/rkward-kde/pkg-plist Tue Jan 28 18:13:38 2020 (r524506) +++ head/math/rkward-kde/pkg-plist Tue Jan 28 18:15:00 2020 (r524507) @@ -1,47 +1,26 @@ bin/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/features.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/features.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/libexec/rkward.rbackend +%%INSTTEST%%lib/R/library/rkwardtests/CITATION +%%INSTTEST%%lib/R/library/rkwardtests/DESCRIPTION +%%INSTTEST%%lib/R/library/rkwardtests/help/aliases.rds +%%INSTTEST%%lib/R/library/rkwardtests/help/AnIndex +%%INSTTEST%%lib/R/library/rkwardtests/help/paths.rds +%%INSTTEST%%lib/R/library/rkwardtests/help/rkwardtests.rdb +%%INSTTEST%%lib/R/library/rkwardtests/help/rkwardtests.rdx +%%INSTTEST%%lib/R/library/rkwardtests/html/00Index.html +%%INSTTEST%%lib/R/library/rkwardtests/html/R.css +%%INSTTEST%%lib/R/library/rkwardtests/INDEX +%%INSTTEST%%lib/R/library/rkwardtests/Meta/features.rds +%%INSTTEST%%lib/R/library/rkwardtests/Meta/hsearch.rds +%%INSTTEST%%lib/R/library/rkwardtests/Meta/links.rds +%%INSTTEST%%lib/R/library/rkwardtests/Meta/nsInfo.rds +%%INSTTEST%%lib/R/library/rkwardtests/Meta/package.rds +%%INSTTEST%%lib/R/library/rkwardtests/Meta/Rd.rds +%%INSTTEST%%lib/R/library/rkwardtests/NAMESPACE +%%INSTTEST%%lib/R/library/rkwardtests/R/rkwardtests +%%INSTTEST%%lib/R/library/rkwardtests/R/rkwardtests.rdb +%%INSTTEST%%lib/R/library/rkwardtests/R/rkwardtests.rdx man/man1/rkward.1.gz -share/applications/org.kde.rkward-open.desktop share/applications/org.kde.rkward.desktop %%PORTDOCS%%%%DOCSDIR%%/index.cache.bz2 %%PORTDOCS%%%%DOCSDIR%%/index.docbook @@ -57,23 +36,13 @@ share/icons/hicolor/48x48/apps/rkward.png share/icons/hicolor/64x64/apps/rkward.png share/icons/hicolor/scalable/apps/rkward.svgz share/kservices5/rkward.protocol -share/kxmlgui5/rkward/detachedwindowcontainer.rc -share/kxmlgui5/rkward/rkcatchedx11windowpart.rc -share/kxmlgui5/rkward/rkcommandeditorwindowpart.rc -share/kxmlgui5/rkward/rkcommandlogpart.rc -share/kxmlgui5/rkward/rkconsolepart.rc -share/kxmlgui5/rkward/rkdummypart.rc -share/kxmlgui5/rkward/rkeditordataframepart.rc -share/kxmlgui5/rkward/rkhelpwindow.rc -share/kxmlgui5/rkward/rkoutputwindow.rc -share/kxmlgui5/rkward/rkstandardactions.rc -share/kxmlgui5/rkward/rktoplevelwindowgui.rc -share/kxmlgui5/rkward/rkwardui.rc %%NLS%%share/locale/ca/LC_MESSAGES/rkward.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/rkward.mo %%NLS%%share/locale/de/LC_MESSAGES/rkward.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/rkward.mo %%NLS%%share/locale/es/LC_MESSAGES/rkward.mo %%NLS%%share/locale/gl/LC_MESSAGES/rkward.mo +%%NLS%%share/locale/it/LC_MESSAGES/rkward.mo %%NLS%%share/locale/nl/LC_MESSAGES/rkward.mo %%NLS%%share/locale/pl/LC_MESSAGES/rkward.mo %%NLS%%share/locale/pt/LC_MESSAGES/rkward.mo @@ -82,6 +51,7 @@ share/kxmlgui5/rkward/rkwardui.rc %%NLS%%share/locale/tr/LC_MESSAGES/rkward.mo %%NLS%%share/locale/uk/LC_MESSAGES/rkward.mo %%NLS%%share/locale/x-test/LC_MESSAGES/rkward.mo +share/metainfo/org.kde.rkward.appdata.xml share/mime/packages/vnd.rkward.r.xml share/org.kde.syntax-highlighting/syntax/r.xml share/org.kde.syntax-highlighting/syntax/rkward.xml @@ -108,6 +78,9 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml %%DATADIR%%/00saveload/import/source.js %%DATADIR%%/00saveload/import/source.rkh %%DATADIR%%/00saveload/import/source.xml +%%DATADIR%%/00saveload/save/ExportRMarkdown.js +%%DATADIR%%/00saveload/save/ExportRMarkdown.rkh +%%DATADIR%%/00saveload/save/ExportRMarkdown.xml %%DATADIR%%/00saveload/save/save.js %%DATADIR%%/00saveload/save/save.rkh %%DATADIR%%/00saveload/save/save.xml @@ -575,7 +548,33 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml %%DATADIR%%/plots/stripchart_plot.js %%DATADIR%%/plots/stripchart_plot.xml %%DATADIR%%/pluginmap_meta.inc +%%DATADIR%%/po/ca/LC_MESSAGES/rkward__analysis.mo +%%DATADIR%%/po/ca/LC_MESSAGES/rkward__data.mo +%%DATADIR%%/po/ca/LC_MESSAGES/rkward__distributions.mo +%%DATADIR%%/po/ca/LC_MESSAGES/rkward__embedded.mo +%%DATADIR%%/po/ca/LC_MESSAGES/rkward__graphics_device.mo %%DATADIR%%/po/ca/LC_MESSAGES/rkward__import_export.mo +%%DATADIR%%/po/ca/LC_MESSAGES/rkward__item_response_theory.mo +%%DATADIR%%/po/ca/LC_MESSAGES/rkward__pages.mo +%%DATADIR%%/po/ca/LC_MESSAGES/rkward__plots.mo +%%DATADIR%%/po/ca@valencia/LC_MESSAGES/rkward__analysis.mo +%%DATADIR%%/po/ca@valencia/LC_MESSAGES/rkward__data.mo +%%DATADIR%%/po/ca@valencia/LC_MESSAGES/rkward__distributions.mo +%%DATADIR%%/po/ca@valencia/LC_MESSAGES/rkward__embedded.mo +%%DATADIR%%/po/ca@valencia/LC_MESSAGES/rkward__graphics_device.mo +%%DATADIR%%/po/ca@valencia/LC_MESSAGES/rkward__import_export.mo +%%DATADIR%%/po/ca@valencia/LC_MESSAGES/rkward__item_response_theory.mo +%%DATADIR%%/po/ca@valencia/LC_MESSAGES/rkward__pages.mo +%%DATADIR%%/po/ca@valencia/LC_MESSAGES/rkward__plots.mo +%%DATADIR%%/po/en_GB/LC_MESSAGES/rkward__analysis.mo +%%DATADIR%%/po/en_GB/LC_MESSAGES/rkward__data.mo +%%DATADIR%%/po/en_GB/LC_MESSAGES/rkward__distributions.mo +%%DATADIR%%/po/en_GB/LC_MESSAGES/rkward__embedded.mo +%%DATADIR%%/po/en_GB/LC_MESSAGES/rkward__graphics_device.mo +%%DATADIR%%/po/en_GB/LC_MESSAGES/rkward__import_export.mo +%%DATADIR%%/po/en_GB/LC_MESSAGES/rkward__item_response_theory.mo +%%DATADIR%%/po/en_GB/LC_MESSAGES/rkward__pages.mo +%%DATADIR%%/po/en_GB/LC_MESSAGES/rkward__plots.mo %%DATADIR%%/po/es/LC_MESSAGES/rkward__analysis.mo %%DATADIR%%/po/es/LC_MESSAGES/rkward__data.mo %%DATADIR%%/po/es/LC_MESSAGES/rkward__distributions.mo @@ -585,8 +584,13 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml %%DATADIR%%/po/es/LC_MESSAGES/rkward__item_response_theory.mo %%DATADIR%%/po/es/LC_MESSAGES/rkward__pages.mo %%DATADIR%%/po/es/LC_MESSAGES/rkward__plots.mo +%%DATADIR%%/po/gl/LC_MESSAGES/rkward__analysis.mo %%DATADIR%%/po/gl/LC_MESSAGES/rkward__data.mo +%%DATADIR%%/po/gl/LC_MESSAGES/rkward__distributions.mo +%%DATADIR%%/po/gl/LC_MESSAGES/rkward__embedded.mo %%DATADIR%%/po/gl/LC_MESSAGES/rkward__graphics_device.mo +%%DATADIR%%/po/gl/LC_MESSAGES/rkward__import_export.mo +%%DATADIR%%/po/gl/LC_MESSAGES/rkward__item_response_theory.mo %%DATADIR%%/po/gl/LC_MESSAGES/rkward__pages.mo %%DATADIR%%/po/gl/LC_MESSAGES/rkward__plots.mo %%DATADIR%%/po/nl/LC_MESSAGES/rkward__analysis.mo @@ -653,9 +657,13 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml %%DATADIR%%/po/x-test/LC_MESSAGES/rkward__pages.mo %%DATADIR%%/po/x-test/LC_MESSAGES/rkward__plots.mo %%DATADIR%%/resource.ver +%%DATADIR%%/rkwarddev_scripts/README_how_to_use_rkwarddev_scripts.md %%DATADIR%%/rkwarddev_scripts/rkwarddev_power_plugin_script.R +%%DATADIR%%/rkwarddev_scripts/rkwarddev_rk.RMarkdown_plugin_script.R %%DATADIR%%/rkwarddev_scripts/subset_dataframe.R %%DATADIR%%/rkwarddev_scripts/write_csv.R +%%DATADIR%%/rpackages/rkward.tgz +%%DATADIR%%/rpackages/rkwardtests.tgz %%DATADIR%%/simple_anova/code.js %%DATADIR%%/simple_anova/description.xml %%DATADIR%%/testing/matrix1.js @@ -683,15 +691,3 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml %%DATADIR%%/x11device/grid.js %%DATADIR%%/x11device/grid.rkh %%DATADIR%%/x11device/grid.xml -%%NLS%%@dir share/locale/ast/LC_MESSAGES -%%NLS%%@dir %%DATADIR%%/po/ast/LC_MESSAGES -%%NLS%%@dir %%DATADIR%%/po/bs/LC_MESSAGES -%%NLS%%@dir %%DATADIR%%/po/ca@valencia/LC_MESSAGES -%%NLS%%@dir %%DATADIR%%/po/cs/LC_MESSAGES -%%NLS%%@dir %%DATADIR%%/po/de/LC_MESSAGES -%%NLS%%@dir %%DATADIR%%/po/fi/LC_MESSAGES -%%NLS%%@dir %%DATADIR%%/po/fr/LC_MESSAGES -%%NLS%%@dir %%DATADIR%%/po/ja/LC_MESSAGES -%%NLS%%@dir %%DATADIR%%/po/lt/LC_MESSAGES -%%NLS%%@dir %%DATADIR%%/po/sk/LC_MESSAGES -%%NLS%%@dir %%DATADIR%%/po/zh_CN/LC_MESSAGES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001281815.00SIF069013762>