Attachment #128800 for bug #172684

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




#

PORTNAME=	arduino-mk
PORTVERSION=	0.10
CATEGORIES=	devel
MASTER_SITES=	http://mjo.tc/atelier/2009/02/acli/
DISTNAME=	${PORTNAME}_${PORTVERSION}


NO_BUILD=	yes

OPTIONS_DEFINE+=	DOCS EXAMPLES
		arduino/tools/ard-parse-boards

.include <bsd.port.options.mk>

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

.if empty(PORT_OPTIONS:MEXAMPLES)
PLIST_SUB+=	EXAMPLES="@comment "
.else
PLIST_SUB+=	EXAMPLES=""
.endif

ARDUINO_CMD=	${FILESDIR}/version.sh ${PREFIX}/arduino/lib/version.txt
OLD_BOARDS_TXT=	/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/boards.txt
NEW_BOARDS_TXT=	${PREFIX}/arduino/hardware/arduino/boards.txt

INSLIST=	AnalogInOutSerial Blink BlinkWithoutDelay Fade HelloWorld \
		WebServer master_reader toneMelody
post-patch:
	@ARDUINO="`$(ARDUINO_CMD)`" && \
	    ${REINPLACE_CMD} -e "s|%%ARDUINO%%|$${ARDUINO}|g" \
	    ${WRKSRC}/arduino-mk/Arduino.mk
	@${REINPLACE_CMD} -e "s|'${OLD_BOARDS_TXT}'|'${NEW_BOARDS_TXT}'|g" \
	    ${WRKSRC}/bin/ard-parse-boards

do-install:
	${MKDIR} ${PREFIX}/${PORTNAME}/bin
	${INSTALL_DATA} ${WRKSRC}/arduino-mk/Arduino.mk ${PREFIX}/${PORTNAME}
	${INSTALL_SCRIPT} ${WRKSRC}/bin/ard-parse-boards ${PREFIX}/${PORTNAME}/bin
	${INSTALL_SCRIPT} ${WRKSRC}/bin/ard-reset-arduino ${PREFIX}/${PORTNAME}/bin
.if ${PORT_OPTIONS:MEXAMPLES}
	${MKDIR} ${EXAMPLESDIR}
	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${INSLIST}" ${EXAMPLESDIR})
.endif
.if ${PORT_OPTIONS:MDOCS}
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README.md ${DOCSDIR}
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (arduino-mk_0.8.tar.gz) = 9510a8cceb8c3a2e093ec8162b0694e6c7a466e75ded8d1ab3592ae0825f1e0c	1	SHA256 (arduino-mk_0.10.tar.gz) = 95a6c15667d4577a22270b4fc046678e974a4babb7ae1ce4673ecaed02ee9a5d
2	SIZE (arduino-mk_0.8.tar.gz) = 16432	2	SIZE (arduino-mk_0.10.tar.gz) = 25394




--- arduino-mk/Arduino.mk.orig	2012-09-17 10:41:19.000000000 -0700
+++ arduino-mk/Arduino.mk	2012-09-17 19:21:52.000000000 -0700
@@ -160,7 +160,7 @@
 #
 #    ARDUINO_LIBS - A list of any libraries used by the sketch (we
 #                   assume these are in
-#                   $(ARDUINO_DIR)/hardware/libraries 
+#                   $(ARDUINO_DIR)/libraries 
 #
 #    ARDUINO_PORT - The port where the Arduino can be found (only needed
 #                   when uploading
@@ -287,7 +287,7 @@
 #
 # Arduino version number
 ifndef ARDUINO_VERSION
-ARDUINO_VERSION = 100
+ARDUINO_VERSION = %%ARDUINO%%
 endif
 
 ########################################################################
@@ -448,12 +448,12 @@
 ########################################################################
 # Local sources
 #
-LOCAL_C_SRCS    = $(wildcard *.c)
-LOCAL_CPP_SRCS  = $(wildcard *.cpp)
-LOCAL_CC_SRCS   = $(wildcard *.cc)
-LOCAL_PDE_SRCS  = $(wildcard *.pde)
-LOCAL_INO_SRCS  = $(wildcard *.ino)
-LOCAL_AS_SRCS   = $(wildcard *.S)
+LOCAL_C_SRCS    ?= $(wildcard *.c)
+LOCAL_CPP_SRCS  ?= $(wildcard *.cpp)
+LOCAL_CC_SRCS   ?= $(wildcard *.cc)
+LOCAL_PDE_SRCS  ?= $(wildcard *.pde)
+LOCAL_INO_SRCS  ?= $(wildcard *.ino)
+LOCAL_AS_SRCS   ?= $(wildcard *.S)
 LOCAL_OBJ_FILES = $(LOCAL_C_SRCS:.c=.o)   $(LOCAL_CPP_SRCS:.cpp=.o) \
 		$(LOCAL_CC_SRCS:.cc=.o)   $(LOCAL_PDE_SRCS:.pde=.o) \
 		$(LOCAL_INO_SRCS:.ino=.o) $(LOCAL_AS_SRCS:.S=.o)
@@ -593,7 +593,11 @@
 
 # the pde -> cpp -> o file
 $(OBJDIR)/%.cpp: %.pde
-	$(ECHO) '#include "WProgram.h"' > $@
+	$(ECHO) '#if ARDUINO >= 100' > $@
+	$(ECHO) '#include "Arduino.h"' >> $@
+	$(ECHO) '#else' >> $@
+	$(ECHO) '#include "WProgram.h"' >> $@
+	$(ECHO) '#endif' >> $@
 	$(CAT)  $< >> $@
 
 # the ino -> cpp -> o file




arduino-mk/Arduino.mk
arduino-mk/bin/ard-parse-boards
arduino-mk/bin/ard-reset-arduino
@dirrm arduino-mk/bin
@dirrm arduino-mk
%%EXAMPLES%%%%EXAMPLESDIR%%/AnalogInOutSerial/AnalogInOutSerial.ino
%%EXAMPLES%%%%EXAMPLESDIR%%/AnalogInOutSerial/Makefile
%%EXAMPLES%%%%EXAMPLESDIR%%/Blink/Blink.ino
%%EXAMPLES%%%%EXAMPLESDIR%%/Blink/Makefile
%%EXAMPLES%%%%EXAMPLESDIR%%/BlinkWithoutDelay/._.DS_Store
%%EXAMPLES%%%%EXAMPLESDIR%%/BlinkWithoutDelay/.DS_Store
%%EXAMPLES%%%%EXAMPLESDIR%%/BlinkWithoutDelay/BlinkWithoutDelay.ino
%%EXAMPLES%%%%EXAMPLESDIR%%/BlinkWithoutDelay/Makefile
%%EXAMPLES%%%%EXAMPLESDIR%%/Fade/Fade.ino
%%EXAMPLES%%%%EXAMPLESDIR%%/Fade/Makefile
%%EXAMPLES%%%%EXAMPLESDIR%%/HelloWorld/HelloWorld.ino
%%EXAMPLES%%%%EXAMPLESDIR%%/HelloWorld/Makefile
%%EXAMPLES%%%%EXAMPLESDIR%%/master_reader/Makefile
%%EXAMPLES%%%%EXAMPLESDIR%%/master_reader/master_reader.ino
%%EXAMPLES%%%%EXAMPLESDIR%%/toneMelody/Makefile
%%EXAMPLES%%%%EXAMPLESDIR%%/toneMelody/pitches.h
%%EXAMPLES%%%%EXAMPLESDIR%%/toneMelody/toneMelody.ino
%%EXAMPLES%%%%EXAMPLESDIR%%/WebServer/Makefile
%%EXAMPLES%%%%EXAMPLESDIR%%/WebServer/WebServer.ino
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/toneMelody
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/master_reader
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/WebServer
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/HelloWorld
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Fade
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/BlinkWithoutDelay/build-cli/libs/Ethernet
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/BlinkWithoutDelay/build-cli/libs
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/BlinkWithoutDelay/build-cli
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/BlinkWithoutDelay
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Blink
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/AnalogInOutSerial
%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
%%REFDOCS%%%%DOCSDIR%%/README.md
%%REFDOCS%%@dirrm %%DOCSDIR%%

Return to bug 172684

Lines 6-12 Link Here

(-)Makefile (-16 / +28 lines)
6	#	6	#
7		7
8	PORTNAME= arduino-mk	8	PORTNAME= arduino-mk
9	PORTVERSION= 0.8	9	PORTVERSION= 0.10
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://mjo.tc/atelier/2009/02/acli/	11	MASTER_SITES= http://mjo.tc/atelier/2009/02/acli/
12	DISTNAME= ${PORTNAME}_${PORTVERSION}	12	DISTNAME= ${PORTNAME}_${PORTVERSION}
Lines 26-60 Link Here
26		26
27	NO_BUILD= yes	27	NO_BUILD= yes
28		28
29	PLIST_FILES= arduino/lib/Arduino.mk \	29	OPTIONS_DEFINE+= DOCS EXAMPLES
30	arduino/tools/ard-parse-boards
31		30
32	.if !defined(NOPORTEXAMPLES)	31	.include <bsd.port.options.mk>
33	PLIST_FILES+= ${EXAMPLESDIR_REL}/Makefile \	32
34	${EXAMPLESDIR_REL}/blink2.pde	33	.if empty(PORT_OPTIONS:MDOCS)
35	PLIST_DIRS+= ${EXAMPLESDIR_REL}	34	PLIST_SUB+= REFDOCS="@comment "
		35	.else
		36	PLIST_SUB+= REFDOCS=""
