cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the hack for locating wish/wish4.0 to also look for wish4.1 now

Browse Source 
that we have that one too.
This commit is contained in:
Peter Wemm 1996-05-24 19:13:04 +00:00
parent 1c12b19f32
commit 2b76d4a8e5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=3123
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/ssh/Makefile
View File

@ -3,7 +3,7 @@
# Date created: 30 Jul 1995 # Date created: 30 Jul 1995
# Whom: torstenb@FreeBSD.ORG # Whom: torstenb@FreeBSD.ORG
# #
# $Id: Makefile,v 1.20 1996/03/24 23:04:17 ache Exp $ # $Id: Makefile,v 1.21 1996/04/17 01:07:04 asami Exp $
# #
# Maximal ssh package requires YES values for # Maximal ssh package requires YES values for
# USE_PERL, USE_WISH, USE_TCPWRAP # USE_PERL, USE_WISH, USE_TCPWRAP
@ -90,9 +90,13 @@ post-install:
# Following stuff must be after <bsd.port.mk> to expand exists() properly # 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)) && \ (exists(${PREFIX}/bin/wish4.0) || exists(${PREFIX}/bin/wish4.1) || \
exists(${PREFIX}/bin/wish)) && \
(!defined(USE_WISH) || ${USE_WISH} != NO) (!defined(USE_WISH) || ${USE_WISH} != NO)
.if exists(${PREFIX}/bin/wish4.0) .if exists(${PREFIX}/bin/wish4.1)
BUILD_DEPENDS+= wish4.1:${PORTSDIR}/x11/tk41
CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish4.1
.elif exists(${PREFIX}/bin/wish4.0)
BUILD_DEPENDS+= wish4.0:${PORTSDIR}/x11/tk4 BUILD_DEPENDS+= wish4.0:${PORTSDIR}/x11/tk4
CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish4.0 CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish4.0
.else .else

10
security/ssh2/Makefile
View File

@ -3,7 +3,7 @@
# Date created: 30 Jul 1995 # Date created: 30 Jul 1995
# Whom: torstenb@FreeBSD.ORG # Whom: torstenb@FreeBSD.ORG
# #
# $Id: Makefile,v 1.20 1996/03/24 23:04:17 ache Exp $ # $Id: Makefile,v 1.21 1996/04/17 01:07:04 asami Exp $
# #
# Maximal ssh package requires YES values for # Maximal ssh package requires YES values for
# USE_PERL, USE_WISH, USE_TCPWRAP # USE_PERL, USE_WISH, USE_TCPWRAP
@ -90,9 +90,13 @@ post-install:
# Following stuff must be after <bsd.port.mk> to expand exists() properly # 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)) && \ (exists(${PREFIX}/bin/wish4.0) || exists(${PREFIX}/bin/wish4.1) || \
exists(${PREFIX}/bin/wish)) && \
(!defined(USE_WISH) || ${USE_WISH} != NO) (!defined(USE_WISH) || ${USE_WISH} != NO)
.if exists(${PREFIX}/bin/wish4.0) .if exists(${PREFIX}/bin/wish4.1)
BUILD_DEPENDS+= wish4.1:${PORTSDIR}/x11/tk41
CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish4.1
.elif exists(${PREFIX}/bin/wish4.0)
BUILD_DEPENDS+= wish4.0:${PORTSDIR}/x11/tk4 BUILD_DEPENDS+= wish4.0:${PORTSDIR}/x11/tk4
CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish4.0 CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish4.0
.else .else