From owner-freebsd-gnome@FreeBSD.ORG  Tue Apr  4 09:37:12 2006
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
X-Original-To: gnome@FreeBSD.org
Delivered-To: freebsd-gnome@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 73AA416A400
	for <gnome@FreeBSD.org>; Tue,  4 Apr 2006 09:37:12 +0000 (UTC)
	(envelope-from jbq@anyware-tech.com)
Received: from caraldi.com (195-13-58-165.oxyd.net [195.13.58.165])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 28B1E43D6A
	for <gnome@FreeBSD.org>; Tue,  4 Apr 2006 09:37:06 +0000 (GMT)
	(envelope-from jbq@anyware-tech.com)
Received: from vision.anyware (10.21.96-84.rev.gaoland.net [84.96.21.10])
	by caraldi.com (Postfix) with ESMTP id EB73861C0
	for <gnome@FreeBSD.org>; Tue,  4 Apr 2006 11:37:05 +0200 (CEST)
Received: by vision.anyware (Postfix, from userid 1021)
	id D98BB61AC; Tue,  4 Apr 2006 11:37:02 +0200 (CEST)
Date: Tue, 4 Apr 2006 11:37:02 +0200
From: Jean-Baptiste Quenot <jbq@caraldi.com>
To: gnome@FreeBSD.org
Message-ID: <20060404093702.GG28452@vision.anyware>
Mail-Followup-To: Jean-Baptiste Quenot <jbq@caraldi.com>, gnome@FreeBSD.org
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="AqsLC8rIMeq19msA"
Content-Disposition: inline
User-Agent: mutt-ng/devel-r581 (FreeBSD)
Cc: 
Subject: Wrong Bash dependency in devel/dbus
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
	<freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Apr 2006 09:37:12 -0000


--AqsLC8rIMeq19msA
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Dear dbus maintainer,

It seems like there is a wrong dependency on bash in devel/dbus:

BUILD_DEPENDS?= bash:${PORTSDIR}/shells/bash

That means bash anywhere in the PATH is OK, but it must be found
under /usr/local/bin.  On my system /bin/bash is a link to
/bin/sh.

But the best would be to remove the dependency completely, please
find the patch attached.
-- 
     Jean-Baptiste Quenot
aka  John Banana Qwerty
http://caraldi.com/jbq/

--AqsLC8rIMeq19msA
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=20060404-freebsd-dbus-kill-bash

diff -ru dbus.orig/Makefile dbus/Makefile
--- dbus.orig/Makefile	Thu Mar 16 00:14:27 2006
+++ dbus/Makefile	Tue Apr  4 11:36:03 2006
@@ -14,7 +14,6 @@
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	A message bus system for inter-application communication
 
-BUILD_DEPENDS?=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS?=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_GNOME?=	gnomehack glib20 libxml2
diff -ru dbus.orig/files/patch-tools_run-with-tmp-session-bus.sh dbus/files/patch-tools_run-with-tmp-session-bus.sh
--- dbus.orig/files/patch-tools_run-with-tmp-session-bus.sh	Tue Apr  4 11:27:56 2006
+++ dbus/files/patch-tools_run-with-tmp-session-bus.sh	Tue Apr  4 11:30:27 2006
@@ -1,8 +1,15 @@
---- tools/run-with-tmp-session-bus.sh.orig	Sat Apr  2 14:52:51 2005
-+++ tools/run-with-tmp-session-bus.sh	Sat Apr  2 14:53:05 2005
-@@ -1,4 +1,4 @@
+--- tools/run-with-tmp-session-bus.sh.orig	Thu Mar 17 18:48:29 2005
++++ tools/run-with-tmp-session-bus.sh	Tue Apr  4 11:29:40 2006
+@@ -1,10 +1,10 @@
 -#! /bin/bash
 +#! /bin/sh
  
  SCRIPTNAME=$0
  WRAPPED_SCRIPT=$1
+ shift
+ 
+-function die() 
++die() 
+ {
+     if ! test -z "$DBUS_SESSION_BUS_PID" ; then
+         echo "killing message bus "$DBUS_SESSION_BUS_PID >&2

--AqsLC8rIMeq19msA--