Index: head/devel/arduino-tools/Makefile
===================================================================
--- head/devel/arduino-tools/Makefile	(revision 438906)
+++ head/devel/arduino-tools/Makefile	(revision 438907)
@@ -1,55 +1,67 @@
 # $FreeBSD$
 
 PORTNAME=	arduino-tools
-PORTVERSION=	1.6.12
-PORTREVISION=	1
+PORTVERSION=	1.8.2
 CATEGORIES=	devel
 MASTER_SITES=	# Mostly metaport - installs files, no build
 DISTFILES=	#
 EXTRACT_ONLY=	#
 
 MAINTAINER=	bsdports@kyle-evans.net
-COMMENT=	Brings together all of the tool dependencies used for Arduino 1.6
+COMMENT=	Brings together all of the tool dependencies used for Arduino 1.6+
 
-RUN_DEPENDS=	avrdude:devel/avrdude \
+LICENSE=	BSD3CLAUSE
+
+RUN_DEPENDS=	arduino-avrdude:devel/arduino-avrdude \
 		bossac:devel/bossa \
 		avr-as:devel/avr-binutils \
 		avr-gcc:devel/avr-gcc \
 		${LOCALBASE}/avr/include/avr/io.h:devel/avr-libc \
-		arm-none-eabi-gcc:devel/arm-none-eabi-gcc \
+		${LOCALBASE}/gcc-arm-embedded-${ARMGCC_FULL_VERS}/bin/arm-none-eabi-gcc:devel/gcc-arm-embedded \
 		${LOCALBASE}/arduino/tools-builder/ctags/${CTAGS_VERS}/ctags:devel/arduino-ctags \
-		arm-none-eabi-newlib>=0:devel/arm-none-eabi-newlib \
-		arduino-core>=0:devel/arduino-core
+		arduino-core>=0:devel/arduino-core \
+		arduinoOTA:devel/arduinoOTA \
+		openocd:devel/openocd
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
+ARMGCC_FULL_VERS=	6-2017-q1-update
+
 ARMGCC_VERS=	4.9.2
-AVRDUDE_VERS=	6.3.0-arduino6
-AVRGCC_VERS=	4.9.2-atmel3.5.3-arduino2
+AVRDUDE_VERS=	6.3.0-arduino9
+AVRGCC_VERS=	4.9.2-atmel3.5.4-arduino2
 BOSSAC_VERS=	1.7.0
 CMSIS_VERS=	${PORTVERSION}
-CTAGS_VERS=	5.8-arduino10
+CTAGS_VERS=	5.8-arduino11
+OCD_VERS=	0.9.0-arduino5-static
+OTA_VERS=	1.1.1
 
 PLIST_SUB+=	ARMGCC_VERS=${ARMGCC_VERS} \
 		AVRDUDE_VERS=${AVRDUDE_VERS} \
 		AVRGCC_VERS=${AVRGCC_VERS} \
 		BOSSAC_VERS=${BOSSAC_VERS} \
-		CMSIS_VERS=${CMSIS_VERS}
+		CMSIS_VERS=${CMSIS_VERS} \
+		OCD_VERS=${OCD_VERS} \
+		OTA_VERS=${OTA_VERS}
 
-_STD_TOOLS_=	arm-none-eabi-gcc:${ARMGCC_VERS} \
+_STD_TOOLS_=	arduinoOTA:${OTA_VERS} \
 		avr-gcc:${AVRGCC_VERS} \
 		avrdude:${AVRDUDE_VERS} \
-		bossac:${BOSSAC_VERS}
+		bossac:${BOSSAC_VERS} \
+		openocd:${OCD_VERS}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/arduino/tools-builder/CMSIS/${CMSIS_VERS}
+	${MKDIR} ${STAGEDIR}${PREFIX}/arduino/tools-builder/arm-none-eabi-gcc/${ARMGCC_VERS}
 	${LN} -s ../../../hardware/arduino/sam/system/CMSIS/CMSIS ${STAGEDIR}${PREFIX}/arduino/tools-builder/CMSIS/${CMSIS_VERS}/CMSIS
 	${LN} -s ../../../hardware/arduino/sam/system/CMSIS/Device ${STAGEDIR}${PREFIX}/arduino/tools-builder/CMSIS/${CMSIS_VERS}/Device
+	${LN} -s ../../../../gcc-arm-embedded-${ARMGCC_FULL_VERS}/bin ${STAGEDIR}${PREFIX}/arduino/tools-builder/arm-none-eabi-gcc/${ARMGCC_VERS}/bin
+	${LN} -s ../../../../etc ${STAGEDIR}${PREFIX}/arduino/tools-builder/arm-none-eabi-gcc/${ARMGCC_VERS}/etc
 .for _tool in ${_STD_TOOLS_}
 	${MKDIR} ${STAGEDIR}${PREFIX}/arduino/tools-builder/${_tool:C/:.*//}/${_tool:C/.*://}
 	${LN} -s ../../../../bin ${STAGEDIR}${PREFIX}/arduino/tools-builder/${_tool:C/:.*//}/${_tool:C/.*://}/bin
 	${LN} -s ../../../../etc ${STAGEDIR}${PREFIX}/arduino/tools-builder/${_tool:C/:.*//}/${_tool:C/.*://}/etc
 .endfor
 
 .include <bsd.port.mk>
Index: head/devel/arduino-tools/pkg-plist
===================================================================
--- head/devel/arduino-tools/pkg-plist	(revision 438906)
+++ head/devel/arduino-tools/pkg-plist	(revision 438907)
@@ -1,10 +1,14 @@
 arduino/tools-builder/CMSIS/%%CMSIS_VERS%%/CMSIS
 arduino/tools-builder/CMSIS/%%CMSIS_VERS%%/Device
+arduino/tools-builder/arduinoOTA/%%OTA_VERS%%/bin
+arduino/tools-builder/arduinoOTA/%%OTA_VERS%%/etc
 arduino/tools-builder/arm-none-eabi-gcc/%%ARMGCC_VERS%%/bin
 arduino/tools-builder/arm-none-eabi-gcc/%%ARMGCC_VERS%%/etc
 arduino/tools-builder/avr-gcc/%%AVRGCC_VERS%%/bin
 arduino/tools-builder/avr-gcc/%%AVRGCC_VERS%%/etc
 arduino/tools-builder/avrdude/%%AVRDUDE_VERS%%/bin
 arduino/tools-builder/avrdude/%%AVRDUDE_VERS%%/etc
 arduino/tools-builder/bossac/%%BOSSAC_VERS%%/bin
 arduino/tools-builder/bossac/%%BOSSAC_VERS%%/etc
+arduino/tools-builder/openocd/%%OCD_VERS%%/bin
+arduino/tools-builder/openocd/%%OCD_VERS%%/etc