Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Dec 2013 12:03:19 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337869 - head/Mk/Uses
Message-ID:  <201312281203.rBSC3JVl074490@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sat Dec 28 12:03:18 2013
New Revision: 337869
URL: http://svnweb.freebsd.org/changeset/ports/337869

Log:
  Patch has been applied twice before committing
  
  Reported by:	antoine

Modified:
  head/Mk/Uses/cran.mk

Modified: head/Mk/Uses/cran.mk
==============================================================================
--- head/Mk/Uses/cran.mk	Sat Dec 28 11:47:30 2013	(r337868)
+++ head/Mk/Uses/cran.mk	Sat Dec 28 12:03:18 2013	(r337869)
@@ -93,98 +93,3 @@ post-install-script:
 .endif
 
 .endif #_INCLUDE_USES_CRAN_MK
-# $FreeBSD$
-#
-# Use the Comprehensive R Archive Network 
-#
-# MAINTAINER=	wen@FreeBSD.org
-#
-# Feature:	cran
-# Usage:	USES=cran or USES=cran:ARGS
-# Valid ARGS:	auto-plist
-#
-# auto-plist	The pkg-plist can be automatically compiled
-
-.if !defined(_INCLUDE_USES_CRAN_MK)
-_INCLUDE_USES_CRAN_MK=	yes
-
-VALID_ARGS=	auto-plist
-
-MASTER_SITE_CRAN+=	http://ftp.ctex.org/mirrors/CRAN/src/contrib/ \
-			http://cran.rakanu.com/src/contrib/ \
-			http://cran.ms.unimelb.edu.au/src/contrib/ \
-			http://mirror.its.dal.ca/cran/src/contrib/ \
-			http://mirrors.dotsrc.org/cran/src/contrib/ \
-			http://cran.univ-lyon1.fr/src/contrib/ \
-			http://ftp5.gwdg.de/pub/misc/cran/src/contrib/ \
-			http://cran.stat.unipd.it/src/contrib/ \
-			http://cran.md.tsukuba.ac.jp/src/contrib/ \
-			http://mirrors.ibiblio.org/pub/mirrors/CRAN/src/contrib/ \
-			http://cran.cnr.berkeley.edu/src/contrib/
-MASTER_SITE_CRAN_ARCHIVE+=	${MASTER_SITE_CRAN:S,$,Archive/${PORTNAME}/,}
-
-MASTER_SITES?=	${MASTER_SITE_CRAN} ${MASTER_SITE_CRAN_ARCHIVE}
-
-USE_FORTRAN=	yes
-BUILD_DEPENDS+=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R
-RUN_DEPENDS+=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R
-
-PKGNAMEPREFIX?=	R-cran-
-
-R_LIB_DIR=	lib/R/library
-R_MOD_DIR?=	${R_LIB_DIR}/${PORTNAME}
-PLIST_SUB+=	R_MOD_DIR=${R_MOD_DIR}
-WRKSRC?=	${WRKDIR}/${PORTNAME}
-
-NO_BUILD=	yes
-R_COMMAND=	${LOCALBASE}/bin/R
-
-.if !target(regression-test)
-R_POSTCMD_CHECK_OPTIONS?=	--timings
-
-.if !exists(${LOCALBASE}/bin/pdflatex)
-R_POSTCMD_CHECK_OPTIONS+=	--no-manual --no-rebuild-vignettes
-.endif
-
-.if defined(NO_STAGE)
-check-makevars::
-	@${ECHO_MSG} "Makefile error: USE_R_MOD cannot be used with NO_STAGE"
-	@${FALSE}
-.endif
-
-regression-test: build
-	@cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} _R_CHECK_FORCE_SUGGESTS_=FALSE \
-	${R_COMMAND} ${R_PRECMD_CHECK_OPTIONS} CMD check \
-	${R_POSTCMD_CHECK_OPTIONS} ${PORTNAME}
-.endif
-
-.if !target(do-install)
-R_POSTCMD_INSTALL_OPTIONS+=	-l ${STAGEDIR}${PREFIX}/${R_LIB_DIR}
-.if defined(NOPORTDATA)
-R_POSTCMD_INSTALL_OPTIONS+=	--no-data --no-demo
-.else
-R_POSTCMD_INSTALL_OPTIONS+=	--install-tests
-.endif
-
-.if defined(NOPORTDOCS)
-R_POSTCMD_INSTALL_OPTIONS+=	--no-docs --no-html
-.endif
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${R_LIB_DIR}
-	@cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} ${R_COMMAND} \
-	${R_PRECMD_INSTALL_OPTIONS} CMD INSTALL \
-	${R_POSTCMD_INSTALL_OPTIONS} ${PORTNAME}
-.endif
-
-.if ${cran_ARGS:Mauto-plist}
-.if !target(post-install-script)
-post-install-script:
-	@${FIND} -ds ${STAGEDIR}${PREFIX}/${R_MOD_DIR} \( -type f -or -type l \) -print | \
-		${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
-	@${FIND} -ds ${STAGEDIR}${PREFIX}/${R_MOD_DIR} -type d -print | ${SED} -E -e \
-		's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
-.endif
-.endif
-
-.endif #_INCLUDE_USES_CRAN_MK



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