Upgrade to 0.6.0.

Changelog at http://freecode.com/projects/rkward#release_349200 .

Feature safe:	yes
This commit is contained in:
Thierry Thomas 2012-10-31 20:29:34 +00:00
parent 84dc74888d
commit cf0eb369c2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=306763
4 changed files with 42 additions and 48 deletions

View file

@ -1,13 +1,8 @@
# New ports collection makefile for: RKWard
# Date created: 19 April 2006
# Whom: thierry@pompo.net
#
# Created by: thierry@pompo.net
# $FreeBSD$
#
PORTNAME= rkward
PORTVERSION= 0.5.7
PORTREVISION= 6
PORTVERSION= 0.6.0
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}/Current_Stable_Releases
PKGNAMESUFFIX= -kde4
@ -32,6 +27,8 @@ USE_GETTEXT= yes
USE_CMAKE= yes
INSTALLS_ICONS= yes
CFLAGS+= -I${LOCALBASE}/include
DOCSDIR= ${PREFIX}/share/doc/HTML/en/rkward
MAN1= rkward.1
@ -46,9 +43,22 @@ PLIST_SUB+= NLS=${NLS}
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
.endif
OPTIONS_DEFINE= RECDEP
RECDEP_DESC= Recommended runtime dependencies
OPTIONS_DEFAULT=RECDEP
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MRECDEP}
LR_MOD_DIR= ${LOCALBASE}/lib/R/library
RUN_DEPENDS+= ${LR_MOD_DIR}/R2HTML/INDEX:${PORTSDIR}/textproc/R-cran-R2HTML \
${LR_MOD_DIR}/XML/INDEX:${PORTSDIR}/textproc/R-cran-XML \
${LR_MOD_DIR}/mvtnorm/INDEX:${PORTSDIR}/math/R-cran-mvtnorm \
${LR_MOD_DIR}/car/INDEX:${PORTSDIR}/math/R-cran-car
.endif
pre-configure:
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
${WRKSRC}/rkward/rkward.sh.template \
${WRKSRC}/rkward/rbackend/rkfrontendtransmitter.cpp
.if defined(NOPORTDOCS)
${REINPLACE_CMD} -e 's|ADD_SUBDIRECTORY(doc)|#ADD_SUBDIRECTORY(doc)|' \
@ -70,7 +80,7 @@ pre-configure:
regression-test: install
@${ECHO_MSG} "To pass the tests, some CRAN packages like R2HTML"
@${ECHO_MSG} "must be installed."
(cd ${WRKSRC}/tests && make plugintests)
(cd ${WRKSRC}/tests && LANG=C make plugintests)
.endif
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (rkward-0.5.7.tar.gz) = 623e3dc89faf31502e1738c76f6e1138054ca8fb99701862cf872040691cbbf4
SIZE (rkward-0.5.7.tar.gz) = 1337243
SHA256 (rkward-0.6.0.tar.gz) = a162abe464a30470553b8cc3bb6f4e757f43982f2ff65a549e33fc4e1a9b3879
SIZE (rkward-0.6.0.tar.gz) = 1448454

View file

@ -1,16 +0,0 @@
--- rkward/rbackend/rkrbackend.cpp.orig 2011-10-18 10:29:11.000000000 +0200
+++ rkward/rbackend/rkrbackend.cpp 2011-11-12 22:08:00.000000000 +0100
@@ -1056,11 +1056,11 @@
if (backend_was_forked) return;
backend_was_forked = true;
- // Block SIGCLD in the main thread from now on. I don't fully understand, why, but otherwise, these signals
+ // Block SIGCHLD in the main thread from now on. I don't fully understand, why, but otherwise, these signals
// interrupt the select() call in the fork()ing code of library(parallel)
sigset_t new_set;
sigemptyset (&new_set);
- sigaddset (&new_set, SIGCLD);
+ sigaddset (&new_set, SIGCHLD);
pthread_sigmask (SIG_BLOCK, &new_set, NULL);
// This was used to show a warning message. Unfortunately, however, forks also occur on every popen (i.e. in system(..., intern=TRUE).

View file

