Support stage

Nuke non sense NOPORTDATA support

2 files changed, 71 insertions, 77 deletions

diff --git a/devel/picasm/Makefile b/devel/picasm/Makefile
index e2a3c0a67d1d..e8476dd6b2a8 100644
--- a/devel/picasm/Makefile
+++ b/devel/picasm/Makefile
@@ -11,6 +11,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable assembler for 16C84 series PICs
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 USE_BZIP2=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//g}
@@ -23,22 +25,15 @@ ALL_TARGET=
 
 EXAMPLE_FILES=	example.asm morse.asm morse.i pic16f84.i picmac.i
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/picasm ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/picasm.txt ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
+	${INSTALL_PROGRAM} ${WRKSRC}/picasm ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/picasm.txt ${STAGEDIR}${DOCSDIR}
 .for EXAMPLE in ${EXAMPLE_FILES}
-	@ ${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/${EXAMPLE} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/${EXAMPLE} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.endif
-.if !defined(NOPORTDATA)
-	${MKDIR} ${DATADIR}/device_definitions
-	${INSTALL_DATA} ${WRKSRC}/device_definitions/*.i ${DATADIR}/device_definitions
-.endif
+	@${MKDIR} ${STAGEDIR}${DATADIR}/device_definitions
+	${INSTALL_DATA} ${WRKSRC}/device_definitions/*.i ${STAGEDIR}${DATADIR}/device_definitions
 
 .include <bsd.port.mk>
diff --git a/devel/picasm/pkg-plist b/devel/picasm/pkg-plist
index 52874e257b9a..fa44ac71c433 100644
--- a/devel/picasm/pkg-plist
+++ b/devel/picasm/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 bin/picasm
 %%PORTDOCS%%%%DOCSDIR%%/picasm.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -8,65 +7,65 @@ bin/picasm
 %%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%%
+%%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%%