From owner-freebsd-current@FreeBSD.ORG  Fri Oct 22 00:47:05 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
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 8543016A4CE
	for <freebsd-current@freebsd.org>;
	Fri, 22 Oct 2004 00:47:05 +0000 (GMT)
Received: from rproxy.gmail.com (rproxy.gmail.com [64.233.170.193])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 38D0A43D5A
	for <freebsd-current@freebsd.org>;
	Fri, 22 Oct 2004 00:47:05 +0000 (GMT)
	(envelope-from amracks@gmail.com)
Received: by rproxy.gmail.com with SMTP id 79so88869rnk
	for <freebsd-current@freebsd.org>;
	Thu, 21 Oct 2004 17:47:04 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
	s=beta; d=gmail.com;
	h=received:message-id:date:from:reply-to:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:references;
	b=sjqrlL4EmoXFhAT0O8U1iSv22n9I3gJq9Gnw0EQU3kRh9DpOhsliw/910FJZQ1lCWeCDvoJi1N4+RAx8GHIyLaCPuck2Ab4BYAmgyVsW2Q7WAuj9y2tztVXLM04mWQJ1H9/j5xVBclLHIRFWkSWaD9yBiYg6+UC9QYrc5dxrpIo=
Received: by 10.38.77.47 with SMTP id z47mr255837rna;
        Thu, 21 Oct 2004 17:46:53 -0700 (PDT)
Received: by 10.38.74.74 with HTTP; Thu, 21 Oct 2004 17:46:53 -0700 (PDT)
Message-ID: <4415e9c104102117463d9ff6f7@mail.gmail.com>
Date: Thu, 21 Oct 2004 17:46:53 -0700
From: Andrew Marks <amracks@gmail.com>
To: freebsd-current@freebsd.org
In-Reply-To: <20041022004228.GA67788@xor.obsecurity.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
References: <4415e9c104102117372ed41d27@mail.gmail.com>
	 <20041022004228.GA67788@xor.obsecurity.org>
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: Andrew Marks <amracks@gmail.com>
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Oct 2004 00:47:05 -0000

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

-Andrew