From thierry@pompo.net  Sun Jul 27 11:57:58 2003
Return-Path: <thierry@pompo.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 76B7937B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 27 Jul 2003 11:57:58 -0700 (PDT)
Received: from graf.pompo.net (lns-th2-2f-81-56-186-139.adsl.proxad.net [81.56.186.139])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C2D6843F3F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 27 Jul 2003 11:57:57 -0700 (PDT)
	(envelope-from thierry@pompo.net)
Received: by graf.pompo.net (Postfix, from userid 1001)
	id 94B3D751E; Sun, 27 Jul 2003 20:51:27 +0200 (CEST)
Message-Id: <20030727185127.94B3D751E@graf.pompo.net>
Date: Sun, 27 Jul 2003 20:51:27 +0200 (CEST)
From: Thierry Thomas <thierry@pompo.net>
Reply-To: Thierry Thomas <thierry@pompo.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: cad/astk-serveur: fixing RUN_DEPENDS.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         54917
>Category:       ports
>Synopsis:       cad/astk-serveur: fixing RUN_DEPENDS.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 27 12:00:35 PDT 2003
>Closed-Date:    Sun Jul 27 22:23:20 PDT 2003
>Last-Modified:  Sun Jul 27 22:23:20 PDT 2003
>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@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:
State-Changed-From-To: open->closed 
State-Changed-By: daichi 
State-Changed-When: Sun Jul 27 22:23:09 PDT 2003 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54917 
>Unformatted:
