- Support staging

- Pet portlint
- Add LICENSE

PR:		189659
Submitted by:	Tobias Rehbein <tobias.rehbein@web.de> (maintainer)

2 files changed, 15 insertions, 30 deletions

diff --git a/www/nanoblogger-extra/Makefile b/www/nanoblogger-extra/Makefile
index 405bf17de9af..a92ccfce2dab 100644
--- a/www/nanoblogger-extra/Makefile
+++ b/www/nanoblogger-extra/Makefile
@@ -9,6 +9,8 @@ MASTER_SITES=	http://nanoblogger.sourceforge.net/downloads/
 MAINTAINER=	tobias.rehbein@web.de
 COMMENT=	Extras for nanoblogger, a small weblog engine
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	nb:${PORTSDIR}/www/nanoblogger
 
 WRKSRC=		${WRKDIR}/nanoblogger-${PORTVERSION}
@@ -16,26 +18,21 @@ DATADIR=	${PREFIX}/share/nanoblogger
 
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 do-install:
 .for data in default lang plugins
-	@( cd ${WRKSRC}/${data} && ${CHMOD} 777 ${WRKSRC}/${data}/* && \
-		${COPYTREE_SHARE} \* ${DATADIR}/${data} "! -empty" )
+	@( cd ${WRKSRC}/${data} && \
+		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${data} "! -empty" )
 .endfor
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in COPYING ChangeLog README
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${MKDIR} ${DOCSDIR}/html
-	@${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/html
-.endif
-
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/examples/nanoblogger.bash_completion ${EXAMPLESDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	@${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR}/html
+
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/docs/examples/nanoblogger.bash_completion ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/nanoblogger-extra/pkg-plist b/www/nanoblogger-extra/pkg-plist
index aba314882c70..c400c7cce503 100644
--- a/www/nanoblogger-extra/pkg-plist
+++ b/www/nanoblogger-extra/pkg-plist
@@ -28,8 +28,8 @@
 %%DATADIR%%/plugins/001_mymood.off
 %%DATADIR%%/plugins/archive/category/include_listings.sh
 %%DATADIR%%/plugins/archive/master_fullindex.off
-%%DATADIR%%/plugins/entry/z0_excerpt.off
 %%DATADIR%%/plugins/entry/format/autotag-p.sh
+%%DATADIR%%/plugins/entry/z0_excerpt.off
 %%DATADIR%%/plugins/file_links.sh
 %%DATADIR%%/plugins/fortune.sh
 %%DATADIR%%/plugins/page/format/autopbr.sh
@@ -38,23 +38,11 @@
 %%DATADIR%%/plugins/shortcode/yahoobuzz.sh
 %%DATADIR%%/plugins/shortcode/youtube.sh
 %%DATADIR%%/plugins/z001_articles_text.off
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/
-@dirrmtry %%DATADIR%%/default/styles
-@dirrmtry %%DATADIR%%/default/templates
-@dirrmtry %%DATADIR%%/default
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 @dirrmtry %%DATADIR%%/lang/de
 @dirrmtry %%DATADIR%%/lang/es
 @dirrmtry %%DATADIR%%/lang/fr
 @dirrmtry %%DATADIR%%/lang/tr
-@dirrmtry %%DATADIR%%/lang
-@dirrmtry %%DATADIR%%/plugins/archive/category
-@dirrmtry %%DATADIR%%/plugins/archive
-@dirrmtry %%DATADIR%%/plugins/entry/format
-@dirrmtry %%DATADIR%%/plugins/entry
-@dirrmtry %%DATADIR%%/plugins/page/format
-@dirrmtry %%DATADIR%%/plugins/page
-@dirrmtry %%DATADIR%%/plugins/shortcode
-@dirrmtry %%DATADIR%%/plugins
 @dirrmtry %%DATADIR%%