Date: Thu, 21 Oct 2004 19:50:43 -0500 From: Chris <racerx@makeworld.com> To: freebsd-current@freebsd.org, Andrew Marks <amracks@gmail.com> Subject: Re: xorg-clients broken patches on 5.3-RC1 Message-ID: <200410211950.43353.racerx@makeworld.com> In-Reply-To: <4415e9c104102117463d9ff6f7@mail.gmail.com> References: <4415e9c104102117372ed41d27@mail.gmail.com> <20041022004228.GA67788@xor.obsecurity.org> <4415e9c104102117463d9ff6f7@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thursday 21 October 2004 07:46 pm, Andrew Marks wrote: > On Thu, 21 Oct 2004 17:42:28 -0700, Kris Kennaway <kris@obsecurity.org> 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).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410211950.43353.racerx>