diff options
author | dmcmahill <dmcmahill> | 2000-10-10 19:26:15 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill> | 2000-10-10 19:26:15 +0000 |
commit | f40cff09ceb279b3b190e0b0b7f408bd412f9105 (patch) | |
tree | 3867af7224f4dc3e612bb091ca0bbb6906bf48c1 | |
parent | f82fc34b912496daa069cb543326903d897d8fc2 (diff) | |
download | pkgsrc-f40cff09ceb279b3b190e0b0b7f408bd412f9105.tar.gz |
define SSH and pass down to the build environment to make sure the right
ssh (/usr/bin/ssh or pkgsrc ssh) is found.
-rw-r--r-- | parallel/pvm3/Makefile | 8 | ||||
-rw-r--r-- | parallel/pvm3/files/patch-sum | 26 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-aa | 4 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-ab | 4 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-ac | 4 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-ad | 4 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-ae | 4 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-af | 4 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-ag | 4 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-ah | 4 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-ai | 4 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-aj | 4 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-ak | 4 | ||||
-rw-r--r-- | parallel/pvm3/patches/patch-al | 4 |
14 files changed, 43 insertions, 39 deletions
diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile index d32f9e33d4c..95aea241427 100644 --- a/parallel/pvm3/Makefile +++ b/parallel/pvm3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2000/10/10 15:02:14 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.15 2000/10/10 19:26:15 dmcmahill Exp $ DISTNAME= pvm3.4.3 PKGNAME= pvm-3.4.3 @@ -9,8 +9,11 @@ EXTRACT_SUFX= .tgz MAINTAINER= root@garbled.net HOMEPAGE= http://www.epm.ornl.gov/pvm/pvm_home.html -.if !exists(/usr/bin/ssh) +.if exists(/usr/bin/ssh) +SSH= /usr/bin/ssh +.else DEPENDS+= {openssh-*,ssh{,6}-1.2.27}:../../security/ssh +SSH= ${LOCALBASE}/bin/ssh .endif USE_FORTRAN= yes @@ -18,6 +21,7 @@ USE_X11= yes WRKSRC= ${WRKDIR}/pvm3 MAKE_ENV+= PVM_ROOT=${WRKSRC} MAKE_ENV+= PVM_ARCH= +MAKE_ENV+= SSH=${SSH} ALL_TARGET= all install MESSAGE_FILE= ${WRKDIR}/MESSAGE PLIST_SRC= ${WRKDIR}/PLIST-src diff --git a/parallel/pvm3/files/patch-sum b/parallel/pvm3/files/patch-sum index 3cee6de319c..8f7645ba818 100644 --- a/parallel/pvm3/files/patch-sum +++ b/parallel/pvm3/files/patch-sum @@ -1,15 +1,15 @@ -$NetBSD: patch-sum,v 1.3 2000/08/23 14:28:18 dmcmahill Exp $ +$NetBSD: patch-sum,v 1.4 2000/10/10 19:26:15 dmcmahill Exp $ -MD5 (patch-aa) = 94537b359ffca393de6db10474b6f836 -MD5 (patch-ab) = 8b517e887490883c7fc4f45c40fff1e8 -MD5 (patch-ac) = 6cfe852c611eaf3328e2454a19b59f00 -MD5 (patch-ad) = b763c510ec989aaedbf863bc22c63b8a -MD5 (patch-ae) = a04b90dea7613e9b2fc082d2faf094a5 -MD5 (patch-af) = a3d26b308936c9554c0f7e3a9855fb33 -MD5 (patch-ag) = ba3fa43129516fa839fe2676534aaf3b -MD5 (patch-ah) = 2587878cb87a47e94f0a6125cfd80d0e -MD5 (patch-ai) = f4182700de078ba9cf10726903dd62e0 -MD5 (patch-aj) = 3011e96b298ad06dca5f85d2d1174abf -MD5 (patch-ak) = daa2ce120d232f1fa060b6a423d2e012 -MD5 (patch-al) = 604a9a263d2f9dbef63368bdee6d7ef3 +MD5 (patch-aa) = 8fd02cf539cefc3c07a424917b466961 +MD5 (patch-ab) = 235ddc71c82e742da55bb560f50d411f +MD5 (patch-ac) = f1016f944a3f13e43385d8c2322fc653 +MD5 (patch-ad) = 4339455e250dd078e508bc51c5e63914 +MD5 (patch-ae) = af4bd06eebbcf561993df69aef616137 +MD5 (patch-af) = 67737306a1161a0418f1a4d6da76dda0 +MD5 (patch-ag) = 51cfa020dd387164aaae86230336b7e9 +MD5 (patch-ah) = fcf8a07d8614f55cfcf659c571ac7aa8 +MD5 (patch-ai) = 880873d7c7a620a9c26ab0c8b05a6dc6 +MD5 (patch-aj) = 450427d982047355d6cefa938f0f6817 +MD5 (patch-ak) = ee01567dd616c0b47b0825334d344c06 +MD5 (patch-al) = 042df86de3734f7d1fe9cf52c3cfdc41 MD5 (patch-am) = 874c6323516778afc6746f759a837725 diff --git a/parallel/pvm3/patches/patch-aa b/parallel/pvm3/patches/patch-aa index 0786f6bf088..f8ace57e9dd 100644 --- a/parallel/pvm3/patches/patch-aa +++ b/parallel/pvm3/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.3 2000/08/23 14:28:18 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.4 2000/10/10 19:26:15 dmcmahill Exp $ --- conf/NETBSDALPHA.def.orig Wed Feb 16 16:19:20 2000 +++ conf/NETBSDALPHA.def Fri Jun 30 16:55:52 2000 @@ -1,4 +1,4 @@ -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = diff --git a/parallel/pvm3/patches/patch-ab b/parallel/pvm3/patches/patch-ab index b580299ed75..fa56adeb456 100644 --- a/parallel/pvm3/patches/patch-ab +++ b/parallel/pvm3/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.3 2000/08/23 14:28:18 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $ --- conf/NETBSDARM32.def.orig Wed Feb 16 16:19:21 2000 +++ conf/NETBSDARM32.def Fri Jun 30 16:55:52 2000 @@ -1,4 +1,4 @@ -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = diff --git a/parallel/pvm3/patches/patch-ac b/parallel/pvm3/patches/patch-ac index b35dec05b45..e860ac67608 100644 --- a/parallel/pvm3/patches/patch-ac +++ b/parallel/pvm3/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.3 2000/08/23 14:28:18 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $ --- conf/NETBSDI386.def.orig Wed Feb 16 16:17:48 2000 +++ conf/NETBSDI386.def Fri Jun 30 16:55:52 2000 @@ -1,4 +1,4 @@ -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = diff --git a/parallel/pvm3/patches/patch-ad b/parallel/pvm3/patches/patch-ad index e4deb50ff59..c4a083df1c6 100644 --- a/parallel/pvm3/patches/patch-ad +++ b/parallel/pvm3/patches/patch-ad @@ -1,10 +1,10 @@ -$NetBSD: patch-ad,v 1.3 2000/08/23 14:28:18 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $ --- conf/NETBSDM68K.def.orig Wed Feb 16 16:19:22 2000 +++ conf/NETBSDM68K.def Fri Jun 30 16:55:52 2000 @@ -1,4 +1,4 @@ -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = diff --git a/parallel/pvm3/patches/patch-ae b/parallel/pvm3/patches/patch-ae index a488ad4297f..e170b0a3c46 100644 --- a/parallel/pvm3/patches/patch-ae +++ b/parallel/pvm3/patches/patch-ae @@ -1,10 +1,10 @@ -$NetBSD: patch-ae,v 1.3 2000/08/23 14:28:19 dmcmahill Exp $ +$NetBSD: patch-ae,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $ --- conf/NETBSDMIPSEB.def.orig Wed Feb 16 16:19:24 2000 +++ conf/NETBSDMIPSEB.def Fri Jun 30 16:55:52 2000 @@ -1,4 +1,4 @@ -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = diff --git a/parallel/pvm3/patches/patch-af b/parallel/pvm3/patches/patch-af index 406d95b44b4..6680ef701c3 100644 --- a/parallel/pvm3/patches/patch-af +++ b/parallel/pvm3/patches/patch-af @@ -1,10 +1,10 @@ -$NetBSD: patch-af,v 1.3 2000/08/23 14:28:19 dmcmahill Exp $ +$NetBSD: patch-af,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $ --- conf/NETBSDMIPSEL.def.orig Wed Feb 16 16:19:27 2000 +++ conf/NETBSDMIPSEL.def Fri Jun 30 16:55:52 2000 @@ -1,4 +1,4 @@ -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = diff --git a/parallel/pvm3/patches/patch-ag b/parallel/pvm3/patches/patch-ag index 275853d705d..49cf81cb1c8 100644 --- a/parallel/pvm3/patches/patch-ag +++ b/parallel/pvm3/patches/patch-ag @@ -1,10 +1,10 @@ -$NetBSD: patch-ag,v 1.3 2000/08/23 14:28:19 dmcmahill Exp $ +$NetBSD: patch-ag,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $ --- conf/NETBSDNS32K.def.orig Wed Feb 16 16:19:34 2000 +++ conf/NETBSDNS32K.def Fri Jun 30 16:55:52 2000 @@ -1,4 +1,4 @@ -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = diff --git a/parallel/pvm3/patches/patch-ah b/parallel/pvm3/patches/patch-ah index c42596ffe0b..ef5ba44fe03 100644 --- a/parallel/pvm3/patches/patch-ah +++ b/parallel/pvm3/patches/patch-ah @@ -1,10 +1,10 @@ -$NetBSD: patch-ah,v 1.3 2000/08/23 14:28:19 dmcmahill Exp $ +$NetBSD: patch-ah,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $ --- conf/NETBSDPOWERPC.def.orig Wed Feb 16 16:19:37 2000 +++ conf/NETBSDPOWERPC.def Fri Jun 30 16:55:52 2000 @@ -1,4 +1,4 @@ -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = diff --git a/parallel/pvm3/patches/patch-ai b/parallel/pvm3/patches/patch-ai index e94acb92fb7..2db22498b08 100644 --- a/parallel/pvm3/patches/patch-ai +++ b/parallel/pvm3/patches/patch-ai @@ -1,10 +1,10 @@ -$NetBSD: patch-ai,v 1.3 2000/08/23 14:28:19 dmcmahill Exp $ +$NetBSD: patch-ai,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $ --- conf/NETBSDSH3.def.orig Wed Feb 16 16:20:10 2000 +++ conf/NETBSDSH3.def Fri Jun 30 16:55:52 2000 @@ -1,4 +1,4 @@ -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = diff --git a/parallel/pvm3/patches/patch-aj b/parallel/pvm3/patches/patch-aj index 38d546947d6..51fd833b40b 100644 --- a/parallel/pvm3/patches/patch-aj +++ b/parallel/pvm3/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.3 2000/08/23 14:28:19 dmcmahill Exp $ +$NetBSD: patch-aj,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $ --- conf/NETBSDSPARC.def.orig Wed Feb 16 16:17:49 2000 +++ conf/NETBSDSPARC.def Fri Jun 30 17:05:55 2000 @@ -8,7 +8,7 @@ $NetBSD: patch-aj,v 1.3 2000/08/23 14:28:19 dmcmahill Exp $ # -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ - -DHASERRORVARS -DNOREXEC -DSYSERRISCONST -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ + -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = diff --git a/parallel/pvm3/patches/patch-ak b/parallel/pvm3/patches/patch-ak index b1fd50f4a7b..766bdf29856 100644 --- a/parallel/pvm3/patches/patch-ak +++ b/parallel/pvm3/patches/patch-ak @@ -1,10 +1,10 @@ -$NetBSD: patch-ak,v 1.3 2000/08/23 14:28:19 dmcmahill Exp $ +$NetBSD: patch-ak,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $ --- conf/NETBSDSPARC64.def.orig Wed Feb 16 16:20:11 2000 +++ conf/NETBSDSPARC64.def Fri Jun 30 16:55:52 2000 @@ -1,4 +1,4 @@ -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = diff --git a/parallel/pvm3/patches/patch-al b/parallel/pvm3/patches/patch-al index d04467dfa1a..aa655c6f3a4 100644 --- a/parallel/pvm3/patches/patch-al +++ b/parallel/pvm3/patches/patch-al @@ -1,10 +1,10 @@ -$NetBSD: patch-al,v 1.3 2000/08/23 14:28:19 dmcmahill Exp $ +$NetBSD: patch-al,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $ --- conf/NETBSDVAX.def.orig Wed Feb 16 16:20:12 2000 +++ conf/NETBSDVAX.def Fri Jun 30 16:55:52 2000 @@ -1,4 +1,4 @@ -ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \ -+ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \ ++ARCHCFLAGS = -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \ -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST ARCHDLIB = ARCHDOBJ = |