Index: math/R/Makefile
===================================================================
--- math/R/Makefile	(wersja 445874)
+++ math/R/Makefile	(kopia robocza)
@@ -3,7 +3,7 @@
 
 PORTNAME=		R
 PORTVERSION=		3.4.1
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		math lang
 MASTER_SITES=		CRAN/src/base/R-${PORTVERSION:C|\..*||}
 
@@ -27,6 +27,7 @@
 			pathfix perl5 readline:port
 
 USE_PERL5=		build
+USE_LDCONFIG=		${PREFIX}/lib/R/lib
 
 OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER LIBR MEMPROF NLS RPROF X11
 OPTIONS_GROUP=		NEEDGCC NEEDX11
@@ -135,8 +136,15 @@
 X11_CONFIGURE_WITH=	x
 X11_USE=		xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt
 
+LIBVER=		0
+PLIST_SUB=	LIBVER=${LIBVER}
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} "s|%%LIBVER%%|${LIBVER}|" \
+		${WRKSRC}/src/main/Makefile.in \
+		${WRKSRC}/src/extra/blas/Makefile.in \
+		${WRKSRC}/src/modules/lapack/Makefile.in
 
 .include <bsd.port.pre.mk>
 .include "compiler.mk"
Index: math/R/files/patch-src_extra_blas_Makefile.in
===================================================================
--- math/R/files/patch-src_extra_blas_Makefile.in	(wersja 0)
+++ math/R/files/patch-src_extra_blas_Makefile.in	(kopia robocza)
@@ -0,0 +1,27 @@
+--- src/extra/blas/Makefile.in.orig	2017-07-16 08:46:49 UTC
++++ src/extra/blas/Makefile.in
+@@ -19,7 +19,7 @@ SOURCES = blas00.c blas.f cmplxblas.f
+ Rblas_la = libRblas$(R_DYLIB_EXT)
+ ## @RBLAS_LDFLAGS@ is used on macOS
+ ## first for internal BLAS
+-Rblas_la_LIBADD = @RBLAS_LDFLAGS@ $(FLIBS_IN_SO)
++Rblas_la_LIBADD = -Wl,-soname,libRblas.so.%%LIBVER%% $(FLIBS_IN_SO)
+ ## then external one
+ Rblas_la_LIBADD0 = @RBLAS_LDFLAGS@
+ 
+@@ -43,6 +43,7 @@ Rblas_install: $(Rblas_la)
+ 	@$(MKINSTALLDIRS) $(DESTDIR)$(Rexeclibdir)
+ 	@$(SHELL) $(top_srcdir)/tools/copy-if-change $(Rblas_la) \
+ 	  $(DESTDIR)$(Rexeclibdir)/$(Rblas_la)
++	@cd $(DESTDIR)$(Rexeclibdir) && ln -s $(Rblas_la) $(Rblas_la).%%LIBVER%%
+ 
+ Rblas_install-strip: $(Rblas_la)
+ 	@$(MKINSTALLDIRS) $(DESTDIR)$(Rexeclibdir)
+@@ -50,6 +51,7 @@ Rblas_install-strip: $(Rblas_la)
+ 	@if test -n "$(STRIP_LIBS)"; then \
+ 	  $(STRIP_LIBS) "$(DESTDIR)$(Rexeclibdir)/$(Rblas_la)" ;\
+ 	fi
++	@cd "$(DESTDIR)$(Rexeclibdir)" && ln -s $(Rblas_la) $(Rblas_la).%%LIBVER%%
+ 
+ mostlyclean: clean
+ clean:

Zmiany atrybutów dla: math/R/files/patch-src_extra_blas_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: math/R/files/patch-src_main_Makefile.in
===================================================================
--- math/R/files/patch-src_main_Makefile.in	(wersja 0)
+++ math/R/files/patch-src_main_Makefile.in	(kopia robocza)
@@ -0,0 +1,19 @@
+--- src/main/Makefile.in.orig	2017-07-16 08:46:49 UTC
++++ src/main/Makefile.in
+@@ -110,7 +110,7 @@ libR_la_LIBADD =  $(MAIN_OBJS) $(EXTRA_STATIC_LIBS) $(
+ libR_la_DEPENDENCIES = $(STATIC_LIBS) $(R_TZONE) @WANT_R_SHLIB_TRUE@ @USE_EXPORTFILES_TRUE@ $(top_builddir)/etc/R.exp
+ 
+ ## The next is needed for macOS only at present
+-LIBR_LDFLAGS = @LIBR_LDFLAGS@
++LIBR_LDFLAGS = -Wl,-soname,libR.so.%%LIBVER%%
+ 
+ 
+ all: R
+@@ -200,6 +200,7 @@ install-bin: installdirs
+ install-lib: installdirs
+ 	@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexeclibdir)"
+ 	@$(SHELL) $(top_srcdir)/tools/copy-if-change $(libR_la) "$(DESTDIR)$(Rexeclibdir)/$(libR_la)"
++	@cd "$(DESTDIR)$(Rexeclibdir)" && ln -s $(libR_la) $(libR_la).%%LIBVER%%
+ install-static: installdirs
+ 	@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexeclibdir)"
+ 	@$(SHELL) $(top_srcdir)/tools/copy-if-change libR.a "$(DESTDIR)$(Rexeclibdir)/libR.a"

Zmiany atrybutów dla: math/R/files/patch-src_main_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: math/R/files/patch-src_modules_lapack_Makefile.in
===================================================================
--- math/R/files/patch-src_modules_lapack_Makefile.in	(wersja 0)
+++ math/R/files/patch-src_modules_lapack_Makefile.in	(kopia robocza)
@@ -0,0 +1,30 @@
+--- src/modules/lapack/Makefile.in.orig	2017-07-16 08:46:49 UTC
++++ src/modules/lapack/Makefile.in
+@@ -82,16 +82,17 @@ $(lapack_la): $(lapack_la_OBJECTS)
+ ## Include BLAS here, as with (static) ATLAS that pulls all the
+ ## BLAS routines into one place.
+ $(Rlapack_la): $(LIBOBJECTS)
+-	$(DYLIB_LINK) -o $@ $(LIBOBJECTS) @RLAPACK_LDFLAGS@ @BLAS_LIBS@ $(Rlapack_la_LIBADD)
++	$(DYLIB_LINK) -o $@ $(LIBOBJECTS)  -Wl,-soname,libRlapack.so.%%LIBVER%% @BLAS_LIBS@ $(Rlapack_la_LIBADD)
+ 
+ Rlapack_install: $(Rlapack_la) 
+ 	@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexeclibdir)"
+ 	@$(SHELL) $(top_srcdir)/tools/copy-if-change $(Rlapack_la) \
+ 	  $(Rexeclibdir)/$(Rlapack_la)
+-
++	@cd $(Rexeclibdir) && ln -s $(Rlapack_la) $(Rlapack_la).%%LIBVER%%
+ install: installdirs
+ 	@$(SHELL) $(top_srcdir)/tools/copy-if-change $(lapack_la) "$(DESTDIR)$(Rexecmodulesdir)/$(lapack_la)"
+ @USE_EXTERNAL_LAPACK_FALSE@	@$(SHELL) $(top_srcdir)/tools/copy-if-change $(Rlapack_la) "$(DESTDIR)$(Rexeclibdir)/$(Rlapack_la)"
++@USE_EXTERNAL_LAPACK_FALSE@	@cd "$(DESTDIR)$(Rexeclibdir)" && ln -sf $(Rlapack_la) $(Rlapack_la).%%LIBVER%%
+ installdirs:
+ 	@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexecmodulesdir)"
+ install-strip-Rlapack:
+@@ -104,6 +105,7 @@ install-strip: @USE_EXTERNAL_LAPACK_FALSE@ install-str
+ 	@if test -n "$(STRIP_LIBS)"; then \
+ 	  $(STRIP_LIBS) "$(DESTDIR)$(Rexecmodulesdir)/$(lapack_la)"; \
+ 	fi
++	@cd "$(DESTDIR)$(Rexeclibdir)" && ln -s $(Rlapack_la) $(Rlapack_la).%%LIBVER%%
+ uninstall:
+ 	@rm -f "$(Rexecmodulesdir)/$(lapack_la)"
+ 

Zmiany atrybutów dla: math/R/files/patch-src_modules_lapack_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: math/R/pkg-plist
===================================================================
--- math/R/pkg-plist	(wersja 445874)
+++ math/R/pkg-plist	(kopia robocza)
@@ -101,8 +101,11 @@
 lib/R/include/Rversion.h
 lib/R/include/S.h
 %%RBLAS%%lib/R/lib/libRblas.so
+%%RBLAS%%lib/R/lib/libRblas.so.%%LIBVER%%
 %%RBLAS%%lib/R/lib/libRlapack.so
+%%RBLAS%%lib/R/lib/libRlapack.so.%%LIBVER%%
 %%LIBR%%lib/R/lib/libR.so
+%%LIBR%%lib/R/lib/libR.so.%%LIBVER%%
 lib/R/library/KernSmooth/DESCRIPTION
 lib/R/library/KernSmooth/INDEX
 lib/R/library/KernSmooth/Meta/features.rds
Index: math/cantor/Makefile
===================================================================
--- math/cantor/Makefile	(wersja 445874)
+++ math/cantor/Makefile	(kopia robocza)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cantor
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
@@ -32,8 +32,7 @@
 OCTAVE_RUN_DEPENDS=	octave:math/octave
 
 R_DESC=		Build R backend and install R
-R_BUILD_DEPENDS=	R:math/R
-R_RUN_DEPENDS=		R:math/R
+R_LIB_DEPENDS=	libR.so:math/R
 # Required to set CFLAGS for -lgfortran.
 R_USES=		fortran
 R_CMAKE_OFF=	-DWITH_R:BOOL=FALSE
Index: math/rkward-kde4/Makefile
===================================================================
--- math/rkward-kde4/Makefile	(wersja 445874)
+++ math/rkward-kde4/Makefile	(kopia robocza)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rkward
 PORTVERSION=	0.6.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-kde4
@@ -13,10 +13,9 @@
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/R:math/R
-LIB_DEPENDS=	libsoprano.so:textproc/soprano
-RUN_DEPENDS=	${LOCALBASE}/bin/R:math/R \
-		${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate
+LIB_DEPENDS=	libR.so:math/R \
+		libsoprano.so:textproc/soprano
+RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate
 
 USES=		cmake gettext fortran kde:4 php:cli shared-mime-info
 USE_QT4=	corelib dbus gui qmake_build moc_build network phonon rcc_build	\
Index: math/rkward-kde4/pkg-plist
===================================================================
--- math/rkward-kde4/pkg-plist	(wersja 445874)
+++ math/rkward-kde4/pkg-plist	(kopia robocza)
@@ -3,6 +3,7 @@
 lib/R/library/rkward/DESCRIPTION
 lib/R/library/rkward/INDEX
 lib/R/library/rkward/Meta/Rd.rds
+lib/R/library/rkward/Meta/features.rds
 lib/R/library/rkward/Meta/hsearch.rds
 lib/R/library/rkward/Meta/links.rds
 lib/R/library/rkward/Meta/nsInfo.rds
@@ -22,6 +23,7 @@
 lib/R/library/rkwardtests/DESCRIPTION
 lib/R/library/rkwardtests/INDEX
 lib/R/library/rkwardtests/Meta/Rd.rds
+lib/R/library/rkwardtests/Meta/features.rds
 lib/R/library/rkwardtests/Meta/hsearch.rds
 lib/R/library/rkwardtests/Meta/links.rds
 lib/R/library/rkwardtests/Meta/nsInfo.rds
Index: math/rpy/Makefile
===================================================================
--- math/rpy/Makefile	(wersja 445874)
+++ math/rpy/Makefile	(kopia robocza)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rpy
 PORTVERSION=	1.0.3
-PORTREVISION=	35
+PORTREVISION=	36
 CATEGORIES=	math
 MASTER_SITES=	SF
 
@@ -13,10 +13,9 @@
 LICENSE=	GPLv2 LGPL21 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${PYNUMPY} \
-		R:math/R
-RUN_DEPENDS=	${PYNUMPY} \
-		R:math/R
+BUILD_DEPENDS=	${PYNUMPY}
+LIB_DEPENDS=	libR.so:math/R
+RUN_DEPENDS=	${PYNUMPY}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
Index: math/rpy2/Makefile
===================================================================
--- math/rpy2/Makefile	(wersja 445874)
+++ math/rpy2/Makefile	(kopia robocza)
@@ -12,10 +12,9 @@
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	${PYNUMPY} \
-		R:math/R
-RUN_DEPENDS=	${PYNUMPY} \
-		R:math/R
+BUILD_DEPENDS=	${PYNUMPY}
+LIB_DEPENDS=	libR.so:math/R
+RUN_DEPENDS=	${PYNUMPY}
 
 USES=		fortran python readline
 USE_PYTHON=	distutils autoplist
Index: science/afni/Makefile
===================================================================
--- science/afni/Makefile	(wersja 445874)
+++ science/afni/Makefile	(kopia robocza)
@@ -20,10 +20,10 @@
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gm4:devel/m4 \
-		R:math/R
+BUILD_DEPENDS=	gm4:devel/m4
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libf2c.so:lang/f2c \
+		libR.so:math/R \
 		libgsl.so:math/gsl \
 		libnetcdff.so:science/netcdf-fortran \
 		libxml2.so:textproc/libxml2 \
@@ -31,8 +31,7 @@
 RUN_DEPENDS=	endian:sysutils/endian \
 		mpeg_encode:multimedia/mpeg_encode \
 		ppmtogif:graphics/netpbm \
-		qhull:math/qhull5 \
-		R:math/R
+		qhull:math/qhull5
 
 CONFLICTS=	im-[0-9]* \
 		nifticlib-[0-9]* \