Attachment #126509 for bug #170242

View | Details | Raw Unified | Return to bug 170242
Collapse All | Expand All




# New ports collection makefile for:	arduino
# Date created:				10 Feb 2010
# Whom:					Warren Block <wblock@wonkity.com>
# $FreeBSD$

PORTNAME=	arduino
PORTVERSION=	1.0.1
PORTREVISION=	2
PORTEPOCH=	1
CATEGORIES=	devel java lang
MASTER_SITES=	GOOGLE_CODE

		${LOCALBASE}/avr/include/avr/io.h:${PORTSDIR}/devel/avr-libc

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_DOS2UNIX=	yes

USE_JAVA=	1.6+
NO_BUILD=	yes

			${PREFIX}/${PORTNAME}/logo.png \
			"arduino" "Development;IDE;" "false"

OPTIONS_DEFINE+=	ATMEGA644 DOCS EXAMPLES
ATMEGA644_DESC=	 	Patch boards.txt adding ATmega644 values
DOCS_DESC=	 	Install the reference documents

INSLIST=	arduino hardware lib libraries logo.png revisions.txt tools

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MATMEGA644}
EXTRA_PATCHES+=	${FILESDIR}/extrapatch-hardware-arduino-boards.txt
.endif

.if empty(PORT_OPTIONS:MDOCS)
PLIST_SUB+=	REFDOCS="@comment "
.else
PLIST_SUB+=	REFDOCS=""
INSLIST+=	reference
.endif

.if empty(PORT_OPTIONS:MEXAMPLES)
PLIST_SUB+=	EXAMPLES="@comment "
FIND_EXCLUDE=	"! -path */examples ! -path */examples/* -prune"
.else
PLIST_SUB+=	EXAMPLES=""
FIND_EXCLUDE=
INSLIST+=	examples
.endif

post-patch:
	@${RM} ${WRKSRC}/hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c.orig
	@${RM} ${WRKSRC}/hardware/arduino/cores/arduino/HardwareSerial.cpp.orig
.if ${PORT_OPTIONS:MATMEGA644}
	@${RM} ${WRKSRC}/hardware/arduino/boards.txt.orig
.endif
	@${RM} -rf ${WRKSRC}/hardware/tools/
	@${RMDIR} ${WRKSRC}/hardware/arduino/firmwares/arduino-usbserial/.dep
	@${MKDIR} ${WRKSRC}/hardware/tools/avr/
	@${LN} -s ${PREFIX}/bin ${WRKSRC}/hardware/tools/avr/bin
	@${LN} -s ${PREFIX}/etc ${WRKSRC}/hardware/tools/avr/etc

	@${MV} ${WRKSRC}/reference/img/logo.png ${WRKSRC}/
	@${RM} -rf ${WRKSRC}/reference/img/

.if empty(PORT_OPTIONS:MDOCS)
	@${RM} -rf ${WRKSRC}/reference
