Attachment 179366 Details for Bug 200177 – svn diff for devel/arduino port addressing issues below (multiple files changed & epoch bumped)

[patch] svn diff for devel/arduino port addressing issues below (multiple files changed & epoch bumped)

arduino.diff (text/plain), 6.22 KB, created by James Elstone on 2017-01-28 00:58:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Elstone

Created: 2017-01-28 00:58:50 UTC

Size: 6.22 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 432596)
>+++ Makefile	(working copy)
>@@ -3,20 +3,23 @@
> 
> PORTNAME=	arduino
> PORTVERSION=	1.0.6
>-PORTEPOCH=	1
>+PORTEPOCH=	2
> CATEGORIES=	devel java lang
> MASTER_SITES=	http://arduino.cc/download.php?f=/
> DISTNAME=	${PORTNAME}-${PORTVERSION}-linux32
> 
>-MAINTAINER=	leres@ee.lbl.gov
>+MAINTAINER=	james@elstone.net
> COMMENT=	Open-source electronics prototyping platform
> 
>+LICENSE=	GPLv2 LGPL21
>+LICENSE_COMB=	multi
>+
> RUN_DEPENDS=	${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar:comms/rxtx \
> 		${LOCALBASE}/bin/avrdude:devel/avrdude \
> 		${LOCALBASE}/avr/include/avr/io.h:devel/avr-libc
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-USES=		dos2unix tar:tgz
>+USES=		dos2unix tar:tgz kmod
> DOS2UNIX_REGEX=	.*$\.\(c|cpp|h|hex|html|ino|lst|txt$|Makefile\)
> 
> USE_JAVA=	yes
>@@ -28,20 +31,27 @@
> USE_LDCONFIG=	${PREFIX}/arduino/lib
> 
> SUB_FILES=	arduino pkg-message
>-SUB_LIST=	PORTNAME=${PORTNAME} LINUXBASE=${LINUXBASE}
>+SUB_LIST=	PORTNAME=${PORTNAME} LINUXBASE=${PREFIX}
> 
>+# Confirmed for ARCHS below. Arm, PowerPC and Sparc untested. (Feedback welcome)
>+ONLY_FOR_ARCHS=	i386 amd64
>+
> REINPLACE_ARGS=	-i ""
> 
> DESKTOP_ENTRIES=	"Arduino" "Arduino IDE" \
> 			${PREFIX}/${PORTNAME}/logo.png \
>-			"arduino" "Development;IDE;" "false"
>+			"arduino" "Development;IDE;" false
> 
>-OPTIONS_DEFINE=		ATMEGA644P DOCS EXAMPLES
>+OPTIONS_DEFINE=		ATMEGA644P DOCS EXAMPLES UARDUNO
> ATMEGA644P_DESC=	ATmega644p patches
> DOCS_DESC=		Install the reference documents
>+UARDUNO_DESC=		Kernel module for Arduino Uno USB interface
> 
> INSLIST=	arduino hardware lib libraries logo.png revisions.txt tools
> 
>+# Add serial drivers for those who are new to this.
>+UARDUNO_RUN_DEPENDS+=	${KMODDIR}/uarduno.ko:comms/uarduno
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MATMEGA644P}
>@@ -87,9 +97,26 @@
> 	@${LN} -s ${PREFIX}/bin ${WRKSRC}/hardware/tools/avr/bin
> 	@${LN} -s ${PREFIX}/etc ${WRKSRC}/hardware/tools/avr/etc
> 
>+	# Remove broken jar, and Linux C6 based libraries.
> 	@${RM} ${WRKSRC}/lib/RXTXcomm.jar
>+
>+	# This port relys on comms/RXTX working without Linux C6 compatibility.
>+	@${RM} ${WRKSRC}/lib/librxtxSerial.so
>+	@${RM} ${WRKSRC}/lib/librxtxSerial64.so
>+	
>+	# Map the RXTX port for our use
> 	@${LN} -s ${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar ${WRKSRC}/lib/RXTXcomm.jar
> 
>+
>+# Add in links to the libraries compiled in RXTX for the above jar to use based on architecture.
>+.if ${MACHTYPE} == i386
>+	@${LN} -s ${JAVA_HOME}/jre/lib/i386/librxtxSerial.so ${WRKSRC}/lib/librxtxSerial.so
>+.endif
>+
>+.if ${MACHTYPE} == x86_64
>+	@${LN} -s ${JAVA_HOME}/jre/lib/amd64/librxtxSerial.so ${WRKSRC}/lib/librxtxSerial64.so
>+.endif
>+
> 	@${MV} ${WRKSRC}/reference/img/logo.png ${WRKSRC}/
> 	@${RM} -r ${WRKSRC}/reference/img/
> 
>@@ -96,7 +123,6 @@
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
> 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "${INSLIST}" ${STAGEDIR}${PREFIX}/${PORTNAME} ${FIND_EXPR})
>-	${CHMOD} +x ${STAGEDIR}${PREFIX}/${PORTNAME}/arduino
> 	${INSTALL_SCRIPT} ${WRKDIR}/arduino ${STAGEDIR}${PREFIX}/bin/
> 
> .include <bsd.port.mk>
>Index: files/arduino.in
>===================================================================
>--- files/arduino.in	(revision 432596)
>+++ files/arduino.in	(working copy)
>@@ -5,4 +5,4 @@
> PATH="%%LINUXBASE%%/usr/bin:${PATH}"
> export PATH
> 
>-exec %%PREFIX%%/%%PORTNAME%%/arduino %%PREFIX%%/%%PORTNAME%%
>+exec '%%PREFIX%%/%%PORTNAME%%/arduino' $@
>Index: files/patch-hardware-arduino-cores-arduino-HardwareSerial.cpp
>===================================================================
>--- files/patch-hardware-arduino-cores-arduino-HardwareSerial.cpp	(revision 432596)
>+++ files/patch-hardware-arduino-cores-arduino-HardwareSerial.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- hardware/arduino/cores/arduino/HardwareSerial.cpp.orig	2013-05-17 12:48:38.000000000 -0700
>-+++ hardware/arduino/cores/arduino/HardwareSerial.cpp	2013-06-30 12:21:21.000000000 -0700
>-@@ -89,7 +89,7 @@
>+--- hardware/arduino/cores/arduino/HardwareSerial.cpp.orig	2014-09-16 13:45:33 UTC
>++++ hardware/arduino/cores/arduino/HardwareSerial.cpp
>+@@ -89,7 +89,7 @@ struct ring_buffer
>  
>  inline void store_char(unsigned char c, ring_buffer *buffer)
>  {
>@@ -9,7 +9,7 @@
>  
>    // if we should be storing the received character into the location
>    // just before the tail (meaning that the head would advance to the
>-@@ -124,14 +124,14 @@
>+@@ -124,14 +124,14 @@ inline void store_char(unsigned char c, 
>        unsigned char c = UDR0;
>        store_char(c, &rx_buffer);
>      } else {
>@@ -26,7 +26,7 @@
>      };
>    #else
>      #error UDR not defined
>-@@ -150,7 +150,7 @@
>+@@ -150,7 +150,7 @@ inline void store_char(unsigned char c, 
>        unsigned char c = UDR1;
>        store_char(c, &rx_buffer1);
>      } else {
>@@ -35,7 +35,7 @@
>      };
>    }
>  #endif
>-@@ -165,7 +165,7 @@
>+@@ -165,7 +165,7 @@ inline void store_char(unsigned char c, 
>        unsigned char c = UDR2;
>        store_char(c, &rx_buffer2);
>      } else {
>@@ -44,7 +44,7 @@
>      };
>    }
>  #endif
>-@@ -180,7 +180,7 @@
>+@@ -180,7 +180,7 @@ inline void store_char(unsigned char c, 
>        unsigned char c = UDR3;
>        store_char(c, &rx_buffer3);
>      } else {
>@@ -53,7 +53,7 @@
>      };
>    }
>  #endif
>-@@ -365,7 +365,6 @@
>+@@ -365,7 +365,6 @@ try_again:
>  void HardwareSerial::begin(unsigned long baud, byte config)
>  {
>    uint16_t baud_setting;
>@@ -61,7 +61,7 @@
>    bool use_u2x = true;
>  
>  #if F_CPU == 16000000UL
>-@@ -459,7 +458,7 @@
>+@@ -459,7 +458,7 @@ void HardwareSerial::flush()
>  
>  size_t HardwareSerial::write(uint8_t c)
>  {
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 432596)
>+++ pkg-plist	(working copy)
>@@ -1,4 +1,7 @@
>+@mode 755
> arduino/arduino
>+bin/arduino
>+@mode
> %%EXAMPLES%%arduino/examples/01.Basics/AnalogReadSerial/AnalogReadSerial.ino
> %%EXAMPLES%%arduino/examples/01.Basics/BareMinimum/BareMinimum.ino
> %%EXAMPLES%%arduino/examples/01.Basics/Blink/Blink.ino
>@@ -565,8 +568,6 @@
> arduino/lib/ecj.jar
> arduino/lib/jna.jar
> arduino/lib/keywords.txt
>-arduino/lib/librxtxSerial.so
>-arduino/lib/librxtxSerial64.so
> arduino/lib/pde.jar
> arduino/lib/preferences.txt
> arduino/lib/theme/buttons.gif
>@@ -1265,4 +1266,3 @@
> arduino/tools/Mangler/make.sh
> arduino/tools/Mangler/src/Mangler.java
> arduino/tools/howto.txt
>-bin/arduino

Actions: View | Diff

Attachments on bug 200177: 156757 | 156758 | 179365 | 179366 | 179367 | 179713 | 180469 | 180597