From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 29 19:45:54 2006 Return-Path: X-Original-To: freebsd-ports-bugs@FreeBSD.org Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B89516A50A for ; Tue, 29 Aug 2006 19:45:54 +0000 (UTC) (envelope-from lapo@lapo.it) Received: from mail.lapo.it (motoko.lapo.it [88.198.0.105]) by mx1.FreeBSD.org (Postfix) with SMTP id 6868443D49 for ; Tue, 29 Aug 2006 19:45:52 +0000 (GMT) (envelope-from lapo@lapo.it) Received: (qmail 25147 invoked by uid 89); 29 Aug 2006 19:45:49 -0000 Received: from unknown (HELO ?10.0.0.1?) (lapo@lapo.it@81.74.40.71) by 0 with SMTP; 29 Aug 2006 19:45:49 -0000 Message-ID: <44F49960.6000707@lapo.it> Date: Tue, 29 Aug 2006 21:45:36 +0200 From: Lapo Luchini User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.8.0.5) Gecko/20060719 Thunderbird/1.5.0.5 Mnenhy/0.7.4.0 MIME-Version: 1.0 To: pav@FreeBSD.org References: <200608281346.k7SDkcLa016804@freefall.freebsd.org> <44F3E8A0.90009@lapo.it> <1156839471.40076.2.camel@pav.hide.vol.cz> In-Reply-To: <1156839471.40076.2.camel@pav.hide.vol.cz> X-Enigmail-Version: 0.94.0.0 OpenPGP: id=C8F252FB Content-Type: text/plain; charset=ISO-8859-2 Content-Transfer-Encoding: 7bit Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/102439: port upgrade: devel/monotone 0.29 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Aug 2006 19:45:54 -0000 Pav Lucistnik wrote: >> It was meant to get rid of $PREFIX/share/zsh/site-functions directory >> for people that don't use shells/zsh, while people that do use zsh >> should have that directory (empty or not). >> > I'm not sure it would work. Probably it wouldn't. > ...I wasn't "sure" neither, that's why I spent time to actually test it both with and without zsh, before sending the PR... > Right now, monotone port will kill the site-functions directory if user > got zsh installed. OK, the "totally correct" solution would be to add a dependence on zsh, but seems quite overkill to me to add a dependence just for a completion script. (and Musha Akinori seems to agree, as he committed the similar line in sysutils/portupgrade/pkg-plist#rev1.25) On the other hand I see no reason at all to "just remove it" when there is a fairly simple solution to remove it only when necessary. Please, do test it as long as you need to be sure about it, but consider applying the rest of the patch: diff -ruN monotone/Makefile monotone-0.29/Makefile --- monotone/Makefile Mon Aug 28 15:46:03 2006 +++ monotone-0.29/Makefile Wed Aug 23 12:34:51 2006 @@ -26,7 +26,7 @@ MAKEINFO="makeinfo --no-split" PLIST_FILES= bin/mtn share/zsh/site-functions/_mtn \ - "@dirrm share/zsh/site-functions" \ + "@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true" \ "@dirrmtry share/zsh" INFO= monotone MAN1= mtn.1 PS: thanks for having added the missing ${MKDIR}.