From owner-freebsd-ports@FreeBSD.ORG  Fri Jan  4 17:08:18 2008
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3374116A420;
	Fri,  4 Jan 2008 17:08:18 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from out4.smtp.messagingengine.com (out4.smtp.messagingengine.com
	[66.111.4.28])
	by mx1.freebsd.org (Postfix) with ESMTP id 0F89613C4CC;
	Fri,  4 Jan 2008 17:08:17 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from compute1.internal (compute1.internal [10.202.2.41])
	by out1.messagingengine.com (Postfix) with ESMTP id 6639582E23;
	Fri,  4 Jan 2008 11:48:34 -0500 (EST)
Received: from heartbeat1.messagingengine.com ([10.202.2.160])
	by compute1.internal (MEProxy); Fri, 04 Jan 2008 11:48:34 -0500
X-Sasl-enc: H+A0/ydNSFPYq5x7+B5X63rqgzRJQNwI0y3Udd8P91PI 1199465314
Received: from empiric.lon.incunabulum.net
	(82-35-112-254.cable.ubr07.dals.blueyonder.co.uk [82.35.112.254])
	by mail.messagingengine.com (Postfix) with ESMTP id E5485B68E;
	Fri,  4 Jan 2008 11:48:33 -0500 (EST)
Message-ID: <477E6360.3070908@incunabulum.net>
Date: Fri, 04 Jan 2008 16:48:32 +0000
From: Bruce M Simpson <bms@incunabulum.net>
User-Agent: Thunderbird 2.0.0.6 (X11/20070928)
MIME-Version: 1.0
To: stas@FreeBSD.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: freebsd-ports@FreeBSD.org
Subject: [PATCH] devel/jtag fails to build if Shockwave Flash is installed
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jan 2008 17:08:18 -0000

Include paths get mixed up by the build -- it will always look in 
/usr/local/include first, this is explicit, and it incorrectly sees the 
Shockwave Flash includes.

empiric# diff -uN eraseflash.c.orig eraseflash.c
--- eraseflash.c.orig   Fri Jan  4 16:44:40 2008
+++ eraseflash.c        Fri Jan  4 16:46:08 2008
@@ -29,7 +29,7 @@
 #include <string.h>

 #include "jtag.h"
-#include "flash.h"
+#include "../../include/flash.h"

 #include "cmd.h"

empiric# diff -uN flashmem.c.orig flashmem.c
--- flashmem.c.orig     Fri Jan  4 16:42:31 2008
+++ flashmem.c  Fri Jan  4 16:46:18 2008
@@ -29,7 +29,7 @@
 #include <string.h>

 #include "jtag.h"
-#include "flash.h"
+#include "../../include/flash.h"

 #include "cmd.h"