pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/R Update R to version 2.4.1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/350554999435
branches:  trunk
changeset: 526539:350554999435
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed Mar 14 11:50:17 2007 +0000

description:
Update R to version 2.4.1.

pkgsrc changes: no longer automatically generate the PLIST.
     use (de)install templates for handling updating the index files
     when adding/removing R packages.

Changes 2.4.1
This is a maintenance release and fixes a number of mostly minor bugs.

Changes 2.4.0
This release has many new features. One important aspect is that S4
classes now have their own internal type, and S4 method dispatch has
been completely revised to using cached generic functions, giving
substantial performance improvements. As a consequence, all packages
depending on "methods" need to be reinstalled.

diffstat:

 math/R/Makefile             |    37 +-
 math/R/Makefile.extension   |    12 +-
 math/R/PLIST                |  8994 ++++++++++++++++++++++++++++++++++++++++++-
 math/R/distinfo             |    14 +-
 math/R/files/pkg-index.tmpl |    25 +
 math/R/patches/patch-aa     |    16 +-
 math/R/patches/patch-ac     |    54 +-
 math/R/patches/patch-ad     |    10 +-
 8 files changed, 9078 insertions(+), 84 deletions(-)

diffs (truncated from 9427 to 300 lines):

diff -r 3ca4735a3e37 -r 350554999435 math/R/Makefile
--- a/math/R/Makefile   Wed Mar 14 11:36:25 2007 +0000
+++ b/math/R/Makefile   Wed Mar 14 11:50:17 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2007/01/08 15:00:36 joerg Exp $
+# $NetBSD: Makefile,v 1.88 2007/03/14 11:50:17 markd Exp $
 
-DISTNAME=              R-2.3.1
+DISTNAME=              R-2.4.1
 CATEGORIES=            math
 MASTER_SITES=          ${MASTER_SITE_R_CRAN:=base/R-2/}
 
@@ -73,10 +73,6 @@
 INSTALL_DATA=          ${INSTALL} ${COPY} -m ${SHAREMODE}
 INSTALL_SCRIPT=                ${INSTALL} ${COPY} -m ${BINMODE}
 
-PLIST_SRC=             ${WRKDIR}/.PLIST_SRC
-R_LIBDIR=              lib/R
-R_INSTALL_DIRS=                ${R_LIBDIR}
-
 BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1
 
 .if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*)
@@ -95,29 +91,12 @@
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 
-# Generate the PLIST dynamically as it changes in each version only in a
-# specific subtree.  This will make maintaining this package a little easier
-# when updating.
-#
+INSTALL_TEMPLATES+=    ../../math/R/files/pkg-index.tmpl
+DEINSTALL_TEMPLATES+=  ../../math/R/files/pkg-index.tmpl
+PRINT_PLIST_AWK+=      /^lib\/R\/doc\/html\/packages.html$$/ { next; }
+PRINT_PLIST_AWK+=      /^lib\/R\/doc\/html\/search\/index.txt$$/ { next; }
+
 post-install:
-       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${R_LIBDIR}
-       ${RM} -f ${PLIST_SRC}
-       ${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}
-       ( cd ${PREFIX};                                                 \
-         for dir in ${R_INSTALL_DIRS}; do                              \
-               ${FIND} $${dir} \( -type f -o -type l \) -print; \
-         done;                                                         \
-       ) | ${GREP} -v "lib/R/doc/html/packages.html" |                 \
-       ${GREP} -v "lib/R/doc/html/search/index.txt" |                  \
-       ${SORT} -u >> ${PLIST_SRC}
-       ${ECHO} "@unexec "${RM:Q}" -f %D/lib/R/doc/html/packages.html" >> ${PLIST_SRC}
-       ${ECHO} "@unexec "${RM:Q}" -f %D/lib/R/doc/html/search/index.txt" >> ${PLIST_SRC}
-       ( cd ${PREFIX} &&                                               \
-         for dir in ${R_INSTALL_DIRS}; do                              \
-               ${FIND} $${dir} -type d -print;         \
-         done;                                                         \
-       ) | ${SORT} -ur | ${SED} -e "s|^|@dirrm |" >> ${PLIST_SRC}
-       ${ECHO} "@exec R CMD "${PERL5:Q}" %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null" >> ${PLIST_SRC}
-       ${ECHO} "@exec "${CAT:Q}" %D/lib/R/library/*/CONTENTS > %D/lib/R/doc/html/search/index.txt 2>/dev/null" >> ${PLIST_SRC}
+       ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/R
 
 .include "../../mk/bsd.pkg.mk"
