After r446199 libR.so has SONAME and was made visible for

consumer ports. Register correct dependency by using LIB_DEPENDS
instead of BUILD|RUN_DEPENDS dance.

math/rkward-kde4:
- Add 2 missing files to pkg-plist also

PR:		219776
Submitted by:	myself
Approved by:	maintainers timeouts

6 files changed, 18 insertions, 21 deletions

diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index 6098efe070a0..caf1f13a141e 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -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_DESC=	Install Octave
 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
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index 170b12239c7a..2f4e45b4248d 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -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 @@ COMMENT=	IDE/GUI for the R-project
 
 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	\
diff --git a/math/rkward-kde4/pkg-plist b/math/rkward-kde4/pkg-plist
index f3dfbf1868e9..badc2f18bc7d 100644
--- a/math/rkward-kde4/pkg-plist
+++ b/math/rkward-kde4/pkg-plist
@@ -3,6 +3,7 @@ lib/R/library/rkward/CITATION
 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/CITATION
 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
diff --git a/math/rpy/Makefile b/math/rpy/Makefile
index 0fec8b1e4083..aa2ed74ef1e8 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rpy
 PORTVERSION=	1.0.3
-PORTREVISION=	35
+PORTREVISION=	36
 CATEGORIES=	math
 MASTER_SITES=	SF
 
@@ -13,10 +13,9 @@ COMMENT=	Python interface to the R Programming Language
 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
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index c2367b4f362b..080fdb520853 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -12,10 +12,9 @@ COMMENT=	Python interface to the R Programming Language
 
 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
diff --git a/science/afni/Makefile b/science/afni/Makefile
index 6864254088e8..c6c681843bae 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -20,10 +20,10 @@ COMMENT=	Advanced Functional Neuro Imaging
 
 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 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 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]* \