Re: math/R and Java support

2014-09-12 Thread Vadim Zhukov
2014-09-11 19:51 GMT+04:00 David Coppa dco...@openbsd.org:

 Add a README and the right 'no checksum' markers into pkg/PLIST.

 OK?

 Index: Makefile
 ===
 RCS file: /cvs/ports/math/R/Makefile,v
 retrieving revision 1.63
 diff -u -p -u -p -r1.63 Makefile
 --- Makefile2 Sep 2014 14:55:37 -   1.63
 +++ Makefile11 Sep 2014 15:43:57 -
 @@ -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
 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 -   1.23
 +++ pkg/PLIST   11 Sep 2014 15:44:05 -
 @@ -79,9 +79,11 @@ lib/R/doc/manual/images/fig12.png
  lib/R/doc/manual/images/hist.png
  lib/R/doc/manual/images/ice.png
  lib/R/etc/
 +@comment no checksum
  lib/R/etc/Makeconf
  lib/R/etc/Renviron
  lib/R/etc/javaconf
 +@comment no checksum
  lib/R/etc/ldpaths
  lib/R/etc/repositories
  lib/R/include/
 @@ -4224,6 +4226,7 @@ lib/R/share/sh/echo.sh
  lib/pkgconfig/libR.pc
  @man man/man1/R.1
  @man man/man1/Rscript.1
 +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 -
 +++ pkg/README  11 Sep 2014 15:44:05 -
 @@ -0,0 +1,17 @@
 +$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=${LOCALBASE}/jdk-1.7.0 ${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.

Hm-m-m, this probably could be handled better by moving lib/R/etc to
/etc/R. Maybe it could be configured; otherwise, mv+ln -s in
post-install should be sufficient. Rafael, what do you think, is it
possible?



math/R and Java support

2014-09-11 Thread David Coppa

Add a README and the right 'no checksum' markers into pkg/PLIST.

OK?

Index: Makefile
===
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.63
diff -u -p -u -p -r1.63 Makefile
--- Makefile2 Sep 2014 14:55:37 -   1.63
+++ Makefile11 Sep 2014 15:43:57 -
@@ -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
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 -   1.23
+++ pkg/PLIST   11 Sep 2014 15:44:05 -
@@ -79,9 +79,11 @@ lib/R/doc/manual/images/fig12.png
 lib/R/doc/manual/images/hist.png
 lib/R/doc/manual/images/ice.png
 lib/R/etc/
+@comment no checksum
 lib/R/etc/Makeconf
 lib/R/etc/Renviron
 lib/R/etc/javaconf
+@comment no checksum
 lib/R/etc/ldpaths
 lib/R/etc/repositories
 lib/R/include/
@@ -4224,6 +4226,7 @@ lib/R/share/sh/echo.sh
 lib/pkgconfig/libR.pc
 @man man/man1/R.1
 @man man/man1/Rscript.1
+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 -
+++ pkg/README  11 Sep 2014 15:44:05 -
@@ -0,0 +1,17 @@
+$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=${LOCALBASE}/jdk-1.7.0 ${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.