- Add CRAN_Include_MAINTAINER tag to Mk/bsd.cran.mk

- Rename R_MOD to USE_R_MOD to be suitable for bsd.port.mk
- Remove math/R-cran-sm/files/bsd.cran.mk to complete the moving

Approved by:	wen (via e-mail)

12 files changed, 24 insertions, 65 deletions

diff --git a/Mk/bsd.cran.mk b/Mk/bsd.cran.mk
index 229104978c7d..150fbaa13306 100644
--- a/Mk/bsd.cran.mk
+++ b/Mk/bsd.cran.mk
@@ -1,7 +1,12 @@
 # Date created:		2009-01-25
 # Whom:			Wen Heping <wenheping@gmail.com>
+#
+# $FreeBSD$
+#
 
-.if defined(R_MOD)
+CRAN_Include_MAINTAINER=	wen@FreeBSD.org
+
+.if defined(USE_R_MOD)
 MASTER_CRAN_SITES+=	http://mirrors.geoexpat.com/cran/src/contrib/ \
 			http://cran.rakanu.com/src/contrib/ \
 			http://cran.cnr.berkeley.edu/src/contrib/
@@ -9,7 +14,7 @@ MASTER_CRAN_SITES+=	http://mirrors.geoexpat.com/cran/src/contrib/ \
 
 MASTER_SITES?=	${MASTER_CRAN_SITES}
 
-.if defined(R_MOD)
+.if defined(USE_R_MOD)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R
 RUN_DEPENDS+=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R
 .endif
@@ -22,11 +27,11 @@ R_COMMAND=	${LOCALBASE}/bin/R
 R_INS=		${R_COMMAND} CMD INSTALL
 
 do-install:
-.if defined(R_MOD)
+.if defined(USE_R_MOD)
 	@cd ${WRKDIR} && ${R_INS} ${PORTNAME}
 .endif
 
-.if defined(R_MOD) && defined(R_MOD_AUTOPLIST)
+.if defined(USE_R_MOD) && defined(R_MOD_AUTOPLIST)
 .if !target(post-install-script)
 post-install-script:
 	@${FIND} -ds ${PREFIX}/${R_MOD_DIR} -type f -print | ${SED} -E -e \
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 3d2f8d097676..8132f5e8912b 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -448,6 +448,8 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  Implies inclusion of bsd.python.mk. (Also see
 #				  that file for more information on USE_PYTHON_*
 #				  and USE_PYDISTUTILS).
+# USE_R_MOD	- If set, this port uses the Comprehensive R Archive Network.
+#		  See bsd.cran.mk for more details.
 # USE_RUBY		- If set, this port relies on the Ruby language.
 #				  Implies inclusion of bsd.ruby.mk.  (Also see
 #				  that file for more information on USE_RUBY_*).
@@ -1513,6 +1515,10 @@ PERL=		${LOCALBASE}/bin/perl
 .include "${PORTSDIR}/Mk/bsd.java.mk"
 .endif
 
+.if defined(USE_R_MOD)
+.include "${PORTSDIR}/Mk/bsd.cran.mk"
+.endif
+
 .if defined(USE_RUBY) || defined(USE_LIBRUBY)
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
 .endif
diff --git a/math/R-cran-RSvgDevice/Makefile b/math/R-cran-RSvgDevice/Makefile
index 4aab3fa64f73..f41eae2d6e9a 100644
--- a/math/R-cran-RSvgDevice/Makefile
+++ b/math/R-cran-RSvgDevice/Makefile
@@ -15,8 +15,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	naylor.b.david@gmail.com
 COMMENT=	A R SVG graphics device
 
-R_MOD=	yes
+USE_R_MOD=	yes
 R_MOD_AUTOPLIST=	yes
 
-.include "${.CURDIR}/../../math/R-cran-sm/files/bsd.cran.mk"
 .include <bsd.port.mk>
diff --git a/math/R-cran-Zelig/Makefile b/math/R-cran-Zelig/Makefile
index 2a0dcf85e572..8338196cf03c 100644
--- a/math/R-cran-Zelig/Makefile
+++ b/math/R-cran-Zelig/Makefile
@@ -14,8 +14,7 @@ DISTNAME=	${PORTNAME}_3.4-8
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Everyone's Statistical Software
 
-R_MOD=	yes
+USE_R_MOD=	yes
 R_MOD_AUTOPLIST=	yes
 
-.include "${.CURDIR}/../../math/R-cran-sm/files/bsd.cran.mk"
 .include <bsd.port.mk>
diff --git a/math/R-cran-car/Makefile b/math/R-cran-car/Makefile
index ea64d621c4b3..d96e5953fba0 100644
--- a/math/R-cran-car/Makefile
+++ b/math/R-cran-car/Makefile
@@ -14,9 +14,7 @@ DISTNAME=	${PORTNAME}_1.2-16
 MAINTAINER=	naylor.b.david@gmail.com
 COMMENT=	Companion to Applied Regression for R
 
-R_MOD=	yes
+USE_R_MOD=	yes
 R_MOD_AUTOPLIST=	yes
 
-.include "${.CURDIR}/../../math/R-cran-sm/files/bsd.cran.mk"
-
 .include <bsd.port.mk>
diff --git a/math/R-cran-gpclib/Makefile b/math/R-cran-gpclib/Makefile
index 40330499e9c5..3ea84aa366b3 100644
--- a/math/R-cran-gpclib/Makefile
+++ b/math/R-cran-gpclib/Makefile
@@ -14,8 +14,7 @@ DISTNAME=	${PORTNAME}_1.5-1
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	General Polygon Clipping Library for R
 
-R_MOD=	yes
+USE_R_MOD=	yes
 R_MOD_AUTOPLIST=	yes
 
-.include "${.CURDIR}/../../math/R-cran-sm/files/bsd.cran.mk"
 .include <bsd.port.mk>
diff --git a/math/R-cran-igraph/Makefile b/math/R-cran-igraph/Makefile
index d5961148ee0e..b577c9bf33ef 100644
--- a/math/R-cran-igraph/Makefile
+++ b/math/R-cran-igraph/Makefile
@@ -18,11 +18,9 @@ COMMENT=	R extension package for igraph
 
 BROKEN=		Does not build with R-2.11.0
 
-R_MOD=	yes
+USE_R_MOD=	yes
 R_MOD_AUTOPLIST=	yes
 
-.include "${.CURDIR}/../../math/R-cran-sm/files/bsd.cran.mk"
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
diff --git a/math/R-cran-inline/Makefile b/math/R-cran-inline/Makefile
index c8fbf2733009..1db2e21a164c 100644
--- a/math/R-cran-inline/Makefile
+++ b/math/R-cran-inline/Makefile
@@ -14,9 +14,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Inline C, C++, Fortran function calls from R
 
-R_MOD=	yes
+USE_R_MOD=	yes
 R_MOD_AUTOPLIST=	yes
 
-.include "${.CURDIR}/../../math/R-cran-sm/files/bsd.cran.mk"
-
 .include <bsd.port.mk>
diff --git a/math/R-cran-psych/Makefile b/math/R-cran-psych/Makefile
index c828869a9825..8c1dde87f0c9 100644
--- a/math/R-cran-psych/Makefile
+++ b/math/R-cran-psych/Makefile
@@ -14,9 +14,7 @@ DISTNAME=	${PORTNAME}_1.0-91
 MAINTAINER=	drue@therub.org
 COMMENT=	Psych package for the R project
 
-R_MOD=			yes
+USE_R_MOD=	yes
 R_MOD_AUTOPLIST=	yes
 
-.include "${.CURDIR}/../../math/R-cran-sm/files/bsd.cran.mk"
-
 .include <bsd.port.mk>
diff --git a/math/R-cran-sm/Makefile b/math/R-cran-sm/Makefile
index cb21435761f6..b616f3718e8d 100644
--- a/math/R-cran-sm/Makefile
+++ b/math/R-cran-sm/Makefile
@@ -14,8 +14,7 @@ DISTNAME=	${PORTNAME}_2.2-4
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Smoothing methods for nonparametric regression and density estimation
 
-R_MOD=	yes
+USE_R_MOD=	yes
 R_MOD_AUTOPLIST=	yes
 
-.include "${.CURDIR}/files/bsd.cran.mk"
 .include <bsd.port.mk>
diff --git a/math/R-cran-sm/files/bsd.cran.mk b/math/R-cran-sm/files/bsd.cran.mk
deleted file mode 100644
index 229104978c7d..000000000000
--- a/math/R-cran-sm/files/bsd.cran.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Date created:		2009-01-25
-# Whom:			Wen Heping <wenheping@gmail.com>
-
-.if defined(R_MOD)
-MASTER_CRAN_SITES+=	http://mirrors.geoexpat.com/cran/src/contrib/ \
-			http://cran.rakanu.com/src/contrib/ \
-			http://cran.cnr.berkeley.edu/src/contrib/
-.endif
-
-MASTER_SITES?=	${MASTER_CRAN_SITES}
-
-.if defined(R_MOD)
-BUILD_DEPENDS+=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R
-RUN_DEPENDS+=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R
-.endif
-
-R_MOD_DIR?=	lib/R/library/${PORTNAME}
-PLIST_SUB+=	R_MOD_DIR=${R_MOD_DIR}
-
-NO_BUILD=	yes
-R_COMMAND=	${LOCALBASE}/bin/R
-R_INS=		${R_COMMAND} CMD INSTALL
-
-do-install:
-.if defined(R_MOD)
-	@cd ${WRKDIR} && ${R_INS} ${PORTNAME}
-.endif
-
-.if defined(R_MOD) && defined(R_MOD_AUTOPLIST)
-.if !target(post-install-script)
-post-install-script:
-	@${FIND} -ds ${PREFIX}/${R_MOD_DIR} -type f -print | ${SED} -E -e \
-		's,^${PREFIX}/?,,' > ${TMPPLIST}
-	@${FIND} -ds ${PREFIX}/${R_MOD_DIR} -type d -print | ${SED} -E -e \
-		's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
-.endif
-.endif
-
diff --git a/math/R-cran-sp/Makefile b/math/R-cran-sp/Makefile
index 57440f152d8f..aeebe995a559 100644
--- a/math/R-cran-sp/Makefile
+++ b/math/R-cran-sp/Makefile
@@ -14,9 +14,7 @@ DISTNAME=	${PORTNAME}_0.9-62
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	R Classes and Methods for Spatial Data
 
-R_MOD=  yes
+USE_R_MOD=  yes
 R_MOD_AUTOPLIST=  yes
 
-.include "${.CURDIR}/../../math/R-cran-sm/files/bsd.cran.mk"
-
 .include <bsd.port.mk>