From owner-svn-ports-all@freebsd.org  Thu Jul 13 09:00:25 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 7B41ED9C56A;
 Thu, 13 Jul 2017 09:00:25 +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 54E376FA1D;
 Thu, 13 Jul 2017 09:00:25 +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 v6D90Oih072345;
 Thu, 13 Jul 2017 09:00:24 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6D90Odb072343;
 Thu, 13 Jul 2017 09:00:24 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201707130900.v6D90Odb072343@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: Thu, 13 Jul 2017 09:00:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r445639 - head/www/nanoblogger
X-SVN-Group: ports-head
X-SVN-Commit-Author: amdmi3
X-SVN-Commit-Paths: head/www/nanoblogger
X-SVN-Commit-Revision: 445639
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jul 2017 09:00:25 -0000

Author: amdmi3
Date: Thu Jul 13 09:00:24 2017
New Revision: 445639
URL: https://svnweb.freebsd.org/changeset/ports/445639

Log:
  - Fix LICENSE
  - Add LICENSE_FILE
  - Unsilence installation
  - Don't install licenses with documentation
  
  Approved by:	portmgr blanket

Modified:
  head/www/nanoblogger/Makefile
  head/www/nanoblogger/pkg-plist

Modified: head/www/nanoblogger/Makefile
==============================================================================
--- head/www/nanoblogger/Makefile	Thu Jul 13 09:00:21 2017	(r445638)
+++ head/www/nanoblogger/Makefile	Thu Jul 13 09:00:24 2017	(r445639)
@@ -10,7 +10,8 @@ MASTER_SITES=	http://nanoblogger.sourceforge.net/downl
 MAINTAINER=	tobias.rehbein@web.de
 COMMENT=	Small weblog engine written in Bash for the command line
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	bash:shells/bash
 
@@ -29,22 +30,22 @@ post-patch:
 	@${RM} ${WRKSRC}/plugins/entry/format/*.orig
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/nb ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/nb.conf ${STAGEDIR}${PREFIX}/etc/nb.conf.sample
+	${INSTALL_SCRIPT} ${WRKSRC}/nb ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/nb.conf ${STAGEDIR}${PREFIX}/etc/nb.conf.sample
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for data in default lang lib moods plugins
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${data} && \
 		( cd ${WRKSRC}/${data} && \
 			${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${data} "! -name *.orig" )
 .endfor
-	@${CP} ${WRKSRC}/welcome-to-nb.txt ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/welcome-to-nb.txt ${STAGEDIR}${DATADIR}
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for doc in COPYING ChangeLog README TODO copyright
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for doc in ChangeLog README TODO
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
-	@${INSTALL_DATA} ${WRKSRC}/docs/nanoblogger.html ${STAGEDIR}${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/docs/nanoblogger.html ${STAGEDIR}${DOCSDIR}/html
 
 .include <bsd.port.mk>

Modified: head/www/nanoblogger/pkg-plist
==============================================================================
--- head/www/nanoblogger/pkg-plist	Thu Jul 13 09:00:21 2017	(r445638)
+++ head/www/nanoblogger/pkg-plist	Thu Jul 13 09:00:24 2017	(r445639)
@@ -77,11 +77,9 @@ bin/nb
 %%DATADIR%%/plugins/weblog_status.sh
 %%DATADIR%%/plugins/z001_articles_meta.sh
 %%DATADIR%%/welcome-to-nb.txt
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/copyright
 %%PORTDOCS%%%%DOCSDIR%%/html/nanoblogger.html
 @dir %%DATADIR%%/plugins/page/mod
 @dir %%DATADIR%%/plugins/entry/mod