ports/158579: [maintainer-update] www/nanoblogger: fix calendar generation

[Tobias Rehbein]

>Number:         158579
>Category:       ports
>Synopsis:       [maintainer-update] www/nanoblogger: fix calendar generation
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 01 20:20:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Tobias Rehbein
>Release:        FreeBSD 8.2-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD sushi.pseudo.local 8.2-RELEASE-p2 FreeBSD 8.2-RELEASE-p2 #4: Thu Jun 2 16:42:39 CEST 2011 tobi at sushi.pseudo.local:/usr/obj/usr/src/sys/SUSHI i386

	
>Description:
	FreeBSDs ncal(1) highlights the current date. This breaks
	www/nanoblogger's html generation as ncal(1)s output is captured to
	generate the blog calendar.

	
>How-To-Repeat:
	Install www/nanobloger and create a new weblog, open the weblogs index.html and look at
	the generated calendar.

	To create a new weblog in /tmp/nb: `nb -b /tmp/nb add weblog`
	
>Fix:
	Find attached a patch that fixes this issue by providing the '-h' parameter to ncal(1).
	

--- www-nanoblogger_cal-plugin-fix.diff begins here ---
diff -ruN www/nanoblogger.orig/files/patch-nb www/nanoblogger/files/patch-nb
--- www/nanoblogger.orig/files/patch-nb	2011-07-01 21:18:32.000000000 +0200
+++ www/nanoblogger/files/patch-nb	2011-07-01 21:32:23.000000000 +0200
@@ -1,5 +1,5 @@
 --- ./nb.orig	2010-02-15 22:01:53.000000000 +0100
-+++ ./nb	2010-03-01 22:12:55.000000000 +0100
++++ ./nb	2011-07-01 21:31:22.000000000 +0200
 @@ -1,4 +1,4 @@
 -#! /bin/bash
 +#! %%LOCALBASE%%/bin/bash
diff -ruN www/nanoblogger.orig/files/patch-nb.conf www/nanoblogger/files/patch-nb.conf
--- www/nanoblogger.orig/files/patch-nb.conf	2011-07-01 21:18:32.000000000 +0200
+++ www/nanoblogger/files/patch-nb.conf	2011-07-01 21:32:23.000000000 +0200
@@ -1,5 +1,5 @@
 --- ./nb.conf.orig	2010-02-15 02:14:23.000000000 +0100
-+++ ./nb.conf	2010-03-01 22:10:36.000000000 +0100
++++ ./nb.conf	2011-07-01 21:31:22.000000000 +0200
 @@ -7,7 +7,7 @@
  NB_LANG="en"
  
diff -ruN www/nanoblogger.orig/files/patch-plugins__calendar.sh www/nanoblogger/files/patch-plugins__calendar.sh
--- www/nanoblogger.orig/files/patch-plugins__calendar.sh	1970-01-01 01:00:00.000000000 +0100
+++ www/nanoblogger/files/patch-plugins__calendar.sh	2011-07-01 21:32:23.000000000 +0200
@@ -0,0 +1,10 @@
+--- ./plugins/calendar.sh.orig	2011-07-01 21:31:36.000000000 +0200
++++ ./plugins/calendar.sh	2011-07-01 21:32:12.000000000 +0200
+@@ -12,6 +12,7 @@
+ cal_month="$2"
+ cal_file="$3"
+ : ${CAL_CMD:=cal}
++: ${CAL_ARGS:=-h}
+ mkdir -p `dirname "$cal_file"`
+ # halt if cal command fails
+ nb_eval "$CAL_CMD" || continue
diff -ruN www/nanoblogger.orig/files/patch-plugins__entry__format__markdown.sh www/nanoblogger/files/patch-plugins__entry__format__markdown.sh
--- www/nanoblogger.orig/files/patch-plugins__entry__format__markdown.sh	2011-07-01 21:18:32.000000000 +0200
+++ www/nanoblogger/files/patch-plugins__entry__format__markdown.sh	2011-07-01 21:32:23.000000000 +0200
@@ -1,5 +1,5 @@
 --- ./plugins/entry/format/markdown.sh.orig	2010-02-14 21:42:17.000000000 +0100
-+++ ./plugins/entry/format/markdown.sh	2010-03-01 22:10:36.000000000 +0100
++++ ./plugins/entry/format/markdown.sh	2011-07-01 21:31:22.000000000 +0200
 @@ -5,7 +5,7 @@
  : ${MARKDOWN_CMD:=markdown}
  : ${MARKDOWN_OPTS:= }
diff -ruN www/nanoblogger.orig/files/patch-plugins__page__format__markdown.sh www/nanoblogger/files/patch-plugins__page__format__markdown.sh
--- www/nanoblogger.orig/files/patch-plugins__page__format__markdown.sh	2011-07-01 21:18:32.000000000 +0200
+++ www/nanoblogger/files/patch-plugins__page__format__markdown.sh	2011-07-01 21:32:23.000000000 +0200
@@ -1,5 +1,5 @@
 --- ./plugins/page/format/markdown.sh.orig	2009-08-10 02:01:37.000000000 +0200
-+++ ./plugins/page/format/markdown.sh	2010-03-01 22:10:36.000000000 +0100
++++ ./plugins/page/format/markdown.sh	2011-07-01 21:31:22.000000000 +0200
 @@ -5,7 +5,7 @@
  : ${MARKDOWN_CMD:=markdown}
  : ${MARKDOWN_OPTS:= }
--- www-nanoblogger_cal-plugin-fix.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: