From owner-svn-ports-head@freebsd.org Fri Oct 28 21:32:03 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E6A6C25135; Fri, 28 Oct 2016 21:32:03 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DBD31777; Fri, 28 Oct 2016 21:32:03 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9SLW2o5040308; Fri, 28 Oct 2016 21:32:02 GMT (envelope-from bsam@FreeBSD.org) Received: (from bsam@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9SLW26s040303; Fri, 28 Oct 2016 21:32:02 GMT (envelope-from bsam@FreeBSD.org) Message-Id: <201610282132.u9SLW26s040303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bsam set sender to bsam@FreeBSD.org using -f From: Boris Samorodov Date: Fri, 28 Oct 2016 21:32:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424885 - in head/devel/arduino-core: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2016 21:32:03 -0000 Author: bsam Date: Fri Oct 28 21:32:01 2016 New Revision: 424885 URL: https://svnweb.freebsd.org/changeset/ports/424885 Log: devel/arduino-core: Enable SAM platforms for use in the IDE, simplify package_index_bundled.json. PR: 213838 Submitted by: Kyle Enavs (maintainer) Added: head/devel/arduino-core/files/extrapatch-hardware_arduino_samd_platform.txt (contents, props changed) head/devel/arduino-core/files/patch-hardware_arduino_sam_platform.txt (contents, props changed) Modified: head/devel/arduino-core/Makefile head/devel/arduino-core/files/patch-hardware_package__index__bundled.json Modified: head/devel/arduino-core/Makefile ============================================================================== --- head/devel/arduino-core/Makefile Fri Oct 28 20:38:17 2016 (r424884) +++ head/devel/arduino-core/Makefile Fri Oct 28 21:32:01 2016 (r424885) @@ -2,6 +2,7 @@ PORTNAME= arduino-core PORTVERSION= 1.6.12 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= bsdports@kyle-evans.net @@ -22,6 +23,7 @@ OPTIONS_SUB= yes NO_BUILD= yes SAMD_DESC= Core support for SAMD boards (Zero/MKR1000) SAMD_GH_TUPLE= arduino:ArduinoCore-samd:1.6.8:samd/hardware/arduino/samd +SAMD_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-hardware_arduino_samd_platform.txt .include Added: head/devel/arduino-core/files/extrapatch-hardware_arduino_samd_platform.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/arduino-core/files/extrapatch-hardware_arduino_samd_platform.txt Fri Oct 28 21:32:01 2016 (r424885) @@ -0,0 +1,20 @@ +--- hardware/arduino/samd/platform.txt.orig 2016-10-12 14:28:09 UTC ++++ hardware/arduino/samd/platform.txt +@@ -111,7 +111,7 @@ recipe.size.regex=\.text\s+([0-9]+).* + # + # BOSSA + # +-tools.bossac.path={runtime.tools.bossac-1.7.0.path} ++tools.bossac.path={runtime.tools.bossac.path}/bin + tools.bossac.cmd=bossac + tools.bossac.cmd.windows=bossac.exe + +@@ -125,7 +125,7 @@ tools.bossac_remote.upload.pattern=/usr/ + # OpenOCD sketch upload + # + +-tools.openocd.path={runtime.tools.openocd-0.9.0-arduino.path} ++tools.openocd.path={runtime.tools.openocd.path}/bin + tools.openocd.cmd=bin/openocd + tools.openocd.cmd.windows=bin/openocd.exe + Added: head/devel/arduino-core/files/patch-hardware_arduino_sam_platform.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/arduino-core/files/patch-hardware_arduino_sam_platform.txt Fri Oct 28 21:32:01 2016 (r424885) @@ -0,0 +1,11 @@ +--- hardware/arduino/sam/platform.txt.orig 2016-09-21 10:09:37 UTC ++++ hardware/arduino/sam/platform.txt +@@ -96,7 +96,7 @@ recipe.size.regex=\.text\s+([0-9]+).* + # ------------------- + + # BOSSA +-tools.bossac.path={runtime.tools.bossac.path} ++tools.bossac.path={runtime.tools.bossac.path}/bin + tools.bossac.cmd=bossac + tools.bossac.cmd.windows=bossac.exe + Modified: head/devel/arduino-core/files/patch-hardware_package__index__bundled.json ============================================================================== --- head/devel/arduino-core/files/patch-hardware_package__index__bundled.json Fri Oct 28 20:38:17 2016 (r424884) +++ head/devel/arduino-core/files/patch-hardware_package__index__bundled.json Fri Oct 28 21:32:01 2016 (r424885) @@ -1,22 +1,126 @@ ---- hardware/package_index_bundled.json.orig 2016-10-04 12:22:50 UTC +--- hardware/package_index_bundled.json.orig 2016-09-21 10:09:37 UTC +++ hardware/package_index_bundled.json -@@ -63,6 +63,9 @@ +@@ -17,10 +17,6 @@ + "help": { + "online": "http://www.arduino.cc/en/Reference/HomePage" + }, +- "url": "http://downloads.arduino.cc/cores/avr-1.6.13.tar.bz2", +- "archiveFileName": "avr-1.6.14.tar.bz2", +- "checksum": "SHA-256:a5f7d66c83e3d4722f4c8dab42bdbcf5af98c611ffca1802ef3d1957b894bd92", +- "size": "4993455", + "boards": [ + {"name": "Arduino Yún"}, + {"name": "Arduino/Genuino Uno"}, +@@ -55,6 +51,22 @@ + "version": "6.3.0-arduino6" + } + ] ++ }, ++ { ++ "name": "Arduino SAM Boards (32-bits ARM Cortex-M3)", ++ "architecture": "sam", ++ "version": "1.6.9", ++ "category": "Arduino", ++ "boards": [ ++ {"name": "Arduino Due"} ++ ], ++ "toolsDependencies": [ ++ { ++ "packager": "arduino", ++ "name": "bossac", ++ "version": "1.7.0" ++ } ++ ] + } + ], + "tools": [ +@@ -63,39 +75,7 @@ "version": "6.3.0-arduino6", "systems": [ { +- "size": "644600", +- "checksum": "SHA-256:2426207423d58eb0e5fc4df9493418f1cb54ba3f328fdc7c3bb582f920b9cbe7", +- "host": "arm-linux-gnueabihf", +- "archiveFileName": "avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2", +- "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2" +- }, +- { +- "size": "696273", +- "checksum": "SHA-256:d9a039c9e92d3dbb2011e75e6c044a1a4a2789e2fbf8386b1d580994811be084", +- "host": "i386-apple-darwin11", +- "archiveFileName": "avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2", +- "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2" +- }, +- { +- "size": "746653", +- "checksum": "SHA-256:97b4875cad6110c70101bb776f3ac37b64a2e73f036cd0b10afb6f4be96a6621", +- "host": "x86_64-linux-gnu", +- "archiveFileName": "avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2", +- "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" +- }, +- { +- "size": "733127", +- "checksum": "SHA-256:5f4bc4b0957b1d34cec9908b7f84a7c297b894b39fe16a4992c284b24c00d6fb", +- "host": "i686-linux-gnu", +- "archiveFileName": "avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2", +- "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2" +- }, +- { +- "size": "645859", +- "checksum": "SHA-256:7468a1bcdfa459d175a095b102c0de28efc466accfb104305fbcad7832659ddc", +- "host": "i686-mingw32", +- "archiveFileName": "avrdude-6.3.0-arduino6-i686-mingw32.zip", +- "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-mingw32.zip" + "host": "%%ARCH%%-freebsd%%OSREL%%" -+ }, -+ { - "size": "644600", - "checksum": "SHA-256:2426207423d58eb0e5fc4df9493418f1cb54ba3f328fdc7c3bb582f920b9cbe7", - "host": "arm-linux-gnueabihf", -@@ -104,6 +107,9 @@ + } + ] + }, +@@ -104,39 +84,16 @@ "version": "4.9.2-atmel3.5.3-arduino2", "systems": [ { +- "size": "27400889", +- "checksum": "SHA-256:77f300d519bc6b9a25df17b36cb303218e9a258c059b2f6bff8f71a0d8f96821", +- "host": "arm-linux-gnueabihf", +- "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2", +- "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2" +- }, +- { +- "size": "27048070", +- "checksum": "SHA-256:311258af188defe24a4b341e4e1f4dc93ca6c80516d3e3b55a2fc07a7050248b", +- "host": "i386-apple-darwin11", +- "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2", +- "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2" +- }, +- { +- "size": "43847945", +- "checksum": "SHA-256:f8e6ede8746c70be01ec79a30803277cd94360cc5b2e104762da0fbcf536fcc6", +- "host": "i686-mingw32", +- "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip", +- "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip" +- }, +- { +- "size": "29292729", +- "checksum": "SHA-256:f108951e7c4dc90926d1fc76cc27549f6ea63c702a2bb7ff39647a19ae86ec68", +- "host": "i686-linux-gnu", +- "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2", +- "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2" +- }, + "host": "%%ARCH%%-freebsd%%OSREL%%" -+ }, -+ { - "size": "27400889", - "checksum": "SHA-256:77f300d519bc6b9a25df17b36cb303218e9a258c059b2f6bff8f71a0d8f96821", - "host": "arm-linux-gnueabihf", ++ } ++ ] ++ }, ++ { ++ "name": "bossac", ++ "version": "1.7.0", ++ "systems": [ + { +- "size": "29882960", +- "checksum": "SHA-256:3903a6d1bb9fdd91727e504b5993d5501f119bcb7f99f7aee98a2101e5629188", +- "host": "x86_64-linux-gnu", +- "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2", +- "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2" ++ "host": "%%ARCH%%-freebsd%%OSREL%%" + } + ] + }