2014-09-25 11:06 GMT+04:00 David Coppa <dco...@openbsd.org>:
>
> Hi again,
>
> Elaborating on http://marc.info/?l=openbsd-ports&m=141045074408704
>
> What about the following diff?
There is a problem: files in this directory are arch-dependant (see
the "ldpaths" file, for example), so they can't go under share. We'll
need either provide something like r_arch=/$(ARCH) in CONFIGURE_ENV
during configure (and move them to share/examples/R/$(ARCH)), or move
things to lib/R/etc/examples (like it was done with system /etc
recently; or we can use any other directory) and @sample from there.
> 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 24 Sep 2014 14:50:22 -0000
> @@ -4,6 +4,7 @@ SHARED_ONLY= Yes
>
> COMMENT= powerful math/statistics/graphics language
> DISTNAME= R-3.1.1
> +REVISION= 0
>
> SHARED_LIBS= R 2.1 # 2.1
> SHARED_LIBS+= Rlapack 31.2 # 31.2
> @@ -114,6 +115,8 @@ USE_GMAKE= Yes
> TEXMFLOCAL= ${PREFIX}/share/texmf-local
>
> post-install:
> + mv ${WRKINST}${LOCALBASE}/lib/R/etc ${PREFIX}/share/examples/R
> + ln -s ${SYSCONFDIR}/R ${PREFIX}/lib/R/etc
> mv ${WRKINST}/${LOCALBASE}/lib/R/share/texmf ${TEXMFLOCAL}
> @perl -i -pe 's:^R_HOME_DIR=.*:R_HOME_DIR=${TRUEPREFIX}/lib/R:' \
> ${PREFIX}/bin/R
> 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 24 Sep 2014 14:50:25 -0000
> @@ -78,12 +78,7 @@ 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
> -lib/R/etc/javaconf
> -lib/R/etc/ldpaths
> -lib/R/etc/repositories
> +lib/R/etc
> lib/R/include/
> lib/R/include/R.h
> lib/R/include/R_ext/
> @@ -4224,6 +4219,18 @@ lib/R/share/sh/echo.sh
> lib/pkgconfig/libR.pc
> @man man/man1/R.1
> @man man/man1/Rscript.1
> +share/examples/R/
> +@sample ${SYSCONFDIR}/R/
> +share/examples/R/Makeconf
> +@sample ${SYSCONFDIR}/R/Makeconf
> +share/examples/R/Renviron
> +@sample ${SYSCONFDIR}/R/Renviron
> +share/examples/R/javaconf
> +@sample ${SYSCONFDIR}/R/javaconf
> +share/examples/R/ldpaths
> +@sample ${SYSCONFDIR}/R/ldpaths
> +share/examples/R/repositories
> +@sample ${SYSCONFDIR}/R/repositories
> share/texmf-local/
> share/texmf-local/bibtex/
> share/texmf-local/bibtex/bib/
