Update to 3.20091202. From the changelog:

* meta: Generate meta description tags even when the html scrubber is enabled.
* meta: Allow use of DESCRIPTION in templates to get at the meta
  description value. (Thanks, NicolasLimare)
* inline: Use caching of inlined pages to speed up builds of inlines
  that include feeds. Speedup of about 25% for small inlines; could
  be much larger for inlines of many, or complex pages.
* Added (incomplete) Turkish po file. Closes: #556744 Thanks, Recai Oktas
* date: New plugin that allows inserting date directives that expand
  to pretty-printed dates, using the same formatting as used for page
  modification date display, etc.
* htmllink: Allow a title attribute to be specified.
* calendar: Add title attributes for all links in the calendars.
* calendar: Fix month wraparound error that broke in December.

pkgsrc changes:

* In the automated setup, recognize CVS as a VCS (found by agc@).
* In MESSAGE, link to <URL:http://ikiwiki.info/setup/> (ditto).

5 files changed, 27 insertions, 8 deletions

diff --git a/www/ikiwiki/MESSAGE b/www/ikiwiki/MESSAGE
index 23f17b662dc..2ca9825f98b 100644
--- a/www/ikiwiki/MESSAGE
+++ b/www/ikiwiki/MESSAGE
@@ -1,5 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.6 2009/11/02 04:23:37 schmonz Exp $
+$NetBSD: MESSAGE,v 1.7 2009/12/02 21:38:43 schmonz Exp $
+
+For a new wiki, see <URL:http://ikiwiki.info/setup/>.
 
 If you use custom templates, make sure they are correct when
 upgrading.
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 0e22e8f374f..21029980915 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2009/11/23 02:36:39 schmonz Exp $
+# $NetBSD: Makefile,v 1.41 2009/12/02 21:38:43 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.20091113
+DISTNAME=	ikiwiki_3.20091202
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	www textproc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index d251f9382fd..c8ba11ec14d 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/10/18 04:43:16 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/12/02 21:38:43 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
 bin/ikiwiki-makerepo
@@ -53,6 +53,7 @@ share/ikiwiki/directives/ikiwiki/directive/comment.mdwn
 share/ikiwiki/directives/ikiwiki/directive/copy.mdwn
 share/ikiwiki/directives/ikiwiki/directive/cut.mdwn
 share/ikiwiki/directives/ikiwiki/directive/cutpaste.mdwn
+share/ikiwiki/directives/ikiwiki/directive/date.mdwn
 share/ikiwiki/directives/ikiwiki/directive/edittemplate.mdwn
 share/ikiwiki/directives/ikiwiki/directive/format.mdwn
 share/ikiwiki/directives/ikiwiki/directive/fortune.mdwn
@@ -331,4 +332,5 @@ share/locale/gu/LC_MESSAGES/ikiwiki.mo
 share/locale/it/LC_MESSAGES/ikiwiki.mo
 share/locale/pl/LC_MESSAGES/ikiwiki.mo
 share/locale/sv/LC_MESSAGES/ikiwiki.mo
+share/locale/tr/LC_MESSAGES/ikiwiki.mo
 share/locale/vi/LC_MESSAGES/ikiwiki.mo
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index fb07328eebb..9539f185953 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.27 2009/11/23 02:36:39 schmonz Exp $
+$NetBSD: distinfo,v 1.28 2009/12/02 21:38:43 schmonz Exp $
 
-SHA1 (ikiwiki_3.20091113.tar.gz) = daaef9d99fa6504bf3b54dac73d62dd73122b1e8
-RMD160 (ikiwiki_3.20091113.tar.gz) = a2550867fe2aa6588fce0ab0190190ad51bba7ef
-Size (ikiwiki_3.20091113.tar.gz) = 1474045 bytes
+SHA1 (ikiwiki_3.20091202.tar.gz) = d5baaba6b804b74f30143d48b7c7613c6f51ecdc
+RMD160 (ikiwiki_3.20091202.tar.gz) = b07d794fb00dd55cff4b7ef593450e80e8e83cd5
+Size (ikiwiki_3.20091202.tar.gz) = 1490861 bytes
 SHA1 (patch-aa) = b64322fe609b8a9c8286f68e5b1bf81f3993914e
 SHA1 (patch-ab) = bbec6e7a4e6772d995a0b084a3875b83950eb194
+SHA1 (patch-ac) = 45496b1c5fc9d209b6c6b8c35ce5b42343d6fe6c
 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
 SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f
diff --git a/www/ikiwiki/patches/patch-ac b/www/ikiwiki/patches/patch-ac
new file mode 100644
index 00000000000..0459be32d2f
--- /dev/null
+++ b/www/ikiwiki/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.7 2009/12/02 21:38:43 schmonz Exp $
+
+--- IkiWiki/Setup/Automator.pm.orig	2009-12-01 16:07:46.000000000 -0500
++++ IkiWiki/Setup/Automator.pm
+@@ -66,6 +66,9 @@ sub import (@) {
+ 		elsif ($config{rcs} eq 'darcs') {
+ 			$config{darcs_wrapper}=$config{repository}."/_darcs/ikiwiki-wrapper";
+ 		}
++		elsif ($config{rcs} eq 'cvs') {
++			$config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
++		}
+ 		elsif ($config{rcs} eq 'bzr') {
+ 			# TODO
+ 		}