On 2019/12/16 10:43, joshua stein wrote:
> This also adds Adafruit's boards to boards.txt to make it easier to
> build for them with devel/arduino-makefile.
>
>
> 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/
This results in an anonymous distfile name for Adafruit_Arduino_Boards
(0dad98d190ebd0e22e7be08f114d27a94784b7d8.tar.gz), it's better to rename it
to something more distinctive
>
> # 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 -)
typo here means those files aren't getting installed.
Updated one here is OK with me if it still works for you.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/arduino/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 12 Jul 2019 21:02:13 -0000 1.20
+++ Makefile 17 Dec 2019 01:03:44 -0000
@@ -2,20 +2,21 @@
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-{arduino/ArduinoCore-avr/archive/}${AVR_V}${EXTRACT_SUFX}:0 \
+
Adafruit_Arduino_Boards-{adafruit/Adafruit_Arduino_Boards/archive/}${ADAFRUIT_BOARDS_V}${EXTRACT_SUFX}:0
CATEGORIES= devel
HOMEPAGE= https://www.arduino.cc/
-MASTER_SITES0=
https://github.com/${GH_ACCOUNT}/ArduinoCore-avr/archive/${AVR_V}/
+MASTER_SITES0= https://github.com/
# arduino core + libraries: LGPLv2.1
# frontend application: GPLv2 (not shipped yet)
@@ -31,6 +32,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_WRKDIST} && 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 -r1.5 distinfo
--- distinfo 8 Nov 2018 01:00:59 -0000 1.5
+++ distinfo 17 Dec 2019 01:03:44 -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
(Adafruit_Arduino_Boards-0dad98d190ebd0e22e7be08f114d27a94784b7d8.tar.gz) =
jy2qC6zTRm/ZlhNh04W4kpY0XjQNXNuQEXUHwKHQ6M0=
+SHA256 (ArduinoCore-avr-1.8.2.tar.gz) =
HCaPdR1WSDtSkLFd3lj3MqxlUfjFsxjcWBoYzMIMFMA=
+SHA256 (arduino-1.8.10.tar.gz) = mwqz3o2LldZ8dNums0yEpoQldsVqtSFJBFXyHuHj8EM=
+SIZE (Adafruit_Arduino_Boards-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 -r1.7 PLIST
--- pkg/PLIST 8 Nov 2018 01:00:59 -0000 1.7
+++ pkg/PLIST 17 Dec 2019 01:03:44 -0000
@@ -41,11 +41,13 @@ share/arduino/bootloaders/caterina-LilyP
share/arduino/bootloaders/caterina-LilyPadUSB/Descriptors.h
share/arduino/bootloaders/caterina-LilyPadUSB/Makefile
share/arduino/bootloaders/caterina-LilyPadUSB/Readme.txt
+share/arduino/bootloaders/caterina/Caterina-Atmega32u4.hex
+share/arduino/bootloaders/caterina/Caterina-BluefruitMicro8.hex
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-Feather32u4.hex
+share/arduino/bootloaders/caterina/Caterina-Flora8.hex
share/arduino/bootloaders/caterina/Caterina-Industrial101.hex
share/arduino/bootloaders/caterina/Caterina-Leonardo.hex
share/arduino/bootloaders/caterina/Caterina-Leonardo.txt
@@ -252,14 +254,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 +422,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 +557,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/
@@ -641,11 +643,20 @@ share/arduino/libraries/SoftwareSerial/s
share/arduino/libraries/SoftwareSerial/src/SoftwareSerial.cpp
share/arduino/libraries/SoftwareSerial/src/SoftwareSerial.h
share/arduino/libraries/Wire/
+share/arduino/libraries/Wire/README.md
+share/arduino/libraries/Wire/TinyWireM.cpp
+share/arduino/libraries/Wire/TinyWireM.h
+share/arduino/libraries/Wire/USI_TWI_Master.cpp
+share/arduino/libraries/Wire/USI_TWI_Master.h
+share/arduino/libraries/Wire/Wire.cpp
+share/arduino/libraries/Wire/Wire.h
share/arduino/libraries/Wire/examples/
share/arduino/libraries/Wire/examples/SFRRanger_reader/
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/
@@ -662,17 +673,30 @@ share/arduino/libraries/Wire/src/Wire.h
share/arduino/libraries/Wire/src/utility/
share/arduino/libraries/Wire/src/utility/twi.c
share/arduino/libraries/Wire/src/utility/twi.h
+share/arduino/libraries/Wire/utility/
+share/arduino/libraries/Wire/utility/twi.c
+share/arduino/libraries/Wire/utility/twi.h
share/arduino/platform.txt
share/arduino/programmers.txt
share/arduino/variants/
+share/arduino/variants/adafruit32u4/
+share/arduino/variants/adafruit32u4/pins_arduino.h
+share/arduino/variants/bluefruitmicro/
+share/arduino/variants/bluefruitmicro/pins_arduino.h
share/arduino/variants/circuitplay32u4/
share/arduino/variants/circuitplay32u4/pins_arduino.h
share/arduino/variants/eightanaloginputs/
share/arduino/variants/eightanaloginputs/pins_arduino.h
share/arduino/variants/ethernet/
share/arduino/variants/ethernet/pins_arduino.h
+share/arduino/variants/feather32u4/
+share/arduino/variants/feather32u4/pins_arduino.h
+share/arduino/variants/flora/
+share/arduino/variants/flora/pins_arduino.h
share/arduino/variants/gemma/
share/arduino/variants/gemma/pins_arduino.h
+share/arduino/variants/itsybitsy32u4/
+share/arduino/variants/itsybitsy32u4/pins_arduino.h
share/arduino/variants/leonardo/
share/arduino/variants/leonardo/pins_arduino.h
share/arduino/variants/mega/
@@ -685,6 +709,8 @@ share/arduino/variants/robot_motor/
share/arduino/variants/robot_motor/pins_arduino.h
share/arduino/variants/standard/
share/arduino/variants/standard/pins_arduino.h
+share/arduino/variants/tiny8/
+share/arduino/variants/tiny8/pins_arduino.h
share/arduino/variants/yun/
share/arduino/variants/yun/pins_arduino.h
share/doc/arduino/
@@ -913,7 +939,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 +967,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/
