ikiwiki 3.14159265. From the changelog:

* Add complete French basewiki and underlays translation from the
  Debian French l10n team, including Philippe Batailler, Alexandre
  Dupas, and Steve Petruzzello.
* Expand banned_users; it can now include PageSpecs, which allows
  banning by IP address.
* underlay: Also allow configuring additional directories to search
  for template files in.
* Fix parsing web commits from ipv6 addresses.
* Add genwrapper hook, that can be used to add code into the C wrapper.
* cvs: Yeah, ikiwiki even supports CVS now. Plugin contributed by
  Amitai Schlair.
* Updated Czech translation from Miroslav Kure. Closes: #546223
* rsync: New plugin that allows pushing the destdir to a remote host
  via rsync or similar. Thanks, Amitai Schlair.
* auto.setup, auto-blog.setup: Fix sanitization of entered wikiname.
  Closes: #547378

Updated during the freeze because it's a leaf package and the bugfixes
and feature additions are desirable (if I may say so myself).

4 files changed, 82 insertions, 10 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 26486d984ee..4962bba4578 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2009/09/24 06:50:18 sno Exp $
+# $NetBSD: Makefile,v 1.32 2009/09/25 07:29:21 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.1415926
+DISTNAME=	ikiwiki_3.14159265
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	1
 CATEGORIES=	www textproc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index c12c23c5395..c0a87dab458 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/08/30 23:30:08 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/09/25 07:29:21 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-makerepo
 bin/ikiwiki-transition
@@ -194,6 +194,69 @@ 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/fr/basewiki/ikiwiki.fr.po
+share/ikiwiki/po/fr/basewiki/ikiwiki/directive.fr.po
+share/ikiwiki/po/fr/basewiki/ikiwiki/formatting.fr.po
+share/ikiwiki/po/fr/basewiki/ikiwiki/markdown.fr.po
+share/ikiwiki/po/fr/basewiki/ikiwiki/openid.fr.po
+share/ikiwiki/po/fr/basewiki/ikiwiki/pagespec.fr.po
+share/ikiwiki/po/fr/basewiki/ikiwiki/pagespec/attachment.fr.po
+share/ikiwiki/po/fr/basewiki/ikiwiki/pagespec/po.fr.po
+share/ikiwiki/po/fr/basewiki/ikiwiki/searching.fr.po
+share/ikiwiki/po/fr/basewiki/ikiwiki/subpage.fr.po
+share/ikiwiki/po/fr/basewiki/ikiwiki/subpage/linkingrules.fr.po
+share/ikiwiki/po/fr/basewiki/ikiwiki/wikilink.fr.po
+share/ikiwiki/po/fr/basewiki/index.fr.po
+share/ikiwiki/po/fr/basewiki/recentchanges.fr.po
+share/ikiwiki/po/fr/basewiki/sandbox.fr.po
+share/ikiwiki/po/fr/basewiki/shortcuts.fr.po
+share/ikiwiki/po/fr/basewiki/templates.fr.po
+share/ikiwiki/po/fr/basewiki/templates/note.fr.po
+share/ikiwiki/po/fr/basewiki/templates/popup.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/aggregate.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/brokenlinks.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/calendar.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/color.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/comment.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/copy.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/cut.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/cutpaste.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/edittemplate.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/format.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/fortune.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/graph.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/haiku.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/if.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/img.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/inline.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/linkmap.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/listdirectives.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/map.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/meta.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/more.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/orphans.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/pagecount.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/pagestats.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/pagetemplate.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/paste.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/ping.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/poll.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/polygen.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/postsparkline.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/progress.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/shortcut.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/sparkline.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/table.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/tag.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/taglink.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/template.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/testpagespec.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/teximg.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/toc.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/toggle.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/toggleable.fr.po
+share/ikiwiki/po/fr/directives/ikiwiki/directive/version.fr.po
+share/ikiwiki/po/fr/smiley/smileys.fr.po
 share/ikiwiki/smiley/smileys.mdwn
 share/ikiwiki/smiley/smileys/alert.png
 share/ikiwiki/smiley/smileys/angry.png
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 8068ba0e5c4..d88d7ed34cf 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2009/08/30 23:30:08 schmonz Exp $
+$NetBSD: distinfo,v 1.20 2009/09/25 07:29:21 schmonz Exp $
 
-SHA1 (ikiwiki_3.1415926.tar.gz) = da7eddde774a495b770194492b676985948feacd
-RMD160 (ikiwiki_3.1415926.tar.gz) = 91c688d4b91ace4d4ac1f8fd55ceebf8b06858f7
-Size (ikiwiki_3.1415926.tar.gz) = 1361688 bytes
+SHA1 (ikiwiki_3.14159265.tar.gz) = 439c6e7e78e112010240faec43b9876b50958481
+RMD160 (ikiwiki_3.14159265.tar.gz) = a730cffc5892e4d1a04ade9f419c641239d0f642
+Size (ikiwiki_3.14159265.tar.gz) = 1413871 bytes
 SHA1 (patch-aa) = a1c77fbdf31ab25abf354678c73c10fd5897f894
 SHA1 (patch-ab) = bbec6e7a4e6772d995a0b084a3875b83950eb194
 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index ab15ecd076a..f7b0bd16a80 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -1,11 +1,21 @@
-# $NetBSD: options.mk,v 1.5 2009/08/12 21:14:35 schmonz Exp $
+# $NetBSD: options.mk,v 1.6 2009/09/25 07:29:21 schmonz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ikiwiki
-PKG_SUPPORTED_OPTIONS=		ikiwiki-amazon-s3 ikiwiki-search
+PKG_SUPPORTED_OPTIONS=		cvs ikiwiki-amazon-s3 ikiwiki-search
 PKG_SUPPORTED_OPTIONS+=		imagemagick python svn w3m
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mcvs)
+. if !exists(/usr/bin/cvs)
+DEPENDS+=	cvs-[0-9]*:../../devel/scmcvs
+. endif
+DEPENDS+=	cvsps-[0-9]*:../../devel/cvsps
+DEPENDS+=	cvsweb-[0-9]*:../../www/cvsweb
+DEPENDS+=	p5-File-chdir-[0-9]*:../../devel/p5-File-chdir
+DEPENDS+=	p5-File-ReadBackwards-[0-9]*:../../textproc/p5-File-ReadBackwards
+.endif
+
 .if !empty(PKG_OPTIONS:Mikiwiki-search)
 DEPENDS+=	p5-Search-Xapian-[0-9]*:../../textproc/p5-Search-Xapian
 DEPENDS+=	p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1