svn commit: r361117 - in head/math: cblas spblas

[Brendan Fabeny]

Author: bf
Date: Mon Jul  7 18:54:17 2014
New Revision: 361117
URL: http://svnweb.freebsd.org/changeset/ports/361117
QAT: https://qat.redports.org/buildarchive/r361117/

Log:
  Use staging; use gcc for spblas

Modified:
  head/math/cblas/Makefile
  head/math/cblas/pkg-descr
  head/math/spblas/Makefile

Modified: head/math/cblas/Makefile
==============================================================================
--- head/math/cblas/Makefile	Mon Jul  7 18:53:59 2014	(r361116)
+++ head/math/cblas/Makefile	Mon Jul  7 18:54:17 2014	(r361117)
@@ -33,7 +33,6 @@ WRKSRC_PROFILE =	${WRKSRC}_PROFILE
 WRKSRC_SHARED=		${WRKSRC}_SHARED
 WRKSRC_STATIC=		${WRKSRC}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if make(makesum) || ${PORT_OPTIONS:MDOCS}
@@ -119,17 +118,17 @@ test-${o:tl}: build-${o:tl}
 .endif
 
 do-install:
-	@${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include
+	@${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
 .if ${PORT_OPTIONS:MSTATIC}
-	@${INSTALL_DATA} ${WRKSRC}/lib/libcblas.a ${PREFIX}/lib
+	@${INSTALL_LIB} ${WRKSRC}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib
 .endif
 .if ${PORT_OPTIONS:MSHARED}
-	@${INSTALL_DATA} ${WRKSRC_SHARED}/lib/libcblas.a ${PREFIX}/lib/libcblas_pic.a
-	@${INSTALL_DATA} ${WRKSRC_SHARED}/lib/libcblas.so.${SVERSION} ${PREFIX}/lib
-	@${LN} -sf libcblas.so.${SVERSION} ${PREFIX}/lib/libcblas.so
+	@${INSTALL_LIB} ${WRKSRC_SHARED}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_pic.a
+	@${INSTALL_LIB} ${WRKSRC_SHARED}/lib/libcblas.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib
+	@${LN} -sf libcblas.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libcblas.so
 .endif
 .if ${PORT_OPTIONS:MPROFILE}
-	@${INSTALL_DATA} ${WRKSRC_PROFILE}/lib/libcblas.a ${PREFIX}/lib/libcblas_p.a
+	@${INSTALL_LIB} ${WRKSRC_PROFILE}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_p.a
 .endif
 
 .include <bsd.port.mk>

Modified: head/math/cblas/pkg-descr
==============================================================================
--- head/math/cblas/pkg-descr	Mon Jul  7 18:53:59 2014	(r361116)
+++ head/math/cblas/pkg-descr	Mon Jul  7 18:54:17 2014	(r361117)
@@ -2,4 +2,4 @@ This is a reference implementation of th
 Fortran Basic Linear Algebra Subprograms (BLAS), as described in
 Annex B of the BLAS Technical Forum (BLAST) Standard.
 
-WWW:	http://www.netlib.org/blas/blast-forum/
+WWW: http://www.netlib.org/blas/blast-forum/

Modified: head/math/spblas/Makefile
==============================================================================
--- head/math/spblas/Makefile	Mon Jul  7 18:53:59 2014	(r361116)
+++ head/math/spblas/Makefile	Mon Jul  7 18:54:17 2014	(r361117)
@@ -11,6 +11,7 @@ MAINTAINER=	bf at FreeBSD.org
 COMMENT=	NIST Sparse Basic Linear Algebra Subprograms (BLAS)
 
 USES=		dos2unix zip
+USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 HEADERS=	blas_enum.h blas_sparse.h blas_sparse_proto.h
@@ -28,7 +29,6 @@ PLIST_FILES=	${HEADERS:S|^|${HDIR}/|} li
 SHLIB_MAJOR=	1
 SRCS=		nist_spblas.cc
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPROFILE}
@@ -62,15 +62,15 @@ post-extract:
 		${WRKSRC}/Makefile
 
 post-install:
-	@${MKDIR} ${PREFIX}/${HDIR}
-	@cd ${WRKSRC}; ${INSTALL_DATA} ${HEADERS} ${PREFIX}/${HDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${HDIR}
+	@cd ${WRKSRC}; ${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/${HDIR}
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${_DISTDIR}/${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>