summaryrefslogtreecommitdiff
path: root/parallel
diff options
context:
space:
mode:
authorwiz <wiz>2000-03-02 23:47:33 +0000
committerwiz <wiz>2000-03-02 23:47:33 +0000
commitea99239a184c7484331bf2a47bbd222771bdefac (patch)
treee4ba66c5015239faab2a513926e0f9f786095972 /parallel
parent39bc5168d44da5c190f22a10ac9a2f76c6ba2a07 (diff)
downloadpkgsrc-ea99239a184c7484331bf2a47bbd222771bdefac.tar.gz
fix PLIST problems, remove BROKEN
Diffstat (limited to 'parallel')
-rw-r--r--parallel/mpi-ch/Makefile9
-rw-r--r--parallel/mpi-ch/files/patch-sum4
-rw-r--r--parallel/mpi-ch/patches/patch-al14
3 files changed, 15 insertions, 12 deletions
diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index e3506f719ee..4ca0b1ab283 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/01/10 01:39:05 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2000/03/02 23:47:33 wiz Exp $
DISTNAME= mpich-1.1.1
CATEGORIES= parallel
@@ -9,8 +9,6 @@ HOMEPAGE= http://www.mcs.anl.gov/mpi/mpich/index.html
DEPENDS+= ssh-1.2.27:../../security/ssh
-BROKEN= PLIST problems
-
WRKSRC= ${WRKDIR}/mpich
ALL_TARGET= ALL
USE_PERL5= yes
@@ -21,7 +19,8 @@ CONFIGURE_ARGS= -prefix=${PREFIX} -arch=netbsd -comm=ch_p4
CONFIGURE_ARGS+= -nof77 -make=${GMAKE} -mpe -rsh=ssh -opt=-O -nodevdebug
post-install:
- ${RM} ${LOCALBASE}/mpiuninstall
- ${RM} ${LOCALBASE}/man/mandesc
+ ${RM} ${PREFIX}/mpiuninstall
+ ${RM} ${PREFIX}/man/mandesc
+ ${RMDIR} ${PREFIX}/share/doc/mpi
.include "../../mk/bsd.pkg.mk"
diff --git a/parallel/mpi-ch/files/patch-sum b/parallel/mpi-ch/files/patch-sum
index 13531f08475..55836b0f578 100644
--- a/parallel/mpi-ch/files/patch-sum
+++ b/parallel/mpi-ch/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:14:55 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/03/02 23:47:35 wiz Exp $
MD5 (patch-aa) = 5a663ee65fcba7816802259b6756506f
MD5 (patch-ab) = edfb74afa3e9207d94680496fdd78014
@@ -11,5 +11,5 @@ MD5 (patch-ah) = 546bfde51a5a081aff1e1ac07285c13d
MD5 (patch-ai) = a450a840ca9b11dc02faf9bb94a5acc2
MD5 (patch-aj) = c453bc520f777078052747e647eebcf4
MD5 (patch-ak) = eb1aac4dffc5bf30c7d470e50cca1e8b
-MD5 (patch-al) = 27cadbf81c475e95758eab3811a457d9
+MD5 (patch-al) = 95a0cb94ac76b392c84fefd1baed7360
MD5 (patch-am) = 8ba07bf04dcc5e7771563769a14b1272
diff --git a/parallel/mpi-ch/patches/patch-al b/parallel/mpi-ch/patches/patch-al
index c3b97e93228..152c9e0f158 100644
--- a/parallel/mpi-ch/patches/patch-al
+++ b/parallel/mpi-ch/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.3 1998/11/12 23:45:54 frueauf Exp $
+$NetBSD: patch-al,v 1.4 2000/03/02 23:47:35 wiz Exp $
---- util/mpiinstall.in.orig Sun Jul 12 08:28:14 1998
-+++ util/mpiinstall.in Tue Oct 20 14:57:33 1998
+--- ./util/mpiinstall.in.orig Sun Jul 12 17:28:14 1998
++++ ./util/mpiinstall.in Fri Mar 3 00:20:21 2000
@@ -120,12 +120,12 @@
# script from the library directory itself.
if [ -n "$libonly" ] ; then
@@ -240,7 +240,7 @@ $NetBSD: patch-al,v 1.3 1998/11/12 23:45:54 frueauf Exp $
fi
fi
#
-@@ -599,12 +602,12 @@
+@@ -599,28 +602,28 @@
echo "Attempting to build ch_p4 secure server"
$Show "( cd mpid/ch_p4/p4/servers ; $MAKE serv_p4 ; )"
CopyFile mpid/ch_p4/p4/bin/serv_p4 $PREFIX/bin $XMODE
@@ -258,7 +258,11 @@ $NetBSD: patch-al,v 1.3 1998/11/12 23:45:54 frueauf Exp $
fi
#
# P4
-@@ -615,12 +618,12 @@
+ if [ "$DEVICE" = "ch_p4" ] ; then
+ if [ ! -x mpid/server/server ] ; then
+ echo "Attempting to build alternate ch_p4 secure server"
+- $Show "( cd mpid/server ; configure ; $MAKE server )"
++ $Show "( cd mpid/server ; ./configure ; $MAKE server )"
fi
if [ -x mpid/server/server ] ; then
CopyFile mpid/server/server $PREFIX/bin $XMODE