Update to 2.55. From the changelog:

* remove: New plugin that adds the ability to remove pages via the
    web. (Sponsored by The TOVA Company.)
* rename: New plugin that adds the ability to rename pages via the
    web. (Sponsored by The TOVA Company.) (This one's for you, Kyle.)
* All rcs backends need to implement rcs_remove, rcs_commitstaged,
    and rcs_rename. (Done for svn, git).
* This version adds renamepage hooks, which can be used to modify
    page content, including links, during renames.
* prefix_directives enabled in doc wiki, all preprocessor directives
    converted. (Simon McVittie)
* editpage: Don't show attachments link when attachments are disabled.
* tag: Allow tagbase to be overridden by starting a tag with "./"
    or "/". (Simon McVittie)
* Really fix bug with links to pages with names containing colons.
    Previous fix mised a few cases.
* Avoid troublesome abs_path calls in wrapper setup.
* Add allow_symlinks_before_srcdir config setting that can be used
    to avoid a security check that is a good safe default, but
    problimatic overkill in some situations.
* Don't allow uploading an attachment with the same name as an
    existing page, to avoid confusion.
* Split out error messages from editpage.tmpl into several separate
    templates.
* attachment: Do not escape _ when determining attachment filenames.
* Rebuild pages that change their type. (Gabriel McManus)
* monotone: Add support for rename, delete, and also diff. (William Uther)
* toggle: Fix incompatability between javascript and webkit.
* bzr: Add support for rename and delete. (Jelmer Vernooij)
* attachment: Use relative paths when inserting links.
* toggle: Fix for when html got tidied. Closes: #492529 (Enrico Zini)
* cutpaste: New plugin by Enrico Zini

3 files changed, 12 insertions, 7 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index ceac1fefa18..dcbf680f977 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2008/07/26 20:03:43 schmonz Exp $
+# $NetBSD: Makefile,v 1.16 2008/07/29 05:04:24 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_2.54
+DISTNAME=	ikiwiki_2.55
 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 7ade41ab744..719661069ad 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/07/26 20:03:43 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/07/29 05:04:24 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-makerepo
 bin/ikiwiki-transition
@@ -79,7 +79,11 @@ share/ikiwiki/templates/atomitem.tmpl
 share/ikiwiki/templates/atompage.tmpl
 share/ikiwiki/templates/blogpost.tmpl
 share/ikiwiki/templates/change.tmpl
+share/ikiwiki/templates/editconflict.tmpl
+share/ikiwiki/templates/editcreationconflict.tmpl
+share/ikiwiki/templates/editfailedsave.tmpl
 share/ikiwiki/templates/editpage.tmpl
+share/ikiwiki/templates/editpagegone.tmpl
 share/ikiwiki/templates/estseek.conf
 share/ikiwiki/templates/feedlink.tmpl
 share/ikiwiki/templates/inlinepage.tmpl
@@ -87,6 +91,7 @@ share/ikiwiki/templates/misc.tmpl
 share/ikiwiki/templates/page.tmpl
 share/ikiwiki/templates/passwordmail.tmpl
 share/ikiwiki/templates/recentchanges.tmpl
+share/ikiwiki/templates/renamesummary.tmpl
 share/ikiwiki/templates/rssitem.tmpl
 share/ikiwiki/templates/rsspage.tmpl
 share/ikiwiki/templates/searchform.tmpl
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index d0e820e0e9e..b58cbc27e7c 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2008/07/26 20:03:43 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2008/07/29 05:04:24 schmonz Exp $
 
-SHA1 (ikiwiki_2.54.tar.gz) = 87e997187a4ae60b36105c070e2879d2c757bcdd
-RMD160 (ikiwiki_2.54.tar.gz) = ca245468ae561937ad9d40f1fc8d0a27fd7be574
-Size (ikiwiki_2.54.tar.gz) = 876160 bytes
+SHA1 (ikiwiki_2.55.tar.gz) = 5df23432bb614059c390e24aae56368a73af9bab
+RMD160 (ikiwiki_2.55.tar.gz) = a63320f77849a375cc30a34023c220d49d92edbe
+Size (ikiwiki_2.55.tar.gz) = 891165 bytes