From 20a2edcc5c7f598031b520b593b27e1c1598b796 Mon Sep 17 00:00:00 2001
From: maho <maho@FreeBSD.org>
Date: Tue, 19 Oct 2004 02:14:59 +0000
Subject: 1) fix build after changes to make(1) on FreeBSD 2) pass portlint,
 and also fix pkg-message as well.

PR:		72261
Submitted by:	thierry@
---
 math/blacs/Makefile    |  9 +++++++--
 math/blacs/pkg-message | 12 ------------
 math/blacs/pkg-plist   | 14 +++++++-------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index 11d3cfbb8cf6..85faf40c6c75 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -26,6 +26,8 @@ LIB_DEPENDS=	lapack:${PORTSDIR}/math/lapack \
 		atlas:${PORTSDIR}/math/atlas
 BUILD_DEPENDS=	${LOCALBASE}/mpich/lib/libmpich.a:${PORTSDIR}/net/mpich
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 .include <bsd.port.pre.mk>
 
 pre-fetch:
@@ -42,7 +44,8 @@ DEBUG_LEVEL=	0
 pre-patch:
 	(${CP} ${WRKSRC}/BMAKES/Bmake.MPI-LINUX ${WRKSRC}/Bmake.inc)
 post-patch:
-	(${REINPLACE_CMD} -e 's,@WRKSRC@,${WRKSRC},g ; s,@DEBUG_LEVEL@,${DEBUG_LEVEL},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}/Bmake.inc)
+	(${REINPLACE_CMD} -e 's,@WRKSRC@,${WRKSRC},g ; s,@DEBUG_LEVEL@,${DEBUG_LEVEL},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}/Bmake.inc)
+	${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/SRC/MPI/Makefile
 
 do-build:
 	(cd ${WRKSRC}; make mpi; make tester)
@@ -70,6 +73,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.post.mk>
diff --git a/math/blacs/pkg-message b/math/blacs/pkg-message
index a498cfdbeca0..e69de29bb2d1 100644
--- a/math/blacs/pkg-message
+++ b/math/blacs/pkg-message
@@ -1,12 +0,0 @@
-*********************************************************************
- Please test your blacs installation
- Test programs are located at /usr/local/share/BLACS/TESTING
-
- Example:
-  % cd /usr/local/share/BLACS/TESTING
-  % mpirun -np 4 xCbtest_MPI-FreeBSD
-  % mpirun -np 4 xFbtest_MPI-FreeBSD
-
-You can change -np 4 to any number to meet your local environment.
-See files at /usr/local/share/doc/blacs for detail.
-*********************************************************************
diff --git a/math/blacs/pkg-plist b/math/blacs/pkg-plist
index f78ea826d2c4..2556d919ba49 100644
--- a/math/blacs/pkg-plist
+++ b/math/blacs/pkg-plist
@@ -9,10 +9,10 @@ share/BLACS/TESTING/comb.dat
 share/BLACS/TESTING/sdrv.dat
 @dirrm share/BLACS/TESTING
 @dirrm share/BLACS
-%%PORTDOCS%%share/doc/blacs/blacs_install.ps.gz
-%%PORTDOCS%%share/doc/blacs/f77blacsqref.ps.gz
-%%PORTDOCS%%share/doc/blacs/mpi_prop.ps.gz
-%%PORTDOCS%%share/doc/blacs/cblacsqref.ps.gz
-%%PORTDOCS%%share/doc/blacs/lawn94.ps.gz
-%%PORTDOCS%%share/doc/blacs/mpiblacs_issues.ps.gz
-%%PORTDOCS%%@dirrm share/doc/blacs
+%%PORTDOCS%%%%DOCSDIR%%/blacs_install.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/f77blacsqref.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/mpi_prop.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/cblacsqref.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/lawn94.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/mpiblacs_issues.ps.gz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit