diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2000-10-10 19:09:26 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2000-10-10 19:09:26 +0000 |
| commit | 69d361149a2eddd472bc774e3b881806b21e58a1 (patch) | |
| tree | 95c0fbf0dd1a51390b568350ebafe427e1378a91 /parallel | |
| parent | 884cbb1d85e9bb6f85d89d12ab216c19b1e12968 (diff) | |
| download | pkgsrc-69d361149a2eddd472bc774e3b881806b21e58a1.tar.gz | |
set SSH and pass down to build environment so the currect ssh gets found
(either the base system one or pkgsrc if ssh isn't in the base system)
Diffstat (limited to 'parallel')
| -rw-r--r-- | parallel/glunix/Makefile | 8 | ||||
| -rw-r--r-- | parallel/glunix/files/patch-sum | 4 | ||||
| -rw-r--r-- | parallel/glunix/patches/patch-ap | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile index 34f3ed0539d..a0715a8ef39 100644 --- a/parallel/glunix/Makefile +++ b/parallel/glunix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/10/10 15:02:13 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.13 2000/10/10 19:09:26 dmcmahill Exp $ DISTNAME= glunix-release-1-0a PKGNAME= glunix-1.0a @@ -10,8 +10,11 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} makedepend${EXTRACT_SUFX} MAINTAINER= root@garbled.net HOMEPAGE= http://now.cs.berkeley.edu/Glunix/glunix.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}/ssh .endif USE_GMAKE= yes @@ -30,6 +33,7 @@ FLAGS= "-m486 -DL_ENDIAN" MAKE_ENV+= OPSYS=${OPSYS} ARCH=${MACHINE_ARCH} NOW_ROOT=${NOW_ROOT} MAKE_ENV+= PORTSDIR=${PKGDIR} WRKDIR=${WRKDIR} FLAGS=${FLAGS} +MAKE_ENV+= SSH=${SSH} SCRIPTS_ENV+= ARCH=${MACHINE_ARCH} RM=${RM} NOW_ROOT=${NOW_ROOT} diff --git a/parallel/glunix/files/patch-sum b/parallel/glunix/files/patch-sum index c56b6bd2c09..5d33df37ac2 100644 --- a/parallel/glunix/files/patch-sum +++ b/parallel/glunix/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.4 2000/07/10 23:54:22 wiz Exp $ +$NetBSD: patch-sum,v 1.5 2000/10/10 19:09:26 dmcmahill Exp $ MD5 (patch-aa) = f07a5edea1b3986a994019f889db2e16 MD5 (patch-ab) = a29f0a2b4373e5ae8992de12da412637 @@ -15,7 +15,7 @@ MD5 (patch-al) = c1123254c24e6c90d0c3343f44daf0ca MD5 (patch-am) = 4b00af8bc9621552081e5c51db9b7474 MD5 (patch-an) = 2e54f806d1174ea42b0a0ad9ad27f1fe MD5 (patch-ao) = 52be376a850d74d469fd9de834ee1085 -MD5 (patch-ap) = 7093402988d0dc0d9ed2d1f7e6be8f47 +MD5 (patch-ap) = d995d5423187516e4c272042be5f2af9 MD5 (patch-aq) = 08e2816178e3680e89a9fffb487c335f MD5 (patch-ar) = 45c481af0af1318e517335522c5bc627 MD5 (patch-as) = 43a0155feb50562abc18be1ed5466424 diff --git a/parallel/glunix/patches/patch-ap b/parallel/glunix/patches/patch-ap index 4f2f68fd717..762e3d7c2fc 100644 --- a/parallel/glunix/patches/patch-ap +++ b/parallel/glunix/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.2 2000/07/10 23:54:23 wiz Exp $ +$NetBSD: patch-ap,v 1.3 2000/10/10 19:09:26 dmcmahill Exp $ --- progs/Makefile.common.orig Wed Nov 5 15:43:41 1997 +++ progs/Makefile.common Wed Jun 21 15:54:25 2000 @@ -55,7 +55,7 @@ $NetBSD: patch-ap,v 1.2 2000/07/10 23:54:23 wiz Exp $ +GLUNIX_PLATFORM = $(GLUNIX_ARCH)-$(GLUNIX_OS)-$(GLUNIX_NET) +PERL_PATH = ${LOCALBASE}/bin/perl +MAIL_PATH = /usr/bin/Mail -+RSH_PATH = ${LOCALBASE}/bin/ssh ++RSH_PATH = ${SSH} +GLUNIX_DIR = $(NOW_ROOT) +GLUNIX_DATA_DIR = $(NOW_ROOT)/data +INSTALL_DIR = $(NOW_ROOT) |