Attachment #177488 for bug #214909




# $FreeBSD$

PORTNAME=	arduino-core
PORTVERSION=	1.6.13
PORTREVISION=	1
CATEGORIES=	devel
DIST_SUBDIR=	arduino

MAINTAINER=	bsdports@kyle-evans.net
COMMENT=	Core board support for Arduino devices

.include <bsd.port.pre.mk>

.if ${ARCH} == "amd64"
ARDUINO_ARCH=	x86_64
.else
ARDUINO_ARCH=	${ARCH}
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|%%ARCH%%|${ARDUINO_ARCH}|g' -e 's|%%OSREL%%|${OSREL:R}|g' ${WRKSRC}/hardware/package_index_bundled.json

do-install:
	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "hardware" ${STAGEDIR}${PREFIX}/arduino ${FIND_EXPR})

Lines 1-5 Link Here

(-)distinfo (-5 / +5 lines)
1	TIMESTAMP = 1476459830	1	TIMESTAMP = 1480046230
2	SHA256 (arduino-Arduino-1.6.12_GH0.tar.gz) = 081c063e34bd72c9912705f33395cdd1870424826b4365dd64439575e0f11817	2	SHA256 (arduino/arduino-Arduino-1.6.13_GH0.tar.gz) = 1f12a3f681f75affacf6b59bae840070c64795ea46d4e2fd2dcc1b3f4de2d7ab
3	SIZE (arduino-Arduino-1.6.12_GH0.tar.gz) = 81248294	3	SIZE (arduino/arduino-Arduino-1.6.13_GH0.tar.gz) = 80205958
4	SHA256 (arduino-ArduinoCore-samd-1.6.8_GH0.tar.gz) = 2e7eded445d9b9cb88babf8d17e63886258ca52103ca4b3760fbb33311e5ffe7	4	SHA256 (arduino/arduino-ArduinoCore-samd-1.6.8_GH0.tar.gz) = 2e7eded445d9b9cb88babf8d17e63886258ca52103ca4b3760fbb33311e5ffe7
5	SIZE (arduino-ArduinoCore-samd-1.6.8_GH0.tar.gz) = 922278	5	SIZE (arduino/arduino-ArduinoCore-samd-1.6.8_GH0.tar.gz) = 922278

Lines 1-11 Link Here

(-)files/patch-hardware_arduino_sam_cores_arduino_itoa.c (-11 lines)
1	--- hardware/arduino/sam/cores/arduino/itoa.c.orig 2016-10-14 15:00:06 UTC
2	+++ hardware/arduino/sam/cores/arduino/itoa.c
3	@@ -121,7 +121,7 @@ extern char* ltoa( long value, char *str
4	return string;
5	}
6
7	-extern char* utoa( unsigned long value, char *string, int radix )
8	+extern char* utoa( unsigned int value, char *string, int radix )
9	{
10	return ultoa( value, string, radix ) ;
11	}

Lines 1-11 Link Here

(-)files/patch-hardware_arduino_sam_cores_arduino_itoa.h (-11 lines)
1	--- hardware/arduino/sam/cores/arduino/itoa.h.orig 2016-10-14 15:00:09 UTC
2	+++ hardware/arduino/sam/cores/arduino/itoa.h
3	@@ -31,7 +31,7 @@ extern void itoa( int n, char s[] ) ;
4
5	extern char* itoa( int value, char *string, int radix ) ;
6	extern char* ltoa( long value, char *string, int radix ) ;
7	-extern char* utoa( unsigned long value, char *string, int radix ) ;
8	+extern char* utoa( unsigned int value, char *string, int radix ) ;
9	extern char* ultoa( unsigned long value, char *string, int radix ) ;
10	#endif /* 0 */
11




--- hardware/package_index_bundled.json.orig	2016-11-22 14:49:35 UTC
+++ hardware/package_index_bundled.json
@@ -17,10 +17,6 @@
           "help": {
             "online": "http://www.arduino.cc/en/Reference/HomePage"
           },
-          "url": "http://downloads.arduino.cc/cores/avr-1.6.15.tar.bz2",
-          "archiveFileName": "avr-1.6.15.tar.bz2",
-          "checksum": "SHA-256:c222efcabbdf6fa63ba3d64afb8d149f83fa73693c413aa05a2ccd9f986ed2fa",
-          "size": "4993959",
           "boards": [
             {"name": "Arduino Yún"},
             {"name": "Arduino/Genuino Uno"},

-              "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.3.0-arduino6-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.3.0-arduino6-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.3.0-arduino6-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.3.0-arduino6-i686-pc-linux-gnu.tar.bz2"
-            },
-            {
-              "size": "645859",
-              "checksum": "SHA-256:7468a1bcdfa459d175a095b102c0de28efc466accfb104305fbcad7832659ddc",
-              "host": "i686-mingw32",
-              "archiveFileName": "avrdude-6.3.0-arduino6-i686-w64-mingw32.zip",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i686-w64-mingw32.zip"
+              "host": "%%ARCH%%-freebsd%%OSREL%%"
             }
           ]

Return to bug 214909

Lines 1-9 Link Here

