From owner-freebsd-x11@FreeBSD.ORG Tue Nov 9 15:51:41 2004 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E659C16A4CE for ; Tue, 9 Nov 2004 15:51:41 +0000 (GMT) Received: from niobe.ijs.si (mail.ijs.si [193.2.4.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0229F43D53 for ; Tue, 9 Nov 2004 15:51:41 +0000 (GMT) (envelope-from dejan.lesjak@ijs.si) Received: from localhost (localhost.ijs.si [127.0.0.1]) by niobe.ijs.si (Postfix) with ESMTP id 1FF8B1DD605; Tue, 9 Nov 2004 16:51:40 +0100 (CET) Received: from niobe.ijs.si ([127.0.0.1]) by localhost (niobe.ijs.si [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 08039-01-3; Tue, 9 Nov 2004 16:51:27 +0100 (CET) Received: from metatron.ijs.si (metatron.ijs.si [193.2.4.152]) by niobe.ijs.si (Postfix) with ESMTP id B77501DD64D; Tue, 9 Nov 2004 16:49:43 +0100 (CET) Received: from [192.168.10.30] (clj8-144.dial-up.arnes.si [194.249.52.144]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by metatron.ijs.si (Postfix) with ESMTP id 5BB291C00720; Tue, 9 Nov 2004 16:49:43 +0100 (CET) From: Dejan Lesjak To: Sascha Holzleiter Date: Tue, 9 Nov 2004 16:49:42 +0100 User-Agent: KMail/1.7 References: <200411061928.00610.dejan.lesjak@ijs.si> <200411090404.58718.dejan.lesjak@ijs.si> <1099978696.88799.6.camel@area51.cc-web.ma.schlund.de> In-Reply-To: <1099978696.88799.6.camel@area51.cc-web.ma.schlund.de> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200411091649.42361.dejan.lesjak@ijs.si> X-Virus-Scanned: amavisd-new at ijs.si cc: freebsd-x11@freebsd.org Subject: Re: Second stab at X.Org 6.8.1 update X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 15:51:42 -0000 On Tuesday 09 of November 2004 06:38, Sascha Holzleiter wrote: > On Tue, 2004-11-09 at 04:04 +0100, Dejan Lesjak wrote: > > As already mentioned on another thread, I've made some mistakes with > > above mentioned patch. The fixed one is here: > > http://www.ijs.si/~lesi/xorg-681-up-6.diff > > There seems to be still one left: > > Hunk #1 failed at 6. > 1 out of 1 hunks failed--saving rejects to x11/xorg-clients/Makefile.rej > > > The reason is that the portrevision of this port was bumped on 11/05. Yes, and the hunk in question has: --- x11/xorg-clients/Makefile 5 Nov 2004 02:46:04 -0000 1.13 +++ x11/xorg-clients/Makefile 8 Nov 2004 23:41:35 -0000 @@ -6,15 +6,13 @@ # PORTNAME= xorg-clients -PORTVERSION= 6.7.0 -PORTREVISION= 5 +PORTVERSION= 6.8.1 That's one of things where -5- patch was wrong and is fixed in -6-. I've just tried again applying on a fresh cvsup in clean chroot and it goes without errors. Are you sure you applied -6- patch to freshly cvsupped ports?