Index: head/www/nanoblogger/Makefile
===================================================================
--- head/www/nanoblogger/Makefile	(revision 445638)
+++ head/www/nanoblogger/Makefile	(revision 445639)
@@ -1,50 +1,51 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	nanoblogger
 PORTVERSION=	3.4.2
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nanoblogger.sourceforge.net/downloads/
 
 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
 
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/nb
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/nb
 	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR},g" ${WRKSRC}/nb
 	@${REINPLACE_CMD} -e "s,%%DOCSDIR%%,${DOCSDIR},g" ${WRKSRC}/nb
 	@${RM} ${WRKSRC}/plugins/page/format/*.orig
 	@${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>
Index: head/www/nanoblogger/pkg-plist
===================================================================
--- head/www/nanoblogger/pkg-plist	(revision 445638)
+++ head/www/nanoblogger/pkg-plist	(revision 445639)
@@ -1,90 +1,88 @@
 bin/nb
 @sample etc/nb.conf.sample
 %%DATADIR%%/default/articles/example.txt
 %%DATADIR%%/default/blog.conf
 %%DATADIR%%/default/data/cat_1.db
 %%DATADIR%%/default/images/favicon.ico
 %%DATADIR%%/default/images/feed-icon-14x14.png
 %%DATADIR%%/default/styles/feed.css
 %%DATADIR%%/default/styles/nb_clean.css
 %%DATADIR%%/default/styles/nb_default.css
 %%DATADIR%%/default/styles/print.css
 %%DATADIR%%/default/templates/archive_index.htm
 %%DATADIR%%/default/templates/category_archive.htm
 %%DATADIR%%/default/templates/category_entry.htm
 %%DATADIR%%/default/templates/day_archive.htm
 %%DATADIR%%/default/templates/entry.htm
 %%DATADIR%%/default/templates/entry.metadata
 %%DATADIR%%/default/templates/file.metadata
 %%DATADIR%%/default/templates/main_index.htm
 %%DATADIR%%/default/templates/main_links.htm
 %%DATADIR%%/default/templates/makepage.htm
 %%DATADIR%%/default/templates/month_archive.htm
 %%DATADIR%%/default/templates/month_entry.htm
 %%DATADIR%%/default/templates/permalink.htm
 %%DATADIR%%/default/templates/permalink_entry.htm
 %%DATADIR%%/default/templates/weblog_status.htm
 %%DATADIR%%/default/templates/year_archive.htm
 %%DATADIR%%/lang/en/help.txt
 %%DATADIR%%/lang/en/messages.lang
 %%DATADIR%%/lang/en/plugins.lang
 %%DATADIR%%/lang/en/templates.lang
 %%DATADIR%%/lib/archive.sh
 %%DATADIR%%/lib/config.sh
 %%DATADIR%%/lib/database.sh
 %%DATADIR%%/lib/error.sh
 %%DATADIR%%/lib/tools.sh
 %%DATADIR%%/moods/moods.conf
 %%DATADIR%%/moods/mymood.txt
 %%DATADIR%%/moods/smilies/angry.gif
 %%DATADIR%%/moods/smilies/cheesy.gif
 %%DATADIR%%/moods/smilies/cool.gif
 %%DATADIR%%/moods/smilies/cry.gif
 %%DATADIR%%/moods/smilies/embarassed.gif
 %%DATADIR%%/moods/smilies/grin.gif
 %%DATADIR%%/moods/smilies/huh.gif
 %%DATADIR%%/moods/smilies/kiss.gif
 %%DATADIR%%/moods/smilies/laugh.gif
 %%DATADIR%%/moods/smilies/lipsrsealed.gif
 %%DATADIR%%/moods/smilies/rolleyes.gif
 %%DATADIR%%/moods/smilies/sad.gif
 %%DATADIR%%/moods/smilies/shocked.gif
 %%DATADIR%%/moods/smilies/smiley.gif
 %%DATADIR%%/moods/smilies/tongue.gif
 %%DATADIR%%/moods/smilies/wink.gif
 %%DATADIR%%/plugins/archive/day/day_archive.sh
 %%DATADIR%%/plugins/archive/master_index.sh
 %%DATADIR%%/plugins/archive/month/month_archive.sh
 %%DATADIR%%/plugins/archive/year/year_archive.sh
 %%DATADIR%%/plugins/atom.sh
 %%DATADIR%%/plugins/calendar.sh
 %%DATADIR%%/plugins/entry/category_links.sh
 %%DATADIR%%/plugins/entry/format/autotag-br.sh
 %%DATADIR%%/plugins/entry/format/markdown.sh
 %%DATADIR%%/plugins/entry/format/raw.sh
 %%DATADIR%%/plugins/makepage/tidy.sh
 %%DATADIR%%/plugins/page/feed_links.sh
 %%DATADIR%%/plugins/page/format/autobr.sh
 %%DATADIR%%/plugins/page/format/markdown.sh
 %%DATADIR%%/plugins/page/format/moods.sh
 %%DATADIR%%/plugins/page/format/raw.sh
 %%DATADIR%%/plugins/post/clean_parts.off
 %%DATADIR%%/plugins/recent_entries.sh
 %%DATADIR%%/plugins/rss2.sh
 %%DATADIR%%/plugins/shortcode/baseurl.sh
 %%DATADIR%%/plugins/shortcode/moods.sh
 %%DATADIR%%/plugins/weblog_links.sh
 %%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
 @dir %%DATADIR%%/plugins/archive/category
 @dir %%DATADIR%%/default/plugins
 @dir %%DATADIR%%/default/cache