--- Makefile	(revision 436252)
+++ Makefile	(working copy)
@@ -21,7 +21,7 @@ 
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		dos2unix tar:tgz kmod
-DOS2UNIX_REGEX=	.*\(\.\(c|cpp|h|hex|html|ino|lst|txt\)|Makefile\)
+DOS2UNIX_REGEX=	.*(\.(c|cpp|h|hex|txt)|Makefile|makefile)
 
 USE_JAVA=	yes
 JAVA_OS=	native
--- files/extrapatch-hardware-arduino-boards.txt	(revision 436252)
+++ files/extrapatch-hardware-arduino-boards.txt	(working copy)
@@ -1,12 +1,9 @@ 
---- 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
-+
-+##############################################################
-+
+--- hardware/arduino/boards.txt.orig	2017-03-15 17:34:53 UTC
++++ hardware/arduino/boards.txt
+@@ -525,6 +525,24 @@ atmega8.build.variant=standard
+ 
+ ##############################################################
+ 
 +atmega644.name=ATmega644
 +atmega644.upload.protocol=stk500
 +atmega644.upload.maximum_size=63488
@@ -18,7 +15,7 @@ 
 +atmega644.bootloader.file=atmega644p
 +atmega644.bootloader.unlock_bits=0x3F
 +atmega644.bootloader.lock_bits=0x0F
-+atmega644.build.mcu=atmega644
++atmega644.build.mcu=atmega644p
 +atmega644.build.f_cpu=16000000L
 +atmega644.build.core=atmega644
 +atmega644.build.variant=atmega644p
@@ -25,18 +22,6 @@ 
 +
 +##############################################################
 +
-+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
+ robotControl.name=Arduino Robot Control
+ robotControl.upload.protocol=avr109
+ robotControl.upload.maximum_size=28672