From owner-svn-ports-head@freebsd.org Wed Apr 19 20:40:12 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E6F6D461B4; Wed, 19 Apr 2017 20:40:12 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C5A58EB; Wed, 19 Apr 2017 20:40:12 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3JKeBjf091681; Wed, 19 Apr 2017 20:40:11 GMT (envelope-from bsam@FreeBSD.org) Received: (from bsam@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3JKeA2H091671; Wed, 19 Apr 2017 20:40:10 GMT (envelope-from bsam@FreeBSD.org) Message-Id: <201704192040.v3JKeA2H091671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bsam set sender to bsam@FreeBSD.org using -f From: Boris Samorodov Date: Wed, 19 Apr 2017 20:40:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438914 - in head: . devel/arduino16 devel/arduino18 devel/arduino18/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2017 20:40:12 -0000 Author: bsam Date: Wed Apr 19 20:40:10 2017 New Revision: 438914 URL: https://svnweb.freebsd.org/changeset/ports/438914 Log: devel/arduino18: Update to Arduino 1.8.2, and: * Firmata upgrade, 2.5.3 => 2.5.5 * Robot_Motor upgrade, 1.0.1 => 1.0.2 * Temboo upgrade, 1.1.7 => 1.1.8 * WiFi101-FirmwareUpdater-Plugin update, 0.8.0 => 0.9.0 * SD 1.1.1 and Servo 1.1.2 now also included * (Port) indentation fixes * (Port) Populate lib/version.txt to fix arduino-makefile usage)) PR: 218282 Submitted by: Kyle Evans (maintainer) Added: head/devel/arduino18/ - copied from r438913, head/devel/arduino16/ Deleted: head/devel/arduino16/ Modified: head/MOVED head/devel/arduino18/Makefile head/devel/arduino18/distinfo head/devel/arduino18/files/patch-app_src_processing_app_Base.java head/devel/arduino18/files/patch-arduino-core_src_cc_arduino_contributions_libraries_LibraryInstaller.java head/devel/arduino18/files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionInstaller.java head/devel/arduino18/files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionsIndexer.java head/devel/arduino18/files/patch-arduino-core_src_processing_app_BaseNoGui.java head/devel/arduino18/files/patch-build_build.xml head/devel/arduino18/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Wed Apr 19 20:28:05 2017 (r438913) +++ head/MOVED Wed Apr 19 20:40:10 2017 (r438914) @@ -9165,6 +9165,7 @@ databases/py-sqlalchemy08|databases/py-s devel/py3-meson||2017-03-30|Removed deskutils/kchmviewer-kde4|deskutils/kchmviewer|2017-03-31|Renamed to drop the -kde4 suffix emulators/ppsspp-qt4|emulators/ppsspp-qt5|2017-03-31|Qt4 support was removed upstream +devel/arduino16|devel/arduino18|2017-03-31|Renamed to match major version following upgrade devel/llvm37||2017-04-01|Obsolete and unmaintained upstream lang/clang37||2017-04-01|Obsolete and unmaintained upstream devel/lldb37||2017-04-01|Obsolete and unmaintained upstream Modified: head/devel/arduino18/Makefile ============================================================================== --- head/devel/arduino16/Makefile Wed Apr 19 20:28:05 2017 (r438913) +++ head/devel/arduino18/Makefile Wed Apr 19 20:40:10 2017 (r438914) @@ -1,65 +1,67 @@ # $FreeBSD$ -PORTNAME= arduino -PORTVERSION= 1.6.12 -PORTREVISION= 4 -CATEGORIES= devel java -PKGNAMESUFFIX= 16 -DIST_SUBDIR= ${PORTNAME} - -MAINTAINER= bsdports@kyle-evans.net -COMMENT= Open-source electronics prototyping platform - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/../license.txt - -LIB_DEPENDS= liblistSerialsj.so:devel/listserialc \ - libastyle-arduinoj.so:devel/libastylej-arduino -RUN_DEPENDS= arduino-builder:devel/arduino-builder \ - arduino-tools>=1.6.12:devel/arduino-tools \ - bash:shells/bash \ - ${JAVA_HOME}/jre/lib/ext/jssc-2.8.0.jar:comms/java-simple-serial-connector +PORTNAME= arduino +PORTVERSION= 1.8.2 +CATEGORIES= devel java +PKGNAMESUFFIX= 18 +DIST_SUBDIR= ${PORTNAME} + +MAINTAINER= bsdports@kyle-evans.net +COMMENT= Open-source electronics prototyping platform + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/../license.txt + +LIB_DEPENDS= liblistSerialsj.so:devel/listserialc \ + libastyle-arduinoj.so:devel/libastylej-arduino +RUN_DEPENDS= arduino-builder:devel/arduino-builder \ + arduino-tools>=1.6.12:devel/arduino-tools \ + bash:shells/bash \ + ${JAVA_HOME}/jre/lib/ext/jssc-2.8.0.jar:comms/java-simple-serial-connector -CONFLICTS= arduino-[0-9]* +CONFLICTS= arduino-[0-9]* BUNDLE_GH_ACCOUNT= arduino-libraries -BUNDLE_LIBRARIES= Firmata:2.5.3:firmata \ +BUNDLE_LIBRARIES= Firmata:2.5.5:firmata \ Bridge:1.6.3:bridge \ Robot_Control:1.0.2:robotcontrol \ - Robot_Motor:1.0.1:robotmotor \ + Robot_Motor:1.0.2:robotmotor \ RobotIRremote:1.0.2:robotir \ SpacebrewYun:1.0.1:spacebrew \ - Temboo:1.1.7:temboo \ + Temboo:1.1.8:temboo \ Esplora:1.0.4:esplora \ Mouse:1.0.1:mouse \ - Keyboard:1.0.1:keyboard - -GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.8.0:wifi10/linux/work/tools/WiFi101 - -USE_GITHUB= yes -GH_ACCOUNT= arduino -GH_PROJECT= Arduino + Keyboard:1.0.1:keyboard \ + SD:1.1.1:sd \ + Servo:1.1.2:servo + +GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.9.0:wifi10/linux/work/tools/WiFi101 + +USE_GITHUB= yes +GH_ACCOUNT= arduino +GH_PROJECT= Arduino .for blib in ${BUNDLE_LIBRARIES} -GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:${blib}/linux/work/libraries/${blib:C/\:.*//} +GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:${blib}/linux/work/libraries/${blib:C/\:.*//} .endfor -USES= desktop-file-utils -LIB_DIRS+= ${LOCALBASE}/lib ${LOCALBASE}/lib/jni -WRKSRC_SUBDIR= build -PATCH_WRKSRC= ${WRKSRC}/../ -MAKE_ARGS+= -Dlight_bundle=true -Dlocal_sources=true -USE_JAVA= yes -USE_ANT= yes +USES= desktop-file-utils +LIB_DIRS+= ${LOCALBASE}/lib ${LOCALBASE}/lib/jni +WRKSRC_SUBDIR= build +PATCH_WRKSRC= ${WRKSRC}/../ +MAKE_ARGS+= -Dlight_bundle=true -Dlocal_sources=true -Dno_arduino_builder=true +USE_JAVA= yes +USE_ANT= yes +OS_DIR= ${WRKSRC}/linux +BUILD_DIR= ${OS_DIR}/work +INSLIST= lib libraries revisions.txt tools +STRIP= # No Elfs here, only symlinks + +OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_SUB= yes + DOCS_MAKE_ARGS= -Dno_docs=false DOCS_MAKE_ARGS_OFF= -Dno_docs=true -OS_DIR= ${WRKSRC}/linux -BUILD_DIR= ${OS_DIR}/work -INSLIST= lib libraries revisions.txt tools -STRIP= # No Elfs here, only symlinks -OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_SUB= yes - DOCS_MASTER_SITES= http://downloads.arduino.cc/:ref,galileo,edison \ https://files.kyle-evans.net/arduino/:ref,galileo,edison DOCS_DISTFILES= reference-1.6.6-3.zip:ref \ @@ -69,11 +71,11 @@ DOCS_DISTFILES= reference-1.6.6-3.zip:r .include .if ${PORT_OPTIONS:MDOCS} -INSLIST+= reference +INSLIST+= reference .endif .if ${PORT_OPTIONS:MEXAMPLES} -INSLIST+= examples +INSLIST+= examples .endif post-extract: @@ -102,5 +104,6 @@ do-install: ${LN} -s ../bin/arduino-builder ${STAGEDIR}${PREFIX}/arduino/arduino-builder ${CP} ${WRKSRC}/shared/icons/arduino.xpm ${STAGEDIR}/${PREFIX}/share/pixmaps ${CP} ${PATCH_WRKSRC}/build/linux/dist/desktop.template ${STAGEDIR}/${PREFIX}/share/applications/arduino.desktop + ${REINPLACE_CMD} -e 's|$${version}|${PORTVERSION}|' ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/version.txt .include Modified: head/devel/arduino18/distinfo ============================================================================== --- head/devel/arduino16/distinfo Wed Apr 19 20:28:05 2017 (r438913) +++ head/devel/arduino18/distinfo Wed Apr 19 20:40:10 2017 (r438914) @@ -1,31 +1,35 @@ -TIMESTAMP = 1476591503 +TIMESTAMP = 1490197071 SHA256 (arduino/reference-1.6.6-3.zip) = c3bfb7f9b408fd99a4a1c0f3b022f0a8b10abae6dc28e35d38b4a0df62903685 SIZE (arduino/reference-1.6.6-3.zip) = 7004842 SHA256 (arduino/Galileo_help_files-1.6.2.zip) = 1c70276e4783286d59c8ac0132c3286e7dcf6825bea65e25747a94416b07aa61 SIZE (arduino/Galileo_help_files-1.6.2.zip) = 4352077 SHA256 (arduino/Edison_help_files-1.6.2.zip) = 56718ce5b2b090d79dae298f6ff9a09c8c1a77f74e3594a951f7035877cc45f4 SIZE (arduino/Edison_help_files-1.6.2.zip) = 3321743 -SHA256 (arduino/arduino-Arduino-1.6.12_GH0.tar.gz) = 081c063e34bd72c9912705f33395cdd1870424826b4365dd64439575e0f11817 -SIZE (arduino/arduino-Arduino-1.6.12_GH0.tar.gz) = 81248294 -SHA256 (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.8.0_GH0.tar.gz) = 2f6b17200c107e6e6190147b1e075d3bd91bf2f673853bce511eb8758c9dd133 -SIZE (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.8.0_GH0.tar.gz) = 568963 -SHA256 (arduino/arduino-libraries-Firmata-2.5.3_GH0.tar.gz) = d59313efb1050b4500d0ca8592bd312a8280903ee60051ec07ebb0f2a8cfa185 -SIZE (arduino/arduino-libraries-Firmata-2.5.3_GH0.tar.gz) = 154530 +SHA256 (arduino/arduino-Arduino-1.8.2_GH0.tar.gz) = df7dba7ad20ca315788d309b9e52d45d1ec509c701a52121426098133e87d674 +SIZE (arduino/arduino-Arduino-1.8.2_GH0.tar.gz) = 48191808 +SHA256 (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.9.0_GH0.tar.gz) = 43f3f992bb1cda45f8609eb0269e394d9c7e2ffab45a29a2bc312579c489d9d1 +SIZE (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.9.0_GH0.tar.gz) = 810749 +SHA256 (arduino/arduino-libraries-Firmata-2.5.5_GH0.tar.gz) = c34732d01e27cfabfc47a12cc684a8d66a484252a19aed41c19b2f06a971535b +SIZE (arduino/arduino-libraries-Firmata-2.5.5_GH0.tar.gz) = 162998 SHA256 (arduino/arduino-libraries-Bridge-1.6.3_GH0.tar.gz) = 8c5f01530973aef9dbd47bd748c093e0a0774cca425e2b00e058f12d805a483f SIZE (arduino/arduino-libraries-Bridge-1.6.3_GH0.tar.gz) = 36011 SHA256 (arduino/arduino-libraries-Robot_Control-1.0.2_GH0.tar.gz) = 1c40bbd733ea3abde7f45102ad61e019c9512670a0da3a43bc0e609a03996a57 SIZE (arduino/arduino-libraries-Robot_Control-1.0.2_GH0.tar.gz) = 78144 -SHA256 (arduino/arduino-libraries-Robot_Motor-1.0.1_GH0.tar.gz) = d2ebb4e924389e15f94cb052794d666e50711c2d5a3ec9a3a3e36f2fd141d198 -SIZE (arduino/arduino-libraries-Robot_Motor-1.0.1_GH0.tar.gz) = 7891 +SHA256 (arduino/arduino-libraries-Robot_Motor-1.0.2_GH0.tar.gz) = b7bf0d33288e92801410332c53033fa83540fcdfcd14edda890133f1fedba288 +SIZE (arduino/arduino-libraries-Robot_Motor-1.0.2_GH0.tar.gz) = 7892 SHA256 (arduino/arduino-libraries-RobotIRremote-1.0.2_GH0.tar.gz) = 58de60b9deb51172c5cb0ba31ce66cae021b937c3f22c69580f59f94b7692af0 SIZE (arduino/arduino-libraries-RobotIRremote-1.0.2_GH0.tar.gz) = 19013 SHA256 (arduino/arduino-libraries-SpacebrewYun-1.0.1_GH0.tar.gz) = b9ac22651020c04a246a0f839c7b7627dff22b1998e6640ee6112d7251538d09 SIZE (arduino/arduino-libraries-SpacebrewYun-1.0.1_GH0.tar.gz) = 6901 -SHA256 (arduino/arduino-libraries-Temboo-1.1.7_GH0.tar.gz) = 34f6a1a87f32dd18515e3813a35e51aebc4a5e369c439cd8b535fa796b0e7d51 -SIZE (arduino/arduino-libraries-Temboo-1.1.7_GH0.tar.gz) = 76226 +SHA256 (arduino/arduino-libraries-Temboo-1.1.8_GH0.tar.gz) = 1aee8614db469e43e2333ff47efcbe3b83fcdb34dd02cd656ec73de2815e39ac +SIZE (arduino/arduino-libraries-Temboo-1.1.8_GH0.tar.gz) = 90457 SHA256 (arduino/arduino-libraries-Esplora-1.0.4_GH0.tar.gz) = 67644c34290d02d7867af87743e5326de55ee076f44ce2edbcd6fabad2ce7bac SIZE (arduino/arduino-libraries-Esplora-1.0.4_GH0.tar.gz) = 12615 SHA256 (arduino/arduino-libraries-Mouse-1.0.1_GH0.tar.gz) = 9269148995b5053a31781a085715f86ba60d9cf209fa1f13ba108858f1f50204 SIZE (arduino/arduino-libraries-Mouse-1.0.1_GH0.tar.gz) = 2421 SHA256 (arduino/arduino-libraries-Keyboard-1.0.1_GH0.tar.gz) = 048468d0c2d3be933971a7cbcdd68ac8619cc9a7b039eaa8ee15783ed767d793 SIZE (arduino/arduino-libraries-Keyboard-1.0.1_GH0.tar.gz) = 4098 +SHA256 (arduino/arduino-libraries-SD-1.1.1_GH0.tar.gz) = bee40dae69eebc39a3cbd37dc3985324d212d352d0b236f876ac61f73815aa92 +SIZE (arduino/arduino-libraries-SD-1.1.1_GH0.tar.gz) = 47102 +SHA256 (arduino/arduino-libraries-Servo-1.1.2_GH0.tar.gz) = a58f5b9087efa12d30afb67e5f0f7bdb9b22548d6ad3c5241eec3dd3d851641d +SIZE (arduino/arduino-libraries-Servo-1.1.2_GH0.tar.gz) = 14059 Modified: head/devel/arduino18/files/patch-app_src_processing_app_Base.java ============================================================================== --- head/devel/arduino16/files/patch-app_src_processing_app_Base.java Wed Apr 19 20:28:05 2017 (r438913) +++ head/devel/arduino18/files/patch-app_src_processing_app_Base.java Wed Apr 19 20:40:10 2017 (r438914) @@ -1,6 +1,6 @@ ---- app/src/processing/app/Base.java.orig 2016-09-21 10:09:37 UTC +--- app/src/processing/app/Base.java.orig 2017-03-16 17:38:01 UTC +++ app/src/processing/app/Base.java -@@ -463,7 +463,7 @@ public class Base { +@@ -460,7 +460,7 @@ public class Base { new Thread(new NewBoardListener(this)).start(); // Check for updates @@ -9,7 +9,7 @@ new UpdateCheck(this); contributionsSelfCheck = new ContributionsSelfCheck(this, new UpdatableBoardsLibsFakeURLsHandler(this), contributionInstaller, libraryInstaller); -@@ -1060,12 +1060,7 @@ public class Base { +@@ -1055,12 +1055,7 @@ public class Base { if (importMenu == null) return; importMenu.removeAll(); @@ -23,7 +23,7 @@ JMenuItem addLibraryMenuItem = new JMenuItem(tr("Add .ZIP Library...")); addLibraryMenuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { -@@ -1392,31 +1387,12 @@ public class Base { +@@ -1388,31 +1383,12 @@ public class Base { boardMenu.putClientProperty("removeOnWindowDeactivation", true); MenuScroller.setScrollerFor(boardMenu); @@ -53,5 +53,5 @@ - boardMenu.add(new JSeparator()); - // Generate custom menus for all platforms - Set customMenusTitles = new HashSet(); + Set customMenusTitles = new HashSet<>(); for (TargetPackage targetPackage : BaseNoGui.packages.values()) { Modified: head/devel/arduino18/files/patch-arduino-core_src_cc_arduino_contributions_libraries_LibraryInstaller.java ============================================================================== --- head/devel/arduino16/files/patch-arduino-core_src_cc_arduino_contributions_libraries_LibraryInstaller.java Wed Apr 19 20:28:05 2017 (r438913) +++ head/devel/arduino18/files/patch-arduino-core_src_cc_arduino_contributions_libraries_LibraryInstaller.java Wed Apr 19 20:40:10 2017 (r438914) @@ -1,4 +1,4 @@ ---- arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java.orig 2016-09-21 10:09:37 UTC +--- arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java.orig 2017-03-16 17:38:01 UTC +++ arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java @@ -55,31 +55,7 @@ public class LibraryInstaller { } Modified: head/devel/arduino18/files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionInstaller.java ============================================================================== --- head/devel/arduino16/files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionInstaller.java Wed Apr 19 20:28:05 2017 (r438913) +++ head/devel/arduino18/files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionInstaller.java Wed Apr 19 20:40:10 2017 (r438914) @@ -1,4 +1,4 @@ ---- arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java.orig 2016-09-21 10:09:37 UTC +--- arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java.orig 2017-03-16 17:38:01 UTC +++ arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java @@ -281,47 +281,11 @@ public class ContributionInstaller { } Modified: head/devel/arduino18/files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionsIndexer.java ============================================================================== --- head/devel/arduino16/files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionsIndexer.java Wed Apr 19 20:28:05 2017 (r438913) +++ head/devel/arduino18/files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionsIndexer.java Wed Apr 19 20:40:10 2017 (r438914) @@ -1,8 +1,8 @@ ---- arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java.orig 2016-09-21 10:09:37 UTC +--- arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java.orig 2017-03-16 17:38:01 UTC +++ arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java -@@ -85,17 +85,6 @@ public class ContributionsIndexer { +@@ -86,17 +86,6 @@ public class ContributionsIndexer { File bundledIndexFile = new File(builtInHardwareFolder, Constants.BUNDLED_INDEX_FILE_NAME); - index = parseIndex(bundledIndexFile); + mergeContributions(bundledIndexFile); - // ...and overlay the default index if present - File defaultIndexFile = getIndexFile(Constants.DEFAULT_INDEX_FILE_NAME); @@ -12,7 +12,7 @@ - throw new SignatureVerificationFailedException(Constants.DEFAULT_INDEX_FILE_NAME); - } - -- mergeContributions(parseIndex(defaultIndexFile), defaultIndexFile); +- mergeContributions(defaultIndexFile); - } - // Set main and bundled indexes as trusted Modified: head/devel/arduino18/files/patch-arduino-core_src_processing_app_BaseNoGui.java ============================================================================== --- head/devel/arduino16/files/patch-arduino-core_src_processing_app_BaseNoGui.java Wed Apr 19 20:28:05 2017 (r438913) +++ head/devel/arduino18/files/patch-arduino-core_src_processing_app_BaseNoGui.java Wed Apr 19 20:40:10 2017 (r438914) @@ -1,6 +1,6 @@ ---- arduino-core/src/processing/app/BaseNoGui.java.orig 2016-09-21 10:09:37 UTC +--- arduino-core/src/processing/app/BaseNoGui.java.orig 2017-03-16 17:38:01 UTC +++ arduino-core/src/processing/app/BaseNoGui.java -@@ -851,7 +851,7 @@ public class BaseNoGui { +@@ -688,7 +688,7 @@ public class BaseNoGui { if (installedFolder != null) { toolPath = installedFolder.getAbsolutePath(); } else { Modified: head/devel/arduino18/files/patch-build_build.xml ============================================================================== --- head/devel/arduino16/files/patch-build_build.xml Wed Apr 19 20:28:05 2017 (r438913) +++ head/devel/arduino18/files/patch-build_build.xml Wed Apr 19 20:40:10 2017 (r438914) @@ -1,6 +1,6 @@ ---- build/build.xml.orig 2016-09-21 10:09:37 UTC +--- build/build.xml.orig 2017-03-16 17:38:01 UTC +++ build/build.xml -@@ -99,7 +99,7 @@ +@@ -100,7 +100,7 @@ @@ -9,64 +9,47 @@ -@@ -177,46 +177,23 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ - - +@@ -184,37 +184,9 @@ -+ - +- - - -- -- +- +- - - - -+ -+ -+ -+ - -- -+ -+ - - - -@@ -232,6 +209,9 @@ - - + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -239,6 +211,9 @@ + + + + @@ -74,7 +57,7 @@ -@@ -250,13 +230,17 @@ +@@ -257,13 +232,17 @@ @@ -93,49 +76,13 @@ -@@ -362,7 +346,7 @@ - - - -- -+ - - - -@@ -447,7 +431,7 @@ - - - -- -+ - - - -@@ -458,7 +442,7 @@ - - - -- -+ - - - -@@ -469,7 +453,7 @@ - - - -- -+ - - - -@@ -643,53 +627,15 @@ +@@ -638,53 +617,15 @@ - - -- +- - - - @@ -148,7 +95,7 @@ - - - -- +- - - - @@ -160,7 +107,7 @@ - - -- +- - - - @@ -173,7 +120,7 @@ - - - -- +- - - - @@ -183,137 +130,3 @@ -@@ -701,7 +647,7 @@ - - - -- -+ - - - -@@ -731,7 +677,7 @@ - - - -- -+ - - - -@@ -756,30 +702,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -822,8 +744,21 @@ - - - -+ -+ -+ -+ - - -+ -+ -+ Skipping download of ${archive_url}, using makepkg downloaded ${basename} -+ -+ -+ -+ -+ -+ - - - Testing checksum of "${archive_file}" -@@ -926,7 +861,7 @@ - - - -- -+ - - - -@@ -935,7 +870,7 @@ - - - -- -+ - - - -@@ -977,7 +912,7 @@ - - - -- -+ - - - -@@ -987,7 +922,7 @@ - - - -- -+ - - - -@@ -998,7 +933,7 @@ - - - -- -+ - - - -@@ -1136,7 +1071,7 @@ - - - -- -+ - - - -@@ -1145,7 +1080,7 @@ - - - -- -+ - - - Modified: head/devel/arduino18/pkg-plist ============================================================================== --- head/devel/arduino16/pkg-plist Wed Apr 19 20:28:05 2017 (r438913) +++ head/devel/arduino18/pkg-plist Wed Apr 19 20:40:10 2017 (r438914) @@ -283,9 +283,9 @@ arduino/lib/jackson-core-2.6.3.jar arduino/lib/jackson-databind-2.6.3.jar arduino/lib/jackson-module-mrbean-2.6.3.jar arduino/lib/java-semver-0.8.0.jar -arduino/lib/jmdns-3.4.1.jar -arduino/lib/jna-4.1.0.jar -arduino/lib/jna-platform-4.1.0.jar +arduino/lib/jmdns-3.5.1.jar +arduino/lib/jna-4.2.2.jar +arduino/lib/jna-platform-4.2.2.jar arduino/lib/jsch-0.1.50.jar arduino/lib/keywords.txt arduino/lib/libastylej.so @@ -293,7 +293,9 @@ arduino/lib/liblistSerialsj.so arduino/lib/pde.jar arduino/lib/preferences.txt arduino/lib/public.gpg.key -arduino/lib/rsyntaxtextarea-2.5.8.1+arduino.jar +arduino/lib/rsyntaxtextarea-2.6.1.jar +arduino/lib/slf4j-api-1.7.22.jar +arduino/lib/slf4j-simple-1.7.22.jar arduino/lib/splash.bmp arduino/lib/splash.png arduino/lib/theme/buttons.png @@ -440,6 +442,13 @@ arduino/libraries/Firmata/.gitignore arduino/libraries/Firmata/Boards.h arduino/libraries/Firmata/Firmata.cpp arduino/libraries/Firmata/Firmata.h +arduino/libraries/Firmata/FirmataConstants.h +arduino/libraries/Firmata/FirmataDefines.h +arduino/libraries/Firmata/FirmataMarshaller.cpp +arduino/libraries/Firmata/FirmataMarshaller.h +arduino/libraries/Firmata/FirmataParser.cpp +arduino/libraries/Firmata/FirmataParser.h +arduino/libraries/Firmata/LICENSE.txt %%EXAMPLES%%arduino/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.ino %%EXAMPLES%%arduino/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.ino %%EXAMPLES%%arduino/libraries/Firmata/examples/EchoString/EchoString.ino @@ -463,7 +472,6 @@ arduino/libraries/Firmata/Firmata.h %%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/LICENSE.txt %%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/StandardFirmataWiFi.ino %%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/wifiConfig.h -arduino/libraries/Firmata/extras/LICENSE.txt arduino/libraries/Firmata/extras/revisions.txt arduino/libraries/Firmata/keywords.txt arduino/libraries/Firmata/library.properties @@ -715,10 +723,14 @@ arduino/libraries/Servo/library.properti arduino/libraries/Servo/src/Servo.h arduino/libraries/Servo/src/avr/Servo.cpp arduino/libraries/Servo/src/avr/ServoTimers.h +arduino/libraries/Servo/src/nrf52/Servo.cpp +arduino/libraries/Servo/src/nrf52/ServoTimers.h arduino/libraries/Servo/src/sam/Servo.cpp arduino/libraries/Servo/src/sam/ServoTimers.h arduino/libraries/Servo/src/samd/Servo.cpp arduino/libraries/Servo/src/samd/ServoTimers.h +arduino/libraries/Servo/src/stm32f4/Servo.cpp +arduino/libraries/Servo/src/stm32f4/ServoTimers.h arduino/libraries/SpacebrewYun/README.adoc %%EXAMPLES%%arduino/libraries/SpacebrewYun/examples/inputOutput/inputOutput.ino %%EXAMPLES%%arduino/libraries/SpacebrewYun/examples/spacebrewBoolean/spacebrewBoolean.ino @@ -848,11 +860,17 @@ arduino/libraries/Temboo/src/utility/Sta arduino/libraries/Temboo/src/utility/TembooCoAPIPStack.h arduino/libraries/Temboo/src/utility/TembooCoAPSession.cpp arduino/libraries/Temboo/src/utility/TembooCoAPSession.h +arduino/libraries/Temboo/src/utility/TembooDS18B20.cpp +arduino/libraries/Temboo/src/utility/TembooDS18B20.h +arduino/libraries/Temboo/src/utility/TembooGPIO.c +arduino/libraries/Temboo/src/utility/TembooGPIO.h arduino/libraries/Temboo/src/utility/TembooGlobal.c arduino/libraries/Temboo/src/utility/TembooGlobal.h arduino/libraries/Temboo/src/utility/TembooMQTTIPStack.h arduino/libraries/Temboo/src/utility/TembooMQTTSession.cpp arduino/libraries/Temboo/src/utility/TembooMQTTSession.h +arduino/libraries/Temboo/src/utility/TembooOneWire.cpp +arduino/libraries/Temboo/src/utility/TembooOneWire.h arduino/libraries/Temboo/src/utility/TembooSession.cpp arduino/libraries/Temboo/src/utility/TembooSession.h arduino/libraries/Temboo/src/utility/TembooTags.h @@ -2032,9 +2050,11 @@ arduino/tools/Mangler/src/Mangler.java arduino/tools/WiFi101/.gitignore arduino/tools/WiFi101/.travis.yml arduino/tools/WiFi101/README.md +arduino/tools/WiFi101/assets/default.html arduino/tools/WiFi101/build.sh arduino/tools/WiFi101/firmwares/19.4.4/m2m_aio_2b0.bin arduino/tools/WiFi101/firmwares/19.4.4/m2m_aio_3a0.bin +arduino/tools/WiFi101/firmwares/19.5.2/m2m_aio_3a0.bin arduino/tools/WiFi101/screenshot-0.png arduino/tools/WiFi101/screenshot-1.png arduino/tools/WiFi101/screenshot-2.png