Now that texlive_texmf-buildset contains the inconsolata LaTeX

package, we can build the full documentation for math/R.

While here, regen patches/patch-configure

Suggestions and OK feinerer@ (maintainer)
This commit is contained in:
dcoppa 2015-09-28 07:32:19 +00:00
parent a1974ef243
commit 90c20485bd
3 changed files with 61 additions and 14 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.74 2015/08/17 15:33:04 feinerer Exp $
# $OpenBSD: Makefile,v 1.75 2015/09/28 07:32:19 dcoppa Exp $
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,8 @@ CONFIGURE_ENV= FFLAGS="${FFLAGS}" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib/R/lib" \
LIBnn=lib \
ac_cv_path_PDFLATEX="" \
MAKEINFO="${LOCALBASE}/bin/gtexi2any" \
TEXI2DVI="${LOCALBASE}/bin/gtexi2dvi" \
rdocdir="${PREFIX}/share/doc/R"
MAKE_FLAGS= DYLIB_EXT=".so.${LIBR_VERSION}" \

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-configure,v 1.25 2015/06/26 18:54:47 feinerer Exp $
$OpenBSD: patch-configure,v 1.26 2015/09/28 07:32:19 dcoppa Exp $
Unbreak build on powerpc (relocation truncated to fit: R_PPC_GOT16...)
Fix linking with external libintl
(https://marc.info/?l=openbsd-ports&m=143526271406832&w=2)
--- configure.orig Thu Jun 11 00:16:27 2015
+++ configure Fri Jun 26 19:38:49 2015
@@ -26276,7 +26276,7 @@ if test "${GCC}" = yes; then
--- configure.orig Thu Aug 13 11:21:16 2015
+++ configure Thu Sep 24 15:12:30 2015
@@ -26258,7 +26258,7 @@ if test "${GCC}" = yes; then
## has 32k and so can use -fpic.
## However, although the gcc docs do not mention it, it seems s390/s390x
## also supports and needs -fPIC
@ -16,7 +16,7 @@ Fix linking with external libintl
cpicflags="-fPIC"
;;
*)
@@ -26287,7 +26287,7 @@ if test "${GCC}" = yes; then
@@ -26269,7 +26269,7 @@ if test "${GCC}" = yes; then
fi
if test "${G77}" = yes; then
case "${host_cpu}" in
@ -25,7 +25,7 @@ Fix linking with external libintl
fpicflags="-fPIC"
;;
*)
@@ -26297,7 +26297,7 @@ if test "${G77}" = yes; then
@@ -26279,7 +26279,7 @@ if test "${G77}" = yes; then
fi
if test "${GXX}" = yes; then
case "${host_cpu}" in
@ -34,7 +34,7 @@ Fix linking with external libintl
cxxpicflags="-fPIC"
;;
*)
@@ -38862,7 +38862,7 @@ fi
@@ -38836,7 +38836,7 @@ fi
## use this to pick out gfortran (even though it is unreliable).
if test "${ac_cv_fc_compiler_gnu}" = yes; then
case "${host_cpu}" in
@ -43,7 +43,7 @@ Fix linking with external libintl
fcpicflags="-fPIC"
;;
*)
@@ -42616,7 +42616,7 @@ else
@@ -42590,7 +42590,7 @@ else
gt_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCINTL"
gt_save_LIBS="$LIBS"
@ -52,7 +52,7 @@ Fix linking with external libintl
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
@@ -42773,8 +42773,8 @@ $as_echo "$gt_source" >&6; }
@@ -42747,8 +42747,8 @@ $as_echo "$gt_source" >&6; }
if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
$as_echo_n "checking how to link with libintl... " >&6; }

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.27 2015/08/17 15:33:04 feinerer Exp $
@comment $OpenBSD: PLIST,v 1.28 2015/09/28 07:32:19 dcoppa Exp $
bin/R
@bin bin/Rscript
lib/R/
@ -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