From owner-svn-ports-head@freebsd.org  Mon Feb  8 11:35:23 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46A289D9542;
 Mon,  8 Feb 2016 11:35:23 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F181B10C0;
 Mon,  8 Feb 2016 11:35:22 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u18BZMtF066236;
 Mon, 8 Feb 2016 11:35:22 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u18BZLh1066234;
 Mon, 8 Feb 2016 11:35:21 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201602081135.u18BZLh1066234@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 8 Feb 2016 11:35:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r408479 - head/devel/scandoc
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Feb 2016 11:35:23 -0000

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@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