ports/54917: cad/astk-serveur: fixing RUN_DEPENDS.

[Thierry Thomas]

>Number:         54917
>Category:       ports
>Synopsis:       cad/astk-serveur: fixing RUN_DEPENDS.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 27 12:00:35 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.8-STABLE FreeBSD 4.8-STABLE #0: Tue Apr 29 18:16:35 CEST 2003 thierry at graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	WITH_BASH or WITH_KSH do not work if they are not installed.
	(See PR ports/54915 for fench/aster - same problem)

>How-To-Repeat:
	On a machine where bash is not installed, try to install astk-serveur
	with the knob WITH_BASH=yes => it will try to fetch the port
	shells/bash, which does not exist. Idem for ksh.

>Fix:
	Please apply the following patch:

--- astk-serveur.diff begins here ---
--- cad/astk-serveur/Makefile.orig	Wed Jul 23 13:20:25 2003
+++ cad/astk-serveur/Makefile	Sun Jul 27 20:40:26 2003
@@ -36,7 +36,7 @@
 # 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,15 +73,20 @@
 .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)
--- astk-serveur.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: