Index: head/math/atlas/Makefile
===================================================================
--- head/math/atlas/Makefile	(revision 365552)
+++ head/math/atlas/Makefile	(revision 365553)
@@ -1,263 +1,266 @@
 # Created by: Nakata Maho <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	atlas
 PORTVERSION=	3.8.4
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/math-${PORTNAME}/Stable/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatically Tuned Linear Algebra Software (ATLAS)
 
 LICENSE=	BSD
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/math/lapack:checksum
 
 USES=		fortran tar:bzip2
 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_DEFAULT=	SHARED
+OPTIONS_DEFINE=		DOCS DATA ARCHDEF TSC WALL_TIMER
+OPTIONS_DEFAULT=	DATA SHARED
 OPTIONS_MULTI=		BUILDTYPE
 OPTIONS_MULTI_BUILDTYPE=SHARED STATIC
 ARCHDEF_DESC=		Use a specified architectural default
+DATA_DESC=		Install tuning data and logs from the build
 SHARED_DESC=		Build static PIC archives and shared libraries
 STATIC_DESC=		Build static (non-PIC) archives
 TSC_DESC=		If WALL_TIMER is enabled, use the TSC
 WALL_TIMER_DESC=	Use less robust timing with higher resolution
 
 PORTSCOUT=	limitw:1,even
 WRKSRC=		${WRKDIR}/ATLAS
 
 .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
 ATLAS_MAXMALLOC?=	67108864
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 .if !empty(ARCH:M*64*)
 POINTER?=	64
 .else
 POINTER?=	32
 .endif
 
 .if defined(MAINTAINER_MODE)
 LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
 .endif
 
-.for i in DATA DOCS
-.  if !defined(NOPORT${i})
-PORT${i}=	*
-.  endif
-.endfor
+.if ${PORT_OPTIONS:MDATA}
+PORTDATA=	*
+.endif
+PORTDOCS=	*
 
 .if ${PORT_OPTIONS:MARCHDEF}
 .  if defined(ARCHDEF)
 .    if ${ARCHDEF} == "NONE"
 ARCHDEFFLAG=	-Si archdef 0
 .    endif
 .  else
 IGNORE=		you have set WITH_ARCHDEF, but have not defined ARCHDEF
 .  endif
 .endif
 
 .if ${PORT_OPTIONS:MSHARED}
 USE_LDCONFIG=	yes
 .endif
 
 .for opt in SHARED STATIC
 .  if ${PORT_OPTIONS:M${opt}}
 PLIST_SUB+=	${opt}=""
 .  else
 PLIST_SUB+=	${opt}="@comment "
 .  endif
 .endfor
 
 EXTRA_FLAGS?=	-Wl,-rpath=${_GCC_RUNTIME}
 SHARED_FLAGS=	${PTHREAD_CFLAGS} ${PICFLAG} -DPIC
 SHARED_LAPACK_WRKSRC=	WRKSRC_SHARED
 STATIC_FLAGS=	${PTHREAD_CFLAGS}
 STATIC_LAPACK_WRKSRC=	WRKSRC
 
 post-patch:
 	@cd ${WRKSRC}/CONFIG/ARCHS ; for t in *.tgz ; do \
 		${MV} $${t} $${t}.bak ; \
 		${TAR} -s '/gcc/${CC}/' -xf $${t}.bak ; \
 		${TAR} -czf $${t} $${t%.tgz} ; \
 		${RM} -r $${t%.tgz} $${t}.bak ; \
 		done
 	@${REINPLACE_CMD} -e 's|$$(ARCH)|$$(ATLAS_ARCH)|g' \
 		${WRKSRC}/Make.top \
 		${WRKSRC}/makes/Make.bin \
 		${WRKSRC}/makes/Make.lib \
 		${WRKSRC}/makes/Make.sysinfo \
 		${WRKSRC}/CONFIG/src/Makefile \
 		${WRKSRC}/CONFIG/ARCHS/Makefile
 	@${REINPLACE_CMD} -e "s|gcc|${CC}|" ${WRKSRC}/CONFIG/ARCHS/Makefile
 	@${REINPLACE_CMD} -e "\|OS=ALL|{N; s|'gcc'|'${CC}'|; \
 		s|'gfortran'|'${FC}'|; s|-mavx|-msse3|;s|'| ${EXTRA_FLAGS}'|4;}" \
 		${WRKSRC}/CONFIG/src/atlcomp.txt
 	@${REINPLACE_CMD} -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|" \
 		-e "s|%%CC%%|${CC}|" \
 		${WRKSRC}/CONFIG/src/SpewMakeInc.c
 	@${REINPLACE_CMD} -E -e \
 	"\|(#define ATL_MaxMalloc[[:blank:]]+)([[:digit:]]+)|s||\1${ATLAS_MAXMALLOC}|" \
 		${WRKSRC}/include/atlas_lvl3.h
 	@${CAT} ${FILESDIR}/tuning-message
 
 do-configure:
