From ee7afd4729f36b6fa9b7116fc1e241df2c5aa332 Mon Sep 17 00:00:00 2001 From: mharo Date: Sun, 2 Apr 2000 04:26:02 +0000 Subject: use ssh in base system, if it exists. PR: 17520 Submitted by: Brooks Davis --- net/mpich/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'net/mpich') diff --git a/net/mpich/Makefile b/net/mpich/Makefile index 1c65b3c88cb9..ccf88df7c6d5 100644 --- a/net/mpich/Makefile +++ b/net/mpich/Makefile @@ -20,14 +20,20 @@ DIST_SUBDIR= mpich HAS_CONFIGURE= yes CONFIGURE_ARGS= -cflags="${CFLAGS}" -prefix=${PREFIX}/mpich +.include + # Include support for ssh client USE_SSH?= YES # Use ssh instead of rsh -.if defined(USE_SSH) && ${USE_SSH} == YES || \ - exists(${PREFIX}/bin/ssh) && \ +.if ${OSVERSION} >= 400016 && \ + exists(/usr/bin/ssh) && \ + (!defined(USE_SSH) || ${USE_SSH} != NO) +CONFIGURE_ARGS+= -rsh="/usr/bin/ssh" +.elif defined(USE_SSH) && ${USE_SSH} == YES || \ + exists(${LOCALBASE}/bin/ssh) && \ (!defined(USE_SSH) || ${USE_SSH} != NO) RUN_DEPENDS+= ssh:${PORTSDIR}/security/ssh -CONFIGURE_ARGS+= -rsh="${PREFIX}/bin/ssh" +CONFIGURE_ARGS+= -rsh="${LOCALBASE}/bin/ssh" .endif ALL_TARGET= @@ -178,4 +184,4 @@ MAN4= CLOG_Finalize.4 CLOG_Init.4 CLOG_Output.4 CLOG_commtype.4 \ MPE_TagsEnd.4 MPE_Update.4 INSTALL_TARGET= install -.include +.include -- cgit