From owner-freebsd-current@FreeBSD.ORG Fri Oct 22 00:50:40 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCCB316A4CE for ; Fri, 22 Oct 2004 00:50:40 +0000 (GMT) Received: from makeworld.com (makeworld.com [198.92.228.38]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BEAA43D39 for ; Fri, 22 Oct 2004 00:50:39 +0000 (GMT) (envelope-from racerx@makeworld.com) Received: from localhost (localhost.com [127.0.0.1]) by makeworld.com (Postfix) with ESMTP id 624816390; Thu, 21 Oct 2004 19:50:33 -0500 (CDT) Received: from makeworld.com ([127.0.0.1]) by localhost (makeworld.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 51000-01; Thu, 21 Oct 2004 19:50:19 -0500 (CDT) Received: from racerx.makeworld.com (racerx.makeworld.com [198.92.228.34]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by makeworld.com (Postfix) with ESMTP id 9432462E1; Thu, 21 Oct 2004 19:50:18 -0500 (CDT) From: Chris To: freebsd-current@freebsd.org, Andrew Marks Date: Thu, 21 Oct 2004 19:50:43 -0500 User-Agent: KMail/1.7 References: <4415e9c104102117372ed41d27@mail.gmail.com> <20041022004228.GA67788@xor.obsecurity.org> <4415e9c104102117463d9ff6f7@mail.gmail.com> In-Reply-To: <4415e9c104102117463d9ff6f7@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200410211950.43353.racerx@makeworld.com> X-Virus-Scanned: by ClamAV 0.75.1/amavisd-new-2.1.2 at makeworld.com - Isn't it ironic Subject: Re: xorg-clients broken patches on 5.3-RC1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: racerx@makeworld.com List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2004 00:50:41 -0000 On Thursday 21 October 2004 07:46 pm, Andrew Marks wrote: > On Thu, 21 Oct 2004 17:42:28 -0700, Kris Kennaway wrote: > > On Thu, Oct 21, 2004 at 05:37:25PM -0700, Andrew Marks wrote: > > > root@CubeMonster# make patch > > > ===> Patching for xorg-clients-6.7.0_4 > > > ===> Applying extra patch > > > /usr/ports/x11-servers/xorg-server/files/patch-FreeBSD.cf > > > ===> Applying extra patch > > > /usr/ports/x11-servers/xorg-server/files/patch-Imake.rules > > > ===> Applying extra patch > > > /usr/ports/x11-servers/xorg-server/files/patch-Imake.tmpl > > > ===> Applying extra patch > > > /usr/ports/x11-servers/xorg-server/files/patch-Library.tmpl > > > ===> Applying extra patch > > > /usr/ports/x11-servers/xorg-server/files/patch-X11.rules > > > ===> Applying extra patch > > > /usr/ports/x11-servers/xorg-server/files/patch-X11.tmpl > > > ===> Applying FreeBSD patches for xorg-clients-6.7.0_4 > > > Ignoring previously applied (or reversed) patch. > > > 2 out of 2 hunks ignored--saving rejects to > > > programs/dpsinfo/Imakefile.rej > > > > > > >> Patch patch-dpsinfo-Imakefile.org failed to apply cleanly. > > > >> Patch(es) patch-dpsinfo-Imakefile applied cleanly. > > > > > > *** Error code 1 > > > > > > Stop in /usr/ports/x11/xorg-clients. > > > > You probably have stale patches in your ports tree. > > > > Kris > > Will wiping out all my xorg ports and cvsup-ing fix that? > > i.e. > rm -rf /usr/ports/x11/xorg* /usr/ports/x11-servers/xorg* > /usr/ports/x11-fonts/xorg* > cvsup ports-supfile Might wanna consider removing the xorg files and dirs in /usr/ports/distfiles also for a completly clean download and rebuild. -- Best regards, Chris You can make a log of your terminal session with script(1).