Attachment #181372 for bug #218282




# $FreeBSD$

PORTNAME=	arduino
PORTVERSION=	1.8.2
CATEGORIES=	devel java
PKGNAMESUFFIX=	18
DIST_SUBDIR=	${PORTNAME}
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]*

BUNDLE_GH_ACCOUNT=	arduino-libraries
BUNDLE_LIBRARIES=	Firmata:2.5.5:firmata \
			Bridge:1.6.3:bridge \
			Robot_Control:1.0.2:robotcontrol \
			Robot_Motor:1.0.2:robotmotor \
			RobotIRremote:1.0.2:robotir \
			SpacebrewYun:1.0.1:spacebrew \
			Temboo:1.1.8:temboo \
			Esplora:1.0.4:esplora \
			Mouse:1.0.1:mouse \
			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/\:.*//}
.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 -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 \

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDOCS}
INSLIST+=	reference
.endif

.if ${PORT_OPTIONS:MEXAMPLES}
INSLIST+=	examples
.endif

post-extract:

	${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 <bsd.port.mk>




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.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.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.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




--- app/src/processing/app/Base.java.orig	2017-03-16 17:38:01 UTC
+++ app/src/processing/app/Base.java
@@ -460,7 +460,7 @@ public class Base {
       new Thread(new NewBoardListener(this)).start();
 
       // Check for updates

         new UpdateCheck(this);
 
         contributionsSelfCheck = new ContributionsSelfCheck(this, new UpdatableBoardsLibsFakeURLsHandler(this), contributionInstaller, libraryInstaller);
@@ -1055,12 +1055,7 @@ public class Base {
     if (importMenu == null)
       return;
     importMenu.removeAll();

     JMenuItem addLibraryMenuItem = new JMenuItem(tr("Add .ZIP Library..."));
     addLibraryMenuItem.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
@@ -1388,31 +1383,12 @@ public class Base {
     boardMenu.putClientProperty("removeOnWindowDeactivation", true);
     MenuScroller.setScrollerFor(boardMenu);
 

-    boardMenu.add(new JSeparator());
-
     // Generate custom menus for all platforms
     Set<String> customMenusTitles = new HashSet<>();
     for (TargetPackage targetPackage : BaseNoGui.packages.values()) {

Lines 1-4 Link Here

(-)files/patch-arduino-core_src_cc_arduino_contributions_libraries_LibraryInstaller.java (-1 / +1 lines)
1	--- arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java.orig 2016-09-21 10:09:37 UTC	1	--- arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java.orig 2017-03-16 17:38:01 UTC
2	+++ arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java	2	+++ arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java
3	@@ -55,31 +55,7 @@ public class LibraryInstaller {	3	@@ -55,31 +55,7 @@ public class LibraryInstaller {
4	}	4	}

Lines 1-4 Link Here

(-)files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionInstaller.java (-1 / +1 lines)
1	--- arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java.orig 2016-09-21 10:09:37 UTC	1	--- arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java.orig 2017-03-16 17:38:01 UTC
2	+++ arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java	2	+++ arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java
3	@@ -281,47 +281,11 @@ public class ContributionInstaller {	3	@@ -281,47 +281,11 @@ public class ContributionInstaller {
4	}	4	}

Lines 1-8 Link Here

(-)files/patch-arduino-core_src_cc_arduino_contributions_packages_ContributionsIndexer.java (-4 / +4 lines)
1	--- arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java.orig 2016-09-21 10:09:37 UTC	1	--- arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java.orig 2017-03-16 17:38:01 UTC
2	+++ arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java	2	+++ arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
3	@@ -85,17 +85,6 @@ public class ContributionsIndexer {	3	@@ -86,17 +86,6 @@ public class ContributionsIndexer {
4	File bundledIndexFile = new File(builtInHardwareFolder, Constants.BUNDLED_INDEX_FILE_NAME);	4	File bundledIndexFile = new File(builtInHardwareFolder, Constants.BUNDLED_INDEX_FILE_NAME);
5	index = parseIndex(bundledIndexFile);	5	mergeContributions(bundledIndexFile);
6		6
7	- // ...and overlay the default index if present	7	- // ...and overlay the default index if present
8	- File defaultIndexFile = getIndexFile(Constants.DEFAULT_INDEX_FILE_NAME);	8	- File defaultIndexFile = getIndexFile(Constants.DEFAULT_INDEX_FILE_NAME);
Lines 12-18 Link Here
12	- throw new SignatureVerificationFailedException(Constants.DEFAULT_INDEX_FILE_NAME);	12	- throw new SignatureVerificationFailedException(Constants.DEFAULT_INDEX_FILE_NAME);
13	- }	13	- }
14	-	14	-
15	- mergeContributions(parseIndex(defaultIndexFile), defaultIndexFile);	15	- mergeContributions(defaultIndexFile);
16	- }	16	- }
17	-	17	-
18	// Set main and bundled indexes as trusted	18	// Set main and bundled indexes as trusted




--- arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java.orig	2016-09-21 10:09:37 UTC
+++ arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java
@@ -79,6 +79,16 @@ public abstract class HostDependentDownl
       }
     }
 
+    if (osName.contains("FreeBSD")) {
+      if (osArch.contains("amd64")) {
+        return host.matches("x86_64-freebsd[0-9]*");
+      } else if (osArch.contains("arm")) {
+        return host.matches("arm.*-freebsd[0-9]*");
+      } else {
+        return host.matches("i386-freebsd[0-9]*");
+      }
+    }
+
     return false;
   }
 }

Lines 1-6 Link Here

