3 files changed, 21 insertions, 24 deletions

diff --git a/math/libflame/Makefile b/math/libflame/Makefile
index a8d8b580c0ea..ea688c8d98af 100644
--- a/math/libflame/Makefile
+++ b/math/libflame/Makefile
@@ -7,11 +7,8 @@ PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.cs.utexas.edu/users/%SUBDIR%/:1,2 LOCAL/bf:3
 MASTER_SITE_SUBDIR=	flame/snapshots/:1 field/docs/:2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:1,3
-.if !defined(NOPORTDOCS) || make(makesum)
-DISTFILES+=	libflame.pdf:2,3
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:3 libflame.pdf:3
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-.endif
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	FLAME dense linear algebra library
@@ -26,8 +23,6 @@ USES=		gmake
 
 CONFIGURE_ARGS	=	--enable-dynamic-build --enable-static-build
 
-BROKEN=		no distinfo provided for some of the distfiles
-
 OPTIONS_DEFINE=	BLAS3_CNTL BUILTIN_BLAS CBLAS EXTERNAL_LAPACK GOTOBLAS \
 		LAPACK2FLAME LAPACK_SUBPROBLEMS OPENMP SHARED STATIC \
 		SUPERMATRIX THREADS
@@ -44,7 +39,6 @@ SHARED_DESC=		Build a shared library and PIC archive
 STATIC_DESC=		Build a non-PIC archive
 SUPERMATRIX_DESC=	Task scheduling and parallel execution
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBLAS3_CNTL}
@@ -54,9 +48,9 @@ CONFIGURE_ARGS+=	--disable-blas3-front-end-cntl-trees
 .endif
 
 .if ${PORT_OPTIONS:MBUILTIN_BLAS}
-IGNORE =	: WITH_BUILTIN_BLAS is an experimental option, for testing purposes only
+IGNORE =	: BUILTIN_BLAS is an experimental option, for testing purposes only
 .if ${PORT_OPTIONS:MCBLAS} || ${PORT_OPTIONS:MGOTOBLAS}
-IGNORE =	: WITH_BUILTIN_BLAS is incompatible with WITH_CBLAS and WITH_GOTOBLAS
+IGNORE =	: BUILTIN_BLAS is incompatible with CBLAS and GOTOBLAS
 .endif
 CONFIGURE_ARGS+=	--enable-builtin-blas
 .else
@@ -64,9 +58,9 @@ CONFIGURE_ARGS+=	--disable-builtin-blas
 .endif
 
 .if ${PORT_OPTIONS:MCBLAS}
-IGNORE =	: WITH_CBLAS yields an incomplete library, and is for testing purposes only
+IGNORE =	: CBLAS yields an incomplete library, and is for testing purposes only
 .if ${PORT_OPTIONS:MGOTOBLAS}
-IGNORE =	: WITH_CBLAS is incompatible with WITH_GOTOBLAS
+IGNORE =	: CBLAS is incompatible with GOTOBLAS
 .endif
 CONFIGURE_ARGS+=	--enable-cblas-interfaces
 .else
@@ -93,7 +87,7 @@ CONFIGURE_ARGS+=	--enable-default-${b:tl}-blocksize=${${b}_BLOCKSIZE}
 
 .if ${PORT_OPTIONS:MLAPACK2FLAME}
 .if ${PORT_OPTIONS:MLAPACK_SUBPROBLEMS}
-IGNORE =	: WITH_LAPACK2FLAME is incompatible with WITH_LAPACK_SUBPROBLEMS
+IGNORE =	: LAPACK2FLAME is incompatible with LAPACK_SUBPROBLEMS
 .endif
 CONFIGURE_ARGS+=	--enable-lapack2flame
 .else
@@ -102,14 +96,14 @@ CONFIGURE_ARGS+=	--disable-lapack2flame
 
 .if ${PORT_OPTIONS:MLAPACK_SUBPROBLEMS}
 .if ! ${PORT_OPTIONS:MEXTERNAL_LAPACK}
-IGNORE =	: WITH_LAPACK_SUBPROBLEMS requires WITH_EXTERNAL_LAPACK
+IGNORE =	: LAPACK_SUBPROBLEMS requires EXTERNAL_LAPACK
 .endif
 CONFIGURE_ARGS+=	--enable-external-lapack-for-subproblems
 .else
 CONFIGURE_ARGS+=	--disable-external-lapack-for-subproblems
 .endif
 
