diff --git a/dev-lang/r/r-3.4.2.recipe b/dev-lang/r/r-3.4.3.recipe similarity index 78% rename from dev-lang/r/r-3.4.2.recipe rename to dev-lang/r/r-3.4.3.recipe index b482c06ce..973f2de50 100644 --- a/dev-lang/r/r-3.4.2.recipe +++ b/dev-lang/r/r-3.4.3.recipe @@ -10,12 +10,12 @@ nonlinear regression models, time series analysis, classical parametric and \ nonparametric tests, clustering, smoothing and graphical data \ representations. Additional modules ('add-on packages') are available for a \ variety of specific purposes but are not distributed with this package." -HOMEPAGE="http://www.r-project.org/" +HOMEPAGE="https://www.r-project.org/" COPYRIGHT="1993-2017 The R Core Team" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://cloud.r-project.org/src/base/R-3/R-$portVersion.tar.gz" -CHECKSUM_SHA256="971e30c2436cf645f58552905105d75788bd9733bddbcb7c4fbff4c1a6d80c64" +CHECKSUM_SHA256="7a3cb831de5b4151e1f890113ed207527b7d4b16df9ec6b35e0964170007f426" SOURCE_DIR="R-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -28,8 +28,8 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - #lib:libcairo$secondaryArchSuffix lib:libbz2$secondaryArchSuffix +# lib:libcairo$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libgettextpo$secondaryArchSuffix @@ -39,8 +39,11 @@ REQUIRES=" lib:libicui18n$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix + lib:liblapack$secondaryArchSuffix lib:liblzma$secondaryArchSuffix lib:libncursesw$secondaryArchSuffix + lib:libopenblas$secondaryArchSuffix +# lib:libpango_1.0$secondaryArchSuffix lib:libpaper$secondaryArchSuffix lib:libpcre$secondaryArchSuffix lib:libpng16$secondaryArchSuffix @@ -55,42 +58,46 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - #devel:libblas$secondaryArchSuffix - #devel:liblapack$secondaryArchSuffix - #devel:libcairo$secondaryArchSuffix + devel:libbz2$secondaryArchSuffix +# devel:libcairo$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix devel:libcurl$secondaryArchSuffix devel:libgettextpo$secondaryArchSuffix + devel:libgfortran$secondaryArchSuffix + devel:libgomp$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libicui18n$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix + devel:liblapack$secondaryArchSuffix + devel:liblzma$secondaryArchSuffix + devel:libncursesw$secondaryArchSuffix + devel:libopenblas$secondaryArchSuffix +# devel:libpango_1.0$secondaryArchSuffix devel:libpaper$secondaryArchSuffix devel:libpcre$secondaryArchSuffix devel:libpng16$secondaryArchSuffix + devel:libquadmath$secondaryArchSuffix devel:libreadline$secondaryArchSuffix + devel:libssl$secondaryArchSuffix devel:libtclstub8.5$secondaryArchSuffix devel:libtiff$secondaryArchSuffix - devel:libbz2$secondaryArchSuffix - devel:liblzma$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:autoconf - cmd:aclocal - cmd:autoheader cmd:awk cmd:bison cmd:gcc$secondaryArchSuffix cmd:gfortran$secondaryArchSuffix cmd:grep - #cmd:kpsewhich #texlive +# cmd:kpsewhich #texlive cmd:ld$secondaryArchSuffix cmd:less cmd:libtoolize$secondaryArchSuffix cmd:make - #cmd:makeindex #texlive - #cmd:pdflatex #texlive - #cmd:pdftex #texlive +# cmd:makeindex #texlive +# cmd:pdflatex #texlive +# cmd:pdftex #texlive cmd:pkg_config$secondaryArchSuffix cmd:pwd cmd:sed @@ -101,12 +108,12 @@ BUILD_PREREQUIRES=" BUILD() { - export CFLAGS="-D_BSD_SOURCE" - export LDFLAGS="-lnetwork -lbsd" + export CPPFLAGS="-D_BSD_SOURCE" + export LIBS="-lnetwork -lbsd" runConfigure --omit-dirs sysconfdir ./configure \ --with-x=no \ - --sysconfdir="$settingsDir/R" \ + --sysconfdir="$sysconfDir/R" \ --enable-R-shlib \ rdocdir="$docDir" \ rincludedir=$includeDir \ @@ -118,6 +125,8 @@ BUILD() INSTALL() { make install + + fixPkgconfig } TEST()