2014-12-21 23:06 GMT+03:00 Rafael Sadowski <raf...@sizeofvoid.org>: > Hey @ports, > > Christmas and holiday season is OpenBSD-ports season. > > Here is an update for math/R. > > - update to Version 3.2.1- New FLAVOR java > - documentation goes in /usr/local/share/doc/R > - New FLAVOR java > -- ... idea and README from David Coppa - thanks David > - sorted in Makefile > > Tested @amd64. > > Regards, > > Rafael Sadowksi > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/math/R/Makefile,v > retrieving revision 1.63 > diff -u -p -u -p -r1.63 Makefile > --- Makefile 2 Sep 2014 14:55:37 -0000 1.63 > +++ Makefile 21 Dec 2014 19:55:22 -0000 > @@ -3,7 +3,7 @@ > SHARED_ONLY= Yes > > COMMENT= powerful math/statistics/graphics language > -DISTNAME= R-3.1.1 > +DISTNAME= R-3.1.2 > > SHARED_LIBS= R 2.1 # 2.1 > SHARED_LIBS+= Rlapack 31.2 # 31.2 > @@ -17,6 +17,9 @@ MAINTAINER= Rafael Sadowski <rafael@size > # GPL > PERMIT_PACKAGE_CDROM= Yes > > +FLAVORS= java > +FLAVOR?= > + > WANTLIB= ICE SM X11 Xext Xmu Xss Xt bz2 c cairo \ > ereadline fontconfig freetype glib-2.0 \ > gobject-2.0 icui18n icuuc jpeg lzma m \ > @@ -26,19 +29,19 @@ WANTLIB= ICE SM X11 Xext Xmu Xss Xt bz2 > > MASTER_SITES= http://cran.r-project.org/src/base/R-3/ \ > ftp://cran.r-project.org/pub/R/src/base/R-3/ \ > + ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/src/base/R-3/ \ > http://cran.at.r-project.org/src/base/R-3/ \ > http://cran.au.r-project.org/src/base/R-3/ \ > http://cran.br.r-project.org/src/base/R-3/ \ > http://cran.ch.r-project.org/src/base/R-3/ \ > - http://cran.es.r-project.org/src/base/R-3/ \ > http://cran.dk.r-project.org/src/base/R-3/ \ > + http://cran.es.r-project.org/src/base/R-3/ \ > http://cran.hu.r-project.org/src/base/R-3/ \ > + http://cran.stat.ucla.edu/src/base/R-3/ \ > http://cran.uk.r-project.org/src/base/R-3/ \ > http://cran.us.r-project.org/src/base/R-3/ \ > http://cran.za.r-project.org/src/base/R-3/ \ > - ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/src/base/R-3/ \ > http://lib.stat.cmu.edu/R/CRAN/src/base/R-3/ \ > - http://cran.stat.ucla.edu/src/base/R-3/ \ > http://probability.ca/cran/src/base/R-3/ > > MODULES= fortran \ > @@ -52,6 +55,7 @@ BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPEND > archivers/unzip \ > archivers/zip \ > devel/xdg-utils > + > LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} \ > ${MODTK_LIB_DEPENDS} \ > archivers/bzip2 \ > @@ -64,15 +68,20 @@ LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} \ > graphics/png \ > graphics/tiff \ > textproc/icu4c > + > RUN_DEPENDS= archivers/gtar \ > archivers/unzip \ > archivers/zip \ > devel/gmake \ > - devel/xdg-utils > + devel/xdg-utils \ > + print/texlive/base > > CONFIGURE_STYLE=gnu > + > MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/tools > + > CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ > + rdocdir="${LOCALBASE}/share/doc/R" \ > --enable-BLAS-shlib \ > --enable-R-shlib \ > --enable-prebuilt-html \ > @@ -85,8 +94,8 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ > --with-system-bzlib \ > --with-system-pcre \ > --with-system-xz \ > - --with-tcltk \ > --with-tcl-config=${MODTCL_CONFIG} \ > + --with-tcltk \ > --with-tk-config=${MODTK_CONFIG} > > CONFIGURE_ENV= FFLAGS="${FFLAGS}" \ > @@ -113,9 +122,16 @@ USE_GMAKE= Yes > > TEXMFLOCAL= ${PREFIX}/share/texmf-local > > +# see README-java > +.if ${FLAVOR:Mjava} > +MODULES+= java > +MODJAVA_VER= 1.7+ > +RUN_DEPENDS+= java/javaPathHelper > +CONFIGURE_ENV+= JAVA_HOME=`${TRUEPREFIX}/bin/javaPathHelper -h R` > +.endif > + > post-install: > mv ${WRKINST}/${LOCALBASE}/lib/R/share/texmf ${TEXMFLOCAL} > @perl -i -pe 's:^R_HOME_DIR=.*:R_HOME_DIR=${TRUEPREFIX}/lib/R:' \ > ${PREFIX}/bin/R > - > .include <bsd.port.mk> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/math/R/distinfo,v > retrieving revision 1.21 > diff -u -p -u -p -r1.21 distinfo > --- distinfo 2 Sep 2014 14:55:37 -0000 1.21 > +++ distinfo 21 Dec 2014 19:55:22 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (R-3.1.1.tar.gz) = zlxNXjRBTOjx7C1WQoYUNfod3EzYm9M2Fyu+JaYsehk= > -SIZE (R-3.1.1.tar.gz) = 28606569 > +SHA256 (R-3.1.2.tar.gz) = vNFQr8rg4C9u+181pqtyQyvoLoSexSzgu4nYw0Ko+no= > +SIZE (R-3.1.2.tar.gz) = 28655941 > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/math/R/pkg/PLIST,v > retrieving revision 1.23 > diff -u -p -u -p -r1.23 PLIST > --- pkg/PLIST 2 Sep 2014 14:55:37 -0000 1.23 > +++ pkg/PLIST 21 Dec 2014 19:55:22 -0000 > @@ -1,4 +1,4 @@ > -@comment $OpenBSD: PLIST,v 1.23 2014/09/02 14:55:37 dcoppa Exp $ > +@comment $OpenBSD$ > bin/R > @bin bin/Rscript > lib/R/ > @@ -31,53 +31,6 @@ lib/R/bin/libtool > lib/R/bin/mkinstalldirs > lib/R/bin/pager > lib/R/bin/rtags > -lib/R/doc/ > -lib/R/doc/AUTHORS > -lib/R/doc/COPYING > -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/NEWS.0 > -lib/R/doc/NEWS.1 > -lib/R/doc/NEWS.2 > -lib/R/doc/NEWS.rds > -lib/R/doc/RESOURCES > -lib/R/doc/THANKS > -lib/R/doc/html/ > -lib/R/doc/html/NEWS.2.html > -lib/R/doc/html/NEWS.html > -lib/R/doc/html/R.css > -lib/R/doc/html/Search.html > -lib/R/doc/html/SearchOn.html > -lib/R/doc/html/about.html > -lib/R/doc/html/favicon.ico > -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.html > -lib/R/doc/html/resources.html > -lib/R/doc/html/right.jpg > -lib/R/doc/html/up.jpg > -lib/R/doc/manual/ > -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/doc/manual/images/ > -lib/R/doc/manual/images/QQ.png > -lib/R/doc/manual/images/ecdf.png > -lib/R/doc/manual/images/fig11.png > -lib/R/doc/manual/images/fig12.png > -lib/R/doc/manual/images/hist.png > -lib/R/doc/manual/images/ice.png > lib/R/etc/ > lib/R/etc/Makeconf > lib/R/etc/Renviron > @@ -2306,6 +2259,7 @@ lib/R/library/mgcv/html/gam.fit3.html > lib/R/library/mgcv/html/gam.html > lib/R/library/mgcv/html/gam.models.html > lib/R/library/mgcv/html/gam.outer.html > +lib/R/library/mgcv/html/gam.scale.html > lib/R/library/mgcv/html/gam.selection.html > lib/R/library/mgcv/html/gam.side.html > lib/R/library/mgcv/html/gam.vcomp.html > @@ -3216,6 +3170,7 @@ lib/R/library/stats/html/ksmooth.html > lib/R/library/stats/html/lag.html > lib/R/library/stats/html/lag.plot.html > lib/R/library/stats/html/line.html > +lib/R/library/stats/html/listof.html > lib/R/library/stats/html/lm.html > lib/R/library/stats/html/lm.influence.html > lib/R/library/stats/html/lm.summaries.html > @@ -4224,6 +4179,54 @@ lib/R/share/sh/echo.sh > lib/pkgconfig/libR.pc > @man man/man1/R.1 > @man man/man1/Rscript.1 > +share/doc/R/ > +share/doc/R/AUTHORS > +share/doc/R/COPYING > +share/doc/R/COPYRIGHTS > +share/doc/R/CRAN_mirrors.csv > +share/doc/R/FAQ > +share/doc/R/KEYWORDS > +share/doc/R/KEYWORDS.db > +share/doc/R/NEWS > +share/doc/R/NEWS.0 > +share/doc/R/NEWS.1 > +share/doc/R/NEWS.2 > +share/doc/R/NEWS.rds > +share/doc/R/RESOURCES > +share/doc/R/THANKS > +share/doc/R/html/ > +share/doc/R/html/NEWS.2.html > +share/doc/R/html/NEWS.html > +share/doc/R/html/R.css > +share/doc/R/html/Search.html > +share/doc/R/html/SearchOn.html > +share/doc/R/html/about.html > +share/doc/R/html/favicon.ico > +share/doc/R/html/index.html > +share/doc/R/html/left.jpg > +share/doc/R/html/logo.jpg > +share/doc/R/html/logosm.jpg > +share/doc/R/html/packages-head-utf8.html > +share/doc/R/html/packages.html > +share/doc/R/html/resources.html > +share/doc/R/html/right.jpg > +share/doc/R/html/up.jpg > +share/doc/R/manual/ > +share/doc/R/manual/R-FAQ.html > +share/doc/R/manual/R-admin.html > +share/doc/R/manual/R-data.html > +share/doc/R/manual/R-exts.html > +share/doc/R/manual/R-intro.html > +share/doc/R/manual/R-ints.html > +share/doc/R/manual/R-lang.html > +share/doc/R/manual/images/ > +share/doc/R/manual/images/QQ.png > +share/doc/R/manual/images/ecdf.png > +share/doc/R/manual/images/fig11.png > +share/doc/R/manual/images/fig12.png > +share/doc/R/manual/images/hist.png > +share/doc/R/manual/images/ice.png > +share/doc/pkg-readmes/${FULLPKGNAME} > share/texmf-local/ > share/texmf-local/bibtex/ > share/texmf-local/bibtex/bib/ > Index: pkg/README > =================================================================== > RCS file: pkg/README > diff -N pkg/README > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ pkg/README 21 Dec 2014 19:55:22 -0000 > @@ -0,0 +1,18 @@ > +$OpenBSD$ > + > ++----------------------------------------------------------------------- > +| Running ${FULLPKGNAME} on OpenBSD > ++----------------------------------------------------------------------- > + > +Configuring Java support > +======================== > +To enable Java support, R needs to know where the JVM and the Java > +libraries are located. > + > +Running: > + > +# env JAVA_HOME=`${TRUEPREFIX}/bin/javaPathHelper -h R` > +# ${TRUEPREFIX}/bin/R CMD javareconf > + > +as root, will update both ${TRUEPREFIX}/lib/R/etc/Makeconf and > +${TRUEPREFIX}/lib/R/etc/ldpaths with the right settings.
Can't this be done in post-install target rather instead? Why does separate FLAVOR needed, I see no FLAVOR-specific files in diff? Is JDK really used at the build time? -- WBR, Vadim Zhukov
