View | Details | Raw Unified | Return to bug 218221 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +4 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	arduino-core
3
PORTNAME=	arduino-core
4
PORTVERSION=	1.6.13
4
PORTVERSION=	1.6.18
5
CATEGORIES=	devel
5
CATEGORIES=	devel
6
DIST_SUBDIR=	arduino
6
DIST_SUBDIR=	arduino
7
7
Lines 14-19 Link Here
14
USE_GITHUB=	yes
14
USE_GITHUB=	yes
15
GH_ACCOUNT=	arduino
15
GH_ACCOUNT=	arduino
16
GH_PROJECT=	Arduino
16
GH_PROJECT=	Arduino
17
GH_TAGNAME=	1.8.2
18
GH_TUPLE=	arduino:ArduinoCore-sam:fc57f2e:sam/hardware/arduino/sam
17
19
18
STRIP=		# No stripping, uses Elf firmware
20
STRIP=		# No stripping, uses Elf firmware
19
21
Lines 25-31 Link Here
25
27
26
NO_BUILD=	yes
28
NO_BUILD=	yes
27
SAMD_DESC=	Core support for SAMD boards (Zero/MKR1000)
29
SAMD_DESC=	Core support for SAMD boards (Zero/MKR1000)
28
SAMD_GH_TUPLE=	arduino:ArduinoCore-samd:1.6.8:samd/hardware/arduino/samd
30
SAMD_GH_TUPLE=	arduino:ArduinoCore-samd:1.6.12:samd/hardware/arduino/samd
29
SAMD_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-hardware_arduino_samd_platform.txt
31
SAMD_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-hardware_arduino_samd_platform.txt
30
32
31
.include <bsd.port.pre.mk>
33
.include <bsd.port.pre.mk>
(-)distinfo (-5 / +7 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1480046230
1
TIMESTAMP = 1490839554
2
SHA256 (arduino/arduino-Arduino-1.6.13_GH0.tar.gz) = 1f12a3f681f75affacf6b59bae840070c64795ea46d4e2fd2dcc1b3f4de2d7ab
2
SHA256 (arduino/arduino-Arduino-1.6.18-1.8.2_GH0.tar.gz) = 2557951d01eb70a028d4efe49e2eef333ac39710261929b7e7ccfd821b903152
3
SIZE (arduino/arduino-Arduino-1.6.13_GH0.tar.gz) = 80205958
3
SIZE (arduino/arduino-Arduino-1.6.18-1.8.2_GH0.tar.gz) = 39419904
4
SHA256 (arduino/arduino-ArduinoCore-samd-1.6.8_GH0.tar.gz) = 2e7eded445d9b9cb88babf8d17e63886258ca52103ca4b3760fbb33311e5ffe7
4
SHA256 (arduino/arduino-ArduinoCore-sam-fc57f2e_GH0.tar.gz) = 3d374e7c7037d317f5da73c95361033b81e6cc12330a7623b20ad2f084bff247
5
SIZE (arduino/arduino-ArduinoCore-samd-1.6.8_GH0.tar.gz) = 922278
5
SIZE (arduino/arduino-ArduinoCore-sam-fc57f2e_GH0.tar.gz) = 38839710
6
SHA256 (arduino/arduino-ArduinoCore-samd-1.6.12_GH0.tar.gz) = fefa0cb0871033451aa0ea08b6a9b4587acdd800b6064a9d47233be7b6368ce8
7
SIZE (arduino/arduino-ArduinoCore-samd-1.6.12_GH0.tar.gz) = 3321356
(-)files/extrapatch-hardware_arduino_samd_platform.txt (-4 / +4 lines)
Lines 1-6 Link Here
1
--- hardware/arduino/samd/platform.txt.orig	2016-10-12 14:28:09 UTC
1
--- hardware/arduino/samd/platform.txt.orig	2017-02-09 15:35:05 UTC
2
+++ hardware/arduino/samd/platform.txt
2
+++ hardware/arduino/samd/platform.txt
3
@@ -111,7 +111,7 @@ recipe.size.regex=\.text\s+([0-9]+).*
3
@@ -131,7 +131,7 @@ tools.avrdude_remote.upload.pattern="ope
4
 #
4
 #
5
 # BOSSA
5
 # BOSSA
6
 #
6
 #
Lines 9-19 Link Here
9
 tools.bossac.cmd=bossac
9
 tools.bossac.cmd=bossac
10
 tools.bossac.cmd.windows=bossac.exe
10
 tools.bossac.cmd.windows=bossac.exe
11
 
11
 
12
@@ -125,7 +125,7 @@ tools.bossac_remote.upload.pattern=/usr/
12
@@ -145,7 +145,7 @@ tools.bossac_remote.upload.pattern=/usr/
13
 # OpenOCD sketch upload
13
 # OpenOCD sketch upload
14
 #
14
 #
15
 
15
 
16
-tools.openocd.path={runtime.tools.openocd-0.9.0-arduino.path}
16
-tools.openocd.path={runtime.tools.openocd-0.9.0-arduino5-static.path}
17
+tools.openocd.path={runtime.tools.openocd.path}/bin
17
+tools.openocd.path={runtime.tools.openocd.path}/bin
18
 tools.openocd.cmd=bin/openocd
18
 tools.openocd.cmd=bin/openocd
19
 tools.openocd.cmd.windows=bin/openocd.exe
19
 tools.openocd.cmd.windows=bin/openocd.exe
(-)files/patch-hardware_arduino_avr_platform.txt (-4 / +4 lines)
Lines 1-4 Link Here
1
--- hardware/arduino/avr/platform.txt.orig	2016-10-13 04:27:28 UTC
1
--- hardware/arduino/avr/platform.txt.orig	2017-02-08 16:50:04 UTC
2
+++ hardware/arduino/avr/platform.txt
2
+++ hardware/arduino/avr/platform.txt
3
@@ -20,8 +20,8 @@ compiler.warning_flags.all=-Wall -Wextra
3
@@ -20,8 +20,8 @@ compiler.warning_flags.all=-Wall -Wextra
4
 # Default "compiler.path" is correct, change only if you want to override the initial value
4
 # Default "compiler.path" is correct, change only if you want to override the initial value
Lines 5-13 Link Here
5
 compiler.path={runtime.tools.avr-gcc.path}/bin/
5
 compiler.path={runtime.tools.avr-gcc.path}/bin/
6
 compiler.c.cmd=avr-gcc
6
 compiler.c.cmd=avr-gcc
7
-compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects
7
-compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects
8
-compiler.c.elf.flags={compiler.warning_flags} -Os -flto -fuse-linker-plugin -Wl,--gc-sections
8
-compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections
9
+compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto
9
+compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto
10
+compiler.c.elf.flags={compiler.warning_flags} -Os -flto -Wl,--gc-sections
10
+compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -Wl,--gc-sections
11
 compiler.c.elf.cmd=avr-gcc
11
 compiler.c.elf.cmd=avr-gcc
12
 compiler.S.flags=-c -g -x assembler-with-cpp -flto
12
 compiler.S.flags=-c -g -x assembler-with-cpp -flto -MMD
13
 compiler.cpp.cmd=avr-g++
13
 compiler.cpp.cmd=avr-g++
(-)files/patch-hardware_package__index__bundled.json (-62 / +97 lines)
Lines 1-18 Link Here
1
--- hardware/package_index_bundled.json.orig	2016-11-22 14:49:35 UTC
1
--- hardware/package_index_bundled.json.orig	2017-02-08 16:50:04 UTC
2
+++ hardware/package_index_bundled.json
2
+++ hardware/package_index_bundled.json
3
@@ -17,10 +17,6 @@
3
@@ -17,10 +17,6 @@
4
           "help": {
4
           "help": {
5
             "online": "http://www.arduino.cc/en/Reference/HomePage"
5
             "online": "http://www.arduino.cc/en/Reference/HomePage"
6
           },
6
           },
7
-          "url": "http://downloads.arduino.cc/cores/avr-1.6.15.tar.bz2",
7
-          "url": "http://downloads.arduino.cc/cores/avr-1.6.17.tar.bz2",
8
-          "archiveFileName": "avr-1.6.15.tar.bz2",
8
-          "archiveFileName": "avr-1.6.17.tar.bz2",
9
-          "checksum": "SHA-256:c222efcabbdf6fa63ba3d64afb8d149f83fa73693c413aa05a2ccd9f986ed2fa",
9
-          "checksum": "SHA-256:ecf63bb02d8f647f720be64b4bf235e0ca37b3180b90d816cbff1886f6744833",
10
-          "size": "4993959",
10
-          "size": "5011912",
11
           "boards": [
11
           "boards": [
12
             {"name": "Arduino Yún"},
12
             {"name": "Arduino Yún"},
13
             {"name": "Arduino/Genuino Uno"},
13
             {"name": "Arduino/Genuino Uno"},
14
@@ -55,6 +51,22 @@
14
@@ -66,6 +62,22 @@
15
               "version": "6.3.0-arduino6"
15
               "version": "1.1.1"
16
             }
16
             }
17
           ]
