- Update to version 1.0.3

- Add optional patches for ATmega644p support

PR:		ports/174783
Submitted by:	Craig Leres <leres@ee.lbl.gov> (maintainer)

7 files changed, 328 insertions, 14 deletions

diff --git a/devel/arduino/files/arduino.in b/devel/arduino/files/arduino.in
index 31d5ad06b2ba..2c737bba78f5 100644
--- a/devel/arduino/files/arduino.in
+++ b/devel/arduino/files/arduino.in
@@ -1,3 +1,8 @@
 #!/bin/sh
 # wrapper to execute the Arduino start script
-%%PREFIX%%/%%PORTNAME%%/arduino %%PREFIX%%/%%PORTNAME%%
+
+# Need the linux version of readlink
+PATH="%%LINUXBASE%%/usr/bin:${PATH}"
+export PATH
+
+exec %%PREFIX%%/%%PORTNAME%%/arduino %%PREFIX%%/%%PORTNAME%%
diff --git a/devel/arduino/files/extrapatch-hardware-arduino-boards.txt b/devel/arduino/files/extrapatch-hardware-arduino-boards.txt
new file mode 100644
index 000000000000..18073a7cf7f6
--- /dev/null
+++ b/devel/arduino/files/extrapatch-hardware-arduino-boards.txt
@@ -0,0 +1,42 @@
+--- hardware/arduino/boards.txt.orig	2012-12-10 04:03:52.000000000 -0800
++++ hardware/arduino/boards.txt	2012-12-26 21:02:48.000000000 -0800
+@@ -522,3 +522,39 @@
+ atmega8.build.f_cpu=16000000L
+ atmega8.build.core=arduino
+ atmega8.build.variant=standard
++
++##############################################################
++
++atmega644.name=ATmega644
++atmega644.upload.protocol=stk500
++atmega644.upload.maximum_size=63488
++atmega644.upload.speed=38400
++atmega644.bootloader.low_fuses=0xFF
++atmega644.bootloader.high_fuses=0xDC
++atmega644.bootloader.extended_fuses=0xFD
++atmega644.bootloader.path=atmega644p
++atmega644.bootloader.file=atmega644p
++atmega644.bootloader.unlock_bits=0x3F
++atmega644.bootloader.lock_bits=0x0F
++atmega644.build.mcu=atmega644
++atmega644.build.f_cpu=16000000L
++atmega644.build.core=atmega644
++atmega644.build.variant=atmega644p
++
++##############################################################
++
++atmega644p.name=ATmega644p
++atmega644p.upload.protocol=stk500
++atmega644p.upload.maximum_size=63488
++atmega644p.upload.speed=38400
++atmega644p.bootloader.low_fuses=0xFF
++atmega644p.bootloader.high_fuses=0xDC
++atmega644p.bootloader.extended_fuses=0xFD
++atmega644p.bootloader.path=atmega644p
++atmega644p.bootloader.file=atmega644p
++atmega644p.bootloader.unlock_bits=0x3F
++atmega644p.bootloader.lock_bits=0x0F
++atmega644p.build.mcu=atmega644p
++atmega644p.build.f_cpu=16000000L
++atmega644p.build.core=atmega644
++atmega644p.build.variant=atmega644p
diff --git a/devel/arduino/files/extrapatch-hardware-arduino-cores-arduino-WInterrupts.c b/devel/arduino/files/extrapatch-hardware-arduino-cores-arduino-WInterrupts.c
new file mode 100644
index 000000000000..62e93758a3fc
--- /dev/null
+++ b/devel/arduino/files/extrapatch-hardware-arduino-cores-arduino-WInterrupts.c
@@ -0,0 +1,24 @@
+--- hardware/arduino/cores/arduino/WInterrupts.c.orig	2012-12-28 10:24:03.000000000 -0800
++++ hardware/arduino/cores/arduino/WInterrupts.c	2012-12-28 10:24:49.000000000 -0800
+@@ -216,6 +216,21 @@
+       #warning detachInterrupt may need some more work for this cpu (case 1)
+     #endif
+       break;
++
++#if defined(INT2)
++    case 2:
++    #if defined(EIMSK)
++      EIMSK &= ~(1 << INT2);
++    #elif defined(GICR)
++      GICR &= ~(1 << INT2);
++    #elif defined(GIMSK)
++      GIMSK &= ~(1 << INT2);
++    #else
++      #warning detachInterrupt may need some more work for this cpu (case 2)
++    #endif
++      break;
++#endif
++
+ #endif
+     }
+       
diff --git a/devel/arduino/files/extrapatch-hardware-arduino-variants-atmega644p-pins_arduino.h b/devel/arduino/files/extrapatch-hardware-arduino-variants-atmega644p-pins_arduino.h
new file mode 100644
index 000000000000..2035d4aa45df
--- /dev/null
+++ b/devel/arduino/files/extrapatch-hardware-arduino-variants-atmega644p-pins_arduino.h
@@ -0,0 +1,227 @@
+--- /dev/null	2012-12-26 20:59:44.000000000 -0800
++++ hardware/arduino/variants/atmega644p/pins_arduino.h	2012-12-26 21:12:00.000000000 -0800
+@@ -0,0 +1,224 @@
++/*
++  pins_arduino.h - Pin definition functions for Arduino
++  Part of Arduino - http://www.arduino.cc/
++
++  Copyright (c) 2007 David A. Mellis
++
++  This library is free software; you can redistribute it and/or
++  modify it under the terms of the GNU Lesser General Public
++  License as published by the Free Software Foundation; either
++  version 2.1 of the License, or (at your option) any later version.
++
++  This library is distributed in the hope that it will be useful,
++  but WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++  Lesser General Public License for more details.
++
++  You should have received a copy of the GNU Lesser General
++  Public License along with this library; if not, write to the
++  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
++  Boston, MA  02111-1307  USA
++
++  $Id: pins_arduino.h 5 2012-07-30 03:39:31Z leres $
++*/
++
++#ifndef Pins_Arduino_h
++#define Pins_Arduino_h
++
++#include <avr/pgmspace.h>
++
++#define NUM_DIGITAL_PINS            32
++#define NUM_ANALOG_INPUTS           8
++#define analogInputToDigitalPin(p)  ((p < 8) ? ((p) - 7) + 24 : -1)
++#define digitalPinHasPWM(p) \
++    ((p) == 4 || (p) == 5 || (p) == 12 || (p) == 13 || (p) == 14 || (p) == 15)
++
++static const uint8_t SS   = 4;
++static const uint8_t MOSI = 5;
++static const uint8_t MISO = 6;
++static const uint8_t SCK  = 7;
++static const uint8_t SCL  = 16;
++static const uint8_t SDA  = 17;
++
++static const uint8_t A0 = 14;
++static const uint8_t A1 = 15;
++static const uint8_t A2 = 16;
++static const uint8_t A3 = 17;
++static const uint8_t A4 = 18;
++static const uint8_t A5 = 19;
++static const uint8_t A6 = 20;
++static const uint8_t A7 = 21;
++
++#ifdef notdef
++/* XXX not yet */
++#define digitalPinToPCICR(p)    (((p) >= 0 && (p) <= 21) ? (&PCICR) : ((uint8_t *)0))
++#define digitalPinToPCICRbit(p) (((p) <= 7) ? 2 : (((p) <= 13) ? 0 : 1))
++#define digitalPinToPCMSK(p)    (((p) <= 7) ? (&PCMSK2) : (((p) <= 13) ? (&PCMSK0) : (((p) <= 21) ? (&PCMSK1) : ((uint8_t *)0))))
++#define digitalPinToPCMSKbit(p) (((p) <= 7) ? (p) : (((p) <= 13) ? ((p) - 8) : ((p) - 14)))
++#endif
++
++#ifdef ARDUINO_MAIN
++
++// Digital pins are also used for the analog output (software PWM).
++// Analog input pins are a separate set.
++
++// ATMEL ATMEGA644P
++//
++//                  +---\/---+
++//     (D 0)  PB0  1|        |40  PA0 (AI 0)
++//     (D 1)  PB1  2|        |39  PA1 (AI 1)
++//     (D 2)  PB2  3|        |38  PA2 (AI 2)
++//     (D 3)  PB3  4|        |37  PA3 (AI 3)
++// PWM (D 4)  PB4  5|        |36  PA4 (AI 4)
++// PWM (D 5)  PB5  6|        |35  PA5 (AI 5)
++//     (D 6)  PB6  7|        |34  PA6 (AI 6)
++//            PB7  8|        |33  PA7 (AI 7)
++//          RESET  9|        |32  AREF
++//            VCC 10|        |31  GND
++//            GND 11|        |30  AVCC
++//          XTAL2 12|        |29  PC7 (D 23)
++//          XTAL1 13|        |28  PC6 (D 22)
++//     (D 8)  PD0 14|        |27  PC5 (D 21)
++//     (D 9)  PD1 15|        |26  PC4 (D 20)
++//     (D 10) PD2 16|        |25  PC3 (D 19)
++//     (D 11) PD3 17|        |24  PC2 (D 18)
++// PWM (D 12) PD4 18|        |23  PC1 (D 17)
++// PWM (D 13) PD5 19|        |22  PC0 (D 16)
++// PWM (D 14) PD6 20|        |21  PD7 (D 15) PWM
++//                  +--------+
++
++// these arrays map port names (e.g. port B) to the
++// appropriate addresses for various functions (e.g. reading
++// and writing)
++const uint16_t PROGMEM port_to_mode_PGM[] = {
++	NOT_A_PORT,
++	(uint16_t) &DDRA,
++	(uint16_t) &DDRB,
++	(uint16_t) &DDRC,
++	(uint16_t) &DDRD,
++};
++
++const uint16_t PROGMEM port_to_output_PGM[] = {
++	NOT_A_PORT,
++	(uint16_t) &PORTA,
++	(uint16_t) &PORTB,
++	(uint16_t) &PORTC,
++	(uint16_t) &PORTD,
++};
++
++const uint16_t PROGMEM port_to_input_PGM[] = {
++	NOT_A_PORT,
++	(uint16_t) &PINA,
++	(uint16_t) &PINB,
++	(uint16_t) &PINC,
++	(uint16_t) &PIND,
++};
++
++const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
++	PB, /* 0 */
++	PB,
++	PB,
++	PB,
++	PB,
++	PB,
++	PB,
++	PB,
++	PD, /* 8 */
++	PD,
++	PD,
++	PD,
++	PD,
++	PD,
++	PD,
++	PD,
++	PC, /* 16 */
++	PC,
++	PC,
++	PC,
++	PC,
++	PC,
++	PC,
++	PC,
++	PA, /* 24 */
++	PA,
++	PA,
++	PA,
++	PA,
++	PA,
++	PA,
++	PA  /* 31 */
++};
++
++const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = {
++	_BV(0), /* 0, port B */
++	_BV(1),
++	_BV(2),
++	_BV(3),
++	_BV(4),
++	_BV(5),
++	_BV(6),
++	_BV(7),
++	_BV(0), /* 8, port D */
++	_BV(1),
++	_BV(2),
++	_BV(3),
++	_BV(4),
++	_BV(5),
++	_BV(6),
++	_BV(7),
++	_BV(0), /* 16, port C */
++	_BV(1),
++	_BV(2),
++	_BV(3),
++	_BV(4),
++	_BV(5),
++	_BV(6),
++	_BV(7),
++	_BV(7), /* 24, port A */
++	_BV(6),
++	_BV(5),
++	_BV(4),
++	_BV(3),
++	_BV(2),
++	_BV(1),
++	_BV(0)
++};
++
++const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
++	NOT_ON_TIMER,	/* 0  - PB0 */
++	NOT_ON_TIMER,	/* 1  - PB1 */
++	NOT_ON_TIMER,	/* 2  - PB2 */
++	TIMER0A,	/* 3  - PB3 */
++	TIMER0B,	/* 4  - PB4 */
++	NOT_ON_TIMER,	/* 5  - PB5 */
++	NOT_ON_TIMER,	/* 6  - PB6 */
++	NOT_ON_TIMER,	/* 7  - PB7 */
++	NOT_ON_TIMER,	/* 8  - PD0 */
++	NOT_ON_TIMER,	/* 9  - PD1 */
++	NOT_ON_TIMER,	/* 10 - PD2 */
++	NOT_ON_TIMER,	/* 11 - PD3 */
++	TIMER1B,	/* 12 - PD4 */
++	TIMER1A,	/* 13 - PD5 */
++	TIMER2B,	/* 14 - PD6 */
++	TIMER2A,	/* 15 - PD7 */
++	NOT_ON_TIMER,	/* 16 - PC0 */
++	NOT_ON_TIMER,	/* 17 - PC1 */
++	NOT_ON_TIMER,	/* 18 - PC2 */
++	NOT_ON_TIMER,	/* 19 - PC3 */
++	NOT_ON_TIMER,	/* 20 - PC4 */
++	NOT_ON_TIMER,	/* 21 - PC5 */
++	NOT_ON_TIMER,	/* 22 - PC6 */
++	NOT_ON_TIMER,	/* 23 - PC7 */
++	NOT_ON_TIMER,	/* 24 - PA0 */
++	NOT_ON_TIMER,	/* 25 - PA1 */
++	NOT_ON_TIMER,	/* 26 - PA2 */
++	NOT_ON_TIMER,	/* 27 - PA3 */
++	NOT_ON_TIMER,	/* 28 - PA4 */
++	NOT_ON_TIMER,	/* 29 - PA5 */
++	NOT_ON_TIMER,	/* 30 - PA6 */
++	NOT_ON_TIMER	/* 31 - PA7 */
++};
++
++#endif
++
++#endif
diff --git a/devel/arduino/files/patch-hardware-arduino-bootloaders-atmega8-ATmegaBOOT.c b/devel/arduino/files/patch-hardware-arduino-bootloaders-atmega8-ATmegaBOOT.c
deleted file mode 100644
index ba3a9aec8f0b..000000000000
--- a/devel/arduino/files/patch-hardware-arduino-bootloaders-atmega8-ATmegaBOOT.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c.orig	2011-03-21 15:17:03.000000000 +0800
-+++ hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c	2011-03-21 15:17:23.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
- 
diff --git a/devel/arduino/files/patch-hardware-arduino-cores-arduino-HardwareSerial.cpp b/devel/arduino/files/patch-hardware-arduino-cores-arduino-HardwareSerial.cpp
new file mode 100644
index 000000000000..7b9549828433
--- /dev/null
+++ b/devel/arduino/files/patch-hardware-arduino-cores-arduino-HardwareSerial.cpp
@@ -0,0 +1,29 @@
+--- hardware/arduino/cores/arduino/HardwareSerial.cpp.orig	2012-07-28 21:20:49.000000000 -0700
++++ hardware/arduino/cores/arduino/HardwareSerial.cpp	2012-07-28 21:24:52.000000000 -0700
+@@ -129,8 +129,6 @@
+     unsigned char c = UDR1;
+     store_char(c, &rx_buffer1);
+   }
+-#elif defined(SIG_USART1_RECV)
+-  #error SIG_USART1_RECV
+ #endif
+ 
+ #if defined(USART2_RX_vect) && defined(UDR2)
+@@ -142,8 +140,6 @@
+     unsigned char c = UDR2;
+     store_char(c, &rx_buffer2);
+   }
+-#elif defined(SIG_USART2_RECV)
+-  #error SIG_USART2_RECV
+ #endif
+ 
+ #if defined(USART3_RX_vect) && defined(UDR3)
+@@ -155,8 +151,6 @@
+     unsigned char c = UDR3;
+     store_char(c, &rx_buffer3);
+   }
+-#elif defined(SIG_USART3_RECV)
+-  #error SIG_USART3_RECV
+ #endif
+ 
+ void serialEventRun(void)
diff --git a/devel/arduino/files/pkg-message.in b/devel/arduino/files/pkg-message.in
index 3652b0a77f4e..9cda56771309 100644
--- a/devel/arduino/files/pkg-message.in
+++ b/devel/arduino/files/pkg-message.in
@@ -1,4 +1,3 @@
-
 Notes on using the Arduino IDE:
 
 To allow serial port locking, add your user to the dialer group:
@@ -17,4 +16,3 @@ visible if you started the IDE from a console):
 
 To start the IDE:
     %%PREFIX%%/bin/arduino
-