Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Mar 2017 00:30:07 +0000 (UTC)
From:      "Carlos J. Puga Medina" <cpm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r436366 - in head/devel/arduino: . files
Message-ID:  <201703180030.v2I0U7rF018239@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cpm
Date: Sat Mar 18 00:30:07 2017
New Revision: 436366
URL: https://svnweb.freebsd.org/changeset/ports/436366

Log:
  devel/arduino: fix DOS2UNIX_REGEX, update atmega644 boards patch
  
  - Many installed source files had CRLF line endings. This was due to too
    much escaping in DOS2UNIX_REGEX. Reduce the list of extensions to just
    the ones that need it and add (lower case) makefile.
  - Update optional 644 boards.txt patch to be like the atmega328 version.
    Only add one board called atmega644 with the mcu set to atmega644p.
  - Bump PORTREVISION
  
  PR:             217817
  Submitted by:   Craig Leres <leres@ee.lbl.gov> (maintainer)

Modified:
  head/devel/arduino/Makefile
  head/devel/arduino/files/extrapatch-hardware-arduino-boards.txt

Modified: head/devel/arduino/Makefile
==============================================================================
--- head/devel/arduino/Makefile	Fri Mar 17 23:42:52 2017	(r436365)
+++ head/devel/arduino/Makefile	Sat Mar 18 00:30:07 2017	(r436366)
@@ -3,7 +3,7 @@
 
 PORTNAME=	arduino
 PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel java lang
 MASTER_SITES=	http://arduino.cc/download.php?f=/
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${JAVA_HOME}/jre/lib/ext/RX
 
 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

Modified: head/devel/arduino/files/extrapatch-hardware-arduino-boards.txt
==============================================================================
--- head/devel/arduino/files/extrapatch-hardware-arduino-boards.txt	Fri Mar 17 23:42:52 2017	(r436365)
+++ head/devel/arduino/files/extrapatch-hardware-arduino-boards.txt	Sat Mar 18 00:30:07 2017	(r436366)
@@ -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,25 +15,13 @@
 +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
 +
 +##############################################################
 +
-+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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703180030.v2I0U7rF018239>