Update to 3.20091218. From the changelog:

* Add complete Spanish basewiki translation done by Fernando Gonzalez de
    Requena.
* Improve javascript onload handling.
* monotone: Deal with format change in version 0.45.
    (Thanks, Richard Levitte)
* cvs: Add missing bit to Automator.
* attachment: Fix reversion in attachment sorting by age.
* Fix utf-8 problems in rename, remove, attachment, 404, sourcepage, and
    goto.

Updating this leaf during the freeze for the bugfixes.

4 files changed, 26 insertions, 22 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 21029980915..536d268b5a1 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2009/12/02 21:38:43 schmonz Exp $
+# $NetBSD: Makefile,v 1.42 2009/12/22 23:23:27 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.20091202
+DISTNAME=	ikiwiki_3.20091218
 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 c8ba11ec14d..f6b52fdcd52 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/12/02 21:38:43 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.21 2009/12/22 23:23:27 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
 bin/ikiwiki-makerepo
@@ -199,6 +199,25 @@ share/ikiwiki/po/da/directives/ikiwiki/directive/toggle.da.po
 share/ikiwiki/po/da/directives/ikiwiki/directive/toggleable.da.po
 share/ikiwiki/po/da/directives/ikiwiki/directive/version.da.po
 share/ikiwiki/po/da/smiley/smileys.da.po
+share/ikiwiki/po/es/basewiki/ikiwiki.es.po
+share/ikiwiki/po/es/basewiki/ikiwiki/directive.es.po
+share/ikiwiki/po/es/basewiki/ikiwiki/formatting.es.po
+share/ikiwiki/po/es/basewiki/ikiwiki/markdown.es.po
+share/ikiwiki/po/es/basewiki/ikiwiki/openid.es.po
+share/ikiwiki/po/es/basewiki/ikiwiki/pagespec.es.po
+share/ikiwiki/po/es/basewiki/ikiwiki/pagespec/attachment.es.po
+share/ikiwiki/po/es/basewiki/ikiwiki/pagespec/po.es.po
+share/ikiwiki/po/es/basewiki/ikiwiki/searching.es.po
+share/ikiwiki/po/es/basewiki/ikiwiki/subpage.es.po
+share/ikiwiki/po/es/basewiki/ikiwiki/subpage/linkingrules.es.po
+share/ikiwiki/po/es/basewiki/ikiwiki/wikilink.es.po
+share/ikiwiki/po/es/basewiki/index.es.po
+share/ikiwiki/po/es/basewiki/recentchanges.es.po
+share/ikiwiki/po/es/basewiki/sandbox.es.po
+share/ikiwiki/po/es/basewiki/shortcuts.es.po
+share/ikiwiki/po/es/basewiki/templates.es.po
+share/ikiwiki/po/es/basewiki/templates/note.es.po
+share/ikiwiki/po/es/basewiki/templates/popup.es.po
 share/ikiwiki/po/fr/basewiki/ikiwiki.fr.po
 share/ikiwiki/po/fr/basewiki/ikiwiki/directive.fr.po
 share/ikiwiki/po/fr/basewiki/ikiwiki/formatting.fr.po
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 9539f185953..f40a38a7220 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.28 2009/12/02 21:38:43 schmonz Exp $
+$NetBSD: distinfo,v 1.29 2009/12/22 23:23:27 schmonz Exp $
 
-SHA1 (ikiwiki_3.20091202.tar.gz) = d5baaba6b804b74f30143d48b7c7613c6f51ecdc
-RMD160 (ikiwiki_3.20091202.tar.gz) = b07d794fb00dd55cff4b7ef593450e80e8e83cd5
-Size (ikiwiki_3.20091202.tar.gz) = 1490861 bytes
+SHA1 (ikiwiki_3.20091218.tar.gz) = 34259660bc2f502aab2ea3a27fb8406b6cea18bd
+RMD160 (ikiwiki_3.20091218.tar.gz) = 400ce23eb48e20defbee4c8911e3e8a02a17b021
+Size (ikiwiki_3.20091218.tar.gz) = 1516789 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
deleted file mode 100644
index 0459be32d2f..00000000000
--- a/www/ikiwiki/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
- 		}