Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Jul 2017 09:00:24 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r445639 - head/www/nanoblogger
Message-ID:  <201707130900.v6D90Odb072343@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707130900.v6D90Odb072343>