@ -12,14 +12,18 @@ share/apps/rkward/00saveload/import/import_spss.xml
share/apps/rkward/00saveload/import/import_stata.js
share/apps/rkward/00saveload/import/import_stata.rkh
share/apps/rkward/00saveload/import/import_stata.xml
share/apps/rkward/00saveload/import/import_xls.js
share/apps/rkward/00saveload/import/import_xls.rkh
share/apps/rkward/00saveload/import/import_xls.xml
share/apps/rkward/00saveload/import/load_data.js
share/apps/rkward/00saveload/import/load_data.rkh
share/apps/rkward/00saveload/import/load_data.xml
share/apps/rkward/00saveload/import/source.js
share/apps/rkward/00saveload/import/source.rkh
share/apps/rkward/00saveload/import/source.xml
share/apps/rkward/00saveload/save/save/code.js
share/apps/rkward/00saveload/save/save/description.xml
share/apps/rkward/00saveload/save/save.js
share/apps/rkward/00saveload/save/save.rkh
share/apps/rkward/00saveload/save/save.xml
share/apps/rkward/00saveload/save/skeleton/code.js
share/apps/rkward/00saveload/save/skeleton/description.xml
share/apps/rkward/00saveload/save/write.js
@ -124,9 +128,9 @@ share/apps/rkward/analysis/outliers/outlier.xml
share/apps/rkward/analysis/regression/linear_regression.js
share/apps/rkward/analysis/regression/linear_regression.rkh
share/apps/rkward/analysis/regression/linear_regression.xml
share/apps/rkward/analysis/t_test_two_vars.js
share/apps/rkward/analysis/t_test_two_vars.rkh
share/apps/rkward/analysis/t_test_two_vars.xml
share/apps/rkward/analysis/t_test.js
share/apps/rkward/analysis/t_test.rkh
share/apps/rkward/analysis/t_test.xml
share/apps/rkward/analysis/time_series/Box_test.js
share/apps/rkward/analysis/time_series/Box_test.rkh
share/apps/rkward/analysis/time_series/Box_test.xml
@ -148,12 +152,9 @@ share/apps/rkward/analysis/variances/fligner_test.xml
share/apps/rkward/analysis/variances/levene_test.js
share/apps/rkward/analysis/variances/levene_test.rkh
share/apps/rkward/analysis/variances/levene_test.xml
share/apps/rkward/analysis/wilcoxon/wilcoxon_exact_test.js
share/apps/rkward/analysis/wilcoxon/wilcoxon_exact_test.rkh
share/apps/rkward/analysis/wilcoxon/wilcoxon_exact_test.xml
share/apps/rkward/analysis/wilcoxon/wilcoxon_test.js
share/apps/rkward/analysis/wilcoxon/wilcoxon_test.rkh
share/apps/rkward/analysis/wilcoxon/wilcoxon_test.xml
share/apps/rkward/analysis/wilcoxon/wilcoxon_tests.js
share/apps/rkward/analysis/wilcoxon/wilcoxon_tests.rkh
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
@ -164,6 +165,7 @@ 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/sort.js
share/apps/rkward/data/sort.rkh
share/apps/rkward/data/sort.xml
share/apps/rkward/data/sort2.xml
share/apps/rkward/descriptive/descriptive_statistics.js
@ -403,8 +405,8 @@ share/apps/rkward/pages/rkward_for_new_users.rkh
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_output.rkh
share/apps/rkward/pages/rkward_plot_history.rkh
share/apps/rkward/pages/rkward_public_functions.rkh
share/apps/rkward/pages/rkward_shortcuts.rkh
@ -501,8 +503,11 @@ share/apps/rkward/rktoplevelwindowgui.rc
share/apps/rkward/rkwardui.rc
share/apps/rkward/simple_anova/code.js
share/apps/rkward/simple_anova/description.xml
share/apps/rkward/testing/optionset.js
share/apps/rkward/testing/optionset.xml
share/apps/rkward/testing/run_code.js
share/apps/rkward/testing/run_code.xml
share/apps/rkward/testing/scatterplot2.xml
share/apps/rkward/testing/test1.js
share/apps/rkward/testing/test1.xml
share/apps/rkward/testing/test2.js
@ -533,19 +538,11 @@ share/icons/hicolor/32x32/apps/rkward.png
share/icons/hicolor/48x48/apps/rkward.png
share/icons/hicolor/64x64/apps/rkward.png
share/icons/hicolor/scalable/apps/rkward.svgz
%%NLS%%share/locale/ca/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/cs/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/da/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/de/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/el/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/es/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/fr/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/it/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/lt/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/pl/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/tr/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/uk/LC_MESSAGES/rkward.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/rkward.mo
%%PORTDOCS%%@dirrm share/doc/HTML/en/rkwardplugins
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrmtry share/doc/HTML/en
@ -581,7 +578,6 @@ share/icons/hicolor/scalable/apps/rkward.svgz
@dirrm share/apps/rkward/analysis/TESTS
@dirrm share/apps/rkward/analysis
@dirrm share/apps/rkward/00saveload/save/skeleton
@dirrm share/apps/rkward/00saveload/save/save
@dirrm share/apps/rkward/00saveload/save
@dirrm share/apps/rkward/00saveload/import
@dirrm share/apps/rkward/00saveload
@ -590,11 +586,13 @@ share/icons/hicolor/scalable/apps/rkward.svgz
@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
@ -607,8 +605,10 @@ 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