Attachment 152146 Details for Bug 196369 – Revised upgrade patchset

[patch] Revised upgrade patchset

patch2.txt (text/plain), 10.07 KB, created by Craig Leres on 2015-01-26 03:28:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Craig Leres

Created: 2015-01-26 03:28:07 UTC

Size: 10.07 KB

patch

obsolete

>Index: devel/arduino/Makefile
>===================================================================
>--- devel/arduino/Makefile	(revision 377902)
>+++ devel/arduino/Makefile	(working copy)
>@@ -2,11 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	arduino
>-PORTVERSION=	1.0.5
>-PORTREVISION=	2
>+PORTVERSION=	1.0.6
> PORTEPOCH=	1
> CATEGORIES=	devel java lang
>-MASTER_SITES=	GOOGLE_CODE
>+MASTER_SITES=	http://arduino.cc/download.php?f=/
> DISTNAME=	${PORTNAME}-${PORTVERSION}-linux32
> 
> MAINTAINER=	leres@ee.lbl.gov
>@@ -20,7 +19,12 @@
> USES=		dos2unix tar:tgz
> DOS2UNIX_REGEX=	.*$\.\(c|cpp|h|hex|html|ino|lst|txt$|Makefile\)
> 
>-USE_JAVA=	1.6+
>+USE_JAVA=	yes
>+JAVA_OS=	native
>+JAVA_VERSION=	1.7
>+JAVA_VENDOR=	openjdk
>+JAVA_RUN=	yes
>+
> NO_BUILD=	yes
> USE_LDCONFIG=	${PREFIX}/arduino/lib
> 
>Index: devel/arduino/distinfo
>===================================================================
>--- devel/arduino/distinfo	(revision 377902)
>+++ devel/arduino/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (arduino-1.0.5-linux32.tgz) = 9fa315c3f13b30900a45373b8c5876bb60b78c228271ed82d53e6ebe427e287f
>-SIZE (arduino-1.0.5-linux32.tgz) = 21162945
>+SHA256 (arduino-1.0.6-linux32.tgz) = f059a572231abafb92099a3a404c0a41502c3413668610676c40029384edc658
>+SIZE (arduino-1.0.6-linux32.tgz) = 21162427
>Index: devel/arduino/pkg-plist
>===================================================================
>--- devel/arduino/pkg-plist	(revision 377902)
>+++ devel/arduino/pkg-plist	(working copy)
>@@ -1,4 +1,3 @@
>-bin/arduino
> arduino/arduino
> %%EXAMPLES%%arduino/examples/01.Basics/AnalogReadSerial/AnalogReadSerial.ino
> %%EXAMPLES%%arduino/examples/01.Basics/BareMinimum/BareMinimum.ino
>@@ -550,6 +549,7 @@
> arduino/hardware/arduino/programmers.txt
> %%ATMEGA644P%%arduino/hardware/arduino/variants/atmega644p/pins_arduino.h
> arduino/hardware/arduino/variants/eightanaloginputs/pins_arduino.h
>+arduino/hardware/arduino/variants/ethernet/pins_arduino.h
> arduino/hardware/arduino/variants/leonardo/pins_arduino.h
> arduino/hardware/arduino/variants/mega/pins_arduino.h
> arduino/hardware/arduino/variants/micro/pins_arduino.h
>@@ -615,19 +615,19 @@
> arduino/libraries/Ethernet/EthernetServer.h
> arduino/libraries/Ethernet/EthernetUdp.cpp
> arduino/libraries/Ethernet/EthernetUdp.h
>+%%EXAMPLES%%arduino/libraries/Ethernet/examples/AdvancedChatServer/AdvancedChatServer.ino
> %%EXAMPLES%%arduino/libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.ino
> %%EXAMPLES%%arduino/libraries/Ethernet/examples/ChatServer/ChatServer.ino
> %%EXAMPLES%%arduino/libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.ino
> %%EXAMPLES%%arduino/libraries/Ethernet/examples/DhcpChatServer/DhcpChatServer.ino
>-%%EXAMPLES%%arduino/libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
>-%%EXAMPLES%%arduino/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
> %%EXAMPLES%%arduino/libraries/Ethernet/examples/TelnetClient/TelnetClient.ino
>-%%EXAMPLES%%arduino/libraries/Ethernet/examples/TwitterClient/TwitterClient.ino
> %%EXAMPLES%%arduino/libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.ino
> %%EXAMPLES%%arduino/libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.ino
> %%EXAMPLES%%arduino/libraries/Ethernet/examples/WebClient/WebClient.ino
> %%EXAMPLES%%arduino/libraries/Ethernet/examples/WebClientRepeating/WebClientRepeating.ino
> %%EXAMPLES%%arduino/libraries/Ethernet/examples/WebServer/WebServer.ino
>+%%EXAMPLES%%arduino/libraries/Ethernet/examples/XivelyClient/XivelyClient.ino
>+%%EXAMPLES%%arduino/libraries/Ethernet/examples/XivelyClientString/XivelyClientString.ino
> arduino/libraries/Ethernet/keywords.txt
> arduino/libraries/Ethernet/util.h
> arduino/libraries/Ethernet/utility/socket.cpp
>@@ -719,9 +719,8 @@
> arduino/libraries/GSM/GSM3VoiceCallService.cpp
> arduino/libraries/GSM/GSM3VoiceCallService.h
> arduino/libraries/GSM/License.txt
>-%%EXAMPLES%%arduino/libraries/GSM/examples/GSMPachubeClient/GSMPachubeClient.ino
>-%%EXAMPLES%%arduino/libraries/GSM/examples/GSMPachubeClientString/GSMPachubeClientString.ino
>-%%EXAMPLES%%arduino/libraries/GSM/examples/GsmTwitterClient/GsmTwitterClient.ino
>+%%EXAMPLES%%arduino/libraries/GSM/examples/GSMXivelyClient/GSMXivelyClient.ino
>+%%EXAMPLES%%arduino/libraries/GSM/examples/GSMXivelyClientString/GSMXivelyClientString.ino
> %%EXAMPLES%%arduino/libraries/GSM/examples/GsmWebClient/GsmWebClient.ino
> %%EXAMPLES%%arduino/libraries/GSM/examples/GsmWebServer/GsmWebServer.ino
> %%EXAMPLES%%arduino/libraries/GSM/examples/MakeVoiceCall/MakeVoiceCall.ino
>@@ -748,8 +747,14 @@
> %%EXAMPLES%%arduino/libraries/LiquidCrystal/examples/TextDirection/TextDirection.ino
> %%EXAMPLES%%arduino/libraries/LiquidCrystal/examples/setCursor/setCursor.ino
> arduino/libraries/LiquidCrystal/keywords.txt
>-arduino/libraries/Robot_Control/Adafruit_GFX.cpp
>-arduino/libraries/Robot_Control/Adafruit_GFX.h
>+arduino/libraries/RobotIRremote/IRremote.cpp
>+arduino/libraries/RobotIRremote/IRremote.h
>+arduino/libraries/RobotIRremote/IRremoteInt.h
>+arduino/libraries/RobotIRremote/IRremoteTools.cpp
>+arduino/libraries/RobotIRremote/IRremoteTools.h
>+arduino/libraries/RobotIRremote/LICENSE.txt
>+arduino/libraries/RobotIRremote/keywords.txt
>+arduino/libraries/RobotIRremote/readme
> arduino/libraries/Robot_Control/ArduinoRobot.cpp
> arduino/libraries/Robot_Control/ArduinoRobot.h
> arduino/libraries/Robot_Control/Arduino_LCD.cpp
>@@ -771,8 +776,6 @@
> arduino/libraries/Robot_Control/Multiplexer.cpp
> arduino/libraries/Robot_Control/Multiplexer.h
> arduino/libraries/Robot_Control/RobotSdCard.cpp
>-arduino/libraries/Robot_Control/SPI.cpp
>-arduino/libraries/Robot_Control/SPI.h
> arduino/libraries/Robot_Control/SdCard.cpp
> arduino/libraries/Robot_Control/SdCard.h
> arduino/libraries/Robot_Control/SdInfo.h
>@@ -781,8 +784,6 @@
> arduino/libraries/Robot_Control/Squawk.h
> arduino/libraries/Robot_Control/SquawkSD.cpp
> arduino/libraries/Robot_Control/SquawkSD.h
>-arduino/libraries/Robot_Control/Wire.cpp
>-arduino/libraries/Robot_Control/Wire.h
> arduino/libraries/Robot_Control/communication.cpp
> %%EXAMPLES%%arduino/libraries/Robot_Control/examples/explore/R01_Logo/R01_Logo.ino
> %%EXAMPLES%%arduino/libraries/Robot_Control/examples/explore/R02_Line_Follow/R02_Line_Follow.ino
>@@ -790,6 +791,7 @@
> %%EXAMPLES%%arduino/libraries/Robot_Control/examples/explore/R04_Compass/R04_Compass.ino
> %%EXAMPLES%%arduino/libraries/Robot_Control/examples/explore/R05_Inputs/R05_Inputs.ino
> %%EXAMPLES%%arduino/libraries/Robot_Control/examples/explore/R06_Wheel_Calibration/R06_Wheel_Calibration.ino
>+%%EXAMPLES%%arduino/libraries/Robot_Control/examples/explore/R06_Wheel_Calibration/scripts_library.h
> %%EXAMPLES%%arduino/libraries/Robot_Control/examples/explore/R07_Runaway_Robot/R07_Runaway_Robot.ino
> %%EXAMPLES%%arduino/libraries/Robot_Control/examples/explore/R08_Remote_Control/R08_Remote_Control.ino
> %%EXAMPLES%%arduino/libraries/Robot_Control/examples/explore/R09_Picture_Browser/R09_Picture_Browser.ino
>@@ -814,13 +816,13 @@
> arduino/libraries/Robot_Control/information.cpp
> arduino/libraries/Robot_Control/keyboard.cpp
> arduino/libraries/Robot_Control/lcd.cpp
>+arduino/libraries/Robot_Control/utility/Adafruit_GFX.cpp
>+arduino/libraries/Robot_Control/utility/Adafruit_GFX.h
> arduino/libraries/Robot_Control/utility/RobotTextManager.cpp
> arduino/libraries/Robot_Control/utility/RobotTextManager.h
> arduino/libraries/Robot_Control/utility/VirtualKeyboard.cpp
> arduino/libraries/Robot_Control/utility/VirtualKeyboard.h
> arduino/libraries/Robot_Control/utility/scripts_Hello_User.h
>-arduino/libraries/Robot_Control/utility/twi.c
>-arduino/libraries/Robot_Control/utility/twi.h
> arduino/libraries/Robot_Motor/ArduinoRobotMotorBoard.cpp
> arduino/libraries/Robot_Motor/ArduinoRobotMotorBoard.h
> arduino/libraries/Robot_Motor/EasyTransfer2.cpp
>@@ -855,7 +857,6 @@
> arduino/libraries/SPI/SPI.cpp
> arduino/libraries/SPI/SPI.h
> %%EXAMPLES%%arduino/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
>-%%EXAMPLES%%arduino/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.ino
> %%EXAMPLES%%arduino/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
> arduino/libraries/SPI/keywords.txt
> arduino/libraries/Servo/Servo.cpp
>@@ -890,7 +891,7 @@
> %%EXAMPLES%%arduino/libraries/TFT/examples/Esplora/EsploraTFTColorPicker/EsploraTFTColorPicker.ino
> %%EXAMPLES%%arduino/libraries/TFT/examples/Esplora/EsploraTFTEtchASketch/EsploraTFTEtchASketch.ino
> %%EXAMPLES%%arduino/libraries/TFT/examples/Esplora/EsploraTFTGraph/EsploraTFTGraph.ino
>-%%EXAMPLES%%arduino/libraries/TFT/examples/Esplora/EsploraTFTHorizion/EsploraTFTHorizion.ino
>+%%EXAMPLES%%arduino/libraries/TFT/examples/Esplora/EsploraTFTHorizon/EsploraTFTHorizon.ino
> %%EXAMPLES%%arduino/libraries/TFT/examples/Esplora/EsploraTFTPong/EsploraTFTPong.ino
> %%EXAMPLES%%arduino/libraries/TFT/examples/Esplora/EsploraTFTTemp/EsploraTFTTemp.ino
> arduino/libraries/TFT/keywords.txt
>@@ -917,14 +918,13 @@
> %%EXAMPLES%%arduino/libraries/WiFi/examples/ScanNetworks/ScanNetworks.ino
> %%EXAMPLES%%arduino/libraries/WiFi/examples/SimpleWebServerWiFi/SimpleWebServerWiFi.ino
> %%EXAMPLES%%arduino/libraries/WiFi/examples/WiFiChatServer/WiFiChatServer.ino
>-%%EXAMPLES%%arduino/libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino
>-%%EXAMPLES%%arduino/libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino
>-%%EXAMPLES%%arduino/libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino
> %%EXAMPLES%%arduino/libraries/WiFi/examples/WiFiUdpNtpClient/WiFiUdpNtpClient.ino
> %%EXAMPLES%%arduino/libraries/WiFi/examples/WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino
> %%EXAMPLES%%arduino/libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino
> %%EXAMPLES%%arduino/libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino
> %%EXAMPLES%%arduino/libraries/WiFi/examples/WiFiWebServer/WiFiWebServer.ino
>+%%EXAMPLES%%arduino/libraries/WiFi/examples/WiFiXivelyClient/WiFiXivelyClient.ino
>+%%EXAMPLES%%arduino/libraries/WiFi/examples/WiFiXivelyClientString/WiFiXivelyClientString.ino
> arduino/libraries/WiFi/keywords.txt
> arduino/libraries/WiFi/utility/debug.h
> arduino/libraries/WiFi/utility/server_drv.cpp
>@@ -1265,3 +1265,4 @@
> arduino/tools/Mangler/make.sh
> arduino/tools/Mangler/src/Mangler.java
> arduino/tools/howto.txt
>+bin/arduino

Flags:

leres: maintainer-approval+

Actions: View | Diff

Attachments on bug 196369: 151097 | 152146 | 152147 | 152156 | 152157