From owner-svn-ports-head@FreeBSD.ORG Sat Dec 28 12:03:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4FD3A99F; Sat, 28 Dec 2013 12:03:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 317141794; Sat, 28 Dec 2013 12:03:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSC3Jae074491; Sat, 28 Dec 2013 12:03:19 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBSC3JVl074490; Sat, 28 Dec 2013 12:03:19 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312281203.rBSC3JVl074490@svn.freebsd.org> From: Baptiste Daroussin Date: Sat, 28 Dec 2013 12:03:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337869 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2013 12:03:19 -0000 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