aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
Diffstat (limited to 'math')
-rw-r--r--math/R-cran-RSvgDevice/Makefile2
-rw-r--r--math/R-cran-SuppDists/Makefile1
-rw-r--r--math/R-cran-Zelig/Makefile1
-rw-r--r--math/R-cran-car/Makefile1
-rw-r--r--math/R-cran-coda/Makefile2
-rw-r--r--math/R-cran-gpclib/Makefile2
-rw-r--r--math/R-cran-inline/Makefile2
-rw-r--r--math/R-cran-mvtnorm/Makefile2
-rw-r--r--math/R-cran-psych/Makefile2
-rw-r--r--math/R-cran-sm/Makefile2
-rw-r--r--math/R-cran-sp/Makefile2
-rw-r--r--math/R/Makefile105
-rw-r--r--math/R/distinfo4
-rw-r--r--math/R/pkg-plist14
-rw-r--r--math/ess/Makefile1
-rw-r--r--math/p5-Statistics-R/Makefile2
-rw-r--r--math/rkward-kde4/Makefile1
-rw-r--r--math/rkward/Makefile2
-rw-r--r--math/rpy/Makefile2
-rw-r--r--math/rpy/pkg-plist2
-rw-r--r--math/rpy2/Makefile2
21 files changed, 88 insertions, 66 deletions
diff --git a/math/R-cran-RSvgDevice/Makefile b/math/R-cran-RSvgDevice/Makefile
index 83d4d31c7da2..6fad94cc2497 100644
--- a/math/R-cran-RSvgDevice/Makefile
+++ b/math/R-cran-RSvgDevice/Makefile
@@ -7,7 +7,7 @@
PORTNAME= RSvgDevice
PORTVERSION= 0.6.4.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= math
PKGNAMEPREFIX= R-cran-
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/math/R-cran-SuppDists/Makefile b/math/R-cran-SuppDists/Makefile
index 751ff150c94f..04b8219ac070 100644
--- a/math/R-cran-SuppDists/Makefile
+++ b/math/R-cran-SuppDists/Makefile
@@ -7,6 +7,7 @@
PORTNAME= SuppDists
DISTVERSION= 1.1-8
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_CRAN_SITES} \
http://r.research.att.com/benchmarks/:benchmark \
diff --git a/math/R-cran-Zelig/Makefile b/math/R-cran-Zelig/Makefile
index de5c63679fd1..80b5dcfc3994 100644
--- a/math/R-cran-Zelig/Makefile
+++ b/math/R-cran-Zelig/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Zelig
DISTVERSION= 3.5
+PORTREVISION= 1
CATEGORIES= math
PKGNAMEPREFIX= R-cran-
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-car/Makefile b/math/R-cran-car/Makefile
index 7148f6302f38..aa22c92188ec 100644
--- a/math/R-cran-car/Makefile
+++ b/math/R-cran-car/Makefile
@@ -7,6 +7,7 @@
PORTNAME= car
DISTVERSION= 2.0-10
+PORTREVISION= 1
CATEGORIES= math
PKGNAMEPREFIX= R-cran-
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-coda/Makefile b/math/R-cran-coda/Makefile
index ab37161faa1b..589867d78b0d 100644
--- a/math/R-cran-coda/Makefile
+++ b/math/R-cran-coda/Makefile
@@ -7,7 +7,7 @@
PORTNAME= coda
DISTVERSION= 0.14-2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
PKGNAMEPREFIX= R-cran-
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-gpclib/Makefile b/math/R-cran-gpclib/Makefile
index f054f658ad52..b5fed9f82329 100644
--- a/math/R-cran-gpclib/Makefile
+++ b/math/R-cran-gpclib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpclib
DISTVERSION= 1.5-1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
PKGNAMEPREFIX= R-cran-
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-inline/Makefile b/math/R-cran-inline/Makefile
index 7350fa6e83ed..492076852656 100644
--- a/math/R-cran-inline/Makefile
+++ b/math/R-cran-inline/Makefile
@@ -7,7 +7,7 @@
PORTNAME= inline
PORTVERSION= 0.3.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
PKGNAMEPREFIX= R-cran-
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/math/R-cran-mvtnorm/Makefile b/math/R-cran-mvtnorm/Makefile
index 45567f1878f8..79b9ce6f7c24 100644
--- a/math/R-cran-mvtnorm/Makefile
+++ b/math/R-cran-mvtnorm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mvtnorm
PORTVERSION= 0.9.96
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
PKGNAMEPREFIX= R-cran-
DISTNAME= ${PORTNAME}_${PORTVERSION:C/\./-/g:C/-/\./1}
diff --git a/math/R-cran-psych/Makefile b/math/R-cran-psych/Makefile
index b55a30a7eb4f..647be092ad0e 100644
--- a/math/R-cran-psych/Makefile
+++ b/math/R-cran-psych/Makefile
@@ -7,7 +7,7 @@
PORTNAME= psych
PORTVERSION= 1.0.94
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math science
PKGNAMEPREFIX= R-cran-
DISTNAME= ${PORTNAME}_${PORTVERSION:C/\./-/g:C/-/\./1}
diff --git a/math/R-cran-sm/Makefile b/math/R-cran-sm/Makefile
index 8aece8664b64..a20cf494c97c 100644
--- a/math/R-cran-sm/Makefile
+++ b/math/R-cran-sm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sm
DISTVERSION= 2.2-4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
PKGNAMEPREFIX= R-cran-
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/math/R-cran-sp/Makefile b/math/R-cran-sp/Makefile
index 1f8337329d55..42cac2c53fa1 100644
--- a/math/R-cran-sp/Makefile
+++ b/math/R-cran-sp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sp
PORTVERSION= 0.9.78
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
PKGNAMEPREFIX= R-cran-
DISTNAME= ${PORTNAME}_${PORTVERSION:C/\./-/g:C/-/\./1}
diff --git a/math/R/Makefile b/math/R/Makefile
index 7a30e536607c..b6f946e21540 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME?= R
-PORTVERSION= 2.13.0
-PORTREVISION= 1
+PORTVERSION= 2.13.1
CATEGORIES= math lang
MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \
ftp://cran.r-project.org/pub/R/src/base/R-2/ \
@@ -46,28 +45,32 @@ CONFIGURE_ARGS = --enable-memory-profiling rdocdir=${DOCSDIR} \
CONFIGURE_ENV= FCFLAGS="${FFLAGS}" \
INSTALL_DATA="${INSTALL} ${COPY} ${_SHROWNGRP} -m 644" \
R_LD_LIBRARY_PATH="${R_LD_LIBRARY_PATH}" TAR="${TAR}"
-MAN1= R.1 Rscript.1
OPTIONS= ATLAS "Use ATLAS instead of BLAS/LAPACK" off \
- GHOSTSCRIPT "Enable the [dev2]bitmap() graphics devices" on \
ICU "Improve collation in multibyte locales with ICU" on \
+ NLS "Build with NLS support" on \
+ PCRE_PORT "Use PCRE port instead of bundled source" on \
+ THREADS "Build a multithreaded R" on
+.if !defined(LIBR_SLAVEPORT)
+OPTIONS+= GHOSTSCRIPT "Enable the [dev2]bitmap() graphics devices" on \
JPEG "Enable the jpeg() graphics device" on \
LETTER_PAPER "Use US Letter paper" off \
LIBR "Install libR, and a dynamically-linked, rather than a static R" on \
- NLS "Build with NLS support" on \
PANGOCAIRO "Enable cairo and pango in the X11() graphics device" on \
- PCRE_PORT "Use PCRE port instead of bundled source" on \
PNG "Enable the png() graphics device" on \
TCLTK "Use Tcl/Tk (for the tcltk package)" on \
- THREADS "Build a multithreaded R" on \
X11 "Enable the X11() graphics device" on \
DVI_MANUALS "Install DVI manuals (requires TeX)" off \
INFO_MANUALS "Install GNU info manuals" on
+.endif # !LIBR_SLAVEPORT
PLIST_SUB= R_SOVERSION="${R_SOVERSION}" \
RBLAS_SOVERSION="${RBLAS_SOVERSION}" \
RLAPACK_SOVERSION="${RLAPACK_SOVERSION}"
R_LD_LIBRARY_PATH= ${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}:${LOCALBASE}/lib
USE_ICONV= yes
+.if !defined(LIBR_SLAVEPORT)
+MAN1= R.1 Rscript.1
USE_LDCONFIG= ${PREFIX}/lib/R/lib
+.endif # !LIBR_SLAVEPORT
WANT_GNOME= yes
.endif # LIBRMATH_SLAVEPORT
CONFIGURE_ENV += LDFLAGS="${LDFLAGS}"
@@ -91,10 +94,6 @@ PICFLAG?= -fpic
CONFIGURE_ENV += SHLIB_${flag}FLAGS="${PICFLAG}"
.endfor
-.if ${ARCH} == "sparc64"
-BROKEN= Does not install on sparc64: assertions fail
-.endif
-
.if !defined(LIBRMATH_SLAVEPORT)
.if defined(WITH_ATLAS)
LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas
@@ -111,10 +110,6 @@ PLIST_SUB+= LAPACK=""
PLIST_SUB+= LAPACK="@comment "
.endif
-.if !defined(WITHOUT_GHOSTSCRIPT)
-USE_GHOSTSCRIPT_RUN= yes
-.endif
-
.if defined(WITHOUT_ICU)
CONFIGURE_ARGS+= --without-ICU
.else
@@ -122,6 +117,37 @@ LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu
CONFIGURE_ARGS+= --with-ICU
.endif
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.if defined(WITHOUT_PCRE_PORT)
+CONFIGURE_ARGS+= --without-system-pcre
+.else
+LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
+CONFIGURE_ARGS+= --with-system-pcre
+.endif
+
+.if defined(WITHOUT_THREADS)
+CONFIGURE_ARGS+= --disable-threads
+.else
+CONFIGURE_ARGS+= --enable-threads=posix
+.endif
+
+.if defined(LIBR_SLAVEPORT)
+
+CONFIGURE_ARGS+= --disable-BLAS-shlib --without-pic --without-x
+
+.else # LIBR_SLAVEPORT
+
+.if !defined(WITHOUT_GHOSTSCRIPT)
+USE_GHOSTSCRIPT_RUN= yes
+.endif
+
.if defined(WITHOUT_JPEG)
CONFIGURE_ARGS+= --without-jpeglib
.else
@@ -140,27 +166,12 @@ CONFIGURE_ARGS+= --enable-R-shlib
PLIST_SUB+= LIBR=""
.endif
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
-
.if defined(WITHOUT_PANGOCAIRO)
-CONFIGURE_ARGS+= --with-cairo=no
+CONFIGURE_ARGS+= --without-cairo
.else
USE_GNOME+= pango
.endif
-.if defined(WITHOUT_PCRE_PORT)
-CONFIGURE_ARGS+= --without-system-pcre
-.else
-LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+= --with-system-pcre
-.endif
-
.if defined(WITHOUT_PNG)
CONFIGURE_ARGS+= --without-libpng
.else
@@ -181,12 +192,6 @@ CONFIGURE_ARGS+= --with-tcltk \
PLIST_SUB+= TCLTK=""
.endif
-.if defined(WITHOUT_THREADS)
-CONFIGURE_ARGS+= --disable-threads
-.else
-CONFIGURE_ARGS+= --enable-threads=posix
-.endif
-
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+= --without-x
PLIST_SUB+= X11="@comment "
@@ -209,6 +214,7 @@ PLIST_SUB+= DVI_MANUAL=""
.else
PLIST_SUB+= DVI_MANUAL="@comment "
.endif
+.endif # LIBR_SLAVEPORT
.endif # !LIBRMATH_SLAVEPORT
post-patch:
@@ -232,12 +238,20 @@ post-patch:
done)
.endif
-.if defined(WITH_LIBR)
-post-build:
+.if defined(LIBR_SLAVEPORT)
+do-build:
+.for d in include extra
+ @(cd ${WRKSRC}/src/${d}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
+ ${MAKE_ARGS} R)
+.endfor
@(cd ${WRKSRC}/src/main; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
- ${MAKE_ARGS} libR.a)
+ ${MAKE_ARGS} Makefile Makedeps libR.a)
-.endif
+do-install:
+ @${MKDIR} ${PREFIX}/lib/R/lib
+ @${INSTALL_DATA} ${WRKSRC}/src/main/libR.a ${PREFIX}/lib/R/lib
+
+.else # LIBR_SLAVEPORT
check regression-test test: build
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} LANGUAGE=en \
@@ -250,9 +264,6 @@ check-all: build
check-all)
post-install:
-.if defined(WITH_LIBR)
- @${INSTALL_LIB} ${WRKSRC}/src/main/libR.a ${PREFIX}/lib/R/lib
-.endif
.for L in R Rblas Rlapack
@(cd ${PREFIX}/lib/R/lib; if [ -f lib${L}.so ] ; then \
${LN} -sf lib${L}.so lib${L}.so.${${L:U}_SOVERSION} ; fi)
@@ -264,11 +275,13 @@ post-install:
done)
.endif
+.endif # LIBR_SLAVEPORT
.else # !LIBRMATH_SLAVEPORT
do-install:
@${INSTALL_DATA} ${WRKSRC}/src/include/Rmath.h ${PREFIX}/include
- @${INSTALL_LIB} ${BUILD_WRKSRC}/libRmath.a ${PREFIX}/lib
- @${INSTALL_LIB} ${BUILD_WRKSRC}/libRmath.so \
+ @${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.a ${PREFIX}/lib
+ @${STRIP_CMD} ${BUILD_WRKSRC}/libRmath.so
+ @${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.so \
${PREFIX}/lib/libRmath.so.${RMATH_SOVERSION}
@(cd ${PREFIX}/lib; ${LN} -sf libRmath.so.${RMATH_SOVERSION} libRmath.so)
diff --git a/math/R/distinfo b/math/R/distinfo
index c42183ae75b8..9a447e35ea5b 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,2 +1,2 @@
-SHA256 (R-2.13.0.tar.gz) = 559213ff05a205b9d2ad7ac7abebf477fb87c1bb3f0b03febbff5aa6bd8ab811
-SIZE (R-2.13.0.tar.gz) = 21832899
+SHA256 (R-2.13.1.tar.gz) = ded5f39bc5130ff58a53d361435e0fee818ebec6c2aacc976ab625a3adf9bc51
+SIZE (R-2.13.1.tar.gz) = 22063747
diff --git a/math/R/pkg-plist b/math/R/pkg-plist
index ee2310112424..1e12c7f3bc09 100644
--- a/math/R/pkg-plist
+++ b/math/R/pkg-plist
@@ -1,6 +1,5 @@
%%DOCSDIR%%/AUTHORS
%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/COPYING.LIB
%%DOCSDIR%%/COPYRIGHTS
%%DOCSDIR%%/CRAN_mirrors.csv
%%DOCSDIR%%/FAQ
@@ -101,7 +100,6 @@ lib/R/include/Rinternals.h
lib/R/include/Rmath.h
lib/R/include/Rversion.h
lib/R/include/S.h
-%%LIBR%%lib/R/lib/libR.a
%%LIBR%%lib/R/lib/libR.so
%%LIBR%%lib/R/lib/libR.so.%%R_SOVERSION%%
%%LAPACK%%lib/R/lib/libRblas.so
@@ -869,7 +867,6 @@ lib/R/library/nnet/libs/nnet.so
%%NLS%%lib/R/library/nnet/po/fr/LC_MESSAGES/R-nnet.mo
lib/R/library/rpart/DESCRIPTION
lib/R/library/rpart/INDEX
-lib/R/library/rpart/LICENCE
lib/R/library/rpart/Meta/Rd.rds
lib/R/library/rpart/Meta/data.rds
lib/R/library/rpart/Meta/hsearch.rds
@@ -1066,6 +1063,7 @@ lib/R/library/survival/Meta/hsearch.rds
lib/R/library/survival/Meta/links.rds
lib/R/library/survival/Meta/nsInfo.rds
lib/R/library/survival/Meta/package.rds
+lib/R/library/survival/Meta/vignette.rds
lib/R/library/survival/NAMESPACE
lib/R/library/survival/NEWS.Rd
lib/R/library/survival/R/survival
@@ -1074,7 +1072,13 @@ lib/R/library/survival/R/survival.rdx
lib/R/library/survival/data/Rdata.rdb
lib/R/library/survival/data/Rdata.rds
lib/R/library/survival/data/Rdata.rdx
+lib/R/library/survival/doc/cgd.dat
+lib/R/library/survival/doc/d3.rda
lib/R/library/survival/doc/index.html
+lib/R/library/survival/doc/raheart.rda
+lib/R/library/survival/doc/timedep.Rnw
+lib/R/library/survival/doc/timedep.pdf
+lib/R/library/survival/doc/timedep.R
lib/R/library/survival/doc/validate.tex
lib/R/library/survival/help/AnIndex
lib/R/library/survival/help/aliases.rds
@@ -1836,13 +1840,13 @@ lib/R/share/texmf/tex/latex/upquote.sty
@dirrm lib/R/library/KernSmooth/Meta
@dirrm lib/R/library/KernSmooth
@dirrm lib/R/library
-@dirrm lib/R/lib
+@dirrmtry lib/R/lib
@dirrm lib/R/include/R_ext
@dirrm lib/R/include
@dirrm lib/R/etc
@dirrm lib/R/bin/exec
@dirrm lib/R/bin
-@dirrm lib/R
+@dirrmtry lib/R
%%PORTDOCS%%%%DVI_MANUAL%%@dirrm %%DOCSDIR%%/manual/images
@dirrm %%DOCSDIR%%/manual
@dirrm %%DOCSDIR%%/html
diff --git a/math/ess/Makefile b/math/ess/Makefile
index c4e11a470ee5..131ffa712412 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ess
PORTVERSION= 5.13
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://ess.r-project.org/downloads/ess/
EXTRACT_SUFX= .tgz
diff --git a/math/p5-Statistics-R/Makefile b/math/p5-Statistics-R/Makefile
index 4518a81d99b4..18311c48bb05 100644
--- a/math/p5-Statistics-R/Makefile
+++ b/math/p5-Statistics-R/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Statistics-R
PORTVERSION= 0.08
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:BRICAS
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index 1fa44513a6f0..66b82c8c787c 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rkward
PORTVERSION= 0.5.6
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}/Current_Stable_Releases
PKGNAMESUFFIX= -kde4
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 64e7d4818bee..3988750e3b5c 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rkward
DISTVERSION= 0.4.9a
-PORTREVISION= 10
+PORTREVISION= 11
PORTEPOCH= 3
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME}/Historical_Releases/0.4.x_and_earlier/0.4.9a%20%28KDE3%29
diff --git a/math/rpy/Makefile b/math/rpy/Makefile
index 4922e11f5a16..bb0032b15bbf 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rpy
PORTVERSION= 1.0.3
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= math
MASTER_SITES= SF
diff --git a/math/rpy/pkg-plist b/math/rpy/pkg-plist
index ba1e10aa6eba..4c8898b44711 100644
--- a/math/rpy/pkg-plist
+++ b/math/rpy/pkg-plist
@@ -1,4 +1,4 @@
-%%PYTHON_SITELIBDIR%%/_rpy2130.so
+%%PYTHON_SITELIBDIR%%/_rpy2131.so
%%PYTHON_SITELIBDIR%%/rpy.py
%%PYTHON_SITELIBDIR%%/rpy.pyc
%%PYTHON_SITELIBDIR%%/rpy.pyo
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index 1b84100091ad..588f5e0222bc 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= rpy2
PORTVERSION= 2.1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= CHEESESHOP \
SF
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:30:08 +0000