17
           ]
18
+        },
18
+        },
Lines 34-126 Link Here
34
         }
34
         }
35
       ],
35
       ],
36
       "tools": [
36
       "tools": [
37
@@ -63,39 +75,7 @@
37
@@ -74,40 +86,8 @@
38
           "version": "6.3.0-arduino6",
38
           "version": "6.3.0-arduino9",
39
           "systems": [
39
           "systems": [
40
             {
40
             {
41
-              "size": "644600",
41
-              "size": "644550",
42
-              "checksum": "SHA-256:2426207423d58eb0e5fc4df9493418f1cb54ba3f328fdc7c3bb582f920b9cbe7",
42
-              "checksum": "SHA-256:25a6834ae48019fccf37024236a1f79fe21760414292a4f3fa058d937ceee1ce",
43
-              "host": "arm-linux-gnueabihf",
43
-              "host": "arm-linux-gnueabihf",
44
-              "archiveFileName": "avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2",
44
-              "archiveFileName": "avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2",
45
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2"
45
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2"
46
-            },
46
-            },
47
-            {
47
-            {
48
-              "size": "696273",
48
-              "size": "697309",
49
-              "checksum": "SHA-256:d9a039c9e92d3dbb2011e75e6c044a1a4a2789e2fbf8386b1d580994811be084",
49
-              "checksum": "SHA-256:bfa06bc042dff252d3a8eded98da159484e75b46d2697da4d9446dcd2aea8465",
50
-              "host": "i386-apple-darwin11",
50
-              "host": "i386-apple-darwin11",
51
-              "archiveFileName": "avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2",
51
-              "archiveFileName": "avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2",
52
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2"
52
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2"
53
-            },
53
-            },
54
-            {
54
-            {
55
-              "size": "746653",
55
-              "size": "711229",
56
-              "checksum": "SHA-256:97b4875cad6110c70101bb776f3ac37b64a2e73f036cd0b10afb6f4be96a6621",
56
-              "checksum": "SHA-256:c8cccb84e2fe49ee837b24f0a60a99e9c371dae26e84c5b0b22b6b6aab2f1f6a",
57
-              "host": "x86_64-linux-gnu",
57
-              "host": "x86_64-linux-gnu",
58
-              "archiveFileName": "avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2",
58
-              "archiveFileName": "avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2",
59
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2"
59
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2"
60
-            },
60
-            },
61
-            {
61
-            {
62
-              "size": "733127",
62
-              "size": "701590",
63
-              "checksum": "SHA-256:5f4bc4b0957b1d34cec9908b7f84a7c297b894b39fe16a4992c284b24c00d6fb",
63
-              "checksum": "SHA-256:4235a2d58e3c3224c603d6c5f0610507ed6c48ebf4051fdcce9f77a7646e218b",
64
-              "host": "i686-linux-gnu",
64
-              "host": "i686-linux-gnu",
65
-              "archiveFileName": "avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2",
65
-              "archiveFileName": "avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2",
66
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2"
66
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2"
67
-            },
67
-            },
68
-            {
68
-            {
69
-              "size": "645859",
69
-              "size": "645974",
70
-              "checksum": "SHA-256:7468a1bcdfa459d175a095b102c0de28efc466accfb104305fbcad7832659ddc",
70
-              "checksum": "SHA-256:f3c5cfa8d0b3b0caee81c5b35fb6acff89c342ef609bf4266734c6266a256d4f",
71
-              "host": "i686-mingw32",
71
-              "host": "i686-mingw32",
72
-              "archiveFileName": "avrdude-6.3.0-arduino6-i686-w64-mingw32.zip",
72
-              "archiveFileName": "avrdude-6.3.0-arduino9-i686-w64-mingw32.zip",
73
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i686-w64-mingw32.zip"
73
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip"
74
+              "host": "%%ARCH%%-freebsd%%OSREL%%"
74
-            }
75
             }
75
+				"host": "%%ARCH%%-freebsd%%OSREL%%"
76
+			}
76
           ]
77
           ]
77
         },
