- fix calendar generation

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

6 files changed, 19 insertions, 6 deletions

diff --git a/www/nanoblogger/Makefile b/www/nanoblogger/Makefile
index 484b89b69d72..c8e7f01da802 100644
--- a/www/nanoblogger/Makefile
+++ b/www/nanoblogger/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nanoblogger
 PORTVERSION=	3.4.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nanoblogger.sourceforge.net/downloads/
 
@@ -25,6 +26,8 @@ post-patch:
 	@${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 ${PREFIX}/bin
diff --git a/www/nanoblogger/files/patch-nb b/www/nanoblogger/files/patch-nb
index 9bec2ea31daa..04dc32fbd5ff 100644
--- a/www/nanoblogger/files/patch-nb
+++ b/www/nanoblogger/files/patch-nb
@@ -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 --git a/www/nanoblogger/files/patch-nb.conf b/www/nanoblogger/files/patch-nb.conf
index 5c3f0b7fb930..5ffd86279974 100644
--- a/www/nanoblogger/files/patch-nb.conf
+++ b/www/nanoblogger/files/patch-nb.conf
@@ -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 --git a/www/nanoblogger/files/patch-plugins__calendar.sh b/www/nanoblogger/files/patch-plugins__calendar.sh
new file mode 100644
index 000000000000..40e5b3cae80e
--- /dev/null
+++ b/www/nanoblogger/files/patch-plugins__calendar.sh
@@ -0,0 +1,10 @@
+--- ./plugins/calendar.sh	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 --git a/www/nanoblogger/files/patch-plugins__entry__format__markdown.sh b/www/nanoblogger/files/patch-plugins__entry__format__markdown.sh
index b95010b72acb..454d16323c8b 100644
--- a/www/nanoblogger/files/patch-plugins__entry__format__markdown.sh
+++ b/www/nanoblogger/files/patch-plugins__entry__format__markdown.sh
@@ -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	2010-02-14 21:42:17.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 --git a/www/nanoblogger/files/patch-plugins__page__format__markdown.sh b/www/nanoblogger/files/patch-plugins__page__format__markdown.sh
index 6ecce8a6a756..ca74a164f2cd 100644
--- a/www/nanoblogger/files/patch-plugins__page__format__markdown.sh
+++ b/www/nanoblogger/files/patch-plugins__page__format__markdown.sh
@@ -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	2009-08-10 02:01:37.000000000 +0200
++++ ./plugins/page/format/markdown.sh	2011-07-01 21:31:22.000000000 +0200
 @@ -5,7 +5,7 @@
  : ${MARKDOWN_CMD:=markdown}
  : ${MARKDOWN_OPTS:= }