Date: Tue, 9 Nov 2004 16:49:42 +0100 From: Dejan Lesjak <dejan.lesjak@ijs.si> To: Sascha Holzleiter <sascha@daemonground.de> Cc: freebsd-x11@freebsd.org Subject: Re: Second stab at X.Org 6.8.1 update Message-ID: <200411091649.42361.dejan.lesjak@ijs.si> In-Reply-To: <1099978696.88799.6.camel@area51.cc-web.ma.schlund.de> References: <200411061928.00610.dejan.lesjak@ijs.si> <200411090404.58718.dejan.lesjak@ijs.si> <1099978696.88799.6.camel@area51.cc-web.ma.schlund.de>
next in thread | previous in thread | raw e-mail | index | archive | help
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?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411091649.42361.dejan.lesjak>