On Mon, Dec 16, 2019 at 10:43:17AM -0600, joshua stein wrote:
> This also adds Adafruit's boards to boards.txt to make it easier to
> build for them with devel/arduino-makefile.
This works great here.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/arduino/Makefile,v
> retrieving revision 1.20
> diff -u -p -u -p -r1.20 Makefile
> --- Makefile 12 Jul 2019 21:02:13 -0000 1.20
> +++ Makefile 16 Dec 2019 16:41:50 -0000
> @@ -2,20 +2,22 @@
>
> COMMENT= open-source electronics prototyping platform
>
> -V= 1.8.7
> -AVR_V= 1.6.23
> -EPOCH= 0
> +V= 1.8.10
> +AVR_V= 1.8.2
> +ADAFRUIT_BOARDS_V= 0dad98d190ebd0e22e7be08f114d27a94784b7d8
> GH_ACCOUNT= arduino
> GH_PROJECT= arduino
> GH_TAGNAME= ${V}
>
> DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
> - ArduinoCore-avr-${AVR_V}${EXTRACT_SUFX}:0
> + ArduinoCore-avr-${AVR_V}${EXTRACT_SUFX}:0 \
> + ${ADAFRUIT_BOARDS_V}${EXTRACT_SUFX}:1
>
> CATEGORIES= devel
> HOMEPAGE= https://www.arduino.cc/
>
> MASTER_SITES0=
> https://github.com/${GH_ACCOUNT}/ArduinoCore-avr/archive/${AVR_V}/
> +MASTER_SITES1=
> https://github.com/adafruit/Adafruit_Arduino_Boards/archive/
>
> # arduino core + libraries: LGPLv2.1
> # frontend application: GPLv2 (not shipped yet)
> @@ -31,6 +33,12 @@ NO_TEST= Yes
> PKG_ARCH= *
> WRKDIST= ${WRKDIR}/Arduino-${V}
> AVR_WRKDIST= ${WRKDIR}/ArduinoCore-avr-${AVR_V}
> +ADAFRUIT_WRKDIST= ${WRKDIR}/Adafruit_Arduino_Boards-${ADAFRUIT_BOARDS_V}
> +
> +post-extract:
> + cd ${ADAFRUIT_WRKDIST} && tar -cf - bootloaders libraries variants | \
> + (cd ${AVR_WORKDIST} && tar xf -)
> + cat ${ADAFRUIT_WRKDIST}/boards.txt >> ${AVR_WRKDIST}/boards.txt
>
> do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/{,doc,examples}/arduino
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/arduino/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- distinfo 8 Nov 2018 01:00:59 -0000 1.5
> +++ distinfo 16 Dec 2019 16:41:50 -0000
> @@ -1,4 +1,6 @@
> -SHA256 (ArduinoCore-avr-1.6.23.tar.gz) =
> RvFEKzP5FlwJUdtkUBwkp8EJ+58k57se3ivW/GnMcLM=
> -SHA256 (arduino-1.8.7.tar.gz) = WYYpWSokV+WXBF0aiizdckhy+3LlrSTrXymXedDDoYE=
> -SIZE (ArduinoCore-avr-1.6.23.tar.gz) = 5477007
> -SIZE (arduino-1.8.7.tar.gz) = 38372798
> +SHA256 (0dad98d190ebd0e22e7be08f114d27a94784b7d8.tar.gz) =
> jy2qC6zTRm/ZlhNh04W4kpY0XjQNXNuQEXUHwKHQ6M0=
> +SHA256 (ArduinoCore-avr-1.8.2.tar.gz) =
> HCaPdR1WSDtSkLFd3lj3MqxlUfjFsxjcWBoYzMIMFMA=
> +SHA256 (arduino-1.8.10.tar.gz) = mwqz3o2LldZ8dNums0yEpoQldsVqtSFJBFXyHuHj8EM=
> +SIZE (0dad98d190ebd0e22e7be08f114d27a94784b7d8.tar.gz) = 194320
> +SIZE (ArduinoCore-avr-1.8.2.tar.gz) = 5476614
> +SIZE (arduino-1.8.10.tar.gz) = 42779826
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/arduino/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 PLIST
> --- pkg/PLIST 8 Nov 2018 01:00:59 -0000 1.7
> +++ pkg/PLIST 16 Dec 2019 16:41:50 -0000
> @@ -44,8 +44,6 @@ share/arduino/bootloaders/caterina-LilyP
> share/arduino/bootloaders/caterina/Caterina-Circuitplay32u4.hex
> share/arduino/bootloaders/caterina/Caterina-Esplora.hex
> share/arduino/bootloaders/caterina/Caterina-Esplora.txt
> -share/arduino/bootloaders/caterina/Caterina-Genuino-Micro.hex
> -share/arduino/bootloaders/caterina/Caterina-Genuino-Micro.txt
> share/arduino/bootloaders/caterina/Caterina-Industrial101.hex
> share/arduino/bootloaders/caterina/Caterina-Leonardo.hex
> share/arduino/bootloaders/caterina/Caterina-Leonardo.txt
> @@ -252,14 +250,14 @@ share/arduino/firmwares/wifishield/wifiH
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR1/
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR1/GCC/
> -share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR1/GCC/lib_ucr1_hd_sdio_v2.7.0.a
> -share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR1/GCC/lib_ucr1_hd_spi_v2.7.0.a
> -share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR1/GCC/lib_ucr1_hd_wl_sta_intwpa_v2.7.0.a
> +@static-lib
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR1/GCC/lib_ucr1_hd_sdio_v2.7.0.a
> +@static-lib
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR1/GCC/lib_ucr1_hd_spi_v2.7.0.a
> +@static-lib
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR1/GCC/lib_ucr1_hd_wl_sta_intwpa_v2.7.0.a
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR2/
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR2/GCC/
> -share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR2/GCC/lib_ucr2_hd_sdio_v2.7.0.a
> -share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR2/GCC/lib_ucr2_hd_spi_v2.7.0.a
> -share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR2/GCC/lib_ucr2_hd_wl_sta_intwpa_v2.7.0.a
> +@static-lib
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR2/GCC/lib_ucr2_hd_sdio_v2.7.0.a
> +@static-lib
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR2/GCC/lib_ucr2_hd_spi_v2.7.0.a
> +@static-lib
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/UCR2/GCC/lib_ucr2_hd_wl_sta_intwpa_v2.7.0.a
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/v2.7.0/revision.txt
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/wl_api.h
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/COMPONENTS/WIFI/HD/wl_fw.h
> @@ -420,7 +418,7 @@ share/arduino/firmwares/wifishield/wifiH
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/UTILS/LIBS/NEWLIB_ADDONS/INCLUDE/nlao_interrupts.h
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/UTILS/LIBS/NEWLIB_ADDONS/INCLUDE/nlao_io.h
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/UTILS/LIBS/NEWLIB_ADDONS/INCLUDE/nlao_usart.h
> -share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/UTILS/LIBS/NEWLIB_ADDONS/libnewlib_addons-at32ucr2-speed_opt.a
> +@static-lib
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/UTILS/LIBS/NEWLIB_ADDONS/libnewlib_addons-at32ucr2-speed_opt.a
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/UTILS/LINKER_SCRIPTS/
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/UTILS/LINKER_SCRIPTS/AT32UC3A/
>
> share/arduino/firmwares/wifishield/wifiHD/src/SOFTWARE_FRAMEWORK/UTILS/LINKER_SCRIPTS/AT32UC3A/0512/
> @@ -555,7 +553,7 @@ share/arduino/firmwares/wifishield/wifi_
>
> share/arduino/firmwares/wifishield/wifi_dnld/src/SOFTWARE_FRAMEWORK/UTILS/LIBS/NEWLIB_ADDONS/INCLUDE/nlao_interrupts.h
>
> share/arduino/firmwares/wifishield/wifi_dnld/src/SOFTWARE_FRAMEWORK/UTILS/LIBS/NEWLIB_ADDONS/INCLUDE/nlao_io.h
>
> share/arduino/firmwares/wifishield/wifi_dnld/src/SOFTWARE_FRAMEWORK/UTILS/LIBS/NEWLIB_ADDONS/INCLUDE/nlao_usart.h
> -share/arduino/firmwares/wifishield/wifi_dnld/src/SOFTWARE_FRAMEWORK/UTILS/LIBS/NEWLIB_ADDONS/libnewlib_addons-at32ucr2-speed_opt.a
> +@static-lib
> share/arduino/firmwares/wifishield/wifi_dnld/src/SOFTWARE_FRAMEWORK/UTILS/LIBS/NEWLIB_ADDONS/libnewlib_addons-at32ucr2-speed_opt.a
>
> share/arduino/firmwares/wifishield/wifi_dnld/src/SOFTWARE_FRAMEWORK/UTILS/LINKER_SCRIPTS/
>
> share/arduino/firmwares/wifishield/wifi_dnld/src/SOFTWARE_FRAMEWORK/UTILS/LINKER_SCRIPTS/AT32UC3A/
>
> share/arduino/firmwares/wifishield/wifi_dnld/src/SOFTWARE_FRAMEWORK/UTILS/LINKER_SCRIPTS/AT32UC3A/0512/
> @@ -646,6 +644,8 @@ share/arduino/libraries/Wire/examples/SF
> share/arduino/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino
> share/arduino/libraries/Wire/examples/digital_potentiometer/
>
> share/arduino/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino
> +share/arduino/libraries/Wire/examples/i2c_scanner/
> +share/arduino/libraries/Wire/examples/i2c_scanner/i2c_scanner.ino
> share/arduino/libraries/Wire/examples/master_reader/
> share/arduino/libraries/Wire/examples/master_reader/master_reader.ino
> share/arduino/libraries/Wire/examples/master_writer/
> @@ -913,7 +913,6 @@ share/examples/arduino/07.Display/barGra
> share/examples/arduino/07.Display/barGraph/schematic.png
> share/examples/arduino/08.Strings/
> share/examples/arduino/08.Strings/CharacterAnalysis/
> -@comment
> share/examples/arduino/08.Strings/CharacterAnalysis/.CharacterAnalysis.ino.swp
> share/examples/arduino/08.Strings/CharacterAnalysis/CharacterAnalysis.ino
> share/examples/arduino/08.Strings/StringAdditionOperator/
>
> share/examples/arduino/08.Strings/StringAdditionOperator/StringAdditionOperator.ino
> @@ -942,7 +941,6 @@ share/examples/arduino/08.Strings/String
> share/examples/arduino/08.Strings/StringLengthTrim/StringLengthTrim.ino
> share/examples/arduino/08.Strings/StringLengthTrim/StringLengthTrim.txt
> share/examples/arduino/08.Strings/StringReplace/
> -@comment share/examples/arduino/08.Strings/StringReplace/.swp
> share/examples/arduino/08.Strings/StringReplace/StringReplace.ino
> share/examples/arduino/08.Strings/StringReplace/StringReplace.txt
> share/examples/arduino/08.Strings/StringStartsWithEndsWith/
--
Tracey Emery
