2 files changed, 42 insertions, 62 deletions

diff --git a/devel/arduino-mk/Makefile b/devel/arduino-mk/Makefile
index e69c44475b2b..3c1cec9e639e 100644
--- a/devel/arduino-mk/Makefile
+++ b/devel/arduino-mk/Makefile
@@ -25,21 +25,6 @@ NO_BUILD=	yes
 
 OPTIONS_DEFINE+=	DOCS EXAMPLES
 
-NO_STAGE=	yes
-.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=	${SH} ${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
@@ -54,17 +39,13 @@ post-patch:
 	    ${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
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin
+	${INSTALL_DATA} ${WRKSRC}/arduino-mk/Arduino.mk ${STAGEDIR}${PREFIX}/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ard-parse-boards ${STAGEDIR}${PREFIX}/${PORTNAME}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ard-reset-arduino ${STAGEDIR}${PREFIX}/${PORTNAME}/bin
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${INSLIST}" ${STAGEDIR}${EXAMPLESDIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/arduino-mk/pkg-plist b/devel/arduino-mk/pkg-plist
index 3c37270a54df..b67832289a7c 100644
--- a/devel/arduino-mk/pkg-plist
+++ b/devel/arduino-mk/pkg-plist
@@ -1,38 +1,37 @@
 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%%
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/AnalogInOutSerial/AnalogInOutSerial.ino
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/AnalogInOutSerial/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Blink/Blink.ino
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Blink/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlinkWithoutDelay/.DS_Store
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlinkWithoutDelay/BlinkWithoutDelay.ino
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BlinkWithoutDelay/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Fade/Fade.ino
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Fade/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/HelloWorld/HelloWorld.ino
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/HelloWorld/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/WebServer/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/WebServer/WebServer.ino
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/master_reader/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/master_reader/master_reader.ino
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toneMelody/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toneMelody/pitches.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toneMelody/toneMelody.ino
+@dirrmtry arduino-mk/bin
+@dirrmtry arduino-mk
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/AnalogInOutSerial
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/Blink
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/BlinkWithoutDelay/build-cli/libs/Ethernet
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/BlinkWithoutDelay/build-cli/libs
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/BlinkWithoutDelay/build-cli
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/BlinkWithoutDelay
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/Fade
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/HelloWorld
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/WebServer
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/master_reader
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/toneMelody
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%