Stage math/atlas and reset maintainer

PR:		192744
Submitted by:	Don Lewis

1 files changed, 33 insertions, 33 deletions

diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 0a58a540f184..dccc6ef28bf0 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -3,13 +3,13 @@
 
 PORTNAME=	atlas
 PORTVERSION=	3.8.4
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/math-${PORTNAME}/Stable/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	bf@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatically Tuned Linear Algebra Software (ATLAS)
 
 LICENSE=	BSD
@@ -22,10 +22,10 @@ USE_GCC=	yes
 CONFLICTS=	atlas-devel-[0-9]* cblas-[0-9]*
 MANUAL_PACKAGE_BUILD=	Optimizes for the local machine.
 
-OPTIONS_DEFINE=	ARCHDEF TSC WALL_TIMER
+OPTIONS_DEFINE=		ARCHDEF TSC WALL_TIMER
 OPTIONS_DEFAULT=	SHARED
-OPTIONS_MULTI=	BUILDTYPE
-OPTIONS_MULTI_BUILDTYPE=	SHARED STATIC
+OPTIONS_MULTI=		BUILDTYPE
+OPTIONS_MULTI_BUILDTYPE=SHARED STATIC
 ARCHDEF_DESC=		Use a specified architectural default
 SHARED_DESC=		Build static PIC archives and shared libraries
 STATIC_DESC=		Build static (non-PIC) archives
@@ -35,8 +35,7 @@ WALL_TIMER_DESC=	Use less robust timing with higher resolution
 PORTSCOUT=	limitw:1,even
 WRKSRC=		${WRKDIR}/ATLAS
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 #Increase ATLAS_MAXMALLOC if the atlas threaded libraries perform poorly on large problems:
 # http://math-atlas.sourceforge.net/errata.html#MaxMalloc
@@ -70,7 +69,7 @@ PORT${i}=	*
 ARCHDEFFLAG=	-Si archdef 0
 .    endif
 .  else
-IGNORE=		: You have set WITH_ARCHDEF, but have not defined ARCHDEF
+IGNORE=		you have set WITH_ARCHDEF, but have not defined ARCHDEF
 .  endif
 .endif
 
@@ -184,7 +183,7 @@ do-build:
 		fi ; \
 	fi ; \
 	${ECHO_CMD} "Building ${opt} ATLAS:" ; cd ${WRKSRC}/${opt} ; \
-	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} all
+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all
 .  endif
 .endfor
 
@@ -196,8 +195,10 @@ post-build:
 .for opt in shared static
 .  if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Timing ${opt} ATLAS:"
-	@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} time ; \
-	cd ARCHS ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ArchNew tarfile
+	(cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} \
+		${MAKE_CMD} ${MAKE_ARGS} time ; \
+		cd ARCHS ; ${SETENV} ${MAKE_ENV} \
+			${MAKE_CMD} ${MAKE_ARGS} ArchNew tarfile)
 .  endif
 .endfor
 .if ${PORT_OPTIONS:MSHARED}
@@ -221,7 +222,7 @@ check regression-test test: build
 .    if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Testing ${opt} ATLAS:"
 	@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} BLAS="${${opt:tu}_BLAS}" \
-	${MAKE} ${MAKE_ARGS} check ptcheck error_report
+	${MAKE_CMD} ${MAKE_ARGS} check ptcheck error_report
 .    endif
 .  endfor
 .endif
@@ -229,35 +230,34 @@ check regression-test test: build
 do-install:
 .for i in libatlas libcblas libf77blas liblapack libptcblas libptf77blas
 .  if ${PORT_OPTIONS:MSTATIC}
-	@${INSTALL_DATA} ${WRKSRC}/static/lib/${i}.a ${PREFIX}/lib/${i:S|lapack|alapack|}.a
+	${INSTALL_DATA} ${WRKSRC}/static/lib/${i}.a \
+		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.a
 .  endif
 .  if ${PORT_OPTIONS:MSHARED}
-	@${INSTALL_DATA} ${WRKSRC}/shared/lib/${i}.a ${PREFIX}/lib/${i:S|lapack|alapack|}_pic.a
-	@${INSTALL_DATA} ${WRKSRC}/shared/lib/${i:S|lapack|alapack|}.so.2 ${PREFIX}/lib
-	@${LN} -sf ${i:S|lapack|alapack|}.so.2 ${PREFIX}/lib/${i:S|lapack|alapack|}.so
+	${INSTALL_DATA} ${WRKSRC}/shared/lib/${i}.a \
+		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}_pic.a
+	${INSTALL_LIB} ${WRKSRC}/shared/lib/${i:S|lapack|alapack|}.so.2 \
+		${STAGEDIR}${PREFIX}/lib
+	${LN} -sf ${i:S|lapack|alapack|}.so.2 \
+		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.so
 .  endif
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/include/cblas.h   ${PREFIX}/include
-	@${INSTALL_DATA} ${WRKSRC}/include/clapack.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/include/cblas.h ${WRKSRC}/include/clapack.h \
+		${STAGEDIR}${PREFIX}/include
 .for opt in shared static
 .  if ${PORT_OPTIONS:M${opt:tu}}
-	@${MKDIR} ${PREFIX}/include/atlas/${opt}
-	@${INSTALL_DATA} ${WRKSRC}/${opt}/include/* ${PREFIX}/include/atlas/${opt}
-	@cd ${PREFIX} ; \
-	${FIND} include/atlas/${opt} -type f -o -type l | ${SORT} >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm include/atlas/${opt}" >> ${TMPPLIST}
-.    if !defined(NOPORTDATA)
-	@${MKDIR} ${DATADIR}/${opt}
-	@cd ${WRKSRC}/${opt}/bin ; ${TAR} -czf INSTALL_LOG.tgz INSTALL_LOG ; \
-	${INSTALL_DATA} INSTALL_LOG.tgz ${DATADIR}/${opt}
-	@${INSTALL_DATA} ${WRKSRC}/${opt}/ARCHS/*.tgz ${DATADIR}/${opt}
-.    endif
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/atlas/${opt}
+	${INSTALL_DATA} ${WRKSRC}/${opt}/include/* \
+		${STAGEDIR}${PREFIX}/include/atlas/${opt}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/${opt}
+	(cd ${WRKSRC}/${opt}/bin ; ${TAR} -czf INSTALL_LOG.tgz INSTALL_LOG ; \
+	${INSTALL_DATA} INSTALL_LOG.tgz ${STAGEDIR}${DATADIR}/${opt})
+	${INSTALL_DATA} ${WRKSRC}/${opt}/ARCHS/*.tgz ${STAGEDIR}${DATADIR}/${opt}
 .  endif
 .endfor
-	@${ECHO_CMD} "@dirrm include/atlas" >> ${TMPPLIST}
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>