diff -r 3ca4735a3e37 -r 350554999435 math/R/Makefile.extension
--- a/math/R/Makefile.extension Wed Mar 14 11:36:25 2007 +0000
+++ b/math/R/Makefile.extension Wed Mar 14 11:50:17 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.10 2007/02/22 19:26:45 wiz Exp $
+# $NetBSD: Makefile.extension,v 1.11 2007/03/14 11:50:33 markd Exp $
 #
 # This Makefile fragment is included by packages for R library packages.
 #
@@ -31,14 +31,12 @@
        ${FIND} ${R_LIB}/$${dir} \( -type f -o -type l \) -print; done ) | ${SORT} -u
 R_PACKLIST_DIRS_CMD=   ( cd ${PREFIX}; for dir in ${R_INST_DIRS}; do \
        ${FIND} ${R_LIB}/$${dir} -type d -print; done ) | ${SORT} -ur | ${SED} -e "s|^|@dirrm |"
-R_PACKLIST_CMDS_CMD=   ( ${ECHO} '@exec R CMD '${PERL5:Q}' %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null'; \
-       ${ECHO} '@exec '${CAT:Q}' %D/lib/R/library/*/CONTENTS > %D/lib/R/doc/html/search/index.txt 2>/dev/null'; \
-       ${ECHO} '@unexec R CMD '${PERL5:Q}' %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null'; \
-       ${ECHO} '@unexec '${CAT:Q}' %D/lib/R/library/*/CONTENTS > %D/lib/R/doc/html/search/index.txt 2>/dev/null' )
 
 R_GENERATE_PLIST=      ${R_PACKLIST_FILES_CMD}; \
-                       ${R_PACKLIST_DIRS_CMD}; \
-                       ${R_PACKLIST_CMDS_CMD};
+                       ${R_PACKLIST_DIRS_CMD};
 GENERATE_PLIST+=       ${R_GENERATE_PLIST}
 
+INSTALL_TEMPLATES+=    ../../math/R/files/pkg-index.tmpl
+DEINSTALL_TEMPLATES+=  ../../math/R/files/pkg-index.tmpl
+
 .include "../../math/R/buildlink3.mk"
diff -r 3ca4735a3e37 -r 350554999435 math/R/PLIST
--- a/math/R/PLIST      Wed Mar 14 11:36:25 2007 +0000
+++ b/math/R/PLIST      Wed Mar 14 11:50:17 2007 +0000
@@ -1,3 +1,8995 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:00 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/03/14 11:50:33 markd Exp $
 bin/R
