diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1996-03-24 23:04:17 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1996-03-24 23:04:17 +0000 |
| commit | ee0c97756ab91509834df6dfb6c86a999197be61 (patch) | |
| tree | f3363ab26694b46a414222ffc0b336032b8c51d6 /security | |
| parent | remove BINGRP?= BINOWN?= BINMODE?= (diff) | |
Auto-sense installed perl & wish
Notes
Notes:
svn path=/head/; revision=2881
Diffstat (limited to 'security')
| -rw-r--r-- | security/ssh/Makefile | 10 | ||||
| -rw-r--r-- | security/ssh2/Makefile | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile index eca51694af64..3b8935fcbf9c 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -3,7 +3,7 @@ # Date created: 30 Jul 1995 # Whom: torstenb@FreeBSD.ORG # -# $Id: Makefile,v 1.18 1996/03/21 14:44:48 ache Exp $ +# $Id: Makefile,v 1.19 1996/03/23 23:36:32 ache Exp $ # # Maximal ssh package requires YES values for # USE_PERL, USE_WISH, USE_TCPWRAP @@ -89,7 +89,9 @@ post-install: # Following stuff must be after <bsd.port.mk> to expand exists() properly -.if defined(USE_WISH) && ${USE_WISH} == YES +.if defined(USE_WISH) && ${USE_WISH} == YES || \ + (exists(${PREFIX}/bin/wish4.0) || exists(${PREFIX}/bin/wish)) && \ + (!defined(USE_WISH) || ${USE_WISH} != NO) .if exists(${PREFIX}/bin/wish4.0) BUILD_DEPENDS+= wish4.0:${PORTSDIR}/x11/tk4 CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish4.0 @@ -101,7 +103,9 @@ CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish CONFIGURE_ENV+= WISH=/replace_it_with_WISH_path .endif -.if defined(USE_PERL) && ${USE_PERL} == YES +.if defined(USE_PERL) && ${USE_PERL} == YES || \ + exists(${PREFIX}/bin/perl5.002) && \ + (!defined(USE_PERL) || ${USE_PERL} != NO) BUILD_DEPENDS+= perl5.002:${PORTSDIR}/lang/perl5 CONFIGURE_ENV+= PERL=${PREFIX}/bin/perl5.002 .else diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile index eca51694af64..3b8935fcbf9c 100644 --- a/security/ssh2/Makefile +++ b/security/ssh2/Makefile @@ -3,7 +3,7 @@ # Date created: 30 Jul 1995 # Whom: torstenb@FreeBSD.ORG # -# $Id: Makefile,v 1.18 1996/03/21 14:44:48 ache Exp $ +# $Id: Makefile,v 1.19 1996/03/23 23:36:32 ache Exp $ # # Maximal ssh package requires YES values for # USE_PERL, USE_WISH, USE_TCPWRAP @@ -89,7 +89,9 @@ post-install: # Following stuff must be after <bsd.port.mk> to expand exists() properly -.if defined(USE_WISH) && ${USE_WISH} == YES +.if defined(USE_WISH) && ${USE_WISH} == YES || \ + (exists(${PREFIX}/bin/wish4.0) || exists(${PREFIX}/bin/wish)) && \ + (!defined(USE_WISH) || ${USE_WISH} != NO) .if exists(${PREFIX}/bin/wish4.0) BUILD_DEPENDS+= wish4.0:${PORTSDIR}/x11/tk4 CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish4.0 @@ -101,7 +103,9 @@ CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish CONFIGURE_ENV+= WISH=/replace_it_with_WISH_path .endif -.if defined(USE_PERL) && ${USE_PERL} == YES +.if defined(USE_PERL) && ${USE_PERL} == YES || \ + exists(${PREFIX}/bin/perl5.002) && \ + (!defined(USE_PERL) || ${USE_PERL} != NO) BUILD_DEPENDS+= perl5.002:${PORTSDIR}/lang/perl5 CONFIGURE_ENV+= PERL=${PREFIX}/bin/perl5.002 .else |