(-)Makefile (-4 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= arduino-core	3	PORTNAME= arduino-core
4	PORTVERSION= 1.6.12	4	PORTVERSION= 1.6.13
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
		6	DIST_SUBDIR= arduino
7		7
8	MAINTAINER= bsdports@kyle-evans.net	8	MAINTAINER= bsdports@kyle-evans.net
9	COMMENT= Core board support for Arduino devices	9	COMMENT= Core board support for Arduino devices
Lines 28-38 Link Here
28	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
29		29
30	.if ${ARCH} == "amd64"	30	.if ${ARCH} == "amd64"
31	ARCH= x86_64	31	ARDUINO_ARCH= x86_64
		32	.else
		33	ARDUINO_ARCH= ${ARCH}
32	.endif	34	.endif
33		35
34	post-patch:	36	post-patch:
35	@${REINPLACE_CMD} -e 's\|%%ARCH%%\|${ARCH}\|g' -e 's\|%%OSREL%%\|${OSREL:R}\|g' ${WRKSRC}/hardware/package_index_bundled.json	37	@${REINPLACE_CMD} -e 's\|%%ARCH%%\|${ARDUINO_ARCH}\|g' -e 's\|%%OSREL%%\|${OSREL:R}\|g' ${WRKSRC}/hardware/package_index_bundled.json
36		38
37	do-install:	39	do-install:
38	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "hardware" ${STAGEDIR}${PREFIX}/arduino ${FIND_EXPR})	40	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "hardware" ${STAGEDIR}${PREFIX}/arduino ${FIND_EXPR})

Lines 1-13 Link Here

(-)files/patch-hardware_package__index__bundled.json (-11 / +11 lines)
1	--- hardware/package_index_bundled.json.orig 2016-09-21 10:09:37 UTC	1	--- hardware/package_index_bundled.json.orig 2016-11-22 14:49:35 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.13.tar.bz2",	7	- "url": "http://downloads.arduino.cc/cores/avr-1.6.15.tar.bz2",
8	- "archiveFileName": "avr-1.6.14.tar.bz2",	8	- "archiveFileName": "avr-1.6.15.tar.bz2",
9	- "checksum": "SHA-256:a5f7d66c83e3d4722f4c8dab42bdbcf5af98c611ffca1802ef3d1957b894bd92",	9	- "checksum": "SHA-256:c222efcabbdf6fa63ba3d64afb8d149f83fa73693c413aa05a2ccd9f986ed2fa",
10	- "size": "4993455",	10	- "size": "4993959",
11	"boards": [	11	"boards": [
12	{"name": "Arduino Yún"},	12	{"name": "Arduino Yún"},
13	{"name": "Arduino/Genuino Uno"},	13	{"name": "Arduino/Genuino Uno"},
Lines 42-48 Link Here
42	- "checksum": "SHA-256:2426207423d58eb0e5fc4df9493418f1cb54ba3f328fdc7c3bb582f920b9cbe7",	42	- "checksum": "SHA-256:2426207423d58eb0e5fc4df9493418f1cb54ba3f328fdc7c3bb582f920b9cbe7",
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-arduino6-armhf-pc-linux-gnu.tar.bz2",
45	- "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"	45	- "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2"
46	- },	46	- },
47	- {	47	- {
48	- "size": "696273",	48	- "size": "696273",
Lines 49-55 Link Here
49	- "checksum": "SHA-256:d9a039c9e92d3dbb2011e75e6c044a1a4a2789e2fbf8386b1d580994811be084",	49	- "checksum": "SHA-256:d9a039c9e92d3dbb2011e75e6c044a1a4a2789e2fbf8386b1d580994811be084",
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-arduino6-i386-apple-darwin11.tar.bz2",
52	- "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2"	52	- "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2"
53	- },	53	- },
54	- {	54	- {
55	- "size": "746653",	55	- "size": "746653",
Lines 56-62 Link Here
56	- "checksum": "SHA-256:97b4875cad6110c70101bb776f3ac37b64a2e73f036cd0b10afb6f4be96a6621",	56	- "checksum": "SHA-256:97b4875cad6110c70101bb776f3ac37b64a2e73f036cd0b10afb6f4be96a6621",
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-arduino6-x86_64-pc-linux-gnu.tar.bz2",
59	- "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-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"
60	- },	60	- },
61	- {	61	- {
62	- "size": "733127",	62	- "size": "733127",
Lines 63-76 Link Here
63	- "checksum": "SHA-256:5f4bc4b0957b1d34cec9908b7f84a7c297b894b39fe16a4992c284b24c00d6fb",	63	- "checksum": "SHA-256:5f4bc4b0957b1d34cec9908b7f84a7c297b894b39fe16a4992c284b24c00d6fb",
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-arduino6-i686-pc-linux-gnu.tar.bz2",
66	- "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"	66	- "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2"
67	- },	67	- },
68	- {	68	- {
69	- "size": "645859",	69	- "size": "645859",
70	- "checksum": "SHA-256:7468a1bcdfa459d175a095b102c0de28efc466accfb104305fbcad7832659ddc",	70	- "checksum": "SHA-256:7468a1bcdfa459d175a095b102c0de28efc466accfb104305fbcad7832659ddc",
71	- "host": "i686-mingw32",	71	- "host": "i686-mingw32",
72	- "archiveFileName": "avrdude-6.3.0-arduino6-i686-mingw32.zip",	72	- "archiveFileName": "avrdude-6.3.0-arduino6-i686-w64-mingw32.zip",
73	- "url": "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-mingw32.zip"	73	- "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i686-w64-mingw32.zip"
74	+ "host": "%%ARCH%%-freebsd%%OSREL%%"	74	+ "host": "%%ARCH%%-freebsd%%OSREL%%"
75	}	75	}
76	]	76	]