Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Jul 2017 18:26:39 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r446540 - in head: math/cantor math/rkward-kde4 math/rpy math/rpy2 science/afni
Message-ID:  <201707241826.v6OIQdmv029571@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Mon Jul 24 18:26:39 2017
New Revision: 446540
URL: https://svnweb.freebsd.org/changeset/ports/446540

Log:
  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

Modified:
  head/math/cantor/Makefile
  head/math/rkward-kde4/Makefile
  head/math/rkward-kde4/pkg-plist
  head/math/rpy/Makefile
  head/math/rpy2/Makefile
  head/science/afni/Makefile

Modified: head/math/cantor/Makefile
==============================================================================
--- head/math/cantor/Makefile	Mon Jul 24 18:20:27 2017	(r446539)
+++ head/math/cantor/Makefile	Mon Jul 24 18:26:39 2017	(r446540)
@@ -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

Modified: head/math/rkward-kde4/Makefile
==============================================================================
--- head/math/rkward-kde4/Makefile	Mon Jul 24 18:20:27 2017	(r446539)
+++ head/math/rkward-kde4/Makefile	Mon Jul 24 18:26:39 2017	(r446540)
@@ -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	\

Modified: head/math/rkward-kde4/pkg-plist
==============================================================================
--- head/math/rkward-kde4/pkg-plist	Mon Jul 24 18:20:27 2017	(r446539)
+++ head/math/rkward-kde4/pkg-plist	Mon Jul 24 18:26:39 2017	(r446540)
@@ -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

Modified: head/math/rpy/Makefile
==============================================================================
--- head/math/rpy/Makefile	Mon Jul 24 18:20:27 2017	(r446539)
+++ head/math/rpy/Makefile	Mon Jul 24 18:26:39 2017	(r446540)
@@ -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 Languag
 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

Modified: head/math/rpy2/Makefile
==============================================================================
--- head/math/rpy2/Makefile	Mon Jul 24 18:20:27 2017	(r446539)
+++ head/math/rpy2/Makefile	Mon Jul 24 18:26:39 2017	(r446540)
@@ -12,10 +12,9 @@ COMMENT=	Python interface to the R Programming Languag
 
 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

Modified: head/science/afni/Makefile
==============================================================================
--- head/science/afni/Makefile	Mon Jul 24 18:20:27 2017	(r446539)
+++ head/science/afni/Makefile	Mon Jul 24 18:26:39 2017	(r446540)
@@ -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]* \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707241826.v6OIQdmv029571>