2 files changed, 36 insertions, 36 deletions

diff --git a/devel/scandoc/Makefile b/devel/scandoc/Makefile
index 6e27b1fef6bc..a6dcc277f158 100644
--- a/devel/scandoc/Makefile
+++ b/devel/scandoc/Makefile
@@ -7,27 +7,26 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A C/C++ documentation generator
+COMMENT=	C/C++ documentation generator
+
+# The foolowing line may be uncommented when/if PR/182572 is committed,
+# the file COPYING should be removed from DOCSDIR installation and plist
+#LICENSE=	ARTPERL10
 
 USES=		perl5
 NO_BUILD=	yes
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-.for i in COPYING ChangeLog README scandoc.html
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/${PORTNAME}
-.endfor
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}/images
-	${CP} -R ${WRKSRC}/images/ ${PREFIX}/share/doc/${PORTNAME}/images/
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}/templates
-	${CP} -R ${WRKSRC}/templates/ ${PREFIX}/share/doc/${PORTNAME}/templates/
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}/test
-	${CP} -R ${WRKSRC}/test/ ${PREFIX}/share/doc/${PORTNAME}/test/
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}/images \
+		${STAGEDIR}${DATADIR}/templates ${STAGEDIR}${DATADIR}/test
+	(cd ${WRKSRC} && \
+		${COPYTREE_SHARE} "COPYING ChangeLog README scandoc.html" \
+			${STAGEDIR}${DOCSDIR}/ && \
+		${COPYTREE_SHARE} "images templates test" \
+			${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/devel/scandoc/pkg-plist b/devel/scandoc/pkg-plist
index da1cde6a4498..22c32d15fe4d 100644
--- a/devel/scandoc/pkg-plist
+++ b/devel/scandoc/pkg-plist
@@ -1,22 +1,23 @@
 bin/scandoc
-%%PORTDOCS%%share/doc/scandoc/COPYING
-%%PORTDOCS%%share/doc/scandoc/ChangeLog
-%%PORTDOCS%%share/doc/scandoc/README
-%%PORTDOCS%%share/doc/scandoc/images/ScanDocBig.jpg
-%%PORTDOCS%%share/doc/scandoc/images/ScanDocSmall.jpg
-%%PORTDOCS%%share/doc/scandoc/images/ball1.gif
-%%PORTDOCS%%share/doc/scandoc/images/ball2.gif
-%%PORTDOCS%%share/doc/scandoc/images/bug.gif
-%%PORTDOCS%%share/doc/scandoc/images/caution.gif
-%%PORTDOCS%%share/doc/scandoc/images/master.gif
-%%PORTDOCS%%share/doc/scandoc/images/tip.gif
-%%PORTDOCS%%share/doc/scandoc/images/warning.gif
-%%PORTDOCS%%share/doc/scandoc/scandoc.html
-%%PORTDOCS%%share/doc/scandoc/templates/apache.pl
-%%PORTDOCS%%share/doc/scandoc/templates/default.pl
-%%PORTDOCS%%share/doc/scandoc/test/Makefile
-%%PORTDOCS%%share/doc/scandoc/test/example.h
-%%PORTDOCS%%@dirrm share/doc/scandoc/images
-%%PORTDOCS%%@dirrm share/doc/scandoc/templates
-%%PORTDOCS%%@dirrm share/doc/scandoc/test
-%%PORTDOCS%%@dirrm share/doc/scandoc
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/scandoc.html
+%%DATADIR%%/images/ScanDocBig.jpg
+%%DATADIR%%/images/ScanDocSmall.jpg
+%%DATADIR%%/images/ball1.gif
+%%DATADIR%%/images/ball2.gif
+%%DATADIR%%/images/bug.gif
+%%DATADIR%%/images/caution.gif
+%%DATADIR%%/images/master.gif
+%%DATADIR%%/images/tip.gif
+%%DATADIR%%/images/warning.gif
+%%DATADIR%%/templates/apache.pl
+%%DATADIR%%/templates/default.pl
+%%DATADIR%%/test/Makefile
+%%DATADIR%%/test/example.h
+@dirrmtry %%DATADIR%%/test
+@dirrmtry %%DATADIR%%/templates
+@dirrmtry %%DATADIR%%/images
+@dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%