diff --git a/dev-lang/r/patches/r-3.3.2.patchset b/dev-lang/r/patches/r-3.3.2.patchset deleted file mode 100644 index c837139c5..000000000 --- a/dev-lang/r/patches/r-3.3.2.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From e4ed00e298561563a05681b23b1ad3ff4f8e30f1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sat, 11 Feb 2017 09:03:25 +0100 -Subject: zlib detection patch (already fixed upstream) - - -diff --git a/configure b/configure -index cf368ce..6759b3c 100755 ---- a/configure -+++ b/configure -@@ -35510,7 +35510,7 @@ int main() { - #ifdef ZLIB_VERSION - /* Work around Debian bug: it uses 1.2.3.4 even though there was no such - version on the master site zlib.net */ -- exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0); -+ exit(ZLIB_VERNUM < 0x1250); - #else - exit(1); - #endif --- -2.11.0 - diff --git a/dev-lang/r/r-3.3.2.recipe b/dev-lang/r/r-3.3.3.recipe similarity index 91% rename from dev-lang/r/r-3.3.2.recipe rename to dev-lang/r/r-3.3.3.recipe index d6dd20238..2c1035c49 100644 --- a/dev-lang/r/r-3.3.2.recipe +++ b/dev-lang/r/r-3.3.3.recipe @@ -11,13 +11,12 @@ 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/" -COPYRIGHT="1993-2016 The R Core Team" +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="d294ad21e9f574fb4828ebb3a94b8cb34f4f304a41687a994be00dd41a4e514c" +CHECKSUM_SHA256="5ab768053a275084618fb669b4fbaadcc39158998a87e8465323829590bcfc6c" SOURCE_DIR="R-$portVersion" -PATCHES="r-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" @@ -30,22 +29,28 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix #lib:libcairo$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libgettextpo$secondaryArchSuffix + lib:libgfortran$secondaryArchSuffix + lib:libgomp$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libicui18n$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix + lib:liblzma$secondaryArchSuffix lib:libncursesw$secondaryArchSuffix lib:libpaper$secondaryArchSuffix lib:libpcre$secondaryArchSuffix lib:libpng16$secondaryArchSuffix + lib:libquadmath$secondaryArchSuffix lib:libreadline$secondaryArchSuffix + lib:libssl$secondaryArchSuffix lib:libtcl8.5$secondaryArchSuffix lib:libtiff$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix - lib:liblzma$secondaryArchSuffix lib:libz$secondaryArchSuffix + cmd:less " BUILD_REQUIRES="