4 files changed, 102 insertions, 23 deletions

diff --git a/www/nanoblogger/Makefile b/www/nanoblogger/Makefile
index f4e4ea3c73b8..aa2ca0939ff4 100644
--- a/www/nanoblogger/Makefile
+++ b/www/nanoblogger/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jpeg@thilelli.net
 COMMENT=	Small weblog engine for the UNIX command line
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
@@ -20,29 +20,24 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 USE_REINPLACE=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	bin/nb etc/nb.conf.default
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-.endif
+SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/nb
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/nb ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/nb.conf ${PREFIX}/etc/nb.conf.default
-	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/nb.conf ${PREFIX}/etc/nb.conf.sample
+	${MKDIR} ${DATADIR}
 .for dir in default moods plugins
 	${CP} -R ${WRKSRC}/${dir} ${DATADIR}
 .endfor
-	@${FIND} ${DATADIR} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+
+post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/nanoblogger.html ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/nanoblogger.html ${DOCSDIR}
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/nanoblogger/files/pkg-message.in b/www/nanoblogger/files/pkg-message.in
new file mode 100644
index 000000000000..9ec8ec9e7918
--- /dev/null
+++ b/www/nanoblogger/files/pkg-message.in
@@ -0,0 +1,10 @@
+POST-INSTALLATION NOTES:
+
+Before you can use NanoBlogger, you will have to create a global configuration file
+to set defaults information and paths to template files.
+
+A sample configuration file has been installed in:
+ %%PREFIX%%/etc/nb.conf.sample
+
+Since there are already some sensible default settings, you can begin with:
+ cp %%PREFIX%%/etc/nb.conf.sample %%PREFIX%%/etc/nb.conf
diff --git a/www/nanoblogger/pkg-descr b/www/nanoblogger/pkg-descr
index e319185f0ffb..b865454309e0 100644
--- a/www/nanoblogger/pkg-descr
+++ b/www/nanoblogger/pkg-descr
@@ -16,14 +16,9 @@ Features include:
     * plugins for calendar, recent entries, weblog status, fortunes, etc.
     * auto-formatting, e.g. line breaks translate to HTML
     * support for relative and absolute links
-    * extensibility through reusability
-    * global configuration to set defaults (nb.conf)
-    * per-weblog configuration to override global defaults (blog.conf)
-    * intelligent build system, only rebuilds relative parts for a modified entry
-    * simple cache system, for faster content generation
-    * auto-detection of weblog from current directory
-    * no dependency on any java-script, server-side scripting, or server-side includes
-    * no dependency on any special database (uses flat-file)
-    * multi-platform portability (or at least wherever there's bash and the required commands)
+    * [...]
 
 WWW: http://nanoblogger.sourceforge.net/
+
+- Julien Gabel
+jpeg@thilelli.net
diff --git a/www/nanoblogger/pkg-plist b/www/nanoblogger/pkg-plist
new file mode 100644
index 000000000000..11061277c859
--- /dev/null
+++ b/www/nanoblogger/pkg-plist
@@ -0,0 +1,79 @@
+bin/nb
+etc/nb.conf.sample
+%%DOCSDIR%%/nanoblogger.html
+%%DATADIR%%/default/articles/example.html
+%%DATADIR%%/default/articles/example.txt
+%%DATADIR%%/default/atom.xml
+%%DATADIR%%/default/blog.conf
+%%DATADIR%%/default/data/2005-06-02T20_48_35.txt
+%%DATADIR%%/default/data/cat_1.db
+%%DATADIR%%/default/images/favicon.ico
+%%DATADIR%%/default/index.html
+%%DATADIR%%/default/index.xml
+%%DATADIR%%/default/styles/nb_clean.css
+%%DATADIR%%/default/styles/nb_default.css
+%%DATADIR%%/default/styles/nb_rusted.css
+%%DATADIR%%/default/styles/nb_spring.css
+%%DATADIR%%/default/templates/category_archive.htm
+%%DATADIR%%/default/templates/entry.htm
+%%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/permalink.htm
+%%DATADIR%%/default/templates/permalink_entry.htm
+%%DATADIR%%/default/templates/weblog_status.htm
+%%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/01_mymood.off
+%%DATADIR%%/plugins/archive/master_index.sh
+%%DATADIR%%/plugins/archive/month/month_calendar.sh
+%%DATADIR%%/plugins/atom.sh
+%%DATADIR%%/plugins/calendar.sh
+%%DATADIR%%/plugins/entry/category_links.sh
+%%DATADIR%%/plugins/entry/mod/auto_break.sh
+%%DATADIR%%/plugins/entry/mod/base_url.sh
+%%DATADIR%%/plugins/entry/mod/moods.sh
+%%DATADIR%%/plugins/fortune.sh
+%%DATADIR%%/plugins/makepage/tidy.sh
+%%DATADIR%%/plugins/page/feed_links.sh
+%%DATADIR%%/plugins/page/page_links.off
+%%DATADIR%%/plugins/recent_entries.sh
+%%DATADIR%%/plugins/rss.sh
+%%DATADIR%%/plugins/rss2.sh
+%%DATADIR%%/plugins/weblog_links.sh
+%%DATADIR%%/plugins/weblog_status.sh
+%%DATADIR%%/plugins/zyx_articles.sh
+@dirrm %%DATADIR%%/plugins/page
+@dirrm %%DATADIR%%/plugins/makepage
+@dirrm %%DATADIR%%/plugins/entry/mod
+@dirrm %%DATADIR%%/plugins/entry
+@dirrm %%DATADIR%%/plugins/archive/month
+@dirrm %%DATADIR%%/plugins/archive
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/moods/smilies
+@dirrm %%DATADIR%%/moods
+@dirrm %%DATADIR%%/default/templates
+@dirrm %%DATADIR%%/default/styles
+@dirrm %%DATADIR%%/default/images
+@dirrm %%DATADIR%%/default/data
+@dirrm %%DATADIR%%/default/articles
+@dirrm %%DATADIR%%/default
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%