36	.endif	37	.endif
37		38
38	.include <bsd.port.pre.mk>	39	.if empty(PORT_OPTIONS:MEXAMPLES)
		40	PLIST_SUB+= EXAMPLES="@comment "
		41	.else
		42	PLIST_SUB+= EXAMPLES=""
		43	.endif
39		44
40	ARDUINO_CMD= ${FILESDIR}/version.sh ${PREFIX}/arduino/lib/version.txt	45	ARDUINO_CMD= ${FILESDIR}/version.sh ${PREFIX}/arduino/lib/version.txt
41	OLD_BOARDS_TXT= /Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/boards.txt	46	OLD_BOARDS_TXT= /Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/boards.txt
42	NEW_BOARDS_TXT= ${PREFIX}/arduino/hardware/arduino/boards.txt	47	NEW_BOARDS_TXT= ${PREFIX}/arduino/hardware/arduino/boards.txt
43		48
		49	INSLIST= AnalogInOutSerial Blink BlinkWithoutDelay Fade HelloWorld \
		50	WebServer master_reader toneMelody
44	post-patch:	51	post-patch:
45	@ARDUINO="`$(ARDUINO_CMD)`" && \	52	@ARDUINO="`$(ARDUINO_CMD)`" && \
46	${REINPLACE_CMD} -e "s\|%%ARDUINO%%\|$${ARDUINO}\|g" \	53	${REINPLACE_CMD} -e "s\|%%ARDUINO%%\|$${ARDUINO}\|g" \
47	${WRKSRC}/Arduino.mk	54	${WRKSRC}/arduino-mk/Arduino.mk
48	@${REINPLACE_CMD} -e "s\|'${OLD_BOARDS_TXT}'\|'${NEW_BOARDS_TXT}'\|g" \	55	@${REINPLACE_CMD} -e "s\|'${OLD_BOARDS_TXT}'\|'${NEW_BOARDS_TXT}'\|g" \
49	${WRKSRC}/ard-parse-boards	56	${WRKSRC}/bin/ard-parse-boards
50		57
51	do-install:	58	do-install:
52	${INSTALL_DATA} ${WRKSRC}/Arduino.mk ${PREFIX}/arduino/lib	59	${MKDIR} ${PREFIX}/${PORTNAME}/bin
53	${INSTALL_SCRIPT} ${WRKSRC}/ard-parse-boards ${PREFIX}/arduino/tools	60	${INSTALL_DATA} ${WRKSRC}/arduino-mk/Arduino.mk ${PREFIX}/${PORTNAME}
54	.if !defined(NOPORTEXAMPLES)	61	${INSTALL_SCRIPT} ${WRKSRC}/bin/ard-parse-boards ${PREFIX}/${PORTNAME}/bin
		62	${INSTALL_SCRIPT} ${WRKSRC}/bin/ard-reset-arduino ${PREFIX}/${PORTNAME}/bin
		63	.if ${PORT_OPTIONS:MEXAMPLES}
55	${MKDIR} ${EXAMPLESDIR}	64	${MKDIR} ${EXAMPLESDIR}
56	${INSTALL_DATA} ${FILESDIR}/Makefile ${EXAMPLESDIR}	65	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${INSLIST}" ${EXAMPLESDIR})
57	${INSTALL_DATA} ${FILESDIR}/blink2.pde ${EXAMPLESDIR}	66	.endif
		67	.if ${PORT_OPTIONS:MDOCS}
		68	${MKDIR} ${DOCSDIR}
		69	${INSTALL_DATA} ${WRKSRC}/README.md ${DOCSDIR}
58	.endif	70	.endif
59		71
60	.include <bsd.port.post.mk>	72	.include <bsd.port.mk>

Added Link Here

