3 files changed, 198 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>
diff --git a/math/atlas/files/patch-tmpnamleak b/math/atlas/files/patch-tmpnamleak
new file mode 100644
index 000000000000..e55007997dc5
--- /dev/null
+++ b/math/atlas/files/patch-tmpnamleak
@@ -0,0 +1,68 @@
+--- CONFIG/src/atlconf_misc.c.orig	2011-05-14 10:33:24.000000000 -0700
++++ CONFIG/src/atlconf_misc.c	2014-08-16 09:10:48.000000000 -0700
+@@ -308,7 +308,10 @@
+    if (targ) sprintf(ln, "ssh %s \"%s\" > %s 2>&1 \n", targ, cmnd, tnam);
+    else sprintf(ln, "%s > %s 2>&1\n", cmnd, tnam);
+    if (!system(ln)) return(tnam);
+-   else return(NULL);
++   else {
++      remove(tnam);
++      return(NULL);
++   }
+ }
+ 
+ int CmndOneLine(char *targ, char *cmnd, char *ln)
+@@ -330,6 +333,7 @@
+       assert(fp);
+       if (!fgets(ln, 2048, fp)) ln[0] = '\0';
+       fclose(fp);
++      remove(tnam);
+       return(0);
+    }
+    else ln[0] = '\0';
+--- tune/sysinfo/emit_buildinfo.c.orig	2011-05-14 10:34:09.000000000 -0700
++++ tune/sysinfo/emit_buildinfo.c	2014-08-16 09:12:52.000000000 -0700
+@@ -53,7 +53,10 @@
+    sprintf(ln, "%s > %s\n", cmnd, tnam);
+    fprintf(stderr, "system: %s", ln);
+    if (!system(ln)) return(tnam);
+-   else return(NULL);
++   else {
++      remove(tnam);
++      return(NULL);
++   }
+ }
+ 
+ void FixString(char *ln)
+@@ -87,6 +90,7 @@
+       assert(fp);
+       if (!fgets(ln, 512, fp)) ln[0] = '\0';
+       fclose(fp);
++      remove(tnam);
+       return(0);
+    }
+    else ln[0] = '\0';
+--- bin/atlas_install.c.orig	2011-05-14 10:33:23.000000000 -0700
++++ bin/atlas_install.c	2014-08-16 09:55:47.000000000 -0700
+@@ -830,6 +830,7 @@
+    fprintf(stdout, "ATLAS install complete.  Examine \n");
+    fprintf(stdout, "ATLAS/bin/<arch>/INSTALL_LOG/SUMMARY.LOG for details.\n");
+    fclose(fpsum);
++   remove(tnam);
+    PrintBanner("INSTALL_LOG/SUMMARY.LOG", 0, 0, 0, 0);
+ }
+ 
+--- CONFIG/src/config.c.orig	2011-05-14 10:33:24.000000000 -0700
++++ CONFIG/src/config.c	2014-08-16 12:21:06.000000000 -0700
+@@ -453,8 +453,10 @@
+  */
+ {
+    char ln[4096], compsflags[1024], archflags[1024];
++   char *tmpnam;
+    int i;
+-   assert(CmndResults(NULL, "make xspew"));
++   assert(tmpnam = CmndResults(NULL, "make xspew"));
++   remove(tmpnam);
+ /*
+  * Translate compiler/flag array to xspew flags
+  */
diff --git a/math/atlas/pkg-plist b/math/atlas/pkg-plist
index 214b314d1c6b..0eee5577a49d 100644
--- a/math/atlas/pkg-plist
+++ b/math/atlas/pkg-plist
@@ -1,5 +1,100 @@
 include/cblas.h
 include/clapack.h
+%%STATIC%%include/atlas/static/atlas_buildinfo.h
+%%STATIC%%include/atlas/static/atlas_cNCmm.h
+%%STATIC%%include/atlas/static/atlas_cacheedge.h
+%%STATIC%%include/atlas/static/atlas_cmv.h
+%%STATIC%%include/atlas/static/atlas_cmvN.h
+%%STATIC%%include/atlas/static/atlas_cmvS.h
+%%STATIC%%include/atlas/static/atlas_cmvT.h
+%%STATIC%%include/atlas/static/atlas_cr1.h
+%%STATIC%%include/atlas/static/atlas_csNKB.h
+%%STATIC%%include/atlas/static/atlas_csysinfo.h
+%%STATIC%%include/atlas/static/atlas_ctrsmXover.h
+%%STATIC%%include/atlas/static/atlas_dNCmm.h
+%%STATIC%%include/atlas/static/atlas_dmv.h
+%%STATIC%%include/atlas/static/atlas_dmvN.h
+%%STATIC%%include/atlas/static/atlas_dmvS.h
+%%STATIC%%include/atlas/static/atlas_dmvT.h
+%%STATIC%%include/atlas/static/atlas_dr1.h
+%%STATIC%%include/atlas/static/atlas_dsysinfo.h
+%%STATIC%%include/atlas/static/atlas_dtrsmXover.h
+%%STATIC%%include/atlas/static/atlas_pthreads.h
+%%STATIC%%include/atlas/static/atlas_sNCmm.h
+%%STATIC%%include/atlas/static/atlas_smv.h
+%%STATIC%%include/atlas/static/atlas_smvN.h
+%%STATIC%%include/atlas/static/atlas_smvS.h
+%%STATIC%%include/atlas/static/atlas_smvT.h
+%%STATIC%%include/atlas/static/atlas_sr1.h
+%%STATIC%%include/atlas/static/atlas_ssysinfo.h
+%%STATIC%%include/atlas/static/atlas_strsmXover.h
+%%STATIC%%include/atlas/static/atlas_trsmNB.h
+%%STATIC%%include/atlas/static/atlas_type.h
+%%STATIC%%include/atlas/static/atlas_zNCmm.h
+%%STATIC%%include/atlas/static/atlas_zdNKB.h
+%%STATIC%%include/atlas/static/atlas_zmv.h
+%%STATIC%%include/atlas/static/atlas_zmvN.h
+%%STATIC%%include/atlas/static/atlas_zmvS.h
+%%STATIC%%include/atlas/static/atlas_zmvT.h
+%%STATIC%%include/atlas/static/atlas_zr1.h
+%%STATIC%%include/atlas/static/atlas_zsysinfo.h
+%%STATIC%%include/atlas/static/atlas_ztrsmXover.h
+%%STATIC%%include/atlas/static/cXover.h
+%%STATIC%%include/atlas/static/cmm.h
+%%STATIC%%include/atlas/static/dXover.h
+%%STATIC%%include/atlas/static/dmm.h
+%%STATIC%%include/atlas/static/sXover.h
+%%STATIC%%include/atlas/static/smm.h
+%%STATIC%%include/atlas/static/zXover.h
+%%STATIC%%include/atlas/static/zmm.h
+%%SHARED%%include/atlas/shared/atlas_buildinfo.h
+%%SHARED%%include/atlas/shared/atlas_cNCmm.h
+%%SHARED%%include/atlas/shared/atlas_cacheedge.h
+%%SHARED%%include/atlas/shared/atlas_cmv.h
+%%SHARED%%include/atlas/shared/atlas_cmvN.h
+%%SHARED%%include/atlas/shared/atlas_cmvS.h
+%%SHARED%%include/atlas/shared/atlas_cmvT.h
+%%SHARED%%include/atlas/shared/atlas_cr1.h
+%%SHARED%%include/atlas/shared/atlas_csNKB.h
+%%SHARED%%include/atlas/shared/atlas_csysinfo.h
+%%SHARED%%include/atlas/shared/atlas_ctrsmXover.h
+%%SHARED%%include/atlas/shared/atlas_dNCmm.h
+%%SHARED%%include/atlas/shared/atlas_dmv.h
+%%SHARED%%include/atlas/shared/atlas_dmvN.h
+%%SHARED%%include/atlas/shared/atlas_dmvS.h
+%%SHARED%%include/atlas/shared/atlas_dmvT.h
+%%SHARED%%include/atlas/shared/atlas_dr1.h
+%%SHARED%%include/atlas/shared/atlas_dsysinfo.h
+%%SHARED%%include/atlas/shared/atlas_dtrsmXover.h
+%%SHARED%%include/atlas/shared/atlas_pthreads.h
+%%SHARED%%include/atlas/shared/atlas_sNCmm.h
+%%SHARED%%include/atlas/shared/atlas_smv.h
+%%SHARED%%include/atlas/shared/atlas_smvN.h
+%%SHARED%%include/atlas/shared/atlas_smvS.h
+%%SHARED%%include/atlas/shared/atlas_smvT.h
+%%SHARED%%include/atlas/shared/atlas_sr1.h
+%%SHARED%%include/atlas/shared/atlas_ssysinfo.h
+%%SHARED%%include/atlas/shared/atlas_strsmXover.h
+%%SHARED%%include/atlas/shared/atlas_trsmNB.h
+%%SHARED%%include/atlas/shared/atlas_type.h
+%%SHARED%%include/atlas/shared/atlas_zNCmm.h
+%%SHARED%%include/atlas/shared/atlas_zdNKB.h
+%%SHARED%%include/atlas/shared/atlas_zmv.h
+%%SHARED%%include/atlas/shared/atlas_zmvN.h
+%%SHARED%%include/atlas/shared/atlas_zmvS.h
+%%SHARED%%include/atlas/shared/atlas_zmvT.h
+%%SHARED%%include/atlas/shared/atlas_zr1.h
+%%SHARED%%include/atlas/shared/atlas_zsysinfo.h
+%%SHARED%%include/atlas/shared/atlas_ztrsmXover.h
+%%SHARED%%include/atlas/shared/cXover.h
+%%SHARED%%include/atlas/shared/cmm.h
+%%SHARED%%include/atlas/shared/dXover.h
+%%SHARED%%include/atlas/shared/dmm.h
+%%SHARED%%include/atlas/shared/sXover.h
+%%SHARED%%include/atlas/shared/smm.h
+%%SHARED%%include/atlas/shared/zXover.h
+%%SHARED%%include/atlas/shared/zmm.h
+@dirrm include/atlas
 %%STATIC%%lib/libalapack.a
 %%SHARED%%lib/libalapack_pic.a
 %%SHARED%%lib/libalapack.so.2
@@ -24,3 +119,5 @@ include/clapack.h
 %%SHARED%%lib/libptf77blas_pic.a
 %%SHARED%%lib/libptf77blas.so.2
 %%SHARED%%lib/libptf77blas.so
+%%STATIC%%@dirrm include/atlas/static
+%%SHARED%%@dirrm include/atlas/shared