aboutsummaryrefslogtreecommitdiffstats
path: root/math
diff options
context:
space:
mode:
authorwen <wen@FreeBSD.org>2016-07-01 16:29:31 +0800
committerwen <wen@FreeBSD.org>2016-07-01 16:29:31 +0800
commit7c57306248c5c962d02e9a20720cc1747c182562 (patch)
treeb602fdb73b9239181188250d04c40c9c4c697f27 /math
parenta2981ff630fb06c9e2128bace7b7bd0cb4cde589 (diff)
downloadfreebsd-ports-graphics-7c57306248c5c962d02e9a20720cc1747c182562.tar.gz
freebsd-ports-graphics-7c57306248c5c962d02e9a20720cc1747c182562.tar.zst
freebsd-ports-graphics-7c57306248c5c962d02e9a20720cc1747c182562.zip
- Update to 3.3.1
- Remove PCRE_PORT option - Really strip the .so file - Minor cleanup PR: 210513 Submitted by: wen@(myself)
Diffstat (limited to 'math')
-rw-r--r--math/R/Makefile23
-rw-r--r--math/R/distinfo5
-rw-r--r--math/R/pkg-plist2
3 files changed, 13 insertions, 17 deletions
diff --git a/math/R/Makefile b/math/R/Makefile
index 177316ccc7f..778b8e00cd8 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME?= R
-PORTVERSION= 3.3.0
-PORTREVISION= 2
+PORTVERSION= 3.3.1
CATEGORIES= math lang
MASTER_SITES= http://cran.r-project.org/%SUBDIR%/ \
ftp://cran.r-project.org/pub/R/%SUBDIR%/ \
@@ -28,7 +27,8 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:textproc/gsed \
texi2dvi:print/texinfo
-LIB_DEPENDS= libcurl.so:ftp/curl
+LIB_DEPENDS= libcurl.so:ftp/curl \
+ libpcre.so:devel/pcre
CONFIGURE_ENV= LIBR_LDFLAGS="${LDFLAGS}" OBJC="${CC}" \
SED="${LOCALBASE}/bin/gsed" \
@@ -74,15 +74,13 @@ CONFIGURE_ARGS= --enable-memory-profiling rdocdir=${DOCSDIR} \
--with-system-bzlib --with-system-zlib
CONFIGURE_ENV+= FCFLAGS="${FFLAGS}" \
R_LD_LIBRARY_PATH="${R_LD_LIBRARY_PATH}" TAR="${TAR}"
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS_DEFINE+= ICU PCRE_PORT THREADS
+OPTIONS_DEFINE+= ICU THREADS
ICU_DESC= Use ICU for collation in multibyte locales
-PCRE_PORT_DESC= Use devel/pcre instead of the bundled PCRE
-OPTIONS_DEFAULT+= ICU PCRE_PORT THREADS
+OPTIONS_DEFAULT+= ICU THREADS
+
.if !defined(LIBR_SLAVEPORT)
RUN_DEPENDS+= ${LOCALBASE}/bin/gsed:textproc/gsed
USE_LDCONFIG= ${PREFIX}/lib/R/lib
@@ -179,13 +177,6 @@ CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.endif
-.if ${PORT_OPTIONS:MPCRE_PORT}
-LIB_DEPENDS+= libpcre.so:devel/pcre
-CONFIGURE_ARGS+= --with-system-pcre
-.else
-CONFIGURE_ARGS+= --without-system-pcre
-.endif
-
.if ${PORT_OPTIONS:MTHREADS}
CONFIGURE_ARGS+= --enable-threads=posix
.else
@@ -390,6 +381,8 @@ post-install:
done)
.endif
+ ${FIND} ${STAGEDIR}${PREFIX}/lib/ -name "*.so" | ${XARGS} ${STRIP_CMD}
+
.endif # LIBR_SLAVEPORT
.else # !LIBRMATH_SLAVEPORT
do-install:
diff --git a/math/R/distinfo b/math/R/distinfo
index 14d04e689f1..882438c3fe0 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,2 +1,3 @@
-SHA256 (R-3.3.0.tar.gz) = 9256b154b1a5993d844bee7b1955cd49c99ad72cef03cce3cd1bdca1310311e4
-SIZE (R-3.3.0.tar.gz) = 29820067
+TIMESTAMP = 1467276607
+SHA256 (R-3.3.1.tar.gz) = 3dc59ae5831f5380f83c169bac2103ad052efe0ecec4ffa74bde4d85a0fda9e2
+SIZE (R-3.3.1.tar.gz) = 29848329
diff --git a/math/R/pkg-plist b/math/R/pkg-plist
index d219a231300..fde384bb510 100644
--- a/math/R/pkg-plist
+++ b/math/R/pkg-plist
@@ -772,6 +772,7 @@ lib/R/library/mgcv/libs/mgcv.so
lib/R/library/nlme/CITATION
lib/R/library/nlme/DESCRIPTION
lib/R/library/nlme/INDEX
+lib/R/library/nlme/LICENCE
lib/R/library/nlme/Meta/Rd.rds
lib/R/library/nlme/Meta/data.rds
lib/R/library/nlme/Meta/hsearch.rds
@@ -813,6 +814,7 @@ lib/R/library/nlme/scripts/ch04.R
lib/R/library/nlme/scripts/ch05.R
lib/R/library/nlme/scripts/ch06.R
lib/R/library/nlme/scripts/ch08.R
+lib/R/library/nlme/scripts/runme.R
lib/R/library/nlme/scripts/sims.rda
lib/R/library/nnet/CITATION
lib/R/library/nnet/DESCRIPTION