From owner-freebsd-ports@FreeBSD.ORG Sun May 13 23:49:28 2007 Return-Path: X-Original-To: ports@FreeBSD.org Delivered-To: freebsd-ports@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BAB1216A400 for ; Sun, 13 May 2007 23:49:28 +0000 (UTC) (envelope-from craig@yekse.gank.org) Received: from ion.gank.org (ion.gank.org [69.55.238.164]) by mx1.freebsd.org (Postfix) with ESMTP id A767F13C447 for ; Sun, 13 May 2007 23:49:28 +0000 (UTC) (envelope-from craig@yekse.gank.org) Received: by ion.gank.org (Postfix, from userid 1001) id 625CB11100; Sun, 13 May 2007 18:30:58 -0500 (CDT) Date: Sun, 13 May 2007 18:31:34 -0500 From: Craig Boston To: Kris Kennaway Message-ID: <20070513233134.GA4326@nowhere> Mail-Followup-To: Craig Boston , Kris Kennaway , ports@FreeBSD.org References: <20070510212817.GA67897@xor.obsecurity.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070510212817.GA67897@xor.obsecurity.org> User-Agent: Mutt/1.4.2.2i Cc: ports@FreeBSD.org Subject: Re: HEADS UP: xorg 7.2 ready for testing X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 May 2007 23:49:28 -0000 I decided to try this, but to do things a little differently. Before I get yelled at for not following instructions, please glance at what I did because I think it's a valid test: 1. Extract xorg7.2 test ports tree from Kris's .tbz 2. pkg_delete -a 3. rm -rf /usr/X11R6 4. Clean everything out of /usr/local except for config files 5. ln -s local /usr/X11R6 6. cd /usr/ports72/x11/xorg && make install clean My reasoning is that with everybody testing the upgrade procedure, it would also be useful to test a clean install to simulate what a new user would encounter. In this instance I think it makes sense to _NOT_ set XORG_UPGRADE, since it's not an upgrade. Unfortunately xorg-libraries seems to be broken when XORG_UPGRADE is not set. The trouble is this section: .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 If XORG_UPGRADE is not set, it is impossible for the port to build. Consider the following possibilities: 1. /usr/X11R6 is a symbolic link to /usr/local test returns true (because it follows symlinks). The build yells at you to read UPDATING and terminates 2. /usr/X11R6 does not exist test returns false. The build mysteriously terminates with nothing but "*** Error code 1" The following patch fixes it. It's a little ugly but the logic should be correct. --- Makefile.orig Sun May 13 18:19:13 2007 +++ Makefile Sun May 13 18:23:53 2007 @@ -66,7 +66,7 @@ .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} + @test -L /usr/X11R6 || test ! -d /usr/X11R6 || ( echo "Read ${PORTSDIR}/UPDATING for the procedure to upgrade to xorg 7.2." && ${FALSE} ) .endif do-install: