Fix with R 2.8.1 and gfortran43.
This commit is contained in:
parent
b8a0041171
commit
9cdc2994e4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=226595
6 changed files with 46 additions and 22 deletions
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= rkward
|
||||
DISTVERSION= 0.4.9a
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
PORTEPOCH= 3
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
|
@ -18,8 +18,6 @@ COMMENT= IDE/GUI for the R-project
|
|||
|
||||
LIB_DEPENDS= R.0:${PORTSDIR}/math/R
|
||||
|
||||
BROKEN= does not compile
|
||||
|
||||
USE_KDELIBS_VER=3
|
||||
USE_PHP= yes
|
||||
WANT_PHP_CLI= yes
|
||||
|
@ -31,8 +29,7 @@ CONFIGURE_ARGS= --disable-fast-perl
|
|||
INSTALLS_ICONS= yes
|
||||
|
||||
USE_FORTRAN= yes
|
||||
FORTRANLIBDIR2= `${DIRNAME} \\`gfortran42 -print-libgcc-file-name\\``/../../../
|
||||
CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
|
||||
FORTRANLIBDIR2= `${DIRNAME} \\`${FC} -print-libgcc-file-name\\``/../../../
|
||||
|
||||
DOCSDIR= ${PREFIX}/share/doc/HTML/en/rkward
|
||||
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
--- ./rkward/rbackend/rembedinternal.cpp.orig 2008-04-10 15:19:08.000000000 +0200
|
||||
+++ ./rkward/rbackend/rembedinternal.cpp 2009-01-21 10:27:25.000000000 +0100
|
||||
@@ -87,7 +87,9 @@
|
||||
#include "R.h"
|
||||
#include "Rinternals.h"
|
||||
#include "Rinterface.h"
|
||||
-#include "Rdevices.h"
|
||||
+#if (R_VERSION < R_Version(2, 8, 1))
|
||||
+# include "Rdevices.h"
|
||||
+#endif
|
||||
#include "R_ext/Parse.h"
|
||||
|
||||
#ifdef R_2_4
|
|
@ -472,21 +472,23 @@ share/icons/locolor/32x32/apps/rkward.png
|
|||
@dirrmtry share/apps/katepart/syntax
|
||||
@dirrmtry share/apps/katepart
|
||||
@cwd %%LOCALBASE%%
|
||||
lib/R/library/rkward/CONTENTS
|
||||
lib/R/library/rkward/DESCRIPTION
|
||||
lib/R/library/rkward/Meta/package.rds
|
||||
lib/R/library/rkward/INDEX
|
||||
lib/R/library/rkward/Meta/Rd.rds
|
||||
lib/R/library/rkward/Meta/hsearch.rds
|
||||
lib/R/library/rkward/libs/rkward.so
|
||||
lib/R/library/rkward/Meta/package.rds
|
||||
lib/R/library/rkward/R-ex/public.R
|
||||
lib/R/library/rkward/R/rkward
|
||||
lib/R/library/rkward/man/rkward.Rd.gz
|
||||
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/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/R-ex/public.R
|
||||
lib/R/library/rkward/CONTENTS
|
||||
lib/R/library/rkward/INDEX
|
||||
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
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= rkward
|
||||
DISTVERSION= 0.4.9a
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
PORTEPOCH= 3
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
|
@ -18,8 +18,6 @@ COMMENT= IDE/GUI for the R-project
|
|||
|
||||
LIB_DEPENDS= R.0:${PORTSDIR}/math/R
|
||||
|
||||
BROKEN= does not compile
|
||||
|
||||
USE_KDELIBS_VER=3
|
||||
USE_PHP= yes
|
||||
WANT_PHP_CLI= yes
|
||||
|
@ -31,8 +29,7 @@ CONFIGURE_ARGS= --disable-fast-perl
|
|||
INSTALLS_ICONS= yes
|
||||
|
||||
USE_FORTRAN= yes
|
||||
FORTRANLIBDIR2= `${DIRNAME} \\`gfortran42 -print-libgcc-file-name\\``/../../../
|
||||
CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
|
||||
FORTRANLIBDIR2= `${DIRNAME} \\`${FC} -print-libgcc-file-name\\``/../../../
|
||||
|
||||
DOCSDIR= ${PREFIX}/share/doc/HTML/en/rkward
|
||||
|
||||
|
|
13
math/rkward/files/patch-rkward_rbackend_rembedinternal.cpp
Normal file
13
math/rkward/files/patch-rkward_rbackend_rembedinternal.cpp
Normal file
|
@ -0,0 +1,13 @@
|
|||
--- ./rkward/rbackend/rembedinternal.cpp.orig 2008-04-10 15:19:08.000000000 +0200
|
||||
+++ ./rkward/rbackend/rembedinternal.cpp 2009-01-21 10:27:25.000000000 +0100
|
||||
@@ -87,7 +87,9 @@
|
||||
#include "R.h"
|
||||
#include "Rinternals.h"
|
||||
#include "Rinterface.h"
|
||||
-#include "Rdevices.h"
|
||||
+#if (R_VERSION < R_Version(2, 8, 1))
|
||||
+# include "Rdevices.h"
|
||||
+#endif
|
||||
#include "R_ext/Parse.h"
|
||||
|
||||
#ifdef R_2_4
|
|
@ -472,21 +472,23 @@ share/icons/locolor/32x32/apps/rkward.png
|
|||
@dirrmtry share/apps/katepart/syntax
|
||||
@dirrmtry share/apps/katepart
|
||||
@cwd %%LOCALBASE%%
|
||||
lib/R/library/rkward/CONTENTS
|
||||
lib/R/library/rkward/DESCRIPTION
|
||||
lib/R/library/rkward/Meta/package.rds
|
||||
lib/R/library/rkward/INDEX
|
||||
lib/R/library/rkward/Meta/Rd.rds
|
||||
lib/R/library/rkward/Meta/hsearch.rds
|
||||
lib/R/library/rkward/libs/rkward.so
|
||||
lib/R/library/rkward/Meta/package.rds
|
||||
lib/R/library/rkward/R-ex/public.R
|
||||
lib/R/library/rkward/R/rkward
|
||||
lib/R/library/rkward/man/rkward.Rd.gz
|
||||
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/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/R-ex/public.R
|
||||
lib/R/library/rkward/CONTENTS
|
||||
lib/R/library/rkward/INDEX
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue