Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Mar 2016 15:55:13 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r410620 - in head/math/superlu: . files
Message-ID:  <201603081555.u28FtDGf021171@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Tue Mar  8 15:55:13 2016
New Revision: 410620
URL: https://svnweb.freebsd.org/changeset/ports/410620

Log:
  Update to 5.1.1.
  
  PR:		203482
  Submitted by:	tkato432 yahoo com
  Sponsored by:	Absolight

Deleted:
  head/math/superlu/files/
Modified:
  head/math/superlu/Makefile
  head/math/superlu/distinfo
  head/math/superlu/pkg-descr
  head/math/superlu/pkg-plist

Modified: head/math/superlu/Makefile
==============================================================================
--- head/math/superlu/Makefile	Tue Mar  8 15:32:10 2016	(r410619)
+++ head/math/superlu/Makefile	Tue Mar  8 15:55:13 2016	(r410620)
@@ -2,95 +2,78 @@
 # $FreeBSD$
 
 PORTNAME=	superlu
-PORTVERSION=	${P_VERSION}
-PORTREVISION=	3
+PORTVERSION=	5.1.1
 CATEGORIES=	math
-MASTER_SITES=	http://crd.lbl.gov/~xiaoye/SuperLU/ \
-		http://crd.lbl.gov/~xiaoye/:doc
-DISTNAME=	${PORTNAME}_${P_VERSION}
+MASTER_SITES=	http://crd-legacy.lbl.gov/~xiaoye/SuperLU/ \
+		http://crd-legacy.lbl.gov/~xiaoye/:doc
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library of routines for performing sparse factorization
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/README
+LICENSE_FILE=	${WRKDIR}/LICENSE
 
-USES=		fortran
+USES=		cmake:outsource fortran
 
 USE_LDCONFIG=	yes
 
-P_VERSION=	4.3
-P_VER=		${P_VERSION:R}
-WRKSRC=		${WRKDIR}/SuperLU_${P_VERSION}
-ALL_TARGET=	lib
-PLIST_SUB=	P_VERSION=${P_VERSION} P_VER=${P_VER}
-
-ARCH2FIX=	SRC/Makefile TESTING/MATGEN/Makefile CBLAS/Makefile make.inc	\
-		MAKE_INC/make.alpha MAKE_INC/make.inc
-
-MAKE_JOBS_UNSAFE=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} superlu_ug.pdf SLU_general.ps.gz:doc simax95.ps.gz:doc
-.endif
-
-.if exists(${LOCALBASE}/lib/libgoto2.so)
-WITH_BLAS?=	gotoblas
-.elif exists(${LOCALBASE}/lib/libatlas.so)
-WITH_BLAS?=	atlas
-.else
-WITH_BLAS?=	reference
-.endif
-
-. if ${WITH_BLAS} == reference
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
-BLAS=		-lblas
-.elif ${WITH_BLAS} == gotoblas
-LIB_DEPENDS+=	libgoto2.so:${PORTSDIR}/math/gotoblas
-BLAS=		-lgoto2p
-.elif ${WITH_BLAS} == atlas
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
-BLAS=		-lptf77blas
-.endif
-
-pre-build:
-	${REINPLACE_CMD} -e 's+%%BLAS%%+-L${LOCALBASE}/lib ${BLAS}+ ; \
-			s+%%CC%%+${CC}+; s+%%FC%%+${FC}+; \
-			s+%%WRKSRC%%+${WRKSRC}+; \
-			s+%%CFLAGS%%+${CFLAGS}+; \
-			s+%%FFLAGS%%+${FFLAGS}+' \
-	${WRKSRC}/make.inc
-.for fmk in ${ARCH2FIX}
-	${REINPLACE_CMD} -e 's|^ARCH *.= ar|ARCMD = ar| ; \
-		s|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/${fmk}
-.endfor
-	${FIND} ${WRKSRC} -name Makefile | ${XARGS}	\
-		${REINPLACE_CMD} -E -e 's|\( cd (.*); \$$\(MAKE\) \)|\$$(MAKE) -C \1|'
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/libsuperlu_${P_VERSION}.a \
-		${STAGEDIR}${PREFIX}/lib/libsuperlu.a
-	${INSTALL_LIB} ${WRKSRC}/libsuperlu_${P_VERSION}.so \
+WRKSRC=		${WRKDIR}/SuperLU_${PORTVERSION}
+PLIST_SUB=	P_VERSION="${PORTVERSION}" P_VER="${P_VER}"
+
+CMAKE_ARGS=	-DUSE_XSDK_DEFAULTS:BOOL=ON \
+		-Denable_examples:BOOL=OFF \
+		-Denable_tests:BOOL=OFF
+
+PORTDOCS=	*
+
+OPTIONS_DEFINE=		DOCS
+OPTIONS_SINGLE=		BLAS
+OPTIONS_SINGLE_BLAS=	ATLAS GOTOBLAS REFERENCE
+OPTIONS_DEFAULT=	REFERENCE
+
+ATLAS_USES=		blaslapack:atlas
+ATLAS_CMAKE_ARGS=	-DBLA_VENDOR:STRING="ATLAS"
+DOCS_DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
+			${SLU_DOCS:S/$/:doc/}
+DOCS_EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+GOTOBLAS_DESC=		GotoBLAS blas implementation
+GOTOBLAS_USES=		blaslapack:gotoblas
+GOTOBLAS_CMAKE_ARGS=	-DBLA_VENDOR:STRING="Goto"
+REFERENCE_DESC=		Reference blas implementation
+REFERENCE_USES=		blaslapack
+REFERENCE_CMAKE_ARGS=	-DBLA_VENDOR:STRING="Generic"
+
+P_VER=		${PORTVERSION:C/^([[:alnum:]]+).*/\1/}
+SLU_DOCS=	SLU_general.ps.gz simax-29176.pdf
+
+post-extract:
+	@${HEAD} -32 ${WRKSRC}/README > ${LICENSE_FILE}
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/CMAKE_C_FLAGS_RELEASE/s|^|#|' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e \
+		'/FFLAGS/s|FATAL_ERROR|WARNING|' ${WRKSRC}/XSDKDefaults.cmake
+	@${REINPLACE_CMD} -e \
+		's|\(/include\)$$|/\1/superlu|' ${WRKSRC}/SRC/CMakeLists.txt
+
+post-install:
+	${LN} -sf libsuperlu_${PORTVERSION}.so \
 		${STAGEDIR}${PREFIX}/lib/libsuperlu.so.${P_VER}
-	${LN} -fs libsuperlu.so.${P_VER} \
-		${STAGEDIR}${PREFIX}/lib/libsuperlu_${P_VERSION}.so
-	${LN} -fs libsuperlu_${P_VERSION}.so \
+	${LN} -sf libsuperlu_${PORTVERSION}.so \
 		${STAGEDIR}${PREFIX}/lib/libsuperlu.so
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/superlu
-	${INSTALL_DATA} ${WRKSRC}/SRC/*.h ${STAGEDIR}${PREFIX}/include/superlu
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/SLU_general.ps.gz ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/simax95.ps.gz ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/superlu_ug.pdf ${STAGEDIR}${DOCSDIR}
-.endif
+	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${SLU_DOCS} \
+		${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/DOC && ${COPYTREE_SHARE} "html ug.pdf" \
+		${STAGEDIR}${DOCSDIR})
 
-regression-test: build
+do-test:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} testing )
 	(cd ${WRKSRC}/TESTING && ${CAT} *.out )
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/math/superlu/distinfo
==============================================================================
--- head/math/superlu/distinfo	Tue Mar  8 15:32:10 2016	(r410619)
+++ head/math/superlu/distinfo	Tue Mar  8 15:55:13 2016	(r410620)
@@ -1,8 +1,6 @@
-SHA256 (superlu/superlu_4.3.tar.gz) = 169920322eb9b9c6a334674231479d04df72440257c17870aaa0139d74416781
-SIZE (superlu/superlu_4.3.tar.gz) = 2875951
-SHA256 (superlu/superlu_ug.pdf) = 4657e60fb7832465b60e208613992d29b6bbd8110103bfe0f5cee0ab79b67766
-SIZE (superlu/superlu_ug.pdf) = 458405
+SHA256 (superlu/superlu_5.1.1.tar.gz) = cec5022c8dc16e38e5c8bc92ed196144fe58864bd1c5ad73fb698398308f8065
+SIZE (superlu/superlu_5.1.1.tar.gz) = 2746173
 SHA256 (superlu/SLU_general.ps.gz) = 00d00cedfadd96a42014d22b30c0cc451a575d8d309774519068b11d4be1ebe5
 SIZE (superlu/SLU_general.ps.gz) = 89463
-SHA256 (superlu/simax95.ps.gz) = b7e7705a280336474a25b0a1aef57226d81ea0dc6f18728b7347cb1726f91d2a
-SIZE (superlu/simax95.ps.gz) = 138096
+SHA256 (superlu/simax-29176.pdf) = 1411a3976b932a834157064dbaf0cdda10763f321bae10eb6f18925432250226
+SIZE (superlu/simax-29176.pdf) = 521916

Modified: head/math/superlu/pkg-descr
==============================================================================
--- head/math/superlu/pkg-descr	Tue Mar  8 15:32:10 2016	(r410619)
+++ head/math/superlu/pkg-descr	Tue Mar  8 15:55:13 2016	(r410620)
@@ -1,24 +1,16 @@
-			SuperLU (Version 3.0)
-			=====================
+SuperLU is a general purpose library for the direct solution of large,
+sparse, nonsymmetric systems of linear equations on high performance
+machines. The library is written in C and is callable from either C or
+Fortran. The library routines will perform an LU decomposition with
+partial pivoting and triangular system solves through forward and back
+substitution. The LU factorization routines can handle non-square
+matrices but the triangular solves are performed only for square
+matrices. The matrix columns may be preordered (before factorization)
+either through library or user supplied routines. This preordering for
+sparsity is completely separate from the factorization. Working
+precision iterative refinement subroutines are provided for improved
+backward stability. Routines are also provided to equilibrate the
+system, estimate the condition number, calculate the relative backward
+error, and estimate error bounds for the refined solutions.
 
-SuperLU is a general purpose library for the direct solution of large, 
-sparse, nonsymmetric systems of linear equations on high performance 
-machines. The library is written in C and is callable from either C or 
-Fortran. The library routines will perform an LU decomposition with 
-partial pivoting and triangular system solves through forward and back 
-substitution. The LU factorization routines can handle non-square matrices 
-but the triangular solves are performed only for square matrices. The 
-matrix columns may be preordered (before factorization) either through 
-library or user supplied routines. This preordering for sparsity is 
-completely separate from the factorization. Working precision iterative 
-refinement subroutines are provided for improved backward stability. 
-Routines are also provided to equilibrate the system, estimate the 
-condition number, calculate the relative backward error, and estimate 
-error bounds for the refined solutions.
-
-WWW: http://crd.lbl.gov/~xiaoye/SuperLU/
-
-Developers:	Sherry Li
-		Jim Demmel
-		John Gilbert
-NOTE: This library has to be linked with BLAS or a compatible library.
+WWW: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/

Modified: head/math/superlu/pkg-plist
==============================================================================
--- head/math/superlu/pkg-plist	Tue Mar  8 15:32:10 2016	(r410619)
+++ head/math/superlu/pkg-plist	Tue Mar  8 15:55:13 2016	(r410620)
@@ -1,5 +1,3 @@
-include/superlu/colamd.h
-include/superlu/html_mainpage.h
 include/superlu/slu_Cnames.h
 include/superlu/slu_cdefs.h
 include/superlu/slu_dcomplex.h
@@ -10,10 +8,6 @@ include/superlu/slu_util.h
 include/superlu/slu_zdefs.h
 include/superlu/superlu_enum_consts.h
 include/superlu/supermatrix.h
-lib/libsuperlu.a
 lib/libsuperlu.so
 lib/libsuperlu.so.%%P_VER%%
 lib/libsuperlu_%%P_VERSION%%.so
-%%PORTDOCS%%%%DOCSDIR%%/SLU_general.ps.gz
-%%PORTDOCS%%%%DOCSDIR%%/simax95.ps.gz
-%%PORTDOCS%%%%DOCSDIR%%/superlu_ug.pdf



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