From owner-freebsd-x11@FreeBSD.ORG  Tue Feb  7 21:58:31 2012
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
Delivered-To: freebsd-x11@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C807D106564A
	for <freebsd-x11@freebsd.org>; Tue,  7 Feb 2012 21:58:31 +0000 (UTC)
	(envelope-from wblock@wonkity.com)
Received: from wonkity.com (wonkity.com [67.158.26.137])
	by mx1.freebsd.org (Postfix) with ESMTP id 84A408FC0A
	for <freebsd-x11@freebsd.org>; Tue,  7 Feb 2012 21:58:31 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
	by wonkity.com (8.14.5/8.14.5) with ESMTP id q17LNg8Y090965;
	Tue, 7 Feb 2012 14:23:42 -0700 (MST)
	(envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
	by wonkity.com (8.14.5/8.14.5/Submit) with ESMTP id q17LNgiJ090962;
	Tue, 7 Feb 2012 14:23:42 -0700 (MST)
	(envelope-from wblock@wonkity.com)
Date: Tue, 7 Feb 2012 14:23:42 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: Meowthink <meowthink@gmail.com>
In-Reply-To: <CABnABobGoLGO200z238o=xNRgrOhA4s2xAnJ-mTiQ+vsUKDw=A@mail.gmail.com>
Message-ID: <alpine.BSF.2.00.1202071413280.88011@wonkity.com>
References: <CABnABobGoLGO200z238o=xNRgrOhA4s2xAnJ-mTiQ+vsUKDw=A@mail.gmail.com>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7
	(wonkity.com [127.0.0.1]); Tue, 07 Feb 2012 14:23:42 -0700 (MST)
Cc: freebsd-x11@freebsd.org
Subject: Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Feb 2012 21:58:31 -0000

On Tue, 7 Feb 2012, Meowthink wrote:

> to Warren,
> Yes, $FreeBSD$ id in i915_suspend.c should be manually edited BEFORE
> patch(or try to deal with svn:keywords).
> And ... I don't know why you got those Makefiles rejected, as they
> were there, not modified in the official repository, for quite a long
> time. Any detail?

It's the path for the first two Makefiles.  Or something about patch, 
maybe:

   # sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/ /usr/src/sys/dev/drm/i915_suspend.c
   # cd /usr/src
   # patch < drm-all.13.1-stable9.1.patch

fails.  But this works:

   # sed -i -e 's/FreeBSD: src.*Exp /FreeBSD/ /usr/src/sys/dev/drm/i915_suspend.c
   # cd /usr/src/sys
   # patch -p1 < drm-all.13.1-stable9.1.patch