From owner-freebsd-ports@FreeBSD.ORG Sun May 13 20:46:34 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 F026F16A403 for ; Sun, 13 May 2007 20:46:34 +0000 (UTC) (envelope-from infofarmer@gmail.com) Received: from nz-out-0506.google.com (nz-out-0506.google.com [64.233.162.227]) by mx1.freebsd.org (Postfix) with ESMTP id 99F3813C44B for ; Sun, 13 May 2007 20:46:34 +0000 (UTC) (envelope-from infofarmer@gmail.com) Received: by nz-out-0506.google.com with SMTP id s1so1657654nze for ; Sun, 13 May 2007 13:46:33 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=YF9KQ6YHVFONlrcsYiSCyCExL6M4iJBbK5tN7SxliOumfO3FlEZC81Y6CIA0FzAoUb2v10w1FYqwCOfBNNEXbtivNMvv3wLt23iNT3S0diA9b7ZBE1Mhzaie+bTxuxBpq4xzEOjwe+WZjuEyV/D1/1KoGGGxDdC3KRO2Y0WZBgs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=Rv9J4VpIyojDC31bA5VlWoOI0xc4r/GhfgLzUl0s7OvXyXMRc57WWcf67UGj2vnFyOGKpnSBANNE4tuoLIcI4nqmHONaBuICTohsh9F0qjNmhZqnyHMnctPnnBfRGBgduX41gXCtYRJOdKJ6GmE8HaOcDdqFRn1gonn67jFEIJM= Received: by 10.114.177.1 with SMTP id z1mr701233wae.1179089193172; Sun, 13 May 2007 13:46:33 -0700 (PDT) Received: by 10.114.194.5 with HTTP; Sun, 13 May 2007 13:46:33 -0700 (PDT) Message-ID: Date: Mon, 14 May 2007 00:46:33 +0400 From: "Andrew Pantyukhin" Sender: infofarmer@gmail.com To: "Kris Kennaway" In-Reply-To: <20070512211419.GA28267@xor.obsecurity.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20070510212817.GA67897@xor.obsecurity.org> <20070512153043.GA12201@graf.pompo.net> <20070512210454.GA28045@xor.obsecurity.org> <20070512211419.GA28267@xor.obsecurity.org> X-Google-Sender-Auth: 4f71271a05db9fad 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 20:46:35 -0000 On 5/13/07, Kris Kennaway wrote: > On Sun, May 13, 2007 at 01:11:15AM +0400, Andrew Pantyukhin wrote: > > On 5/13/07, Kris Kennaway wrote: > > >On Sun, May 13, 2007 at 01:00:51AM +0400, Andrew Pantyukhin wrote: > > >> mergebase.sh failed, probably because my system is quite > > >> dirty. Even after I removed the conflicting files, it just > > >> failed. I've made the merge myself and been living happily > > >> ever since (so far). > > > > > >Hmm, would be nice to know why. > > > > I'll try to look closer at it on my laptop. Something tells > > me it'll fail there too, because it's my development system > > and it's as dirty as it gets. > > Running sh -x will help. It fails at line 81. The problem is when there are empty dirs in /usr/X11R6, they cause "File exists" errors, but don't get deleted. Reproducible this way: # rm -rf /usr/X11R6 # mkdir /usr/X11R6 #