Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Jul 2016 15:48:17 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r418640 - head/math/R
Message-ID:  <201607161548.u6GFmHtf040572@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sat Jul 16 15:48:17 2016
New Revision: 418640
URL: https://svnweb.freebsd.org/changeset/ports/418640

Log:
  Fix dependencies, Makefile cleanups
  
  Detailed maintainer log:
  - Explicitly rely on required perl for the build
  - math/R cannot be built in poudriere when math/atlas is chosen for the
    BLAS implementation.  It's not the default, so handle gracefully with
    an IGNORE (could also have set MANUAL_PACKAGE_BUILD with
    ATLAS_VARS= MANUAL_PACKAGE_BUILD=...)
  - fix a type: DOC_BUILD_DEPEND -> DOCS_BUILD_DEPEND
  
  PR:		210983
  Submitted by:	jrm@ftfl.ca (maintainer)

Modified:
  head/math/R/Makefile

Modified: head/math/R/Makefile
==============================================================================
--- head/math/R/Makefile	Sat Jul 16 15:40:34 2016	(r418639)
+++ head/math/R/Makefile	Sat Jul 16 15:48:17 2016	(r418640)
@@ -28,23 +28,18 @@ LICENSE=		GPLv2
 
 LIB_DEPENDS=		libcurl.so:ftp/curl \
 			libpcre.so:devel/pcre
-BUILD_DEPENDS=		texi2dvi:print/texinfo
 
 GNU_CONFIGURE=		yes
-USES=			fortran iconv objc:compiler
+USES=			fortran iconv objc:compiler perl5
+USE_PERL5=		build
 USE_LDCONFIG=		${PREFIX}/lib/R/lib
-
-CONFIGURE_ARGS=		--disable-java --enable-memory-profiling \
-			rdocdir=${DOCSDIR}
-
+CONFIGURE_ARGS=		--disable-java --enable-memory-profiling rdocdir=${DOCSDIR}
 INSTALL_TARGET=		install-strip
 
 OPTIONS_DEFINE=		DOCS ICU INFO LETTER LIBR LDOUBLE LTO MISSING NLS \
 			OPENMP THREADS X11
-
 OPTIONS_GROUP=		NEEDX11
 OPTIONS_GROUP_NEEDX11=	GHOSTSCRIPT JPEG CAIROPANGO PDF PNG TCLTK TIFF
-
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NETLIB RBLAS
 
@@ -77,8 +72,11 @@ OPTIONS_DEFAULT_powerpc64+=	MISSING
 OPTIONS_DEFAULT_sparc64+=	MISSING
 
 ATLAS_USES=		blaslapack:atlas
+.if defined(BATCH) || defined(PACKAGE_BUILDING)
+ATLAS_IGNORE=		Choose a BLAS option other than ATLAS for package building.
+.endif
 
-DOC_BUILD_DEPENDS=	texi2any:print/texinfo
+DOCS_BUILD_DEPENDS=	texi2any:print/texinfo
 
 GHOSTSCRIPT_IMPLIES=	X11
 GHOSTSCRIPT_USES=	ghostscript



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