summaryrefslogtreecommitdiff
path: root/cad/astk-serveur
diff options
context:
space:
mode:
authorDaichi GOTO <daichi@FreeBSD.org>2003-07-28 05:22:59 +0000
committerDaichi GOTO <daichi@FreeBSD.org>2003-07-28 05:22:59 +0000
commit0b4f6089efe5d4b4f8419f35ce86f9d9730f5a75 (patch)
tree7167d8e7758370f1bcbaa8f1eac0f83e539a2f4b /cad/astk-serveur
parentfix archivers/makeself: makeself.sh fails (diff)
fix cad/astk-serveur: fixing RUN_DEPENDS
PR: 54917 Submitted by: Thierry Thomas <thierry@pompo.net>
Notes
Notes: svn path=/head/; revision=85710
Diffstat (limited to 'cad/astk-serveur')
-rw-r--r--cad/astk-serveur/Makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index e20b4437297b..68ce7444aef0 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -36,7 +36,7 @@ COMMENT?= Graphical interface for Code_Aster (server side)
# There exists a "logical" RUN_DEPENDS towards french/aster and french/eficas
# for the server part, but it is not set to avoid circular dependences.
RUN_DEPENDS= ${LOCALBASE}/lib/Tktable${TKTAB_VER}:${PORTSDIR}/x11-toolkits/tktable \
- ${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIA}
+ ${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}
.if defined(WITH_PBS) && !defined(CLIENT_SEUL)
RUN_DEPENDS+= ${LOCALBASE}bin/pbs_tclsh:misc/pbs
.endif
@@ -73,16 +73,21 @@ SHIA= zsh
.elif defined(WITH_BASH)
SHIA= bash
.elif defined(WITH_KSH)
-SHIA= ksh
+SHIA= ksh93
.elif exists(${LOCALBASE}/bin/zsh)
SHIA= zsh
.elif exists(${LOCALBASE}/bin/bash)
SHIA= bash
-.elif exists(${LOCALBASE}/bin/ksh)
-SHIA= ksh
+.elif exists(${LOCALBASE}/bin/ksh93)
+SHIA= ksh93
.else
SHIA= zsh
.endif
+.if ${SHIA} == "bash"
+SHIADEP= bash2
+.else
+SHIADEP= ${SHIA}
+.endif
.if !defined(WITH_ED)
.if exists(${X11BASE}/bin/nedit)