+lib/R/COPYING
+lib/R/NEWS
+lib/R/SVN-REVISION
+lib/R/bin/BATCH
+lib/R/bin/COMPILE
+lib/R/bin/INSTALL
+lib/R/bin/LINK
+lib/R/bin/R
+lib/R/bin/REMOVE
+lib/R/bin/Rcmd
+lib/R/bin/Rd2dvi
+lib/R/bin/Rd2txt
+lib/R/bin/Rdconv
+lib/R/bin/Rdiff
+lib/R/bin/Rprof
+lib/R/bin/SHLIB
+lib/R/bin/Sd2Rd
+lib/R/bin/Stangle
+lib/R/bin/Sweave
+lib/R/bin/build
+lib/R/bin/check
+lib/R/bin/config
+lib/R/bin/exec/R
+lib/R/bin/f77_f2c
+lib/R/bin/javareconf
+lib/R/bin/libtool
+lib/R/bin/mkinstalldirs
+lib/R/bin/pager
+lib/R/bin/texi2dvi
+lib/R/doc/AUTHORS
+lib/R/doc/COPYING
+lib/R/doc/COPYING.LIB
+lib/R/doc/COPYRIGHTS
+lib/R/doc/CRAN_mirrors.csv
+lib/R/doc/FAQ
+lib/R/doc/KEYWORDS
+lib/R/doc/KEYWORDS.db
+lib/R/doc/NEWS
+lib/R/doc/RESOURCES
+lib/R/doc/THANKS
+lib/R/doc/html/R.css
+lib/R/doc/html/about.html
+lib/R/doc/html/index.html
+lib/R/doc/html/left.jpg
+lib/R/doc/html/logo.jpg
+lib/R/doc/html/logosm.jpg
+lib/R/doc/html/packages-head-utf8.html
+lib/R/doc/html/packages-head.html
+lib/R/doc/html/resources.html
+lib/R/doc/html/right.jpg
+lib/R/doc/html/search/IndexEntry.class
+lib/R/doc/html/search/IndexStream.class
+lib/R/doc/html/search/IndexTable.class
+lib/R/doc/html/search/SearchEngine-foot.html
+lib/R/doc/html/search/SearchEngine-head.html
+lib/R/doc/html/search/SearchEngine.class
+lib/R/doc/html/search/SearchEngine.html
+lib/R/doc/html/search/SearchObject.html
+lib/R/doc/html/search/Tracer.class
+lib/R/doc/html/search/Value.class
+lib/R/doc/html/thanks.html
+lib/R/doc/html/up.jpg
+lib/R/doc/manual/R-FAQ.html
+lib/R/doc/manual/R-admin.html
+lib/R/doc/manual/R-data.html
+lib/R/doc/manual/R-exts.html
+lib/R/doc/manual/R-intro.html
+lib/R/doc/manual/R-ints.html
+lib/R/doc/manual/R-lang.html
+lib/R/etc/Makeconf
+lib/R/etc/Renviron
+lib/R/etc/ldpaths
+lib/R/etc/repositories
+lib/R/include/R.h
+lib/R/include/R_ext/Applic.h
+lib/R/include/R_ext/Arith.h
+lib/R/include/R_ext/BLAS.h
+lib/R/include/R_ext/Boolean.h
+lib/R/include/R_ext/Callbacks.h
+lib/R/include/R_ext/Complex.h
+lib/R/include/R_ext/Constants.h
+lib/R/include/R_ext/Error.h
+lib/R/include/R_ext/GetX11Image.h
+lib/R/include/R_ext/GraphicsBase.h
+lib/R/include/R_ext/GraphicsDevice.h
+lib/R/include/R_ext/GraphicsEngine.h
+lib/R/include/R_ext/Lapack.h
+lib/R/include/R_ext/Linpack.h
+lib/R/include/R_ext/Memory.h
+lib/R/include/R_ext/Parse.h
+lib/R/include/R_ext/Print.h
+lib/R/include/R_ext/PrtUtil.h
+lib/R/include/R_ext/R-ftp-http.h
+lib/R/include/R_ext/RConverters.h
+lib/R/include/R_ext/RS.h
+lib/R/include/R_ext/RStartup.h
+lib/R/include/R_ext/Random.h
+lib/R/include/R_ext/Rdynload.h
+lib/R/include/R_ext/Riconv.h
+lib/R/include/R_ext/Utils.h
+lib/R/include/R_ext/eventloop.h
+lib/R/include/R_ext/libextern.h
+lib/R/include/R_ext/rlocale.h
+lib/R/include/Rconfig.h
+lib/R/include/Rdefines.h
+lib/R/include/Rdevices.h
+lib/R/include/Rembedded.h
+lib/R/include/Rgraphics.h
+lib/R/include/Rinterface.h
+lib/R/include/Rinternals.h
+lib/R/include/Rmath.h
+lib/R/include/Rversion.h
+lib/R/include/S.h
+lib/R/lib/libR.so
+lib/R/lib/libRblas.so
+lib/R/lib/libRlapack.so
+lib/R/library/KernSmooth/CONTENTS
+lib/R/library/KernSmooth/DESCRIPTION
+lib/R/library/KernSmooth/INDEX
+lib/R/library/KernSmooth/Meta/Rd.rds
+lib/R/library/KernSmooth/Meta/hsearch.rds
+lib/R/library/KernSmooth/Meta/nsInfo.rds
+lib/R/library/KernSmooth/Meta/package.rds
+lib/R/library/KernSmooth/NAMESPACE
+lib/R/library/KernSmooth/R-ex/bkde.R
+lib/R/library/KernSmooth/R-ex/bkde2D.R
+lib/R/library/KernSmooth/R-ex/bkfe.R
+lib/R/library/KernSmooth/R-ex/dpih.R
+lib/R/library/KernSmooth/R-ex/dpik.R
+lib/R/library/KernSmooth/R-ex/dpill.R
+lib/R/library/KernSmooth/R-ex/locpoly.R
+lib/R/library/KernSmooth/R/KernSmooth
+lib/R/library/KernSmooth/R/KernSmooth.rdb
+lib/R/library/KernSmooth/R/KernSmooth.rdx
+lib/R/library/KernSmooth/help/AnIndex
+lib/R/library/KernSmooth/help/bkde
+lib/R/library/KernSmooth/help/bkde2D
+lib/R/library/KernSmooth/help/bkfe
+lib/R/library/KernSmooth/help/dpih
+lib/R/library/KernSmooth/help/dpik
+lib/R/library/KernSmooth/help/dpill
+lib/R/library/KernSmooth/help/locpoly
+lib/R/library/KernSmooth/html/00Index.html
+lib/R/library/KernSmooth/html/bkde.html
+lib/R/library/KernSmooth/html/bkde2D.html
+lib/R/library/KernSmooth/html/bkfe.html
+lib/R/library/KernSmooth/html/dpih.html
+lib/R/library/KernSmooth/html/dpik.html
+lib/R/library/KernSmooth/html/dpill.html
+lib/R/library/KernSmooth/html/locpoly.html
+lib/R/library/KernSmooth/latex/bkde.tex
+lib/R/library/KernSmooth/latex/bkde2D.tex
+lib/R/library/KernSmooth/latex/bkfe.tex
+lib/R/library/KernSmooth/latex/dpih.tex
+lib/R/library/KernSmooth/latex/dpik.tex
+lib/R/library/KernSmooth/latex/dpill.tex
+lib/R/library/KernSmooth/latex/locpoly.tex
+lib/R/library/KernSmooth/libs/KernSmooth.so
+lib/R/library/KernSmooth/man/KernSmooth.Rd.gz
+lib/R/library/MASS/CITATION
+lib/R/library/MASS/CONTENTS
+lib/R/library/MASS/DESCRIPTION
+lib/R/library/MASS/INDEX
+lib/R/library/MASS/LICENCE
+lib/R/library/MASS/Meta/Rd.rds
+lib/R/library/MASS/Meta/data.rds
+lib/R/library/MASS/Meta/hsearch.rds
+lib/R/library/MASS/Meta/nsInfo.rds
+lib/R/library/MASS/Meta/package.rds
+lib/R/library/MASS/NAMESPACE
+lib/R/library/MASS/NEWS
+lib/R/library/MASS/R-ex/Insurance.R
+lib/R/library/MASS/R-ex/Null.R
+lib/R/library/MASS/R-ex/OME.R
+lib/R/library/MASS/R-ex/Skye.R
+lib/R/library/MASS/R-ex/addterm.R
+lib/R/library/MASS/R-ex/anova.negbin.R
+lib/R/library/MASS/R-ex/area.R
+lib/R/library/MASS/R-ex/bacteria.R
+lib/R/library/MASS/R-ex/bandwidth.nrd.R
+lib/R/library/MASS/R-ex/bcv.R
+lib/R/library/MASS/R-ex/beav1.R
+lib/R/library/MASS/R-ex/beav2.R
+lib/R/library/MASS/R-ex/birthwt.R
+lib/R/library/MASS/R-ex/boxcox.R
+lib/R/library/MASS/R-ex/caith.R
+lib/R/library/MASS/R-ex/cement.R
+lib/R/library/MASS/R-ex/confint.R
+lib/R/library/MASS/R-ex/contr.sdif.R
+lib/R/library/MASS/R-ex/corresp.R
+lib/R/library/MASS/R-ex/cov.rob.R
+lib/R/library/MASS/R-ex/cov.trob.R
+lib/R/library/MASS/R-ex/denumerate.R
+lib/R/library/MASS/R-ex/dose.p.R
+lib/R/library/MASS/R-ex/dropterm.R
+lib/R/library/MASS/R-ex/eagles.R
+lib/R/library/MASS/R-ex/epil.R
+lib/R/library/MASS/R-ex/farms.R
+lib/R/library/MASS/R-ex/fitdistr.R
+lib/R/library/MASS/R-ex/fractions.R
+lib/R/library/MASS/R-ex/galaxies.R
+lib/R/library/MASS/R-ex/gamma.shape.glm.R
+lib/R/library/MASS/R-ex/gehan.R
+lib/R/library/MASS/R-ex/ginv.R
+lib/R/library/MASS/R-ex/glm.convert.R
+lib/R/library/MASS/R-ex/glm.nb.R



Home | Main Index | Thread Index | Old Index