-.if ${PORT_OPTIONS:MEXTERNAL_LAPACK} || ! ${PORT_OPTIONS:MBLAS}
+.if ${PORT_OPTIONS:MEXTERNAL_LAPACK} || ! ${PORT_OPTIONS:MBUILTIN_BLAS}
 .if ${PORT_OPTIONS:MCBLAS}
 .if exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas_c
@@ -117,7 +111,7 @@ WITH_BLAS?=	atlas_c
 WITH_BLAS?=	reference_c
 .endif
 .if !(${WITH_BLAS} == "atlas_c" || ${WITH_BLAS} == "reference_c")
-IGNORE=	: WITH_CBLAS is incompatible with WITH_BLAS = ${WITH_BLAS}
+IGNORE=	: CBLAS is incompatible with WITH_BLAS = ${WITH_BLAS}
 .endif
 .elif exists(${LOCALBASE}/lib/libgoto2.so)
 WITH_BLAS?=	gotoblas
@@ -170,10 +164,10 @@ LAPACK+=	-lblas
 
 .if ${PORT_OPTIONS:MOPENMP}
 .if ${PORT_OPTIONS:MTHREADS}
-IGNORE =	WITH_OPENMP is incompatible with WITH_THREADS
+IGNORE =	OPENMP is incompatible with THREADS
 .endif
 .if !empty(CC:M*clang*)
-IGNORE =	clang does not support WITH_OPENMP, use WITH_THREADS instead
+IGNORE =	clang does not support OPENMP, use THREADS instead
 .endif
 OPENMP_CFLAGS ?=	-fopenmp
 CFLAGS+=		${OPENMP_CFLAGS}
@@ -199,7 +193,7 @@ PLIST_SUB+=	${o}="@comment "
 .endif
 .endfor
 
-.if ${PORT_OPTIONS:MWITH_SUPERMATRIX}
+.if ${PORT_OPTIONS:MSUPERMATRIX}
 CONFIGURE_ARGS+=	--enable-supermatrix
 .else
 CONFIGURE_ARGS+=	--disable-supermatrix
@@ -305,20 +299,22 @@ do-install:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
 	${MAKE_ARGS} install-headers
 .if ${PORT_OPTIONS:MSHARED}
+	@cd ${WRKSRC}/lib; ${STRIP_CMD} */libflame.so */libflame.a
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
 	${MAKE_ARGS} install-libs install-lib-symlinks
 .endif
 .if ${PORT_OPTIONS:MSTATIC}
+	@cd ${WRKSRC}_STATIC/lib; ${STRIP_CMD} */libflame.a
 	@cd ${WRKSRC}_STATIC; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
 	${MAKE_ARGS} install-libs
 .endif
 .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}/examples; ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${WRKSRC}/examples; ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .if defined(MAINTAINER_MODE)
diff --git a/math/libflame/distinfo b/math/libflame/distinfo
index 90055022dea8..815d93451a20 100644
--- a/math/libflame/distinfo
+++ b/math/libflame/distinfo
@@ -1,3 +1,4 @@
 SHA256 (libflame-r7421.tar.gz) = 5c42ffe69f40fb46aa9bcf289a3d124700f31cfa231587207c568dd0274e01bb
 SIZE (libflame-r7421.tar.gz) = 3953831
-SHA256 (libflame.pdf) = IGNORE
+SHA256 (libflame.pdf) = 8f628171d4778144a7732bacf4dfa3dc35098b9f4238c29dc8bc9b3b05e8718f
+SIZE (libflame.pdf) = 1290721
diff --git a/math/libflame/pkg-descr b/math/libflame/pkg-descr
index bd448383a50f..ada6cb0aae90 100644
--- a/math/libflame/pkg-descr
+++ b/math/libflame/pkg-descr
@@ -10,4 +10,4 @@ Interfaces (APIs) for representing the algorithms in code, and tools for
 mechanical derivation, implementation and analysis of algorithms and
 implementations.
 
-WWW:	http://z.cs.utexas.edu/wiki/flame.wiki/FrontPage
+WWW: http://z.cs.utexas.edu/wiki/flame.wiki/FrontPage