On Tue, Nov 1, 2016 at 9:53 AM, Ingo Feinerer <[email protected]> wrote:
> Dear useRs,
>
> update math/R 3.3.1 -> 3.3.2
>
> - remove two FTP mirrors (there are plenty of HTTP)
> - add print/texinfo to RUN_DEPENDS as 'R CMD build' needs it
> - regen patch
>
> Works for me on amd64.
>
> OK?
Looks good portswise, and works as expected.
ok dcoppa@
Ciao!
David
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/R/Makefile,v
> retrieving revision 1.87
> diff -u -p -r1.87 Makefile
> --- Makefile 2 Sep 2016 13:02:24 -0000 1.87
> +++ Makefile 1 Nov 2016 08:44:32 -0000
> @@ -1,8 +1,7 @@
> # $OpenBSD: Makefile,v 1.87 2016/09/02 13:02:24 dcoppa Exp $
>
> COMMENT= powerful math/statistics/graphics language
> -DISTNAME= R-3.3.1
> -REVISION= 1
> +DISTNAME= R-3.3.2
>
> SO_VERSION= 32.0
> .for _lib in R Rblas Rlapack
> @@ -23,8 +22,6 @@ WANTLIB += lzma m ncurses nghttp2 pango-
> WANTLIB += png readline ssl tiff z ${MODTK_WANTLIB}
>
> MASTER_SITES= https://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.br.r-project.org/src/base/R-3/ \
> http://cran.ch.r-project.org/src/base/R-3/ \
> @@ -67,6 +64,7 @@ RUN_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
> archivers/zip \
> devel/gmake \
> devel/xdg-utils \
> + print/texinfo \
> print/texlive/base>=2014p1
>
> CONFIGURE_STYLE=gnu
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/math/R/distinfo,v
> retrieving revision 1.31
> diff -u -p -r1.31 distinfo
> --- distinfo 21 Jun 2016 18:21:52 -0000 1.31
> +++ distinfo 1 Nov 2016 08:44:32 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (R-3.3.1.tar.gz) = PcWa5YMfU4D4PBabrCEDrQUu/g7OxP+nS95NhaD9qeI=
> -SIZE (R-3.3.1.tar.gz) = 29848329
> +SHA256 (R-3.3.2.tar.gz) = 0pStIen1dPtIKOuzqUuMs09PMEpBaHqZS+AN1BpOUUw=
> +SIZE (R-3.3.2.tar.gz) = 29440670
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/math/R/patches/patch-configure,v
> retrieving revision 1.28
> diff -u -p -r1.28 patch-configure
> --- patches/patch-configure 6 May 2016 08:52:28 -0000 1.28
> +++ patches/patch-configure 1 Nov 2016 08:44:32 -0000
> @@ -1,8 +1,8 @@
> $OpenBSD: patch-configure,v 1.28 2016/05/06 08:52:28 feinerer Exp $
>
> ---- configure.orig Tue May 3 12:17:51 2016
> -+++ configure Tue May 3 12:19:33 2016
> -@@ -35481,8 +35481,8 @@ fi
> +--- configure.orig Mon Oct 24 13:34:26 2016
> ++++ configure Tue Nov 1 09:06:08 2016
> +@@ -35492,8 +35492,8 @@ fi
>
> fi
> if test "${have_zlib}" = yes; then
> @@ -13,7 +13,7 @@ $OpenBSD: patch-configure,v 1.28 2016/05
> if ${r_cv_header_zlib_h+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> -@@ -35499,7 +35499,7 @@ int main() {
> +@@ -35510,7 +35510,7 @@ int main() {
> #ifdef ZLIB_VERSION
> /* Work around Debian bug: it uses 1.2.3.4 even though there was no such
> version on the master site zlib.net */
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/math/R/pkg/PLIST,v
> retrieving revision 1.31
> diff -u -p -r1.31 PLIST
> --- pkg/PLIST 21 Jun 2016 18:21:52 -0000 1.31
> +++ pkg/PLIST 1 Nov 2016 08:44:33 -0000
> @@ -1910,14 +1910,12 @@ 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/
> share/texmf-local/bibtex/bib/RJournal.bib
> share/texmf-local/bibtex/bib/Rnews.bib
> share/texmf-local/bibtex/bst/
> share/texmf-local/bibtex/bst/jss.bst
> -share/texmf-local/tex/
> share/texmf-local/tex/latex/
> share/texmf-local/tex/latex/Rd.sty
> share/texmf-local/tex/latex/Sweave.sty
>
--
"If you try a few times and give up, you'll never get there. But if
you keep at it... There's a lot of problems in the world which can
really be solved by applying two or three times the persistence that
other people will."
-- Stewart Nelson