(-)files/patch-arduino-mk-Arduino.mk (+52 lines)
1	--- arduino-mk/Arduino.mk.orig 2012-09-17 10:41:19.000000000 -0700
2	+++ arduino-mk/Arduino.mk 2012-09-17 19:21:52.000000000 -0700
3	@@ -160,7 +160,7 @@
4	#
5	# ARDUINO_LIBS - A list of any libraries used by the sketch (we
6	# assume these are in
7	-# $(ARDUINO_DIR)/hardware/libraries
8	+# $(ARDUINO_DIR)/libraries
9	#
10	# ARDUINO_PORT - The port where the Arduino can be found (only needed
11	# when uploading
12	@@ -287,7 +287,7 @@
13	#
14	# Arduino version number
15	ifndef ARDUINO_VERSION
16	-ARDUINO_VERSION = 100
17	+ARDUINO_VERSION = %%ARDUINO%%
18	endif
19
20	########################################################################
21	@@ -448,12 +448,12 @@
22	########################################################################
23	# Local sources
24	#
25	-LOCAL_C_SRCS = $(wildcard *.c)
26	-LOCAL_CPP_SRCS = $(wildcard *.cpp)
27	-LOCAL_CC_SRCS = $(wildcard *.cc)
28	-LOCAL_PDE_SRCS = $(wildcard *.pde)
29	-LOCAL_INO_SRCS = $(wildcard *.ino)
30	-LOCAL_AS_SRCS = $(wildcard *.S)
31	+LOCAL_C_SRCS ?= $(wildcard *.c)
32	+LOCAL_CPP_SRCS ?= $(wildcard *.cpp)
33	+LOCAL_CC_SRCS ?= $(wildcard *.cc)
34	+LOCAL_PDE_SRCS ?= $(wildcard *.pde)
35	+LOCAL_INO_SRCS ?= $(wildcard *.ino)
36	+LOCAL_AS_SRCS ?= $(wildcard *.S)
37	LOCAL_OBJ_FILES = $(LOCAL_C_SRCS:.c=.o) $(LOCAL_CPP_SRCS:.cpp=.o) \
38	$(LOCAL_CC_SRCS:.cc=.o) $(LOCAL_PDE_SRCS:.pde=.o) \
39	$(LOCAL_INO_SRCS:.ino=.o) $(LOCAL_AS_SRCS:.S=.o)
40	@@ -593,7 +593,11 @@
41
42	# the pde -> cpp -> o file
43	$(OBJDIR)/%.cpp: %.pde
44	- $(ECHO) '#include "WProgram.h"' > $@
45	+ $(ECHO) '#if ARDUINO >= 100' > $@
46	+ $(ECHO) '#include "Arduino.h"' >> $@
47	+ $(ECHO) '#else' >> $@
48	+ $(ECHO) '#include "WProgram.h"' >> $@
49	+ $(ECHO) '#endif' >> $@
50	$(CAT) $< >> $@
51
52	# the ino -> cpp -> o file

Added Link Here

(-)pkg-plist (+38 lines)
1	arduino-mk/Arduino.mk
2	arduino-mk/bin/ard-parse-boards
3	arduino-mk/bin/ard-reset-arduino
4	@dirrm arduino-mk/bin
5	@dirrm arduino-mk
6	%%EXAMPLES%%%%EXAMPLESDIR%%/AnalogInOutSerial/AnalogInOutSerial.ino
7	%%EXAMPLES%%%%EXAMPLESDIR%%/AnalogInOutSerial/Makefile
8	%%EXAMPLES%%%%EXAMPLESDIR%%/Blink/Blink.ino
9	%%EXAMPLES%%%%EXAMPLESDIR%%/Blink/Makefile
10	%%EXAMPLES%%%%EXAMPLESDIR%%/BlinkWithoutDelay/._.DS_Store
11	%%EXAMPLES%%%%EXAMPLESDIR%%/BlinkWithoutDelay/.DS_Store
12	%%EXAMPLES%%%%EXAMPLESDIR%%/BlinkWithoutDelay/BlinkWithoutDelay.ino
13	%%EXAMPLES%%%%EXAMPLESDIR%%/BlinkWithoutDelay/Makefile
14	%%EXAMPLES%%%%EXAMPLESDIR%%/Fade/Fade.ino
15	%%EXAMPLES%%%%EXAMPLESDIR%%/Fade/Makefile
16	%%EXAMPLES%%%%EXAMPLESDIR%%/HelloWorld/HelloWorld.ino
17	%%EXAMPLES%%%%EXAMPLESDIR%%/HelloWorld/Makefile
18	%%EXAMPLES%%%%EXAMPLESDIR%%/master_reader/Makefile
19	%%EXAMPLES%%%%EXAMPLESDIR%%/master_reader/master_reader.ino
20	%%EXAMPLES%%%%EXAMPLESDIR%%/toneMelody/Makefile
21	%%EXAMPLES%%%%EXAMPLESDIR%%/toneMelody/pitches.h
22	%%EXAMPLES%%%%EXAMPLESDIR%%/toneMelody/toneMelody.ino
23	%%EXAMPLES%%%%EXAMPLESDIR%%/WebServer/Makefile
24	%%EXAMPLES%%%%EXAMPLESDIR%%/WebServer/WebServer.ino
25	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/toneMelody
26	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/master_reader
27	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/WebServer
28	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/HelloWorld
29	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Fade
30	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/BlinkWithoutDelay/build-cli/libs/Ethernet
31	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/BlinkWithoutDelay/build-cli/libs
32	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/BlinkWithoutDelay/build-cli
33	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/BlinkWithoutDelay
34	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Blink
35	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/AnalogInOutSerial
36	%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
37	%%REFDOCS%%%%DOCSDIR%%/README.md
38	%%REFDOCS%%@dirrm %%DOCSDIR%%