svn commit: r455296 - head/math/R
Joseph Mingrone
jrm at FreeBSD.org
Fri Dec 1 14:59:53 UTC 2017
Author: jrm
Date: Fri Dec 1 14:59:51 2017
New Revision: 455296
URL: https://svnweb.freebsd.org/changeset/ports/455296
Log:
math/R: Update to version 3.4.3
Other port changes:
- Add armv6 and armv7 to ONLY_FOR_ARCHS; armv6 and armv7 were tested by mmel@
and working on 11.
- Remove LIBR option and always build the shared library. This was requested by
yuri@ and a RFC was posted on ports@ with no response.
- Exclude OPENMP option for everything except amd64 and i386.
- Turn on OPENMP option by default to match upstream.
- Turn off TCLTK option by default.
- LLVM, which gets pulled in with FLANG, provides libomp, so only depend on
devel/openmp, when GFORTRAN and OPENMP are on.
Modified:
head/math/R/Makefile
head/math/R/distinfo
head/math/R/pkg-plist
Modified: head/math/R/Makefile
==============================================================================
--- head/math/R/Makefile Fri Dec 1 14:52:51 2017 (r455295)
+++ head/math/R/Makefile Fri Dec 1 14:59:51 2017 (r455296)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= R
-DISTVERSION= 3.4.2
-PORTREVISION= 3
+DISTVERSION= 3.4.3
CATEGORIES= math lang
MASTER_SITES= CRAN/src/base/R-${PORTVERSION:C|\..*||}
@@ -12,14 +11,22 @@ COMMENT= Language for statistical computing and graph
LICENSE= GPLv2
-ONLY_FOR_ARCHS= aarch64 amd64 i386
+BROKEN_FreeBSD_10_armv6= Fails to build
+ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386
LIB_DEPENDS= libcurl.so:ftp/curl \
libpcre.so:devel/pcre
BUILD_DEPENDS= texi2any:print/texinfo
-RUN_DEPENDS= gmake:devel/gmake
+RUN_DEPENDS= gmake:devel/gmake # R packages may require GNU make
+# possible TODO
+# - Use --with-recommended-packages=no by default
+# - Add an option for recommended packages
+# - Create ports for each of the recommended packages
+# - Create a meta-port for the recommended packages
+
CONFIGURE_ARGS= --disable-java \
+ --enable-R-shlib \
--with-readline \
rdocdir=${DOCSDIR}
GNU_CONFIGURE= yes
@@ -29,8 +36,11 @@ USES= gmake iconv libtool localbase \
USE_PERL5= build
USE_LDCONFIG= ${PREFIX}/lib/R/lib
-OPTIONS_DEFINE= FLANG ICU INFO LDOUBLE LETTER LIBR MEMPROF NLS OPENMP RPROF X11
-OPTIONS_EXCLUDE_aarch64=FLANG # define+exclude for *_OFF option helpers
+OPTIONS_DEFINE= FLANG ICU INFO LDOUBLE LETTER MEMPROF NLS OPENMP RPROF \
+ X11
+OPTIONS_EXCLUDE_aarch64= FLANG OPENMP
+OPTIONS_EXCLUDE_armv6= FLANG OPENMP
+OPTIONS_EXCLUDE_armv7= FLANG OPENMP
OPTIONS_EXCLUDE_i386= FLANG
OPTIONS_GROUP= NEEDX11
OPTIONS_GROUP_NEEDX11= GHOSTSCRIPT JPEG CAIROPANGO PNG TCLTK TEXDOCS TIFF
@@ -47,9 +57,7 @@ INFO_DESC= GNU info manuals
JPEG_DESC= JPEG graphics device
LDOUBLE_DESC= Long double data type
LETTER_DESC= US letter paper
-LIBR_DESC= Shared R library
MEMPROF_DESC= Memory profiling via Rprofmem() and tracemem()
-NEEDGCC_DESC= Require GCC
NEEDX11_DESC= Require X11
NETLIB_DESC= Netlib BLAS implementation
OPENBLAS_DESC= OpenBLAS BLAS implementation
@@ -59,15 +67,15 @@ RPROF_DESC= R profiling via Rprof()
TEXDOCS_DESC= Build/Install TeX-dependent documentation files
X11_DESC= X11 graphics device
-OPTIONS_DEFAULT= CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE LIBR PNG \
- RBLAS RPROF TCLTK TIFF X11
+OPTIONS_DEFAULT= CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE OPENMP \
+ PNG RBLAS RPROF TIFF X11
ATLAS_USES= blaslapack:atlas
ATLAS_CONFIGURE_ON= --disable-BLAS-shlib
ATLAS_VARS= MANUAL_PACKAGE_BUILD=\
"Choose a BLAS option other than ATLAS for package building."
CAIROPANGO_IMPLIES= X11
-CAIROPANGO_CONFIGURE_WITH=cairo
+CAIROPANGO_CONFIGURE_WITH= cairo
CAIROPANGO_USES= gettext jpeg pkgconfig
CAIROPANGO_USE= GNOME=pango,cairo
FLANG_USES= fortran:flang
@@ -83,19 +91,16 @@ JPEG_IMPLIES= X11
JPEG_CONFIGURE_WITH= jpeglib
JPEG_CONFIGURE_ENV= r_cv_header_jpeglib_h=yes
JPEG_USES= jpeg
-LDOUBLE_CONFIGURE_ENABLE=long-double
+LDOUBLE_CONFIGURE_ENABLE= long-double
LETTER_CONFIGURE_ENV= R_PAPERSIZE=letter
-LIBR_CONFIGURE_ENABLE= R-shlib
-LIBR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_main_Makefile.in
-MEMPROF_CONFIGURE_ENABLE=memory-profiling
+MEMPROF_CONFIGURE_ENABLE= memory-profiling
NETLIB_USES= blaslapack:netlib
NETLIB_CONFIGURE_ON= --disable-BLAS-shlib
NLS_CONFIGURE_OFF= --disable-nls
NLS_USES= gettext
OPENBLAS_USES= blaslapack:openblas
OPENBLAS_CONFIGURE_ON= --disable-BLAS-shlib
-OPENMP_CONFIGURE_ENABLE=openmp
-OPENMP_LIB_DEPENDS= libomp.so:devel/openmp
+OPENMP_CONFIGURE_ENABLE= openmp
PNG_IMPLIES= X11
PNG_LIB_DEPENDS= libpng.so:graphics/png
PNG_CONFIGURE_WITH= libpng
@@ -124,6 +129,15 @@ X11_USE= xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt
LIBVER= ${PORTVERSION:R}
PLIST_SUB= LIBVER=${LIBVER}
+.include <bsd.port.options.mk>
+.include "compiler.mk"
+
+# LLVM, which gets pulled in with FLANG, provides libomp. So, only depend on
+# devel/openmp, when GFORTRAN and OPENMP are on.
+.if ! ${PORT_OPTIONS:MFLANG} && ${PORT_OPTIONS:MOPENMP}
+LIB_DEPENDS+= libomp.so:devel/openmp
+.endif
+
post-patch:
@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
@${REINPLACE_CMD} "s|%%LIBVER%%|${LIBVER}|" \
@@ -139,6 +153,4 @@ post-install-RBLAS-off:
@${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \
${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
-.include <bsd.port.pre.mk>
-.include "compiler.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/math/R/distinfo
==============================================================================
--- head/math/R/distinfo Fri Dec 1 14:52:51 2017 (r455295)
+++ head/math/R/distinfo Fri Dec 1 14:59:51 2017 (r455296)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506599196
-SHA256 (R-3.4.2.tar.gz) = 971e30c2436cf645f58552905105d75788bd9733bddbcb7c4fbff4c1a6d80c64
-SIZE (R-3.4.2.tar.gz) = 30255544
+TIMESTAMP = 1512059911
+SHA256 (R-3.4.3.tar.gz) = 7a3cb831de5b4151e1f890113ed207527b7d4b16df9ec6b35e0964170007f426
+SIZE (R-3.4.3.tar.gz) = 30249655
Modified: head/math/R/pkg-plist
==============================================================================
--- head/math/R/pkg-plist Fri Dec 1 14:52:51 2017 (r455295)
+++ head/math/R/pkg-plist Fri Dec 1 14:59:51 2017 (r455296)
@@ -104,8 +104,8 @@ lib/R/include/S.h
%%RBLAS%%lib/R/lib/libRblas.so.%%LIBVER%%
%%RBLAS%%lib/R/lib/libRlapack.so
%%RBLAS%%lib/R/lib/libRlapack.so.%%LIBVER%%
-%%LIBR%%lib/R/lib/libR.so
-%%LIBR%%lib/R/lib/libR.so.%%LIBVER%%
+lib/R/lib/libR.so
+lib/R/lib/libR.so.%%LIBVER%%
lib/R/library/KernSmooth/DESCRIPTION
lib/R/library/KernSmooth/INDEX
lib/R/library/KernSmooth/Meta/features.rds
@@ -1524,7 +1524,7 @@ lib/R/share/texmf/tex/latex/omsaett.fd
lib/R/share/texmf/tex/latex/omscmtt.fd
lib/R/share/texmf/tex/latex/ts1aer.fd
lib/R/share/texmf/tex/latex/ts1aett.fd
-%%LIBR%%libdata/pkgconfig/libR.pc
+libdata/pkgconfig/libR.pc
man/man1/R.1.gz
man/man1/Rscript.1.gz
%%DOCSDIR%%/html/Rlogo.pdf
More information about the svn-ports-all
mailing list