ports/154829: [PATCH] devel/arduino: Eliminate references to legacy include

[Craig Leres]

>Number:         154829
>Category:       ports
>Synopsis:       [PATCH] devel/arduino: Eliminate references to legacy include
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 16 19:30:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Craig Leres
>Release:        FreeBSD 8.1-RELEASE amd64
>Organization:
Lawrence Berkeley National Laboratory
>Environment:
	FreeBSD hot.ee.lbl.gov 8.1-RELEASE FreeBSD 8.1-RELEASE #6 r16: Sat Jan
 1 11:54:26 PST 2011
leres at hot.ee.lbl.gov:/usr/src/8.1-RELEASE/sys/amd64/compile/LBLSMPIPV6
amd64

>Description:
	The include file avr/delay.h in avr-libc 1.7.0 has been
	depreciated; the new include is util/delay.h. If you include
	avr/delay.h, a gcc warning is generated.

	This is true for the FreeBSD port version of arduino (0019)
	as well as the current released version (0022).

>How-To-Repeat:
	Try to build a sketch with -Werror turned on:

	    /usr/local/bin/avr-gcc -c -Werror -mmcu=atmega328p -DF_CPU=16000000
- -I. -I/usr/local/arduino/hardware/arduino/cores/arduino
- -I/usr/local/arduino -I/usr/local/arduino/local/libraries
- -I/usr/local/arduino/libraries/EEPROM -g -Os -w -Wall
- -ffunction-sections -fdata-sections -std=gnu99
/usr/local/arduino/hardware/arduino/cores/arduino/WInterrupts.c -o
build-cli/WInterrupts.o
	    In file included from
/usr/local/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
			     from
/usr/local/arduino/hardware/arduino/cores/arduino/WInterrupts.c:33:
	
/usr/local/lib/gcc/avr/4.3.4/../../../../avr/include/avr/delay.h:36:2:
error: #warning "This file has been moved to <util/delay.h>."
	    gmake: *** [build-cli/WInterrupts.o] Error 1

>Fix:
	I have filed an upstream ticket:

	    http://code.google.com/p/arduino/issues/detail?id=480

	which I assume will be part of some future release > 0022.

	The attached patch files are to be put in devel/arduino/files.
	They work work with both 0019 (current port version) and 0022
	(current released version).

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1cI8cACgkQWxlAhAje3JuPwQCdEvxLIokz8lvnOZOy7q8TrJqm
s5AAn29Nxybj05M80v3yw4oc1qTZiOVJ
=nWk1
-----END PGP SIGNATURE-----

--------------010701030806060300050103
Content-Type: text/plain;
 name="patch-hardware-arduino-bootloaders-atmega8-ATmegaBOOT.c"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="patch-hardware-arduino-bootloaders-atmega8-ATmegaBOOT.c"

--- hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c.orig	2010-09-20 08:54:44.000000000 -0700
+++ hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c	2011-02-16 10:49:29.000000000 -0800
@@ -36,7 +36,7 @@
 #include <avr/pgmspace.h>
 #include <avr/eeprom.h>
 #include <avr/interrupt.h>
-#include <avr/delay.h>
+#include <util/delay.h>
 
 //#define F_CPU			16000000
 

--------------010701030806060300050103
Content-Type: text/plain;
 name="patch-hardware-arduino-cores-arduino-wiring_private.h"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="patch-hardware-arduino-cores-arduino-wiring_private.h"

--- hardware/arduino/cores/arduino/wiring_private.h.orig	2010-09-20 08:54:45.000000000 -0700
+++ hardware/arduino/cores/arduino/wiring_private.h	2011-02-16 10:52:54.000000000 -0800
@@ -27,7 +27,7 @@
 
 #include <avr/io.h>
 #include <avr/interrupt.h>
-#include <avr/delay.h>
+#include <util/delay.h>
 #include <stdio.h>
 #include <stdarg.h>
 

--------------010701030806060300050103
Content-Type: application/octet-stream;
 name="patch-hardware-arduino-bootloaders-atmega8-ATmegaBOOT.c.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename*0="patch-hardware-arduino-bootloaders-atmega8-ATmegaBOOT.c.sig"

iEYEABECAAYFAk1cI8cACgkQWxlAhAje3JuQkQCdFP1mvlcB/0glwfjNU9j9c7cuyYQAn0QL
X2nZ6IUDI8VW93AxFFJaNCMz
--------------010701030806060300050103
Content-Type: application/octet-stream;
 name="patch-hardware-arduino-cores-arduino-wiring_private.h.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename*0="patch-hardware-arduino-cores-arduino-wiring_private.h.sig"

iEYEABECAAYFAk1cI8cACgkQWxlAhAje3JsnkQCggJingpiG0KEmBsozg4PYpre6UwkAmgPT
/ndtJaOHb8Q3SUg5dYnGZQtr
--------------010701030806060300050103--
>Release-Note:
>Audit-Trail:
>Unformatted:
 This is a multi-part message in MIME format.
 --------------010701030806060300050103
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1