(-)files/patch-arduino-core_src_processing_app_BaseNoGui.java (-2 / +2 lines)
1	--- arduino-core/src/processing/app/BaseNoGui.java.orig 2016-09-21 10:09:37 UTC	1	--- arduino-core/src/processing/app/BaseNoGui.java.orig 2017-03-16 17:38:01 UTC
2	+++ arduino-core/src/processing/app/BaseNoGui.java	2	+++ arduino-core/src/processing/app/BaseNoGui.java
3	@@ -851,7 +851,7 @@ public class BaseNoGui {	3	@@ -688,7 +688,7 @@ public class BaseNoGui {
4	if (installedFolder != null) {	4	if (installedFolder != null) {
5	toolPath = installedFolder.getAbsolutePath();	5	toolPath = installedFolder.getAbsolutePath();
6	} else {	6	} else {




--- build/build.xml.orig	2017-03-16 17:38:01 UTC
+++ build/build.xml
@@ -100,7 +100,7 @@
   </fileset>
 
   <target name="build" description="Build Arduino.">

 
     <antcall target="generate-hourly-build-txt"/>
   </target>
@@ -184,37 +184,9 @@
 
     <mkdir dir="${target.path}/reference"/>
 
-    <!-- Unzip documentation -->
-    <antcall target="unzip">
-      <param name="archive_file" value="shared/reference-1.6.6-3.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/reference-1.6.6-3.zip" />
-      <param name="final_folder" value="${target.path}/reference/www.arduino.cc" />
-      <param name="dest_folder" value="${target.path}/reference/" />
-    </antcall>
-    <antcall target="unzip">
-      <param name="archive_file" value="shared/Galileo_help_files-1.6.2.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip" />
-      <param name="final_folder" value="${target.path}/reference/Galileo_help_files" />
-      <param name="dest_folder" value="${target.path}/reference/" />
-    </antcall>
-    <antcall target="unzip">
-      <param name="archive_file" value="shared/Edison_help_files-1.6.2.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/Edison_help_files-1.6.2.zip" />
-      <param name="final_folder" value="${target.path}/reference/Edison_help_files" />
-      <param name="dest_folder" value="${target.path}/reference/" />
-    </antcall>
-
-    <!-- Fix wrong permissions from zip file root folder -->
-    <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" />
-    <chmod perm="755" dir="${target.path}/reference/Edison_help_files" />
+    <antcall target="assemble-docs" />
 
     <!-- Write the revision file! -->
     <echo file="${target.path}/lib/version.txt" message="${version}" />
 
     <antcall target="assemble-libraries" />
-
 
-    <!-- Add WiFi101 updater tool -->
-    <antcall target="unzip">
-      <param name="archive_file" value="shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip" />
-      <param name="archive_url" value="https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.0/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip" />
-      <param name="final_folder" value="${target.path}/tools/WiFi101" />
-      <param name="dest_folder" value="${target.path}/tools/" />
-    </antcall>
+  <target name="assemble-docs" unless="no_docs">
+      <!-- Fix wrong permissions from zip file root folder -->
+      <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" />
+      <chmod perm="755" dir="${target.path}/reference/Edison_help_files" />
   </target>
 
   <target name="assemble-docs" unless="no_docs">
-      <!-- Unzip documentation -->
-      <antcall target="unzip">
-        <param name="archive_file" value="shared/reference-1.6.6-3.zip" />
-        <param name="archive_url" value="https://downloads.arduino.cc/reference-1.6.6-3.zip" />
-        <param name="final_folder" value="${target.path}/reference/www.arduino.cc" />
-        <param name="dest_folder" value="${target.path}/reference/" />
-      </antcall>
-      <antcall target="unzip">
-        <param name="archive_file" value="shared/Galileo_help_files-1.6.2.zip" />
-        <param name="archive_url" value="https://downloads.arduino.cc/Galileo_help_files-1.6.2.zip" />
-        <param name="final_folder" value="${target.path}/reference/Galileo_help_files" />
-        <param name="dest_folder" value="${target.path}/reference/" />
-      </antcall>
-      <antcall target="unzip">
-        <param name="archive_file" value="shared/Edison_help_files-1.6.2.zip" />
-        <param name="archive_url" value="https://downloads.arduino.cc/Edison_help_files-1.6.2.zip" />
-        <param name="final_folder" value="${target.path}/reference/Edison_help_files" />
-        <param name="dest_folder" value="${target.path}/reference/" />
-      </antcall>
-
       <!-- Fix wrong permissions from zip file root folder -->
       <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" />
       <chmod perm="755" dir="${target.path}/reference/Edison_help_files" />
@@ -239,6 +211,9 @@
     <download-library name="SD" version="1.1.1"/>
     <download-library githubuser="Adafruit" name="Adafruit_CircuitPlayground" version="1.6.4"/>
   </target>
+  <target name="assemble-libraries-light" if="light_bundle">
+    <mkdir dir="${target.path}/libraries" />

 
   <macrodef name="download-library">
     <attribute name="name"/>
@@ -257,13 +232,17 @@
   </macrodef>
 
   <!-- copy hardware folder -->

 
   <!-- - - - - - - - - -->
   <!-- Revision check  -->
@@ -638,53 +617,15 @@
 
     <antcall target="unzip">
       <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino4.jar.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip" />
+      <param name="archive_url" value="https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip" />
       <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
       <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
     </antcall>
@@ -447,7 +431,7 @@
 
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
@@ -458,7 +442,7 @@
 
     <antcall target="unzip">
       <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
+      <param name="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
       <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
@@ -469,7 +453,7 @@
     <mkdir dir="${staging_folder}/arduino-builder-macosx"/>
     <antcall target="untar">
       <param name="archive_file" value="./arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-      <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+      <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
       <param name="final_folder" value="${staging_folder}/arduino-builder-macosx/arduino-builder" />
       <param name="dest_folder" value="${staging_folder}/arduino-builder-macosx" />
     </antcall>
@@ -643,53 +627,15 @@
   </target>
 
   <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
-    <antcall target="unzip">
-      <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
-      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
-      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
-      <param name="dest_folder" value="${staging_folder}" />
-    </antcall>

-
-    <antcall target="unzip">
-      <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
-      <param name="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
-      <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
-      <param name="dest_folder" value="${staging_folder}" />
-    </antcall>

   <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
-    <antcall target="unzip">
-      <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
-      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
-      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
-      <param name="dest_folder" value="${staging_folder}" />
-    </antcall>

-
-    <antcall target="unzip">
-      <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
-      <param name="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
-      <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
-      <param name="dest_folder" value="${staging_folder}" />
-    </antcall>

   </target>
 
   <target name="linuxarm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">
@@ -701,7 +647,7 @@
     <mkdir dir="${staging_folder}/arduino-builder-arm"/>
     <antcall target="untar">
       <param name="archive_file" value="./arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-      <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+      <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
       <param name="final_folder" value="${staging_folder}/arduino-builder-arm/arduino-builder" />
       <param name="dest_folder" value="${staging_folder}/arduino-builder-arm" />
     </antcall>
@@ -731,7 +677,7 @@
     <mkdir dir="${staging_folder}/arduino-builder-linux32"/>
     <antcall target="untar">
       <param name="archive_file" value="./arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-      <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+      <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
       <param name="final_folder" value="${staging_folder}/arduino-builder-linux32/arduino-builder" />
       <param name="dest_folder" value="${staging_folder}/arduino-builder-linux32" />
     </antcall>
@@ -756,30 +702,6 @@
     <antcall target="linux-jvm-${linux-bundle-jvm-task}">
       <param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
     </antcall>
-
-    <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
-    <mkdir dir="${staging_folder}/arduino-builder-linux64"/>
-    <antcall target="untar">
-      <param name="archive_file" value="./arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-      <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-      <param name="final_folder" value="${staging_folder}/arduino-builder-linux64/arduino-builder" />
-      <param name="dest_folder" value="${staging_folder}/arduino-builder-linux64" />
-    </antcall>
-    <copy file="${staging_folder}/arduino-builder-linux64/arduino-builder" tofile="linux/work/arduino-builder" />
-    <chmod perm="755" file="linux/work/arduino-builder" />
-    <move file="${staging_folder}/arduino-builder-linux64/tools" tofile="linux/work/tools-builder"/>
-    <copy todir="linux/work/hardware" overwrite="true">
-      <fileset dir="${staging_folder}/arduino-builder-linux64/hardware" includes="*.txt"/>
-    </copy>
-    <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
-
-    <antcall target="avr-toolchain-bundle">
-      <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
-      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
-      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
-      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
-    </antcall>
   </target>
 
   <target name="linux-jvm-noop"/>
@@ -822,8 +744,21 @@
 
   <!-- Retrieve tool -->
   <target name="untar-unzip-download" depends="untar-unzip-check" unless="${archive_file}_available">
+      <antcall target="untar-unzip-download-web" />
+      <antcall target="untar-unzip-download-local" />
+  </target>
+  <target name="untar-unzip-download-web" unless="local_sources">
     <get src="${archive_url}" dest="${archive_file}" verbose="true" ignoreerrors="true" />
   </target>
+  <target name="untar-unzip-download-local" if="local_sources">
+    <basename file="${archive_file}" property="basename" />
+    <echo>Skipping download of ${archive_url}, using makepkg downloaded ${basename}</echo>
+    <exec executable="ln" failonerror="true">
+        <arg value="-s" />
+        <arg value="${basedir}/../../${basename}" />
+        <arg value="${archive_file}" />
+    </exec>
+  </target>
 
   <target name="untar-unzip-checksum" depends="untar-unzip-download">
     <echo>Testing checksum of "${archive_file}"</echo>
@@ -926,7 +861,7 @@
   <target name="download-launch4j-windows">
     <antcall target="unzip-with-ant-task">
       <param name="archive_file" value="windows/launch4j-3.8-win32.zip"/>
-      <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-win32.zip"/>
+      <param name="archive_url" value="https://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-win32.zip"/>
       <param name="final_folder" value="windows/launcher/launch4j"/>
       <param name="dest_folder" value="windows/launcher/"/>
     </antcall>
@@ -935,7 +870,7 @@
   <target name="download-launch4j-linux">
     <antcall target="untar">
       <param name="archive_file" value="windows/launch4j-3.8-linux.tgz"/>
-      <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-linux.tgz"/>
+      <param name="archive_url" value="https://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-linux.tgz"/>
       <param name="final_folder" value="windows/launcher/launch4j"/>
       <param name="dest_folder" value="windows/launcher/"/>
     </antcall>
@@ -977,7 +912,7 @@
 
     <antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
@@ -987,7 +922,7 @@
 
     <antcall target="unzip">
       <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
+      <param name="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
       <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
@@ -998,7 +933,7 @@
     <mkdir dir="${staging_folder}/arduino-builder-windows"/>
     <antcall target="unzip-with-ant-task">
       <param name="archive_file" value="./arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" />
+      <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" />
       <param name="final_folder" value="${staging_folder}/arduino-builder-windows/arduino-builder.exe" />
       <param name="dest_folder" value="${staging_folder}/arduino-builder-windows" />
     </antcall>
@@ -1136,7 +1071,7 @@
 
     <antcall target="${unpack_target}">
       <param name="archive_file" value="${staging_folder}/${gcc_archive_file}"/>
-      <param name="archive_url" value="http://downloads.arduino.cc/tools/${gcc_archive_file}"/>
+      <param name="archive_url" value="https://downloads.arduino.cc/tools/${gcc_archive_file}"/>
       <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/${gcc_version}/"/>
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/"/>
     </antcall>
@@ -1145,7 +1080,7 @@
 
     <antcall target="${unpack_target}">
       <param name="archive_file" value="${staging_folder}/${avrdude_archive_file}"/>
-      <param name="archive_url" value="http://downloads.arduino.cc/tools/${avrdude_archive_file}"/>
+      <param name="archive_url" value="https://downloads.arduino.cc/tools/${avrdude_archive_file}"/>
       <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/${avrdude_version}"/>
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/"/>
     </antcall>

Lines 283-291 Link Here

(-)pkg-plist (-5 / +25 lines)
283	arduino/lib/jackson-databind-2.6.3.jar	283	arduino/lib/jackson-databind-2.6.3.jar
284	arduino/lib/jackson-module-mrbean-2.6.3.jar	284	arduino/lib/jackson-module-mrbean-2.6.3.jar
285	arduino/lib/java-semver-0.8.0.jar	285	arduino/lib/java-semver-0.8.0.jar
286	arduino/lib/jmdns-3.4.1.jar	286	arduino/lib/jmdns-3.5.1.jar
287	arduino/lib/jna-4.1.0.jar	287	arduino/lib/jna-4.2.2.jar
288	arduino/lib/jna-platform-4.1.0.jar	288	arduino/lib/jna-platform-4.2.2.jar
289	arduino/lib/jsch-0.1.50.jar	289	arduino/lib/jsch-0.1.50.jar
290	arduino/lib/keywords.txt	290	arduino/lib/keywords.txt
291	arduino/lib/libastylej.so	291	arduino/lib/libastylej.so
Lines 293-299 Link Here
293	arduino/lib/pde.jar	293	arduino/lib/pde.jar
294	arduino/lib/preferences.txt	294	arduino/lib/preferences.txt
295	arduino/lib/public.gpg.key	295	arduino/lib/public.gpg.key
296	arduino/lib/rsyntaxtextarea-2.5.8.1+arduino.jar	296	arduino/lib/rsyntaxtextarea-2.6.1.jar
		297	arduino/lib/slf4j-api-1.7.22.jar
		298	arduino/lib/slf4j-simple-1.7.22.jar
297	arduino/lib/splash.bmp	299	arduino/lib/splash.bmp
298	arduino/lib/splash.png	300	arduino/lib/splash.png
299	arduino/lib/theme/buttons.png	301	arduino/lib/theme/buttons.png
Lines 440-445 Link Here
440	arduino/libraries/Firmata/Boards.h	442	arduino/libraries/Firmata/Boards.h
441	arduino/libraries/Firmata/Firmata.cpp	443	arduino/libraries/Firmata/Firmata.cpp
442	arduino/libraries/Firmata/Firmata.h	444	arduino/libraries/Firmata/Firmata.h
		445	arduino/libraries/Firmata/FirmataConstants.h
		446	arduino/libraries/Firmata/FirmataDefines.h
		447	arduino/libraries/Firmata/FirmataMarshaller.cpp
		448	arduino/libraries/Firmata/FirmataMarshaller.h
		449	arduino/libraries/Firmata/FirmataParser.cpp
		450	arduino/libraries/Firmata/FirmataParser.h
		451	arduino/libraries/Firmata/LICENSE.txt
443	%%EXAMPLES%%arduino/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.ino	452	%%EXAMPLES%%arduino/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.ino
444	%%EXAMPLES%%arduino/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.ino	453	%%EXAMPLES%%arduino/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.ino
445	%%EXAMPLES%%arduino/libraries/Firmata/examples/EchoString/EchoString.ino	454	%%EXAMPLES%%arduino/libraries/Firmata/examples/EchoString/EchoString.ino
Lines 463-469 Link Here
463	%%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/LICENSE.txt	472	%%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/LICENSE.txt
464	%%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/StandardFirmataWiFi.ino	473	%%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/StandardFirmataWiFi.ino
465	%%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/wifiConfig.h	474	%%EXAMPLES%%arduino/libraries/Firmata/examples/StandardFirmataWiFi/wifiConfig.h
466	arduino/libraries/Firmata/extras/LICENSE.txt
467	arduino/libraries/Firmata/extras/revisions.txt	475	arduino/libraries/Firmata/extras/revisions.txt
468	arduino/libraries/Firmata/keywords.txt	476	arduino/libraries/Firmata/keywords.txt
469	arduino/libraries/Firmata/library.properties	477	arduino/libraries/Firmata/library.properties
Lines 715-724 Link Here
715	arduino/libraries/Servo/src/Servo.h	723	arduino/libraries/Servo/src/Servo.h
716	arduino/libraries/Servo/src/avr/Servo.cpp	724	arduino/libraries/Servo/src/avr/Servo.cpp
717	arduino/libraries/Servo/src/avr/ServoTimers.h	725	arduino/libraries/Servo/src/avr/ServoTimers.h
		726	arduino/libraries/Servo/src/nrf52/Servo.cpp
		727	arduino/libraries/Servo/src/nrf52/ServoTimers.h
718	arduino/libraries/Servo/src/sam/Servo.cpp	728	arduino/libraries/Servo/src/sam/Servo.cpp
719	arduino/libraries/Servo/src/sam/ServoTimers.h	729	arduino/libraries/Servo/src/sam/ServoTimers.h
720	arduino/libraries/Servo/src/samd/Servo.cpp	730	arduino/libraries/Servo/src/samd/Servo.cpp
721	arduino/libraries/Servo/src/samd/ServoTimers.h	731	arduino/libraries/Servo/src/samd/ServoTimers.h
		732	arduino/libraries/Servo/src/stm32f4/Servo.cpp
		733	arduino/libraries/Servo/src/stm32f4/ServoTimers.h
722	arduino/libraries/SpacebrewYun/README.adoc	734	arduino/libraries/SpacebrewYun/README.adoc
723	%%EXAMPLES%%arduino/libraries/SpacebrewYun/examples/inputOutput/inputOutput.ino	735	%%EXAMPLES%%arduino/libraries/SpacebrewYun/examples/inputOutput/inputOutput.ino
724	%%EXAMPLES%%arduino/libraries/SpacebrewYun/examples/spacebrewBoolean/spacebrewBoolean.ino	736	%%EXAMPLES%%arduino/libraries/SpacebrewYun/examples/spacebrewBoolean/spacebrewBoolean.ino
Lines 848-858 Link Here
848	arduino/libraries/Temboo/src/utility/TembooCoAPIPStack.h	860	arduino/libraries/Temboo/src/utility/TembooCoAPIPStack.h
849	arduino/libraries/Temboo/src/utility/TembooCoAPSession.cpp	861	arduino/libraries/Temboo/src/utility/TembooCoAPSession.cpp
850	arduino/libraries/Temboo/src/utility/TembooCoAPSession.h	862	arduino/libraries/Temboo/src/utility/TembooCoAPSession.h
		863	arduino/libraries/Temboo/src/utility/TembooDS18B20.cpp
		864	arduino/libraries/Temboo/src/utility/TembooDS18B20.h
		865	arduino/libraries/Temboo/src/utility/TembooGPIO.c
		866	arduino/libraries/Temboo/src/utility/TembooGPIO.h
851	arduino/libraries/Temboo/src/utility/TembooGlobal.c	867	arduino/libraries/Temboo/src/utility/TembooGlobal.c
852	arduino/libraries/Temboo/src/utility/TembooGlobal.h	868	arduino/libraries/Temboo/src/utility/TembooGlobal.h
853	arduino/libraries/Temboo/src/utility/TembooMQTTIPStack.h	869	arduino/libraries/Temboo/src/utility/TembooMQTTIPStack.h
854	arduino/libraries/Temboo/src/utility/TembooMQTTSession.cpp	870	arduino/libraries/Temboo/src/utility/TembooMQTTSession.cpp
855	arduino/libraries/Temboo/src/utility/TembooMQTTSession.h	871	arduino/libraries/Temboo/src/utility/TembooMQTTSession.h
		872	arduino/libraries/Temboo/src/utility/TembooOneWire.cpp
		873	arduino/libraries/Temboo/src/utility/TembooOneWire.h
856	arduino/libraries/Temboo/src/utility/TembooSession.cpp	874	arduino/libraries/Temboo/src/utility/TembooSession.cpp
857	arduino/libraries/Temboo/src/utility/TembooSession.h	875	arduino/libraries/Temboo/src/utility/TembooSession.h
858	arduino/libraries/Temboo/src/utility/TembooTags.h	876	arduino/libraries/Temboo/src/utility/TembooTags.h
Lines 2032-2040 Link Here
2032	arduino/tools/WiFi101/.gitignore	2050	arduino/tools/WiFi101/.gitignore
2033	arduino/tools/WiFi101/.travis.yml	2051	arduino/tools/WiFi101/.travis.yml
2034	arduino/tools/WiFi101/README.md	2052	arduino/tools/WiFi101/README.md
		2053	arduino/tools/WiFi101/assets/default.html
2035	arduino/tools/WiFi101/build.sh	2054	arduino/tools/WiFi101/build.sh
2036	arduino/tools/WiFi101/firmwares/19.4.4/m2m_aio_2b0.bin	2055	arduino/tools/WiFi101/firmwares/19.4.4/m2m_aio_2b0.bin
2037	arduino/tools/WiFi101/firmwares/19.4.4/m2m_aio_3a0.bin	2056	arduino/tools/WiFi101/firmwares/19.4.4/m2m_aio_3a0.bin
		2057	arduino/tools/WiFi101/firmwares/19.5.2/m2m_aio_3a0.bin
2038	arduino/tools/WiFi101/screenshot-0.png	2058	arduino/tools/WiFi101/screenshot-0.png
2039	arduino/tools/WiFi101/screenshot-1.png	2059	arduino/tools/WiFi101/screenshot-1.png
2040	arduino/tools/WiFi101/screenshot-2.png	2060	arduino/tools/WiFi101/screenshot-2.png

Return to bug 218282

Lines 1-65 Link Here

(-)Makefile (-42 / +45 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= arduino	3	PORTNAME= arduino
4	PORTVERSION= 1.6.12	4	PORTVERSION= 1.8.2
5	PORTREVISION= 4	5	CATEGORIES= devel java
6	CATEGORIES= devel java	6	PKGNAMESUFFIX= 18
7	PKGNAMESUFFIX= 16	7	DIST_SUBDIR= ${PORTNAME}
8	DIST_SUBDIR= ${PORTNAME}
9		8
10	MAINTAINER= bsdports@kyle-evans.net	9	MAINTAINER= bsdports@kyle-evans.net
11	COMMENT= Open-source electronics prototyping platform	10	COMMENT= Open-source electronics prototyping platform
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14	LICENSE_FILE= ${WRKSRC}/../license.txt	13	LICENSE_FILE= ${WRKSRC}/../license.txt
15		14
16	LIB_DEPENDS= liblistSerialsj.so:devel/listserialc \	15	LIB_DEPENDS= liblistSerialsj.so:devel/listserialc \
17	libastyle-arduinoj.so:devel/libastylej-arduino	16	libastyle-arduinoj.so:devel/libastylej-arduino
18	RUN_DEPENDS= arduino-builder:devel/arduino-builder \	17	RUN_DEPENDS= arduino-builder:devel/arduino-builder \
19	arduino-tools>=1.6.12:devel/arduino-tools \	18	arduino-tools>=1.6.12:devel/arduino-tools \
20	bash:shells/bash \	19	bash:shells/bash \
21	${JAVA_HOME}/jre/lib/ext/jssc-2.8.0.jar:comms/java-simple-serial-connector	20	${JAVA_HOME}/jre/lib/ext/jssc-2.8.0.jar:comms/java-simple-serial-connector
22		21
23	CONFLICTS= arduino-[0-9]*	22	CONFLICTS= arduino-[0-9]*
24		23
25	BUNDLE_GH_ACCOUNT= arduino-libraries	24	BUNDLE_GH_ACCOUNT= arduino-libraries
26	BUNDLE_LIBRARIES= Firmata:2.5.3:firmata \	25	BUNDLE_LIBRARIES= Firmata:2.5.5:firmata \
27	Bridge:1.6.3:bridge \	26	Bridge:1.6.3:bridge \
28	Robot_Control:1.0.2:robotcontrol \	27	Robot_Control:1.0.2:robotcontrol \
29	Robot_Motor:1.0.1:robotmotor \	28	Robot_Motor:1.0.2:robotmotor \
30	RobotIRremote:1.0.2:robotir \	29	RobotIRremote:1.0.2:robotir \
31	SpacebrewYun:1.0.1:spacebrew \	30	SpacebrewYun:1.0.1:spacebrew \
32	Temboo:1.1.7:temboo \	31	Temboo:1.1.8:temboo \
33	Esplora:1.0.4:esplora \	32	Esplora:1.0.4:esplora \
34	Mouse:1.0.1:mouse \	33	Mouse:1.0.1:mouse \
35	Keyboard:1.0.1:keyboard	34	Keyboard:1.0.1:keyboard \
		35	SD:1.1.1:sd \
		36	Servo:1.1.2:servo
36		37
37	GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.8.0:wifi10/linux/work/tools/WiFi101	38	GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.9.0:wifi10/linux/work/tools/WiFi101
38		39
39	USE_GITHUB= yes	40	USE_GITHUB= yes
40	GH_ACCOUNT= arduino	41	GH_ACCOUNT= arduino
41	GH_PROJECT= Arduino	42	GH_PROJECT= Arduino
42		43
43	.for blib in ${BUNDLE_LIBRARIES}	44	.for blib in ${BUNDLE_LIBRARIES}
44	GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:${blib}/linux/work/libraries/${blib:C/\:.*//}	45	GH_TUPLE+= ${BUNDLE_GH_ACCOUNT}:${blib}/linux/work/libraries/${blib:C/\:.*//}
45	.endfor	46	.endfor
46		47
47	USES= desktop-file-utils	48	USES= desktop-file-utils
48	LIB_DIRS+= ${LOCALBASE}/lib ${LOCALBASE}/lib/jni	49	LIB_DIRS+= ${LOCALBASE}/lib ${LOCALBASE}/lib/jni
49	WRKSRC_SUBDIR= build	50	WRKSRC_SUBDIR= build
50	PATCH_WRKSRC= ${WRKSRC}/../	51	PATCH_WRKSRC= ${WRKSRC}/../
51	MAKE_ARGS+= -Dlight_bundle=true -Dlocal_sources=true	52	MAKE_ARGS+= -Dlight_bundle=true -Dlocal_sources=true -Dno_arduino_builder=true
52	USE_JAVA= yes	53	USE_JAVA= yes
53	USE_ANT= yes	54	USE_ANT= yes
		55	OS_DIR= ${WRKSRC}/linux
		56	BUILD_DIR= ${OS_DIR}/work
		57	INSLIST= lib libraries revisions.txt tools
		58	STRIP= # No Elfs here, only symlinks
		59
		60	OPTIONS_DEFINE= DOCS EXAMPLES
		61	OPTIONS_SUB= yes
		62
54	DOCS_MAKE_ARGS= -Dno_docs=false	63	DOCS_MAKE_ARGS= -Dno_docs=false
55	DOCS_MAKE_ARGS_OFF= -Dno_docs=true	64	DOCS_MAKE_ARGS_OFF= -Dno_docs=true
56	OS_DIR= ${WRKSRC}/linux
57	BUILD_DIR= ${OS_DIR}/work
58	INSLIST= lib libraries revisions.txt tools
59	STRIP= # No Elfs here, only symlinks
60	OPTIONS_DEFINE= DOCS EXAMPLES
61	OPTIONS_SUB= yes
62
63	DOCS_MASTER_SITES= http://downloads.arduino.cc/:ref,galileo,edison \	65	DOCS_MASTER_SITES= http://downloads.arduino.cc/:ref,galileo,edison \
64	https://files.kyle-evans.net/arduino/:ref,galileo,edison	66	https://files.kyle-evans.net/arduino/:ref,galileo,edison
65	DOCS_DISTFILES= reference-1.6.6-3.zip:ref \	67	DOCS_DISTFILES= reference-1.6.6-3.zip:ref \
Lines 69-79 Link Here
69	.include <bsd.port.options.mk>	71	.include <bsd.port.options.mk>
70		72
71	.if ${PORT_OPTIONS:MDOCS}	73	.if ${PORT_OPTIONS:MDOCS}
72	INSLIST+= reference	74	INSLIST+= reference
73	.endif	75	.endif
74		76
75	.if ${PORT_OPTIONS:MEXAMPLES}	77	.if ${PORT_OPTIONS:MEXAMPLES}
76	INSLIST+= examples	78	INSLIST+= examples
77	.endif	79	.endif
78		80
79	post-extract:	81	post-extract:
Lines 102-106 Link Here
102	${LN} -s ../bin/arduino-builder ${STAGEDIR}${PREFIX}/arduino/arduino-builder	104	${LN} -s ../bin/arduino-builder ${STAGEDIR}${PREFIX}/arduino/arduino-builder
103	${CP} ${WRKSRC}/shared/icons/arduino.xpm ${STAGEDIR}/${PREFIX}/share/pixmaps	105	${CP} ${WRKSRC}/shared/icons/arduino.xpm ${STAGEDIR}/${PREFIX}/share/pixmaps
104	${CP} ${PATCH_WRKSRC}/build/linux/dist/desktop.template ${STAGEDIR}/${PREFIX}/share/applications/arduino.desktop	106	${CP} ${PATCH_WRKSRC}/build/linux/dist/desktop.template ${STAGEDIR}/${PREFIX}/share/applications/arduino.desktop
		107	${REINPLACE_CMD} -e 's\|$${version}\|${PORTVERSION}\|' ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/version.txt
105		108
106	.include <bsd.port.mk>	109	.include <bsd.port.mk>

Lines 1-4 Link Here

(-)distinfo (-11 / +15 lines)
1	TIMESTAMP = 1476591503	1	TIMESTAMP = 1490197071
2	SHA256 (arduino/reference-1.6.6-3.zip) = c3bfb7f9b408fd99a4a1c0f3b022f0a8b10abae6dc28e35d38b4a0df62903685	2	SHA256 (arduino/reference-1.6.6-3.zip) = c3bfb7f9b408fd99a4a1c0f3b022f0a8b10abae6dc28e35d38b4a0df62903685
3	SIZE (arduino/reference-1.6.6-3.zip) = 7004842	3	SIZE (arduino/reference-1.6.6-3.zip) = 7004842
4	SHA256 (arduino/Galileo_help_files-1.6.2.zip) = 1c70276e4783286d59c8ac0132c3286e7dcf6825bea65e25747a94416b07aa61	4	SHA256 (arduino/Galileo_help_files-1.6.2.zip) = 1c70276e4783286d59c8ac0132c3286e7dcf6825bea65e25747a94416b07aa61
Lines 5-28 Link Here
5	SIZE (arduino/Galileo_help_files-1.6.2.zip) = 4352077	5	SIZE (arduino/Galileo_help_files-1.6.2.zip) = 4352077
6	SHA256 (arduino/Edison_help_files-1.6.2.zip) = 56718ce5b2b090d79dae298f6ff9a09c8c1a77f74e3594a951f7035877cc45f4	6	SHA256 (arduino/Edison_help_files-1.6.2.zip) = 56718ce5b2b090d79dae298f6ff9a09c8c1a77f74e3594a951f7035877cc45f4
7	SIZE (arduino/Edison_help_files-1.6.2.zip) = 3321743	7	SIZE (arduino/Edison_help_files-1.6.2.zip) = 3321743
8	SHA256 (arduino/arduino-Arduino-1.6.12_GH0.tar.gz) = 081c063e34bd72c9912705f33395cdd1870424826b4365dd64439575e0f11817	8	SHA256 (arduino/arduino-Arduino-1.8.2_GH0.tar.gz) = df7dba7ad20ca315788d309b9e52d45d1ec509c701a52121426098133e87d674
9	SIZE (arduino/arduino-Arduino-1.6.12_GH0.tar.gz) = 81248294	9	SIZE (arduino/arduino-Arduino-1.8.2_GH0.tar.gz) = 48191808
10	SHA256 (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.8.0_GH0.tar.gz) = 2f6b17200c107e6e6190147b1e075d3bd91bf2f673853bce511eb8758c9dd133	10	SHA256 (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.9.0_GH0.tar.gz) = 43f3f992bb1cda45f8609eb0269e394d9c7e2ffab45a29a2bc312579c489d9d1
11	SIZE (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.8.0_GH0.tar.gz) = 568963	11	SIZE (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.9.0_GH0.tar.gz) = 810749
12	SHA256 (arduino/arduino-libraries-Firmata-2.5.3_GH0.tar.gz) = d59313efb1050b4500d0ca8592bd312a8280903ee60051ec07ebb0f2a8cfa185	12	SHA256 (arduino/arduino-libraries-Firmata-2.5.5_GH0.tar.gz) = c34732d01e27cfabfc47a12cc684a8d66a484252a19aed41c19b2f06a971535b
13	SIZE (arduino/arduino-libraries-Firmata-2.5.3_GH0.tar.gz) = 154530	13	SIZE (arduino/arduino-libraries-Firmata-2.5.5_GH0.tar.gz) = 162998
14	SHA256 (arduino/arduino-libraries-Bridge-1.6.3_GH0.tar.gz) = 8c5f01530973aef9dbd47bd748c093e0a0774cca425e2b00e058f12d805a483f	14	SHA256 (arduino/arduino-libraries-Bridge-1.6.3_GH0.tar.gz) = 8c5f01530973aef9dbd47bd748c093e0a0774cca425e2b00e058f12d805a483f
15	SIZE (arduino/arduino-libraries-Bridge-1.6.3_GH0.tar.gz) = 36011	15	SIZE (arduino/arduino-libraries-Bridge-1.6.3_GH0.tar.gz) = 36011
16	SHA256 (arduino/arduino-libraries-Robot_Control-1.0.2_GH0.tar.gz) = 1c40bbd733ea3abde7f45102ad61e019c9512670a0da3a43bc0e609a03996a57	16	SHA256 (arduino/arduino-libraries-Robot_Control-1.0.2_GH0.tar.gz) = 1c40bbd733ea3abde7f45102ad61e019c9512670a0da3a43bc0e609a03996a57
17	SIZE (arduino/arduino-libraries-Robot_Control-1.0.2_GH0.tar.gz) = 78144	17	SIZE (arduino/arduino-libraries-Robot_Control-1.0.2_GH0.tar.gz) = 78144
18	SHA256 (arduino/arduino-libraries-Robot_Motor-1.0.1_GH0.tar.gz) = d2ebb4e924389e15f94cb052794d666e50711c2d5a3ec9a3a3e36f2fd141d198	18	SHA256 (arduino/arduino-libraries-Robot_Motor-1.0.2_GH0.tar.gz) = b7bf0d33288e92801410332c53033fa83540fcdfcd14edda890133f1fedba288
19	SIZE (arduino/arduino-libraries-Robot_Motor-1.0.1_GH0.tar.gz) = 7891	19	SIZE (arduino/arduino-libraries-Robot_Motor-1.0.2_GH0.tar.gz) = 7892
20	SHA256 (arduino/arduino-libraries-RobotIRremote-1.0.2_GH0.tar.gz) = 58de60b9deb51172c5cb0ba31ce66cae021b937c3f22c69580f59f94b7692af0	20	SHA256 (arduino/arduino-libraries-RobotIRremote-1.0.2_GH0.tar.gz) = 58de60b9deb51172c5cb0ba31ce66cae021b937c3f22c69580f59f94b7692af0
21	SIZE (arduino/arduino-libraries-RobotIRremote-1.0.2_GH0.tar.gz) = 19013	21	SIZE (arduino/arduino-libraries-RobotIRremote-1.0.2_GH0.tar.gz) = 19013
22	SHA256 (arduino/arduino-libraries-SpacebrewYun-1.0.1_GH0.tar.gz) = b9ac22651020c04a246a0f839c7b7627dff22b1998e6640ee6112d7251538d09	22	SHA256 (arduino/arduino-libraries-SpacebrewYun-1.0.1_GH0.tar.gz) = b9ac22651020c04a246a0f839c7b7627dff22b1998e6640ee6112d7251538d09
23	SIZE (arduino/arduino-libraries-SpacebrewYun-1.0.1_GH0.tar.gz) = 6901	23	SIZE (arduino/arduino-libraries-SpacebrewYun-1.0.1_GH0.tar.gz) = 6901
24	SHA256 (arduino/arduino-libraries-Temboo-1.1.7_GH0.tar.gz) = 34f6a1a87f32dd18515e3813a35e51aebc4a5e369c439cd8b535fa796b0e7d51	24	SHA256 (arduino/arduino-libraries-Temboo-1.1.8_GH0.tar.gz) = 1aee8614db469e43e2333ff47efcbe3b83fcdb34dd02cd656ec73de2815e39ac
25	SIZE (arduino/arduino-libraries-Temboo-1.1.7_GH0.tar.gz) = 76226	25	SIZE (arduino/arduino-libraries-Temboo-1.1.8_GH0.tar.gz) = 90457
26	SHA256 (arduino/arduino-libraries-Esplora-1.0.4_GH0.tar.gz) = 67644c34290d02d7867af87743e5326de55ee076f44ce2edbcd6fabad2ce7bac	26	SHA256 (arduino/arduino-libraries-Esplora-1.0.4_GH0.tar.gz) = 67644c34290d02d7867af87743e5326de55ee076f44ce2edbcd6fabad2ce7bac
27	SIZE (arduino/arduino-libraries-Esplora-1.0.4_GH0.tar.gz) = 12615	27	SIZE (arduino/arduino-libraries-Esplora-1.0.4_GH0.tar.gz) = 12615
28	SHA256 (arduino/arduino-libraries-Mouse-1.0.1_GH0.tar.gz) = 9269148995b5053a31781a085715f86ba60d9cf209fa1f13ba108858f1f50204	28	SHA256 (arduino/arduino-libraries-Mouse-1.0.1_GH0.tar.gz) = 9269148995b5053a31781a085715f86ba60d9cf209fa1f13ba108858f1f50204
Lines 29-31 Link Here
29	SIZE (arduino/arduino-libraries-Mouse-1.0.1_GH0.tar.gz) = 2421	29	SIZE (arduino/arduino-libraries-Mouse-1.0.1_GH0.tar.gz) = 2421
30	SHA256 (arduino/arduino-libraries-Keyboard-1.0.1_GH0.tar.gz) = 048468d0c2d3be933971a7cbcdd68ac8619cc9a7b039eaa8ee15783ed767d793	30	SHA256 (arduino/arduino-libraries-Keyboard-1.0.1_GH0.tar.gz) = 048468d0c2d3be933971a7cbcdd68ac8619cc9a7b039eaa8ee15783ed767d793
31	SIZE (arduino/arduino-libraries-Keyboard-1.0.1_GH0.tar.gz) = 4098	31	SIZE (arduino/arduino-libraries-Keyboard-1.0.1_GH0.tar.gz) = 4098
		32	SHA256 (arduino/arduino-libraries-SD-1.1.1_GH0.tar.gz) = bee40dae69eebc39a3cbd37dc3985324d212d352d0b236f876ac61f73815aa92
		33	SIZE (arduino/arduino-libraries-SD-1.1.1_GH0.tar.gz) = 47102
		34	SHA256 (arduino/arduino-libraries-Servo-1.1.2_GH0.tar.gz) = a58f5b9087efa12d30afb67e5f0f7bdb9b22548d6ad3c5241eec3dd3d851641d
		35	SIZE (arduino/arduino-libraries-Servo-1.1.2_GH0.tar.gz) = 14059

Lines 1-6 Link Here

(-)files/patch-app_src_processing_app_Base.java (-5 / +5 lines)
1	--- app/src/processing/app/Base.java.orig 2016-09-21 10:09:37 UTC	1	--- app/src/processing/app/Base.java.orig 2017-03-16 17:38:01 UTC
2	+++ app/src/processing/app/Base.java	2	+++ app/src/processing/app/Base.java
3	@@ -463,7 +463,7 @@ public class Base {	3	@@ -460,7 +460,7 @@ public class Base {
4	new Thread(new NewBoardListener(this)).start();	4	new Thread(new NewBoardListener(this)).start();
5		5
6	// Check for updates	6	// Check for updates
Lines 9-15 Link Here
9	new UpdateCheck(this);	9	new UpdateCheck(this);
10		10
11	contributionsSelfCheck = new ContributionsSelfCheck(this, new UpdatableBoardsLibsFakeURLsHandler(this), contributionInstaller, libraryInstaller);	11	contributionsSelfCheck = new ContributionsSelfCheck(this, new UpdatableBoardsLibsFakeURLsHandler(this), contributionInstaller, libraryInstaller);
12	@@ -1060,12 +1060,7 @@ public class Base {	12	@@ -1055,12 +1055,7 @@ public class Base {
13	if (importMenu == null)	13	if (importMenu == null)
14	return;	14	return;
15	importMenu.removeAll();	15	importMenu.removeAll();
Lines 23-29 Link Here
23	JMenuItem addLibraryMenuItem = new JMenuItem(tr("Add .ZIP Library..."));	23	JMenuItem addLibraryMenuItem = new JMenuItem(tr("Add .ZIP Library..."));
24	addLibraryMenuItem.addActionListener(new ActionListener() {	24	addLibraryMenuItem.addActionListener(new ActionListener() {
25	public void actionPerformed(ActionEvent e) {	25	public void actionPerformed(ActionEvent e) {
26	@@ -1392,31 +1387,12 @@ public class Base {	26	@@ -1388,31 +1383,12 @@ public class Base {
27	boardMenu.putClientProperty("removeOnWindowDeactivation", true);	27	boardMenu.putClientProperty("removeOnWindowDeactivation", true);
28	MenuScroller.setScrollerFor(boardMenu);	28	MenuScroller.setScrollerFor(boardMenu);
29		29
Lines 53-57 Link Here
53	- boardMenu.add(new JSeparator());	53	- boardMenu.add(new JSeparator());
54	-	54	-
55	// Generate custom menus for all platforms	55	// Generate custom menus for all platforms
56	Set<String> customMenusTitles = new HashSet<String>();	56	Set<String> customMenusTitles = new HashSet<>();
57	for (TargetPackage targetPackage : BaseNoGui.packages.values()) {	57	for (TargetPackage targetPackage : BaseNoGui.packages.values()) {