From owner-freebsd-x11@FreeBSD.ORG Wed May 9 02:25:11 2007 Return-Path: X-Original-To: freebsd-x11@freebsd.org Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8B49716A407 for ; Wed, 9 May 2007 02:25:11 +0000 (UTC) (envelope-from hg@queue.to) Received: from pickle.queue.to (pickle.queue.to [71.180.69.18]) by mx1.freebsd.org (Postfix) with ESMTP id 1714D13C483 for ; Wed, 9 May 2007 02:25:10 +0000 (UTC) (envelope-from hg@queue.to) Received: (qmail 41116 invoked from network); 8 May 2007 22:25:10 -0400 Received: from cally.queue.to (172.16.0.6) by pickle.queue.to with ESMTP; 8 May 2007 22:25:10 -0400 Message-ID: <46413105.8090509@queue.to> Date: Tue, 08 May 2007 22:25:09 -0400 From: Howard Goldstein User-Agent: Thunderbird 2.0.0.0 (X11/20070508) MIME-Version: 1.0 To: Kris Kennaway References: <464100A7.5060200@queue.to> <20070508230300.GA98545@xor.obsecurity.org> <4641049F.70408@queue.to> <20070508232223.GA98863@xor.obsecurity.org> <464108DD.1040507@queue.to> <20070508235926.GA99040@xor.obsecurity.org> In-Reply-To: <20070508235926.GA99040@xor.obsecurity.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-x11@freebsd.org Subject: Re: x11/x11-libraries build X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2007 02:25:11 -0000 Kris Kennaway wrote: > On Tue, May 08, 2007 at 07:33:49PM -0400, Howard Goldstein wrote: >> Kris Kennaway wrote: >>> On Tue, May 08, 2007 at 07:15:43PM -0400, Howard Goldstein wrote: >>>> Kris Kennaway wrote: >>>>> On Tue, May 08, 2007 at 06:58:47PM -0400, Howard Goldstein wrote: >>>>>> Heads up? Hmmm.... make clean works, but not make: >>>>>> >>>>>> cally:/usr/ports/x11/xorg-libraries# make -v >>>>>> *** Error code 1 >>>>>> >>>>>> Stop in /usr/ports/x11/xorg-libraries. >>>>>> cally:/usr/ports/x11/xorg-libraries# >>>>>> >>>>>> >>>>>> On a system with no /usr/X11R6 at all, something in the following bits >>>>>> hoses the build when those vars are not defined: >>>>>> >>>>>> .if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING) >>>>>> pre-everything:: >>>>>> @test -d /usr/X11R6 && echo "Read ${PORTSDIR}/UPDATING for the >>>>>> procedure to upgrade to xorg 7.2." && ${FALSE} >>>>>> .endif >>>>> Did you try reading the text you quoted? >>>> Yes. Do you know why it's failing with that output, is it because there >>>> is no /usr/X11R6? Keep in mind this is on a system that's been tracking >>>> git for months. >>> Yes, see ${PORTSDIR}/UPDATING. >> Perhaps I'm not understanding your problem with my post. Is the >> argument to the echo supposed to display on this failure, or, is it >> supposed to fail displaying "*** Error code 1" without any further >> explanation which is what I'm seeing here? > > It is supposed to break if /usr/X11R6 is not a symlink. So I guess it > should be > > @test -L /usr/X11R6 || ( echo "Read ${PORTSDIR}/UPDATING for the procedure to upgrade to xorg 7.2." && /usr/bin/false ) Yup, and no amount of my re-reading the UPDATING was going to fix that logic :( A slightly related issue hanging out there is the symlink vs the local/etc/rc.d's. It's not mentioned in the UPDATING and I didn't find the Tools/mergebase.sh so I couldn't tell if something in there is intended to patch rc.subr either with my nasty patch or some more artful way of avoiding the problem with undesirable multiple local rc.d runs.