78
         },
78
@@ -104,39 +84,16 @@
79
         {
79
           "version": "4.9.2-atmel3.5.3-arduino2",
80
@@ -115,39 +95,7 @@
81
           "version": "4.9.2-atmel3.5.4-arduino2",
80
           "systems": [
82
           "systems": [
81
             {
83
             {
82
-              "size": "27400889",
84
-              "size": "27764772",
83
-              "checksum": "SHA-256:77f300d519bc6b9a25df17b36cb303218e9a258c059b2f6bff8f71a0d8f96821",
85
-              "checksum": "SHA-256:ee36009e19bd238d1f6351cbc9aa5db69714761f67dec4c1d69d5d5d7758720c",
84
-              "host": "arm-linux-gnueabihf",
86
-              "host": "arm-linux-gnueabihf",
85
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2",
87
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2",
86
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2"
88
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2"
87
-            },
89
-            },
88
-            {
90
-            {
89
-              "size": "27048070",
91
-              "size": "28574644",
90
-              "checksum": "SHA-256:311258af188defe24a4b341e4e1f4dc93ca6c80516d3e3b55a2fc07a7050248b",
92
-              "checksum": "SHA-256:67b3ed3555eacf0b4fc6f62240773b9f0220171fe4de26bb8d711547fc884730",
91
-              "host": "i386-apple-darwin11",
93
-              "host": "i386-apple-darwin11",
92
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2",
94
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2",
93
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2"
95
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2"
94
-            },
96
-            },
95
-            {
97
-            {
96
-              "size": "43847945",
98
-              "size": "44386446",
97
-              "checksum": "SHA-256:f8e6ede8746c70be01ec79a30803277cd94360cc5b2e104762da0fbcf536fcc6",
99
-              "checksum": "SHA-256:6044551cd729d88ea6ffcccf10aad1934c5b164d61f4f5890b0e78524ffff853",
98
-              "host": "i686-mingw32",
100
-              "host": "i686-mingw32",
99
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip",
101
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip",
100
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip"
102
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip"
101
-            },
103
-            },
102
-            {
104
-            {
103
-              "size": "29292729",
105
-              "size": "29723974",
104
-              "checksum": "SHA-256:f108951e7c4dc90926d1fc76cc27549f6ea63c702a2bb7ff39647a19ae86ec68",
106
-              "checksum": "SHA-256:63a9d4cebbac06fd5fa8f48a2e2ba7d513837dcddc97f560129b4e466af901b5",
105
-              "host": "i686-linux-gnu",
107
-              "host": "i686-linux-gnu",
106
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2",
108
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2",
107
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2"
109
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2"
108
-            },
110
-            },
109
+              "host": "%%ARCH%%-freebsd%%OSREL%%"
111
-            {
110
+            }
112
-              "size": "30374404",
111
+          ]
113
-              "checksum": "SHA-256:19480217f1524d78467b83cd742f503182bbcc76b5440093261f146828aa588c",
112
+        },
114
-              "host": "x86_64-linux-gnu",
113
+        {
115
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2",
114
+          "name": "bossac",
116
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2"
115
+          "version": "1.7.0",
117
+				"host": "%%ARCH%%-freebsd%%OSREL%%"
116
+          "systems": [
118
             }
119
           ]
120
         },
