svn commit: r408479 - head/devel/scandoc

[Dmitry Marakasov]

Author: amdmi3
Date: Mon Feb  8 11:35:21 2016
New Revision: 408479
URL: https://svnweb.freebsd.org/changeset/ports/408479

Log:
  - Fix license
  - Switch to options helpers

Modified:
  head/devel/scandoc/Makefile
  head/devel/scandoc/pkg-plist

Modified: head/devel/scandoc/Makefile
==============================================================================
--- head/devel/scandoc/Makefile	Mon Feb  8 11:20:19 2016	(r408478)
+++ head/devel/scandoc/Makefile	Mon Feb  8 11:35:21 2016	(r408479)
@@ -9,25 +9,23 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	ports at FreeBSD.org
 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
+LICENSE=	ARTPERL10
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${PORTNAME}
 NO_BUILD=	yes
+
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "images templates test" \
+			${STAGEDIR}${DATADIR}
 
-post-install:
-	@${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})
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog README scandoc.html \
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/devel/scandoc/pkg-plist
==============================================================================
--- head/devel/scandoc/pkg-plist	Mon Feb  8 11:20:19 2016	(r408478)
+++ head/devel/scandoc/pkg-plist	Mon Feb  8 11:35:21 2016	(r408479)
@@ -1,5 +1,4 @@
 bin/scandoc
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/scandoc.html