On Fri, Sep 25, 2015 at 06:39:26AM -0600, David Coppa wrote:
> Now that texlive_texmf-buildset contains the inconsolata TeX package,
> we can build the full documentation for math/R.
Great!
> The diff below does this.
>
> Thanks to Edd for his assistance with TeXLive sorcery.
Thank you.
> OK?
OK (but with a small comment; see below).
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/R/Makefile,v
> retrieving revision 1.74
> diff -u -p -u -p -r1.74 Makefile
> --- Makefile 17 Aug 2015 15:33:04 -0000 1.74
> +++ Makefile 24 Sep 2015 14:47:59 -0000
> @@ -4,6 +4,7 @@ SHARED_ONLY= Yes
>
> COMMENT= powerful math/statistics/graphics language
> DISTNAME= R-3.2.2
> +REVISION= 0
>
> SHARED_LIBS= R 3.1
> SHARED_LIBS+= Rlapack 31.2 # 31.2
> @@ -48,7 +49,9 @@ MODGCC4_LANGS= fortran
> BUILD_DEPENDS= archivers/gtar \
> archivers/unzip \
> archivers/zip \
> - devel/xdg-utils
> + devel/xdg-utils \
> + print/texinfo \
> + print/texlive/base>=2014p1
>
> LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} \
> ${MODTK_LIB_DEPENDS} \
> @@ -69,7 +72,7 @@ RUN_DEPENDS= archivers/gtar \
> archivers/zip \
> devel/gmake \
> devel/xdg-utils \
> - print/texlive/base
> + print/texlive/base>=2014p1
>
> CONFIGURE_STYLE=gnu
>
> @@ -85,7 +88,7 @@ CONFIGURE_ENV= FFLAGS="${FFLAGS}" \
> CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib/R/lib" \
> LIBnn=lib \
> - ac_cv_path_PDFLATEX="" \
> + ac_cv_path_MAKEINFO="${LOCALBASE}/bin/gmakeinfo" \
gmakeinfo is just a link to gtexi2any. As the configure script looks for
texi2any I recommend to use the latter (just for consistency). Moreover,
we can use MAKEINFO instead of ac_cv_path_MAKEINFO in this case:
MAKEINFO=gtexi2any
(In addition I am using
TEXI2DVI=gtexi2dvi
in order to keep these two in sync; maybe/probably we do not need this.)
> rdocdir="${PREFIX}/share/doc/R"
>
> MAKE_FLAGS= DYLIB_EXT=".so.${LIBR_VERSION}" \
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/math/R/pkg/PLIST,v
> retrieving revision 1.27
> diff -u -p -u -p -r1.27 PLIST
> --- pkg/PLIST 17 Aug 2015 15:33:04 -0000 1.27
> +++ pkg/PLIST 24 Sep 2015 14:48:00 -0000
> @@ -779,6 +779,7 @@ lib/R/library/grid/Meta/hsearch.rds
> lib/R/library/grid/Meta/links.rds
> lib/R/library/grid/Meta/nsInfo.rds
> lib/R/library/grid/Meta/package.rds
> +lib/R/library/grid/Meta/vignette.rds
> lib/R/library/grid/NAMESPACE
> lib/R/library/grid/R/
> lib/R/library/grid/R/grid
> @@ -787,18 +788,45 @@ lib/R/library/grid/R/grid.rdx
> lib/R/library/grid/doc/
> lib/R/library/grid/doc/DivByZero.txt
> lib/R/library/grid/doc/changes.txt
> +lib/R/library/grid/doc/displaylist.R
> +lib/R/library/grid/doc/displaylist.Rnw
> lib/R/library/grid/doc/displaylist.pdf
> +lib/R/library/grid/doc/frame.R
> +lib/R/library/grid/doc/frame.Rnw
> lib/R/library/grid/doc/frame.pdf
> +lib/R/library/grid/doc/grid.R
> +lib/R/library/grid/doc/grid.Rnw
> lib/R/library/grid/doc/grid.pdf
> +lib/R/library/grid/doc/grobs.R
> +lib/R/library/grid/doc/grobs.Rnw
> lib/R/library/grid/doc/grobs.pdf
> +lib/R/library/grid/doc/index.html
> +lib/R/library/grid/doc/interactive.R
> +lib/R/library/grid/doc/interactive.Rnw
> lib/R/library/grid/doc/interactive.pdf
> +lib/R/library/grid/doc/locndimn.R
> +lib/R/library/grid/doc/locndimn.Rnw
> lib/R/library/grid/doc/locndimn.pdf
> +lib/R/library/grid/doc/moveline.R
> +lib/R/library/grid/doc/moveline.Rnw
> lib/R/library/grid/doc/moveline.pdf
> +lib/R/library/grid/doc/nonfinite.R
> +lib/R/library/grid/doc/nonfinite.Rnw
> lib/R/library/grid/doc/nonfinite.pdf
> +lib/R/library/grid/doc/plotexample.R
> +lib/R/library/grid/doc/plotexample.Rnw
> lib/R/library/grid/doc/plotexample.pdf
> +lib/R/library/grid/doc/rotated.R
> +lib/R/library/grid/doc/rotated.Rnw
> lib/R/library/grid/doc/rotated.pdf
> +lib/R/library/grid/doc/saveload.R
> +lib/R/library/grid/doc/saveload.Rnw
> lib/R/library/grid/doc/saveload.pdf
> +lib/R/library/grid/doc/sharing.R
> +lib/R/library/grid/doc/sharing.Rnw
> lib/R/library/grid/doc/sharing.pdf
> +lib/R/library/grid/doc/viewports.R
> +lib/R/library/grid/doc/viewports.Rnw
> lib/R/library/grid/doc/viewports.pdf
> lib/R/library/grid/help/
> lib/R/library/grid/help/AnIndex
> @@ -1058,12 +1086,16 @@ lib/R/library/parallel/Meta/hsearch.rds
> lib/R/library/parallel/Meta/links.rds
> lib/R/library/parallel/Meta/nsInfo.rds
> lib/R/library/parallel/Meta/package.rds
> +lib/R/library/parallel/Meta/vignette.rds
> lib/R/library/parallel/NAMESPACE
> lib/R/library/parallel/R/
> lib/R/library/parallel/R/parallel
> lib/R/library/parallel/R/parallel.rdb
> lib/R/library/parallel/R/parallel.rdx
> lib/R/library/parallel/doc/
> +lib/R/library/parallel/doc/index.html
> +lib/R/library/parallel/doc/parallel.R
> +lib/R/library/parallel/doc/parallel.Rnw
> lib/R/library/parallel/doc/parallel.pdf
> lib/R/library/parallel/help/
> lib/R/library/parallel/help/AnIndex
> @@ -1742,6 +1774,7 @@ lib/R/library/utils/Meta/hsearch.rds
> lib/R/library/utils/Meta/links.rds
> lib/R/library/utils/Meta/nsInfo.rds
> lib/R/library/utils/Meta/package.rds
> +lib/R/library/utils/Meta/vignette.rds
> lib/R/library/utils/NAMESPACE
> lib/R/library/utils/R/
> lib/R/library/utils/R/utils
> @@ -1751,7 +1784,10 @@ lib/R/library/utils/Sweave/
> lib/R/library/utils/Sweave/Sweave-test-1.Rnw
> lib/R/library/utils/Sweave/example-1.Rnw
> lib/R/library/utils/doc/
> +lib/R/library/utils/doc/Sweave.R
> +lib/R/library/utils/doc/Sweave.Rnw
> lib/R/library/utils/doc/Sweave.pdf
> +lib/R/library/utils/doc/index.html
> lib/R/library/utils/help/
> lib/R/library/utils/help/AnIndex
> lib/R/library/utils/help/aliases.rds
> @@ -1852,6 +1888,13 @@ 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