.endif
.if empty(PORT_OPTIONS:MEXAMPLES)
	@${RM} -rf ${WRKSRC}/examples
	@${RM} -rf ${WRKSRC}/libraries/*/examples
.endif

do-install:
	@${MKDIR} ${PREFIX}/${PORTNAME}
	@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "${INSLIST}" ${PREFIX}/${PORTNAME} ${FIND_EXCLUDE})
	@${INSTALL_SCRIPT} ${WRKDIR}/arduino ${PREFIX}/bin/

post-install:




--- hardware/arduino/boards.txt.orig	2011-11-28 16:56:32.000000000 -0800
+++ hardware/arduino/boards.txt	2012-04-22 21:15:11.000000000 -0700
@@ -472,3 +472,39 @@
 atmega8.build.f_cpu=16000000L
 atmega8.build.core=arduino
 atmega8.build.variant=standard
+
+##############################################################
+
+atmega644.name=ATmega644
+atmega644.upload.protocol=stk500
+atmega644.upload.maximum_size=63488
+atmega644.upload.speed=38400
+atmega644.bootloader.low_fuses=0xFF
+atmega644.bootloader.high_fuses=0xDC
+atmega644.bootloader.extended_fuses=0xFD
+atmega644.bootloader.path=atmega644p
+atmega644.bootloader.file=atmega644p
+atmega644.bootloader.unlock_bits=0x3F
+atmega644.bootloader.lock_bits=0x0F
+atmega644.build.mcu=atmega644
+atmega644.build.f_cpu=16000000L
+atmega644.build.core=atmega644
+atmega644.build.variant=standard
+
+##############################################################
+
+atmega644p.name=ATmega644p
+atmega644p.upload.protocol=stk500
+atmega644p.upload.maximum_size=63488
+atmega644p.upload.speed=38400
+atmega644p.bootloader.low_fuses=0xFF
+atmega644p.bootloader.high_fuses=0xDC
+atmega644p.bootloader.extended_fuses=0xFD
+atmega644p.bootloader.path=atmega644p
+atmega644p.bootloader.file=atmega644p
+atmega644p.bootloader.unlock_bits=0x3F
+atmega644p.bootloader.lock_bits=0x0F
+atmega644p.build.mcu=atmega644p
+atmega644p.build.f_cpu=16000000L
+atmega644p.build.core=atmega644
+atmega644p.build.variant=standard




--- hardware/arduino/cores/arduino/HardwareSerial.cpp.orig	2012-07-28 21:20:49.000000000 -0700
+++ hardware/arduino/cores/arduino/HardwareSerial.cpp	2012-07-28 21:24:52.000000000 -0700
@@ -129,8 +129,6 @@
     unsigned char c = UDR1;
     store_char(c, &rx_buffer1);
   }
-#elif defined(SIG_USART1_RECV)
-  #error SIG_USART1_RECV
 #endif
 
 #if defined(USART2_RX_vect) && defined(UDR2)
@@ -142,8 +140,6 @@
     unsigned char c = UDR2;
     store_char(c, &rx_buffer2);
   }
-#elif defined(SIG_USART2_RECV)
-  #error SIG_USART2_RECV
 #endif
 
 #if defined(USART3_RX_vect) && defined(UDR3)
@@ -155,8 +151,6 @@
     unsigned char c = UDR3;
     store_char(c, &rx_buffer3);
   }
-#elif defined(SIG_USART3_RECV)
-  #error SIG_USART3_RECV
 #endif
 
 void serialEventRun(void)

Lines 1-4 Link Here

(-)files/pkg-message.in (-2 / +2 lines)
1		1	##########
2	Notes on using the Arduino IDE:	2	Notes on using the Arduino IDE:
3		3
4	To allow serial port locking, add your user to the dialer group:	4	To allow serial port locking, add your user to the dialer group:
Lines 17-20 Link Here
17		17
18	To start the IDE:	18	To start the IDE:
19	%%PREFIX%%/bin/arduino	19	%%PREFIX%%/bin/arduino
20		20	##########

Lines 721-727 Link Here

(-)pkg-plist (-1 lines)
721	@dirrm arduino/hardware/arduino/variants	721	@dirrm arduino/hardware/arduino/variants
722	@dirrm arduino/hardware/arduino/firmwares/arduino-usbserial/Lib	722	@dirrm arduino/hardware/arduino/firmwares/arduino-usbserial/Lib
723	@dirrm arduino/hardware/arduino/firmwares/arduino-usbserial/Board	723	@dirrm arduino/hardware/arduino/firmwares/arduino-usbserial/Board
724	@dirrm arduino/hardware/arduino/firmwares/arduino-usbserial/.dep
725	@dirrm arduino/hardware/arduino/firmwares/arduino-usbserial	724	@dirrm arduino/hardware/arduino/firmwares/arduino-usbserial
726	@dirrm arduino/hardware/arduino/firmwares/arduino-usbdfu/Board	725	@dirrm arduino/hardware/arduino/firmwares/arduino-usbdfu/Board
727	@dirrm arduino/hardware/arduino/firmwares/arduino-usbdfu	726	@dirrm arduino/hardware/arduino/firmwares/arduino-usbdfu

Return to bug 170242

Lines 1-11 Link Here

(-)Makefile (-14 / +20 lines)
1	# New ports collection makefile for: arduino
2	# Date created: 10 Feb 2010
3	# Whom: Warren Block <wblock@wonkity.com>
4	# $FreeBSD$	1	# $FreeBSD$
5		2
6	PORTNAME= arduino	3	PORTNAME= arduino
7	PORTVERSION= 1.0.1	4	PORTVERSION= 1.0.1
8	PORTREVISION= 1	5	PORTREVISION= 2
9	PORTEPOCH= 1	6	PORTEPOCH= 1
10	CATEGORIES= devel java lang	7	CATEGORIES= devel java lang
11	MASTER_SITES= GOOGLE_CODE	8	MASTER_SITES= GOOGLE_CODE
Lines 20-25 Link Here
20	${LOCALBASE}/avr/include/avr/io.h:${PORTSDIR}/devel/avr-libc	17	${LOCALBASE}/avr/include/avr/io.h:${PORTSDIR}/devel/avr-libc
21		18
22	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	19	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
		20	USE_DOS2UNIX= yes
23		21
24	USE_JAVA= 1.6+	22	USE_JAVA= 1.6+
25	NO_BUILD= yes	23	NO_BUILD= yes
Lines 34-59 Link Here
34	${PREFIX}/${PORTNAME}/logo.png \	32	${PREFIX}/${PORTNAME}/logo.png \
35	"arduino" "Development;IDE;" "false"	33	"arduino" "Development;IDE;" "false"
36		34
37	OPTIONS_DEFINE+= DOCS EXAMPLES	35	OPTIONS_DEFINE+= ATMEGA644 DOCS EXAMPLES
		36	ATMEGA644_DESC= Patch boards.txt adding ATmega644 values
38	DOCS_DESC= Install the reference documents	37	DOCS_DESC= Install the reference documents
39		38
		39	INSLIST= arduino hardware lib libraries logo.png revisions.txt tools
		40
40	.include <bsd.port.options.mk>	41	.include <bsd.port.options.mk>
41		42
		43	.if ${PORT_OPTIONS:MATMEGA644}
		44	EXTRA_PATCHES+= ${FILESDIR}/extrapatch-hardware-arduino-boards.txt
		45	.endif
		46
42	.if empty(PORT_OPTIONS:MDOCS)	47	.if empty(PORT_OPTIONS:MDOCS)
43	PLIST_SUB+= REFDOCS="@comment "	48	PLIST_SUB+= REFDOCS="@comment "
44	.else	49	.else
45	PLIST_SUB+= REFDOCS=""	50	PLIST_SUB+= REFDOCS=""
		51	INSLIST+= reference
46	.endif	52	.endif
47		53
48	.if empty(PORT_OPTIONS:MEXAMPLES)	54	.if empty(PORT_OPTIONS:MEXAMPLES)
49	PLIST_SUB+= EXAMPLES="@comment "	55	PLIST_SUB+= EXAMPLES="@comment "
		56	FIND_EXCLUDE= "! -path /examples ! -path /examples/* -prune"
50	.else	57	.else
51	PLIST_SUB+= EXAMPLES=""	58	PLIST_SUB+= EXAMPLES=""
		59	FIND_EXCLUDE=
		60	INSLIST+= examples
52	.endif	61	.endif
53		62
54	post-patch:	63	post-patch:
55	@${RM} ${WRKSRC}/hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c.orig	64	@${RM} ${WRKSRC}/hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c.orig
		65	@${RM} ${WRKSRC}/hardware/arduino/cores/arduino/HardwareSerial.cpp.orig
		66	.if ${PORT_OPTIONS:MATMEGA644}
		67	@${RM} ${WRKSRC}/hardware/arduino/boards.txt.orig
		68	.endif
56	@${RM} -rf ${WRKSRC}/hardware/tools/	69	@${RM} -rf ${WRKSRC}/hardware/tools/
		70	@${RMDIR} ${WRKSRC}/hardware/arduino/firmwares/arduino-usbserial/.dep
57	@${MKDIR} ${WRKSRC}/hardware/tools/avr/	71	@${MKDIR} ${WRKSRC}/hardware/tools/avr/
58	@${LN} -s ${PREFIX}/bin ${WRKSRC}/hardware/tools/avr/bin	72	@${LN} -s ${PREFIX}/bin ${WRKSRC}/hardware/tools/avr/bin
59	@${LN} -s ${PREFIX}/etc ${WRKSRC}/hardware/tools/avr/etc	73	@${LN} -s ${PREFIX}/etc ${WRKSRC}/hardware/tools/avr/etc
Lines 64-80 Link Here
64	@${MV} ${WRKSRC}/reference/img/logo.png ${WRKSRC}/	78	@${MV} ${WRKSRC}/reference/img/logo.png ${WRKSRC}/
65	@${RM} -rf ${WRKSRC}/reference/img/	79	@${RM} -rf ${WRKSRC}/reference/img/
66		80
67	.if empty(PORT_OPTIONS:MDOCS)
68	@${RM} -rf ${WRKSRC}/reference
69	.endif
70	.if empty(PORT_OPTIONS:MEXAMPLES)
71	@${RM} -rf ${WRKSRC}/examples
72	@${RM} -rf ${WRKSRC}/libraries/*/examples
73	.endif
74
75	do-install:	81	do-install:
76	@${MKDIR} ${PREFIX}/${PORTNAME}	82	@${MKDIR} ${PREFIX}/${PORTNAME}
77	@${CP} -Rp ${WRKSRC}/* ${PREFIX}/${PORTNAME}	83	@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "${INSLIST}" ${PREFIX}/${PORTNAME} ${FIND_EXCLUDE})
78	@${INSTALL_SCRIPT} ${WRKDIR}/arduino ${PREFIX}/bin/	84	@${INSTALL_SCRIPT} ${WRKDIR}/arduino ${PREFIX}/bin/
79		85
80	post-install:	86	post-install:

Line 0 Link Here

(-)files/extrapatch-hardware-arduino-boards.txt (+42 lines)
	1	--- hardware/arduino/boards.txt.orig 2011-11-28 16:56:32.000000000 -0800
	2	+++ hardware/arduino/boards.txt 2012-04-22 21:15:11.000000000 -0700
	3	@@ -472,3 +472,39 @@
	4	atmega8.build.f_cpu=16000000L
	5	atmega8.build.core=arduino
	6	atmega8.build.variant=standard
	7	+
	8	+##############################################################
	9	+
	10	+atmega644.name=ATmega644
	11	+atmega644.upload.protocol=stk500
	12	+atmega644.upload.maximum_size=63488
	13	+atmega644.upload.speed=38400
	14	+atmega644.bootloader.low_fuses=0xFF
	15	+atmega644.bootloader.high_fuses=0xDC
	16	+atmega644.bootloader.extended_fuses=0xFD
	17	+atmega644.bootloader.path=atmega644p
	18	+atmega644.bootloader.file=atmega644p
	19	+atmega644.bootloader.unlock_bits=0x3F
	20	+atmega644.bootloader.lock_bits=0x0F
	21	+atmega644.build.mcu=atmega644
	22	+atmega644.build.f_cpu=16000000L
	23	+atmega644.build.core=atmega644
	24	+atmega644.build.variant=standard
	25	+
	26	+##############################################################
	27	+
	28	+atmega644p.name=ATmega644p
	29	+atmega644p.upload.protocol=stk500
	30	+atmega644p.upload.maximum_size=63488
	31	+atmega644p.upload.speed=38400
	32	+atmega644p.bootloader.low_fuses=0xFF
	33	+atmega644p.bootloader.high_fuses=0xDC
	34	+atmega644p.bootloader.extended_fuses=0xFD
	35	+atmega644p.bootloader.path=atmega644p
	36	+atmega644p.bootloader.file=atmega644p
	37	+atmega644p.bootloader.unlock_bits=0x3F
	38	+atmega644p.bootloader.lock_bits=0x0F
	39	+atmega644p.build.mcu=atmega644p
	40	+atmega644p.build.f_cpu=16000000L
	41	+atmega644p.build.core=atmega644
	42	+atmega644p.build.variant=standard

Line 0 Link Here

(-)files/patch-hardware-arduino-cores-arduino-HardwareSerial.cpp (+29 lines)
	1	--- hardware/arduino/cores/arduino/HardwareSerial.cpp.orig 2012-07-28 21:20:49.000000000 -0700
	2	+++ hardware/arduino/cores/arduino/HardwareSerial.cpp 2012-07-28 21:24:52.000000000 -0700
	3	@@ -129,8 +129,6 @@
	4	unsigned char c = UDR1;
	5	store_char(c, &rx_buffer1);
	6	}
	7	-#elif defined(SIG_USART1_RECV)
	8	- #error SIG_USART1_RECV
	9	#endif
	10
	11	#if defined(USART2_RX_vect) && defined(UDR2)
	12	@@ -142,8 +140,6 @@
	13	unsigned char c = UDR2;
	14	store_char(c, &rx_buffer2);
	15	}
	16	-#elif defined(SIG_USART2_RECV)
	17	- #error SIG_USART2_RECV
	18	#endif
	19
	20	#if defined(USART3_RX_vect) && defined(UDR3)
	21	@@ -155,8 +151,6 @@
	22	unsigned char c = UDR3;
	23	store_char(c, &rx_buffer3);
	24	}
	25	-#elif defined(SIG_USART3_RECV)
	26	- #error SIG_USART3_RECV
	27	#endif
	28
	29	void serialEventRun(void)