3 files changed, 192 insertions, 159 deletions

diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index 1a1cea41ad95..af509c033aa2 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -32,10 +32,20 @@ LIB_DEPENDS=	lapack:${PORTSDIR}/math/lapack \
 F77?=	f77
 USE_REINPLACE=	yes
 
+ARCH2FIX=	PBLAS/SRC PBLAS/SRC/PBBLAS PBLAS/SRC/PTOOLS PBLAS/SRC/PTZBLAS \
+		REDIST/SRC SRC TOOLS TOOLS/LAPACK
+
+DATADIR=	${PREFIX}/share/${PORTNAME:U}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:U}
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 .include "files/manpages"
 
 post-patch:
-	${REINPLACE_CMD} -e 's,@WRKSRC@,${WRKSRC},g ; s,@PREFIX@,${PREFIX},g ; s,@CC@,${CC},g ; s,@CFLAGS@,${CFLAGS},g ; s,@F77@,${F77},g ; s,@FFLAGS@,${FFLAGS},g ; s,@F77EXTRAFLAGS@,${F77EXTRAFLAGS},g' ${WRKSRC}/SLmake.inc
+	${REINPLACE_CMD} -e 's,@WRKSRC@,${WRKSRC},g ; s,@PREFIX@,${PREFIX},g ; s,@CC@,${CC},g ; s,@CFLAGS@,${CFLAGS},g ; s,@F77@,${F77},g ; s,@FFLAGS@,${FFLAGS},g ; s,@F77EXTRAFLAGS@,${F77EXTRAFLAGS},g ; s,^ARCH *.= ar,ARCMD = ar,' ${WRKSRC}/SLmake.inc
+.for mkf in ${ARCH2FIX}
+	${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/${mkf}/Makefile
+.endfor
 
 do-build:
 	(cd ${WRKSRC}; make ; make exe)
@@ -72,6 +82,8 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e 's,/usr/local,${PREFIX},g' ${PKGMESSAGE}
+	@${SED} -e 's,/usr/local,${PREFIX},g' ${FILESDIR}/pkg-message.in \
+		> ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/math/scalapack/pkg-message.in b/math/scalapack/pkg-message.in
new file mode 100644
index 000000000000..ca405055f55a
--- /dev/null
+++ b/math/scalapack/pkg-message.in
@@ -0,0 +1,21 @@
+***********************************************************************
+ Please test your scalapack installation
+ Example programs are located at /usr/local/share/SCALAPACK/examples
+
+ Test programs are located at /usr/local/share/SCALAPACK/TESTING
+
+ Example:
+  % cd /usr/local/share/SCALAPACK/TESTING
+  % /usr/local/mpich/bin/mpirun -np 4 xcbrd
+  % /usr/local/mpich/bin/mpirun -np 4 xcdblu
+   etc., etc. ...
+
+  to perform all the tests,
+  % cd /usr/local/share/SCALAPACK/TESTING
+  % csh
+  % foreach i (x*)
+  ? /usr/local/mpich/bin/mpirun -np 4 $i >& ~/$i.log
+  ? end
+You can change -np 4 to any number to meet your environment.
+See files at /usr/local/share/doc/scalapack for detail.
+**********************************************************************
diff --git a/math/scalapack/pkg-plist b/math/scalapack/pkg-plist
index 54ea868ee9c3..6283a75f1a30 100644
--- a/math/scalapack/pkg-plist
+++ b/math/scalapack/pkg-plist
@@ -5,160 +5,160 @@ include/PBtools.h
 include/pblas.h
 include/scalapack.h
 lib/libscalapack.a
-share/SCALAPACK/TESTING/BLLT.dat
-share/SCALAPACK/TESTING/BLU.dat
-share/SCALAPACK/TESTING/BRD.dat
-share/SCALAPACK/TESTING/EVC.dat
-share/SCALAPACK/TESTING/GEMR2D.dat
-share/SCALAPACK/TESTING/HRD.dat
-share/SCALAPACK/TESTING/INV.dat
-share/SCALAPACK/TESTING/LLT.dat
-share/SCALAPACK/TESTING/LS.dat
-share/SCALAPACK/TESTING/LU.dat
-share/SCALAPACK/TESTING/NEP.dat
-share/SCALAPACK/TESTING/PCBLAS1TIM.dat
-share/SCALAPACK/TESTING/PCBLAS1TST.dat
-share/SCALAPACK/TESTING/PCBLAS2TIM.dat
-share/SCALAPACK/TESTING/PCBLAS2TST.dat
-share/SCALAPACK/TESTING/PCBLAS3TIM.dat
-share/SCALAPACK/TESTING/PCBLAS3TST.dat
-share/SCALAPACK/TESTING/PDBLAS1TIM.dat
-share/SCALAPACK/TESTING/PDBLAS1TST.dat
-share/SCALAPACK/TESTING/PDBLAS2TIM.dat
-share/SCALAPACK/TESTING/PDBLAS2TST.dat
-share/SCALAPACK/TESTING/PDBLAS3TIM.dat
-share/SCALAPACK/TESTING/PDBLAS3TST.dat
-share/SCALAPACK/TESTING/PSBLAS1TIM.dat
-share/SCALAPACK/TESTING/PSBLAS1TST.dat
-share/SCALAPACK/TESTING/PSBLAS2TIM.dat
-share/SCALAPACK/TESTING/PSBLAS2TST.dat
-share/SCALAPACK/TESTING/PSBLAS3TIM.dat
-share/SCALAPACK/TESTING/PSBLAS3TST.dat
-share/SCALAPACK/TESTING/PZBLAS1TIM.dat
-share/SCALAPACK/TESTING/PZBLAS1TST.dat
-share/SCALAPACK/TESTING/PZBLAS2TIM.dat
-share/SCALAPACK/TESTING/PZBLAS2TST.dat
-share/SCALAPACK/TESTING/PZBLAS3TIM.dat
-share/SCALAPACK/TESTING/PZBLAS3TST.dat
-share/SCALAPACK/TESTING/QR.dat
-share/SCALAPACK/TESTING/SEP.dat
-share/SCALAPACK/TESTING/SVD.dat
-share/SCALAPACK/TESTING/TRD.dat
-share/SCALAPACK/TESTING/TRMR2D.dat
-share/SCALAPACK/TESTING/xcbrd
-share/SCALAPACK/TESTING/xcdblu
-share/SCALAPACK/TESTING/xcdtlu
-share/SCALAPACK/TESTING/xcevc
-share/SCALAPACK/TESTING/xcgblu
-share/SCALAPACK/TESTING/xcgemr
-share/SCALAPACK/TESTING/xcgsep
-share/SCALAPACK/TESTING/xchrd
-share/SCALAPACK/TESTING/xcinv
-share/SCALAPACK/TESTING/xcllt
-share/SCALAPACK/TESTING/xcls
-share/SCALAPACK/TESTING/xclu
-share/SCALAPACK/TESTING/xcnep
-share/SCALAPACK/TESTING/xcpblas1tim
-share/SCALAPACK/TESTING/xcpblas1tst
-share/SCALAPACK/TESTING/xcpblas2tim
-share/SCALAPACK/TESTING/xcpblas2tst
-share/SCALAPACK/TESTING/xcpblas3tim
-share/SCALAPACK/TESTING/xcpblas3tst
-share/SCALAPACK/TESTING/xcpbllt
-share/SCALAPACK/TESTING/xcptllt
-share/SCALAPACK/TESTING/xcqr
-share/SCALAPACK/TESTING/xcsep
-share/SCALAPACK/TESTING/xctrd
-share/SCALAPACK/TESTING/xctrmr
-share/SCALAPACK/TESTING/xdbrd
-share/SCALAPACK/TESTING/xddblu
-share/SCALAPACK/TESTING/xddtlu
-share/SCALAPACK/TESTING/xdgblu
-share/SCALAPACK/TESTING/xdgemr
-share/SCALAPACK/TESTING/xdgsep
-share/SCALAPACK/TESTING/xdhrd
-share/SCALAPACK/TESTING/xdinv
-share/SCALAPACK/TESTING/xdllt
-share/SCALAPACK/TESTING/xdls
-share/SCALAPACK/TESTING/xdlu
-share/SCALAPACK/TESTING/xdnep
-share/SCALAPACK/TESTING/xdpblas1tim
-share/SCALAPACK/TESTING/xdpblas1tst
-share/SCALAPACK/TESTING/xdpblas2tim
-share/SCALAPACK/TESTING/xdpblas2tst
-share/SCALAPACK/TESTING/xdpblas3tim
-share/SCALAPACK/TESTING/xdpblas3tst
-share/SCALAPACK/TESTING/xdpbllt
-share/SCALAPACK/TESTING/xdptllt
-share/SCALAPACK/TESTING/xdqr
-share/SCALAPACK/TESTING/xdsep
-share/SCALAPACK/TESTING/xdsvd
-share/SCALAPACK/TESTING/xdtrd
-share/SCALAPACK/TESTING/xdtrmr
-share/SCALAPACK/TESTING/xigemr
-share/SCALAPACK/TESTING/xitrmr
-share/SCALAPACK/TESTING/xsbrd
-share/SCALAPACK/TESTING/xsdblu
-share/SCALAPACK/TESTING/xsdtlu
-share/SCALAPACK/TESTING/xsgblu
-share/SCALAPACK/TESTING/xsgemr
-share/SCALAPACK/TESTING/xsgsep
-share/SCALAPACK/TESTING/xshrd
-share/SCALAPACK/TESTING/xsinv
-share/SCALAPACK/TESTING/xsllt
-share/SCALAPACK/TESTING/xsls
-share/SCALAPACK/TESTING/xslu
-share/SCALAPACK/TESTING/xsnep
-share/SCALAPACK/TESTING/xspblas1tim
-share/SCALAPACK/TESTING/xspblas1tst
-share/SCALAPACK/TESTING/xspblas2tim
-share/SCALAPACK/TESTING/xspblas2tst
-share/SCALAPACK/TESTING/xspblas3tim
-share/SCALAPACK/TESTING/xspblas3tst
-share/SCALAPACK/TESTING/xspbllt
-share/SCALAPACK/TESTING/xsptllt
-share/SCALAPACK/TESTING/xsqr
-share/SCALAPACK/TESTING/xssep
-share/SCALAPACK/TESTING/xssvd
-share/SCALAPACK/TESTING/xstrd
-share/SCALAPACK/TESTING/xstrmr
-share/SCALAPACK/TESTING/xzbrd
-share/SCALAPACK/TESTING/xzdblu
-share/SCALAPACK/TESTING/xzdtlu
-share/SCALAPACK/TESTING/xzevc
-share/SCALAPACK/TESTING/xzgblu
-share/SCALAPACK/TESTING/xzgemr
-share/SCALAPACK/TESTING/xzgsep
-share/SCALAPACK/TESTING/xzhrd
-share/SCALAPACK/TESTING/xzinv
-share/SCALAPACK/TESTING/xzllt
-share/SCALAPACK/TESTING/xzls
-share/SCALAPACK/TESTING/xzlu
-share/SCALAPACK/TESTING/xznep
-share/SCALAPACK/TESTING/xzpblas1tim
-share/SCALAPACK/TESTING/xzpblas1tst
-share/SCALAPACK/TESTING/xzpblas2tim
-share/SCALAPACK/TESTING/xzpblas2tst
-share/SCALAPACK/TESTING/xzpblas3tim
-share/SCALAPACK/TESTING/xzpblas3tst
-share/SCALAPACK/TESTING/xzpbllt
-share/SCALAPACK/TESTING/xzptllt
-share/SCALAPACK/TESTING/xzqr
-share/SCALAPACK/TESTING/xzsep
-share/SCALAPACK/TESTING/xztrd
-share/SCALAPACK/TESTING/xztrmr
-share/examples/SCALAPACK/Makefile
-share/examples/SCALAPACK/example1.cc
-share/examples/SCALAPACK/example1.f
-@dirrm share/SCALAPACK/TESTING
-@dirrm share/SCALAPACK
-@dirrm share/examples/SCALAPACK
-%%PORTDOCS%%share/doc/scalapack/design.ps.gz
-%%PORTDOCS%%share/doc/scalapack/lawn100.ps.gz
-%%PORTDOCS%%share/doc/scalapack/manual.ps.gz
-%%PORTDOCS%%share/doc/scalapack/pblasqref.ps.gz
-%%PORTDOCS%%share/doc/scalapack/pumma_refmanual.ps.gz
-%%PORTDOCS%%share/doc/scalapack/scalapack_install.ps.gz
-%%PORTDOCS%%share/doc/scalapack/scalapackqref.ps.gz
-%%PORTDOCS%%share/doc/scalapack/trans.ps.gz
-%%PORTDOCS%%@dirrm share/doc/scalapack
+%%DATADIR%%/TESTING/BLLT.dat
+%%DATADIR%%/TESTING/BLU.dat
+%%DATADIR%%/TESTING/BRD.dat
+%%DATADIR%%/TESTING/EVC.dat
+%%DATADIR%%/TESTING/GEMR2D.dat
+%%DATADIR%%/TESTING/HRD.dat
+%%DATADIR%%/TESTING/INV.dat
+%%DATADIR%%/TESTING/LLT.dat
+%%DATADIR%%/TESTING/LS.dat
+%%DATADIR%%/TESTING/LU.dat
+%%DATADIR%%/TESTING/NEP.dat
+%%DATADIR%%/TESTING/PCBLAS1TIM.dat
+%%DATADIR%%/TESTING/PCBLAS1TST.dat
+%%DATADIR%%/TESTING/PCBLAS2TIM.dat
+%%DATADIR%%/TESTING/PCBLAS2TST.dat
+%%DATADIR%%/TESTING/PCBLAS3TIM.dat
+%%DATADIR%%/TESTING/PCBLAS3TST.dat
+%%DATADIR%%/TESTING/PDBLAS1TIM.dat
+%%DATADIR%%/TESTING/PDBLAS1TST.dat
+%%DATADIR%%/TESTING/PDBLAS2TIM.dat
+%%DATADIR%%/TESTING/PDBLAS2TST.dat
+%%DATADIR%%/TESTING/PDBLAS3TIM.dat
+%%DATADIR%%/TESTING/PDBLAS3TST.dat
+%%DATADIR%%/TESTING/PSBLAS1TIM.dat
+%%DATADIR%%/TESTING/PSBLAS1TST.dat
+%%DATADIR%%/TESTING/PSBLAS2TIM.dat
+%%DATADIR%%/TESTING/PSBLAS2TST.dat
+%%DATADIR%%/TESTING/PSBLAS3TIM.dat
+%%DATADIR%%/TESTING/PSBLAS3TST.dat
+%%DATADIR%%/TESTING/PZBLAS1TIM.dat
+%%DATADIR%%/TESTING/PZBLAS1TST.dat
+%%DATADIR%%/TESTING/PZBLAS2TIM.dat
+%%DATADIR%%/TESTING/PZBLAS2TST.dat
+%%DATADIR%%/TESTING/PZBLAS3TIM.dat
+%%DATADIR%%/TESTING/PZBLAS3TST.dat
+%%DATADIR%%/TESTING/QR.dat
+%%DATADIR%%/TESTING/SEP.dat
+%%DATADIR%%/TESTING/SVD.dat
+%%DATADIR%%/TESTING/TRD.dat
+%%DATADIR%%/TESTING/TRMR2D.dat
+%%DATADIR%%/TESTING/xcbrd
+%%DATADIR%%/TESTING/xcdblu
+%%DATADIR%%/TESTING/xcdtlu
+%%DATADIR%%/TESTING/xcevc
+%%DATADIR%%/TESTING/xcgblu
+%%DATADIR%%/TESTING/xcgemr
+%%DATADIR%%/TESTING/xcgsep
+%%DATADIR%%/TESTING/xchrd
+%%DATADIR%%/TESTING/xcinv
+%%DATADIR%%/TESTING/xcllt
+%%DATADIR%%/TESTING/xcls
+%%DATADIR%%/TESTING/xclu
+%%DATADIR%%/TESTING/xcnep
+%%DATADIR%%/TESTING/xcpblas1tim
+%%DATADIR%%/TESTING/xcpblas1tst
+%%DATADIR%%/TESTING/xcpblas2tim
+%%DATADIR%%/TESTING/xcpblas2tst
+%%DATADIR%%/TESTING/xcpblas3tim
+%%DATADIR%%/TESTING/xcpblas3tst
+%%DATADIR%%/TESTING/xcpbllt
+%%DATADIR%%/TESTING/xcptllt
+%%DATADIR%%/TESTING/xcqr
+%%DATADIR%%/TESTING/xcsep
+%%DATADIR%%/TESTING/xctrd
+%%DATADIR%%/TESTING/xctrmr
+%%DATADIR%%/TESTING/xdbrd
+%%DATADIR%%/TESTING/xddblu
+%%DATADIR%%/TESTING/xddtlu
+%%DATADIR%%/TESTING/xdgblu
+%%DATADIR%%/TESTING/xdgemr
+%%DATADIR%%/TESTING/xdgsep
+%%DATADIR%%/TESTING/xdhrd
+%%DATADIR%%/TESTING/xdinv
+%%DATADIR%%/TESTING/xdllt
+%%DATADIR%%/TESTING/xdls
+%%DATADIR%%/TESTING/xdlu
+%%DATADIR%%/TESTING/xdnep
+%%DATADIR%%/TESTING/xdpblas1tim
+%%DATADIR%%/TESTING/xdpblas1tst
+%%DATADIR%%/TESTING/xdpblas2tim
+%%DATADIR%%/TESTING/xdpblas2tst
+%%DATADIR%%/TESTING/xdpblas3tim
+%%DATADIR%%/TESTING/xdpblas3tst
+%%DATADIR%%/TESTING/xdpbllt
+%%DATADIR%%/TESTING/xdptllt
+%%DATADIR%%/TESTING/xdqr
+%%DATADIR%%/TESTING/xdsep
+%%DATADIR%%/TESTING/xdsvd
+%%DATADIR%%/TESTING/xdtrd
+%%DATADIR%%/TESTING/xdtrmr
+%%DATADIR%%/TESTING/xigemr
+%%DATADIR%%/TESTING/xitrmr
+%%DATADIR%%/TESTING/xsbrd
+%%DATADIR%%/TESTING/xsdblu
+%%DATADIR%%/TESTING/xsdtlu
+%%DATADIR%%/TESTING/xsgblu
+%%DATADIR%%/TESTING/xsgemr
+%%DATADIR%%/TESTING/xsgsep
+%%DATADIR%%/TESTING/xshrd
+%%DATADIR%%/TESTING/xsinv
+%%DATADIR%%/TESTING/xsllt
+%%DATADIR%%/TESTING/xsls
+%%DATADIR%%/TESTING/xslu
+%%DATADIR%%/TESTING/xsnep
+%%DATADIR%%/TESTING/xspblas1tim
+%%DATADIR%%/TESTING/xspblas1tst
+%%DATADIR%%/TESTING/xspblas2tim
+%%DATADIR%%/TESTING/xspblas2tst
+%%DATADIR%%/TESTING/xspblas3tim
+%%DATADIR%%/TESTING/xspblas3tst
+%%DATADIR%%/TESTING/xspbllt
+%%DATADIR%%/TESTING/xsptllt
+%%DATADIR%%/TESTING/xsqr
+%%DATADIR%%/TESTING/xssep
+%%DATADIR%%/TESTING/xssvd
+%%DATADIR%%/TESTING/xstrd
+%%DATADIR%%/TESTING/xstrmr
+%%DATADIR%%/TESTING/xzbrd
+%%DATADIR%%/TESTING/xzdblu
+%%DATADIR%%/TESTING/xzdtlu
+%%DATADIR%%/TESTING/xzevc
+%%DATADIR%%/TESTING/xzgblu
+%%DATADIR%%/TESTING/xzgemr
+%%DATADIR%%/TESTING/xzgsep
+%%DATADIR%%/TESTING/xzhrd
+%%DATADIR%%/TESTING/xzinv
+%%DATADIR%%/TESTING/xzllt
+%%DATADIR%%/TESTING/xzls
+%%DATADIR%%/TESTING/xzlu
+%%DATADIR%%/TESTING/xznep
+%%DATADIR%%/TESTING/xzpblas1tim
+%%DATADIR%%/TESTING/xzpblas1tst
+%%DATADIR%%/TESTING/xzpblas2tim
+%%DATADIR%%/TESTING/xzpblas2tst
+%%DATADIR%%/TESTING/xzpblas3tim
+%%DATADIR%%/TESTING/xzpblas3tst
+%%DATADIR%%/TESTING/xzpbllt
+%%DATADIR%%/TESTING/xzptllt
+%%DATADIR%%/TESTING/xzqr
+%%DATADIR%%/TESTING/xzsep
+%%DATADIR%%/TESTING/xztrd
+%%DATADIR%%/TESTING/xztrmr
+%%EXAMPLESDIR%%/Makefile
+%%EXAMPLESDIR%%/example1.cc
+%%EXAMPLESDIR%%/example1.f
+@dirrm %%DATADIR%%/TESTING
+@dirrm %%DATADIR%%
+@dirrm %%EXAMPLESDIR%%/
+%%PORTDOCS%%%%DOCSDIR%%/design.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/lawn100.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/manual.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/pblasqref.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/pumma_refmanual.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/scalapack_install.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/scalapackqref.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/trans.ps.gz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%