Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Dec 2019 19:50:37 +0000 (UTC)
From:      Joseph Mingrone <jrm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r520192 - head/math/R
Message-ID:  <201912151950.xBFJobw4078034@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jrm
Date: Sun Dec 15 19:50:37 2019
New Revision: 520192
URL: https://svnweb.freebsd.org/changeset/ports/520192

Log:
  math/R: No-op to standardize formatting using ports-mgmt/portfmt

Modified:
  head/math/R/Makefile   (contents, props changed)

Modified: head/math/R/Makefile
==============================================================================
--- head/math/R/Makefile	Sun Dec 15 19:12:07 2019	(r520191)
+++ head/math/R/Makefile	Sun Dec 15 19:50:37 2019	(r520192)
@@ -14,9 +14,9 @@ LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64
 
+BUILD_DEPENDS=	texi2any:print/texinfo
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre.so:devel/pcre
-BUILD_DEPENDS=	texi2any:print/texinfo
 RUN_DEPENDS=	gmake:devel/gmake # R packages may require GNU make
 
 # possible TODO
@@ -25,36 +25,37 @@ RUN_DEPENDS=	gmake:devel/gmake # R packages may requir
 # - Create ports for each of the recommended packages
 # - Create a meta-port for the recommended packages
 
-USES=		compiler:c++11-lang gmake iconv libtool localbase pathfix \
-		perl5 readline:port
+USES=		compiler:c++11-lang gmake iconv libtool localbase pathfix perl5 \
+		readline:port
 USE_LDCONFIG=	${PREFIX}/lib/R/lib
 USE_PERL5=	build
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-java \
 		--enable-R-shlib \
 		--with-readline \
 		rdocdir=${DOCSDIR}
-GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-PLIST_SUB=	LIBVER=${LIBVER}
+PLIST_SUB=	LIBVER=${_LIBVER}
 
 OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER MEMPROF NLS RPROF X11
 OPTIONS_DEFINE_amd64=	FLANG OPENMP
 OPTIONS_DEFINE_i386=	OPENMP
-OPTIONS_GROUP=		NEEDX11
-OPTIONS_GROUP_NEEDX11=	GHOSTSCRIPT JPEG CAIROPANGO PNG TCLTK TEXDOCS TIFF
-OPTIONS_SINGLE=		BLAS
-OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NETLIB RBLAS
 OPTIONS_DEFAULT=	CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE PNG RBLAS \
 			RPROF TCLTK TIFF X11
 OPTIONS_DEFAULT_amd64=	OPENMP
 OPTIONS_DEFAULT_i386=	OPENMP
+OPTIONS_GROUP=		NEEDX11
+OPTIONS_GROUP_NEEDX11=	CAIROPANGO GHOSTSCRIPT JPEG PNG TCLTK TEXDOCS TIFF
+OPTIONS_SINGLE=		BLAS
+OPTIONS_SINGLE_BLAS=	ATLAS NETLIB OPENBLAS RBLAS
+
 OPTIONS_SUB=		YES
 
 ATLAS_DESC=		ATLAS BLAS implementation
+CAIROPANGO_DESC=	Cairo graphics device and Pango multi-language text
 FLANG_DESC=		Use experimental flang instead of default Fortran compiler
 GHOSTSCRIPT_DESC=	Graphics device for bitmap files via Ghostscript
-CAIROPANGO_DESC=	Cairo graphics device and Pango multi-language text
 INFO_DESC=		GNU info manuals
 JPEG_DESC=		JPEG graphics device
 LDOUBLE_DESC=		Long double data type
@@ -69,62 +70,63 @@ RPROF_DESC=		R profiling via Rprof()
 TEXDOCS_DESC=		Build/Install TeX-dependent documentation files
 X11_DESC=		X11 graphics device
 
-ATLAS_USES=		blaslapack:atlas
-ATLAS_CONFIGURE_ON=	--disable-BLAS-shlib
-CAIROPANGO_IMPLIES=	X11
+ATLAS_USES=			blaslapack:atlas
+ATLAS_CONFIGURE_ON=		--disable-BLAS-shlib
+CAIROPANGO_IMPLIES=		X11
+CAIROPANGO_USES=		gettext gnome jpeg pkgconfig
+CAIROPANGO_USE=			GNOME=cairo,pango
 CAIROPANGO_CONFIGURE_WITH=	cairo
-CAIROPANGO_USES=	gettext gnome jpeg pkgconfig
-CAIROPANGO_USE=		GNOME=pango,cairo
-FLANG_LIB_DEPENDS=	libpgmath.so:math/libpgmath
-FLANG_USES=		fortran:flang
-FLANG_PREVENTS=		ATLAS OPENBLAS NETLIB
-GHOSTSCRIPT_IMPLIES=	X11
-GHOSTSCRIPT_USES=	ghostscript
-ICU_CONFIGURE_WITH=	ICU
-ICU_LIB_DEPENDS=	libicui18n.so:devel/icu
-INFO_INSTALL_TARGET=	install-info
-INFO_INFO=		R-FAQ R-admin R-data R-exts R-ints R-intro R-lang
-JPEG_IMPLIES=		X11
-JPEG_CONFIGURE_WITH=	jpeglib
-JPEG_CONFIGURE_ENV=	r_cv_header_jpeglib_h=yes
-JPEG_USES=		jpeg pkgconfig
+FLANG_PREVENTS=			ATLAS NETLIB OPENBLAS
+FLANG_LIB_DEPENDS=		libpgmath.so:math/libpgmath
+FLANG_USES=			fortran:flang
+GHOSTSCRIPT_IMPLIES=		X11
+GHOSTSCRIPT_USES=		ghostscript
+ICU_LIB_DEPENDS=		libicui18n.so:devel/icu
+ICU_CONFIGURE_WITH=		ICU
+INFO_INSTALL_TARGET=		install-info
+INFO_INFO=			R-admin R-data R-exts R-FAQ R-intro R-ints \
+				R-lang
+JPEG_IMPLIES=			X11
+JPEG_USES=			jpeg pkgconfig
+JPEG_CONFIGURE_WITH=		jpeglib
+JPEG_CONFIGURE_ENV=		r_cv_header_jpeglib_h=yes
 LDOUBLE_CONFIGURE_ENABLE=	long-double
-LETTER_CONFIGURE_ENV=	R_PAPERSIZE=letter
+LETTER_CONFIGURE_ENV=		R_PAPERSIZE=letter
 MEMPROF_CONFIGURE_ENABLE=	memory-profiling
-NETLIB_USES=		blaslapack:netlib
-NETLIB_CONFIGURE_ON=	--disable-BLAS-shlib
-NLS_CONFIGURE_OFF=	--disable-nls
-NLS_USES=		gettext
-OPENBLAS_USES=		blaslapack:openblas
-OPENBLAS_CONFIGURE_ON=	--disable-BLAS-shlib
+NETLIB_USES=			blaslapack:netlib
+NETLIB_CONFIGURE_ON=		--disable-BLAS-shlib
+NLS_USES=			gettext
+NLS_CONFIGURE_OFF=		--disable-nls
+OPENBLAS_USES=			blaslapack:openblas
+OPENBLAS_CONFIGURE_ON=		--disable-BLAS-shlib
 OPENMP_CONFIGURE_ENABLE=	openmp
-PNG_IMPLIES=		X11
-PNG_LIB_DEPENDS=	libpng.so:graphics/png
-PNG_CONFIGURE_WITH=	libpng
-RBLAS_CONFIGURE_ON=	--without-blas \
-			--without-lapack \
-			--enable-BLAS-shlib
-RBLAS_CONFIGURE_OFF=	--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
-			--with-lapack="${LAPACKLIB}"
-RBLAS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_extra_blas_Makefile.in \
-			${PATCHDIR}/extra-patch-src_modules_lapack_Makefile.in
-RPROF_CONFIGURE_ENABLE=	R-profiling
-TCLTK_IMPLIES=		X11
-TCLTK_USES=		tcl tk
-TCLTK_CONFIGURE_WITH=	tcltk
+PNG_IMPLIES=			X11
+PNG_LIB_DEPENDS=		libpng.so:graphics/png
+PNG_CONFIGURE_WITH=		libpng
+RBLAS_CONFIGURE_OFF=		--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
+				--with-lapack="${LAPACKLIB}"
+RBLAS_CONFIGURE_ON=		--enable-BLAS-shlib \
+				--without-blas \
+				--without-lapack
+RBLAS_EXTRA_PATCHES=		${PATCHDIR}/extra-patch-src_extra_blas_Makefile.in \
+				${PATCHDIR}/extra-patch-src_modules_lapack_Makefile.in
+RPROF_CONFIGURE_ENABLE=		R-profiling
+TCLTK_IMPLIES=			X11
+TCLTK_USES=			tcl tk
+TCLTK_CONFIGURE_WITH=		tcltk
+TEXDOCS_USE=			TEX=dvipsk:build,kpathsea:build,pdftex:build
 .for i in KPSEWHICH MAKEINDEX PDFLATEX PDFTEX TEX TEXI2DVI
 TEXDOCS_CONFIGURE_ENV_OFF+=	ac_cv_path_${i}=""
 .endfor
-TEXDOCS_INSTALL_TARGET=	install-pdf
-TEXDOCS_USE=		tex=dvipsk:build,kpathsea:build,pdftex:build
-TIFF_IMPLIES=		X11
-TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_CONFIGURE_WITH=	libtiff
-X11_CONFIGURE_WITH=	x
-X11_USES=		xorg
-X11_USE=		xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt
+TEXDOCS_INSTALL_TARGET=		install-pdf
+TIFF_IMPLIES=			X11
+TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
+TIFF_CONFIGURE_WITH=		libtiff
+X11_USES=			xorg
+X11_USE=			XORG=ice,sm,x11,xext,xmu,xscrnsaver,xt
+X11_CONFIGURE_WITH=		x
 
-LIBVER=		${PORTVERSION:R}
+_LIBVER=	${PORTVERSION:R}
 
 .include <bsd.port.options.mk>
 
@@ -143,7 +145,7 @@ LIBVER=		${PORTVERSION:R}
 #
 # This will be moot after 12.1 when openmp will be in base.
 .if ! ${PORT_OPTIONS:MFLANG}
-USES+=	fortran
+USES+=		fortran
 .if ${PORT_OPTIONS:MOPENMP}
 LIB_DEPENDS+=	libomp.so:devel/openmp
 .endif
@@ -151,17 +153,17 @@ LIB_DEPENDS+=	libomp.so:devel/openmp
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
-	@${REINPLACE_CMD} "s|%%LIBVER%%|${LIBVER}|" \
+	@${REINPLACE_CMD} "s|%%LIBVER%%|${_LIBVER}|" \
 		${WRKSRC}/src/main/Makefile.in \
 		${WRKSRC}/src/extra/blas/Makefile.in \
 		${WRKSRC}/src/modules/lapack/Makefile.in
 
-post-install-RBLAS-on:
-	@${REINPLACE_CMD} -e "s| -lR| -lR -lRblas|" \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
-
 post-install-RBLAS-off:
 	@${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
+
+post-install-RBLAS-on:
+	@${REINPLACE_CMD} -e "s| -lR| -lR -lRblas|" \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
 
 .include <bsd.port.mk>



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