121
@@ -156,39 +104,7 @@
122
           "version": "1.1.1",
123
           "systems": [
117
             {
124
             {
118
-              "size": "29882960",
125
-              "size": "2045036",
119
-              "checksum": "SHA-256:3903a6d1bb9fdd91727e504b5993d5501f119bcb7f99f7aee98a2101e5629188",
126
-              "checksum": "SHA-256:7ac91ef1d5b357c0ceb790be02ef54986db598ba5a42fffbd6c8ecbdd6a271ef",
127
-              "host": "i686-linux-gnu",
128
-              "archiveFileName": "arduinoOTA-1.1.1-linux_386.tar.bz2",
129
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2"
130
-            },
131
-            {
132
-              "size": "2178288",
133
-              "checksum": "SHA-256:eb5ad0a457dd7f610f7f9b85454399c36755673d61a16f9d07cdfcbbb32ec277",
120
-              "host": "x86_64-linux-gnu",
134
-              "host": "x86_64-linux-gnu",
121
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2",
135
-              "archiveFileName": "arduinoOTA-1.1.1-linux_amd64.tar.bz2",
122
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2"
136
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2"
123
+              "host": "%%ARCH%%-freebsd%%OSREL%%"
137
-            },
138
-            {
139
-              "size": "1962115",
140
-              "checksum": "SHA-256:e4880d83df3d3f6f4b7b7bcde161e80a0556877468803a3c6066ee4ad18a374c",
141
-              "host": "arm-linux-gnueabihf",
142
-              "archiveFileName": "arduinoOTA-1.1.1-linux_arm.tar.bz2",
143
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_arm.tar.bz2"
144
-            },
145
-            {
146
-              "size": "2181376",
147
-              "checksum": "SHA-256:a1ce7cf578982f3af5e4fab6b5839e44830d7a41cb093faba5c4b45952a6fa55",
148
-              "host": "i386-apple-darwin11",
149
-              "archiveFileName": "arduinoOTA-1.1.1-darwin_amd64.tar.bz2",
150
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-darwin_amd64.tar.bz2"
151
-            },
152
-            {
153
-              "size": "2248431",
154
-              "checksum": "SHA-256:b2d3610c77f969a68cd75b6ea66bf63ec10c263937009d99147fbcd975c90006",
155
-              "host": "i686-mingw32",
156
-              "archiveFileName": "arduinoOTA-1.1.1-windows_386.zip",
157
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-windows_386.zip"
158
+				"host": "%%ARCH%%-freebsd%%OSREL%%"
124
             }
159
             }
125
           ]
160
           ]
126
         }
161
         }

Return to bug 218221