-	@if [ "x${WITH_WALL_TIMER}" != "x" ] ; then \
+	@if [ ${PORT_OPTIONS:MWALL_TIMER} ] ; then \
 		TIMEFLAG= ; \
-		if [ \( ${ARCH} = "i386" -o ${ARCH} = "amd64" \) -a "x${WITH_TSC}" != "x" ] ; then \
+		if [ \( ${ARCH} = "i386" -o ${ARCH} = "amd64" \) -a ${PORT_OPTIONS:MTSC} ] ; then \
 			freq=`${SYSCTL} -ni machdep.tsc_freq` ; \
 			if [ "x$${freq}" != "x" ] ; then \
 				if [ $${freq} -gt 1000000 ] ; then \
 					MHZ=$$(($${freq}/1000000)) ; \
 					TIMEFLAG="-D c -DPentiumCPS=$${MHZ}" ; \
 				fi ; \
 			fi ; \
 		fi ; \
 		if [ "x$${TIMEFLAG}" = "x" ] ; then \
 			TIMEFLAG="-D c -DWALL" ; \
 		fi ; \
 	fi ; \
 	${ECHO_CMD} "TIMEFLAG = $${TIMEFLAG}" \
 		> ${WRKSRC}/saved_flags ; \
 	${ECHO_CMD} "Dummy configuration of ATLAS to obtain compiler flags:" ; \
 	${MKDIR} ${WRKSRC}/static ; cd ${WRKSRC}/static ; \
 		../configure --cc="${CC}" --cflags="${CFLAGS}" \
 		--prefix="${PREFIX}" -v 2 $${TIMEFLAG} ${ARCHDEFFLAG} \
 		-Ss f77lib " " -Ss pmake "${MAKE} ${_MAKE_JOBS}" \
 		-Fa alg "${STATIC_FLAGS} " -b ${POINTER}
 	@${SED} -ne "\|F77FLAGS =|p" ${WRKSRC}/static/Make.inc \
 		>> ${WRKSRC}/saved_flags
 
 post-configure:
 	@${RM} -r ${WRKSRC}/static
 
 do-build:
 .for opt in shared static
 .  if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Building the LAPACK archives with ${opt} ATLAS flags:"
 	F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FFLAGS}" ; \
 	LW=`${MAKE} -C ${PORTSDIR}/math/lapack -V ${${opt:tu}_LAPACK_WRKSRC}` ; \
-	${MAKE} -C ${PORTSDIR}/math/lapack WITH_${opt:tu}=yes \
-		clean patch ; \
+	${MAKE} -C ${PORTSDIR}/math/lapack WITH=${opt:tu} clean patch ; \
 	cd $${LW} ; ${SETENV} ${MAKE_ENV:NFFLAGS=*} EXTRAFLAGS="${${opt:tu}_FLAGS}" \
 		FFLAGS="-pipe $${F77FLAGS}" ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
 		ARCH="${AR}" lapacklib ; \
 	TIMEFLAG=`${MAKE} -f ${WRKSRC}/saved_flags -V TIMEFLAG` ; \
 	${MKDIR} ${WRKSRC}/${opt} ; cd ${WRKSRC}/${opt} ; \
 	${MV} $${LW}/liblapack.a liblapack_${opt}.a ; \
 	${MAKE} -C ${PORTSDIR}/math/lapack clean ; \
 	${ECHO_CMD} "Configuring ${opt} ATLAS:" ; \
 		../configure --cc="${CC}" --cflags="${CFLAGS}" \
 		--with-netlib-lapack="${WRKSRC}/${opt}/liblapack_${opt}.a" \
 		--prefix="${PREFIX}" -v 2 $${TIMEFLAG} ${ARCHDEFFLAG} \
 		-Ss f77lib " " -Ss pmake "${MAKE} ${_MAKE_JOBS}" \
 		-Fa alg "${${opt:tu}_FLAGS} " -b ${POINTER} ; \
 	if [ "x${WITH_ARCHDEF}" != "x" ] ; then \
 		if [ "x${ARCHDEF}" != "xNONE" ] ; then \
 			if [ -f ${ARCHDEF} ] ; then \
 				${CP} -f ${ARCHDEF} ${WRKSRC}/CONFIG/ARCHS/ ; \
 			elif [ ! -f ${WRKSRC}/CONFIG/ARCHS/${ARCHDEF} ] ; then \
 				${ECHO_CMD} \
 				"==> ${PKGNAME} : ARCHDEF \"${ARCHDEF}\" does not exist" ; \
 				exit 1 ; \
 			fi ; \
 			${REINPLACE_CMD} -E -e \
 			"\|[[:blank:]]*ARCH =|s|=.*|= ${ARCHDEF:T:S/.tgz$//}|" \
 			${WRKSRC}/${opt}/Make.inc ; \
 		fi ; \
 	fi ; \
 	${ECHO_CMD} "Building ${opt} ATLAS:" ; cd ${WRKSRC}/${opt} ; \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all
 .  endif
 .endfor
 
 L1=	${FC} $${F77FLAGS} ${SHARED_FLAGS} ${LDFLAGS} -shared -Wl,-x \
 	-Wl,--whole-archive -Wl,-soname,
 L2=	-Wl,--no-whole-archive -Wl,--as-needed ${PTHREAD_LIBS}
 
 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_CMD} ${MAKE_ARGS} time ; \
 		cd ARCHS ; ${SETENV} ${MAKE_ENV} \
 			${MAKE_CMD} ${MAKE_ARGS} ArchNew tarfile)
 .  endif
 .endfor
 .if ${PORT_OPTIONS:MSHARED}
 	@${ECHO_CMD} "Building ATLAS shared libraries:"
 	@F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FFLAGS}" ; \
 	cd ${WRKSRC}/shared/lib ; \
 	${L1}libatlas.so.2 -o libatlas.so.2 libatlas.a ${L2} ; \
 	${L1}libf77blas.so.2 -o libf77blas.so.2 libf77blas.a ${L2} libatlas.so.2 ; \
 	${L1}libptf77blas.so.2 -o libptf77blas.so.2 libptf77blas.a ${L2} libatlas.so.2 ; \
 	${L1}libcblas.so.2 -o libcblas.so.2 libcblas.a ${L2} libatlas.so.2 ; \
 	${L1}libptcblas.so.2 -o libptcblas.so.2 libptcblas.a ${L2} libatlas.so.2 ; \
 	${L1}libalapack.so.2 -o libalapack.so.2 liblapack.a ${L2} libatlas.so.2
 .endif
 
 .if defined(MAINTAINER_MODE)
 STATIC_BLAS=	${LOCALBASE}/lib/libblas.a
 SHARED_BLAS=	-L${LOCALBASE}/lib -lblas
 
 check regression-test test: build
 .  for opt in shared static
 .    if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Testing ${opt} ATLAS:"
 	@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} BLAS="${${opt:tu}_BLAS}" \
 	${MAKE_CMD} ${MAKE_ARGS} check ptcheck error_report
 .    endif
 .  endfor
 .endif
 
 do-install:
 .for i in libatlas libcblas libf77blas liblapack libptcblas libptf77blas
 .  if ${PORT_OPTIONS:MSTATIC}
 	${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 \
 		${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 ${WRKSRC}/include/clapack.h \
 		${STAGEDIR}${PREFIX}/include
 .for opt in shared static
 .  if ${PORT_OPTIONS:M${opt:tu}}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/atlas/${opt}
 	${INSTALL_DATA} ${WRKSRC}/${opt}/include/* \
 		${STAGEDIR}${PREFIX}/include/atlas/${opt}
+.    if ${PORT_OPTIONS:MDATA}
 	@${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}
+	(cd ${WRKSRC}/${opt}/bin; \
+		${COPYTREE_SHARE} INSTALL_LOG ${STAGEDIR}${DATADIR}/${opt})
+	(cd ${WRKSRC}/${opt}/ARCHS; \
+		${COPYTREE_SHARE} "*" ${STAGEDIR}${DATADIR}/${opt} \
+		"! -name Makefile -and ! -name *.tgz")
+.    endif
 .  endif
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/math/atlas/pkg-plist
===================================================================
--- head/math/atlas/pkg-plist	(revision 365552)
+++ head/math/atlas/pkg-plist	(revision 365553)
@@ -1,123 +1,123 @@
 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
+%%STATIC%%@dirrm include/atlas/static
+%%SHARED%%@dirrm include/atlas/shared
 @dirrm include/atlas
 %%STATIC%%lib/libalapack.a
 %%SHARED%%lib/libalapack_pic.a
 %%SHARED%%lib/libalapack.so.2
 %%SHARED%%lib/libalapack.so
 %%STATIC%%lib/libatlas.a
 %%SHARED%%lib/libatlas_pic.a
 %%SHARED%%lib/libatlas.so.2
 %%SHARED%%lib/libatlas.so
 %%STATIC%%lib/libcblas.a
 %%SHARED%%lib/libcblas_pic.a
 %%SHARED%%lib/libcblas.so.2
 %%SHARED%%lib/libcblas.so
 %%STATIC%%lib/libf77blas.a
 %%SHARED%%lib/libf77blas_pic.a
 %%SHARED%%lib/libf77blas.so.2
 %%SHARED%%lib/libf77blas.so
 %%STATIC%%lib/libptcblas.a
 %%SHARED%%lib/libptcblas_pic.a
 %%SHARED%%lib/libptcblas.so.2
 %%SHARED%%lib/libptcblas.so
 %%STATIC%%lib/libptf77blas.a
 %%SHARED%%lib/libptf77blas_pic.a
 %%SHARED%%lib/libptf77blas.so.2
 %%SHARED%%lib/libptf77blas.so
-%%STATIC%%@dirrm include/atlas/static
-%%SHARED%%@dirrm include/atlas/shared