2 files changed, 76 insertions, 70 deletions
diff --git a/devel/picasm/Makefile b/devel/picasm/Makefile
index 8c1a74839a2e..c4caaa9ca2e7 100644
--- a/devel/picasm/Makefile
+++ b/devel/picasm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	picasm
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.jmp.fi/~trossi/pic/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
@@ -27,13 +28,18 @@ EXAMPLE_FILES=	example.asm morse.asm morse.i pic16f84.i picmac.i
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/picasm ${PREFIX}/bin
-	${MKDIR} ${DATADIR}/device_definitions
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
+	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/picasm.txt ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
 .for EXAMPLE in ${EXAMPLE_FILES}
+	@ ${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/${EXAMPLE} ${EXAMPLESDIR}
 .endfor
+.endif
+.if !defined(NOPORTDATA)
+	${MKDIR} ${DATADIR}/device_definitions
 	${INSTALL_DATA} ${WRKSRC}/device_definitions/*.i ${DATADIR}/device_definitions
 .endif
 
diff --git a/devel/picasm/pkg-plist b/devel/picasm/pkg-plist
index 672d0a89f805..52874e257b9a 100644
--- a/devel/picasm/pkg-plist
+++ b/devel/picasm/pkg-plist
@@ -2,71 +2,71 @@
 bin/picasm
 %%PORTDOCS%%%%DOCSDIR%%/picasm.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.asm
-%%PORTDOCS%%%%EXAMPLESDIR%%/morse.asm
-%%PORTDOCS%%%%EXAMPLESDIR%%/morse.i
-%%PORTDOCS%%%%EXAMPLESDIR%%/pic16f84.i
-%%PORTDOCS%%%%EXAMPLESDIR%%/picmac.i
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%DATADIR%%/device_definitions/_pic12c508.i
-%%DATADIR%%/device_definitions/_pic12c509.i
-%%DATADIR%%/device_definitions/_pic12c671.i
-%%DATADIR%%/device_definitions/_pic12c672.i
-%%DATADIR%%/device_definitions/_pic14000.i
-%%DATADIR%%/device_definitions/_pic14c000.i
-%%DATADIR%%/device_definitions/_pic16c52.i
-%%DATADIR%%/device_definitions/_pic16c54.i
-%%DATADIR%%/device_definitions/_pic16c54a.i
-%%DATADIR%%/device_definitions/_pic16c55.i
-%%DATADIR%%/device_definitions/_pic16c554.i
-%%DATADIR%%/device_definitions/_pic16c554a.i
-%%DATADIR%%/device_definitions/_pic16c556a.i
-%%DATADIR%%/device_definitions/_pic16c558.i
-%%DATADIR%%/device_definitions/_pic16c558a.i
-%%DATADIR%%/device_definitions/_pic16c56.i
-%%DATADIR%%/device_definitions/_pic16c57.i
-%%DATADIR%%/device_definitions/_pic16c58a.i
-%%DATADIR%%/device_definitions/_pic16c61.i
-%%DATADIR%%/device_definitions/_pic16c62.i
-%%DATADIR%%/device_definitions/_pic16c620.i
-%%DATADIR%%/device_definitions/_pic16c621.i
-%%DATADIR%%/device_definitions/_pic16c622.i
-%%DATADIR%%/device_definitions/_pic16c62a.i
-%%DATADIR%%/device_definitions/_pic16c63.i
-%%DATADIR%%/device_definitions/_pic16c64.i
-%%DATADIR%%/device_definitions/_pic16c64a.i
-%%DATADIR%%/device_definitions/_pic16c65.i
-%%DATADIR%%/device_definitions/_pic16c65a.i
-%%DATADIR%%/device_definitions/_pic16c66.i
-%%DATADIR%%/device_definitions/_pic16c67.i
-%%DATADIR%%/device_definitions/_pic16c71.i
-%%DATADIR%%/device_definitions/_pic16c710.i
-%%DATADIR%%/device_definitions/_pic16c711.i
-%%DATADIR%%/device_definitions/_pic16c715.i
-%%DATADIR%%/device_definitions/_pic16c72.i
-%%DATADIR%%/device_definitions/_pic16c73.i
-%%DATADIR%%/device_definitions/_pic16c73a.i
-%%DATADIR%%/device_definitions/_pic16c74.i
-%%DATADIR%%/device_definitions/_pic16c74a.i
-%%DATADIR%%/device_definitions/_pic16c76.i
-%%DATADIR%%/device_definitions/_pic16c77.i
-%%DATADIR%%/device_definitions/_pic16c83.i
-%%DATADIR%%/device_definitions/_pic16c84.i
-%%DATADIR%%/device_definitions/_pic16c923.i
-%%DATADIR%%/device_definitions/_pic16c924.i
-%%DATADIR%%/device_definitions/_pic16f688.i
-%%DATADIR%%/device_definitions/_pic16f72.i
-%%DATADIR%%/device_definitions/_pic16f818.i
-%%DATADIR%%/device_definitions/_pic16f819.i
-%%DATADIR%%/device_definitions/_pic16f84.i
-%%DATADIR%%/device_definitions/_pic16f873.i
-%%DATADIR%%/device_definitions/_pic16f874.i
-%%DATADIR%%/device_definitions/_pic16f876.i
-%%DATADIR%%/device_definitions/_pic16f877.i
-%%DATADIR%%/device_definitions/_pic17c42.i
-%%DATADIR%%/device_definitions/_pic17c43.i
-%%DATADIR%%/device_definitions/_pic17c44.i
-%%DATADIR%%/device_definitions/_pic17c752.i
-%%DATADIR%%/device_definitions/_pic17c756.i
-@dirrm %%DATADIR%%/device_definitions
-@dirrm %%DATADIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.asm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/morse.asm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/morse.i
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pic16f84.i
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/picmac.i
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic12c508.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic12c509.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic12c671.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic12c672.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic14000.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic14c000.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c52.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c54.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c54a.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c55.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c554.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c554a.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c556a.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c558.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c558a.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c56.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c57.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c58a.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c61.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c62.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c620.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c621.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c622.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c62a.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c63.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c64.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c64a.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c65.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c65a.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c66.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c67.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c71.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c710.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c711.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c715.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c72.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c73.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c73a.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c74.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c74a.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c76.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c77.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c83.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c84.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c923.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16c924.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16f688.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16f72.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16f818.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16f819.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16f84.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16f873.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16f874.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16f876.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic16f877.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic17c42.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic17c43.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic17c44.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic17c752.i
+%%PORTDATA%%%%DATADIR%%/device_definitions/_pic17c756.i
+%%PORTDATA%%@dirrm %%DATADIR%%/device_definitions
+%%PORTDATA%%@dirrm %%DATADIR%%