Hello all. The patch below enables building of shared R library. Cantor needs it to interact with R. Builds fine on amd64. OK?
-- WBR, Vadim Zhukov Index: Makefile =================================================================== RCS file: /cvs/ports/math/R/Makefile,v retrieving revision 1.43 diff -u -p -r1.43 Makefile --- Makefile 16 Sep 2011 10:31:22 -0000 1.43 +++ Makefile 23 Oct 2011 05:39:43 -0000 @@ -4,9 +4,10 @@ SHARED_ONLY= Yes COMMENT= clone of S, a powerful math/statistics/graphics language DISTNAME= R-2.8.1 -REVISION= 5 +REVISION= 6 SHARED_LIBS= Rlapack 29.0 \ - Rblas 29.0 + Rblas 29.0 \ + R 0.0 CATEGORIES= math HOMEPAGE= http://www.r-project.org/ @@ -17,8 +18,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= GL ICE SM X11 Xau Xdamage Xdmcp Xext Xfixes Xmu Xrender Xss Xt \ - Xxf86vm bz2 c cairo drm expat fontconfig freetype glib-2.0 \ +WANTLIB= GL ICE SM X11 Xext Xmu Xrender Xss Xt \ + bz2 c cairo expat fontconfig freetype glib-2.0 \ gmodule-2.0 gobject-2.0 gthread-2.0 jpeg m ncurses pango-1.0 \ pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs \ readline tiff xcb xcb-render xcb-shm z \ @@ -47,6 +48,7 @@ LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} \ CONFIGURE_STYLE=gnu MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/tools CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --enable-R-shlib \ --with-readline --with-tcltk \ --with-tcl-config=${MODTCL_CONFIG} \ --with-tk-config=${MODTK_CONFIG} \ @@ -57,6 +59,7 @@ MAKE_FLAGS= INSTALL='install -c' \ INSTALL_DATA='install -c -m 644' \ INSTALL_PROGRAM='install -c -s -m 555' \ INSTALL_SCRIPT='install -c -m 555' \ + LIBR_VERSION=${LIBR_VERSION} \ LIBRlapack_VERSION=${LIBRlapack_VERSION} \ LIBRblas_VERSION=${LIBRblas_VERSION} Index: patches/patch-src_main_Makefile_in =================================================================== RCS file: patches/patch-src_main_Makefile_in diff -N patches/patch-src_main_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_main_Makefile_in 23 Oct 2011 05:39:43 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/main/Makefile.in.orig Sun Oct 23 08:22:48 2011 ++++ src/main/Makefile.in Sun Oct 23 08:23:28 2011 +@@ -12,6 +12,8 @@ R_HOME=$(top_builddir) + + include $(top_builddir)/Makeconf + ++DYLIB_EXT=.so.$(LIBR_VERSION) ++ + SOURCES_C = \ + CConverters.c CommandLineArgs.c \ + Rdynload.c Renviron.c RNG.c \ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/math/R/pkg/PLIST,v retrieving revision 1.16 diff -u -p -r1.16 PLIST --- pkg/PLIST 26 Oct 2008 23:04:00 -0000 1.16 +++ pkg/PLIST 23 Oct 2011 05:39:44 -0000 @@ -128,6 +128,7 @@ lib/R/include/Rmath.h lib/R/include/Rversion.h lib/R/include/S.h lib/R/lib/ +@lib lib/R/lib/libR.so.${LIBR_VERSION} @lib lib/R/lib/libRblas.so.${LIBRblas_VERSION} @lib lib/R/lib/libRlapack.so.${LIBRlapack_VERSION} lib/R/library/ @@ -9399,5 +9400,6 @@ lib/R/share/texmf/omscmtt.fd lib/R/share/texmf/ts1aer.fd lib/R/share/texmf/ts1aett.fd lib/R/share/texmf/upquote.sty +lib/pkgconfig/libR.pc @man man/man1/R.1 @man man/man1/Rscript.1
