Update to 2.54. From the changelog:

2.54:
  * Make it possible to load setup files w/o running them. Code
    needing to do so can call IkiWiki::Setup::load, which will return
    a hash of values.
  * ikiwiki-transition: Fix command-line processing so the prefix_directives
    transition works again.
  * template: Add support for a BASENAME variable.
  * Fixes creation of pages when clicking on WikiLinks starting with "/".
  * Change deb dependencies to list Text::Markdown before markdown, since
    the former, while slower, has a much better html parser that avoids
    numerous bugs.
  * Move yesno function out of inline and into IkiWiki core, not exported.
  * Error handling improvement for preprocess hooks. It's now safe to call
    error() from such hooks; it will cause a nicely formatted error message
    to be inserted into the page.
  * Cut the size of the binary package in half by excluding pages for bugs
    and todo items from the html shipped in it.
  * parentlinks: New plugin, split out of ikiwiki core and enabled by default,
    and several new fields added to allow for advanced styling. (intrigeri)
  * smileys: Some fixes for escaped smileys.
  * smileys: Note that smileys need to be double-escaped for the escaping to
    work. Markdown removes one level of escaping.
  * Add a postscan hook.
  * search: Use postscan hook, avoid updating index when previewing.
  * git: Put web committer name/openid/address in the git author field.
    The committer's email address is not used (because leaking email addresses
    is not liked by many users). Closes: #451023
  * git: Fix parsing of git logs with no commit messages at all.
  * search: Fixes for title stemming, and use better term for tags.
    (Rebuilding the wiki on upgrade to this version is recommended if you
    use the search plugin.)
  * meta, inline: Support guid options, to allow forcing a particular url or
    uuid in feeds.
  * meta: fix title() PageSpec
  * Some footer style changes.
  * aggregate: Add an `aggregateinternal` option, which allows storing
    aggregated data to internal-use files, rather than wiki pages. This
    can save disk space, and be faster.
  * ikiwiki-transition: Add a `aggregateinternal` transition to rename
    the aggregated files.

2.53:
  * search: generate configuration files once only when rebuilding
  * attachment: Fix an uninitialised value warning when editing a page
    that currently has no attachments.
  * Fix a bug with links to pages whose names contained colons.
  * attachment: Support old versions of CGI.pm that lack an upload method.
  * Include ikiwiki.setup in examples in the debian package.
  * attachment: Support perl 5.8's buggy version of CGI.pm.
  * otl: Support utf-8 files. (Recai Oktaş)

2.52:
  * attachment: New plugin for uploading and managing attachments.
    This includes a fairly powerful PageSpec based admin pref for deciding
    whether to accept a given upload, and an attachment management interface
    on the edit page.
  * If attachments are not enabled, configure CGI.pm to disable file
    uploads by default. (An anti-DOS measure.)
  * toggle: Add support for toggles that are open by default.
  * toggle: Fix to work in preview mode.
  * toggle: Add javascript to top of page, not to end. This avoids flicker
    since closed toggles will not be displayed as the page is loading.
  * The editpage form now uses the raw page name, not the page title, in its
    'page' cgi parameter. Using the title was ambiguous and made it
    impossible to tell between some pages, like "foo/bar" and "foo__47__bar",
    sometimes causing the wrong page to be edited.
  * This change means that some edit links need to be updated.
    Force a rebuild on upgrade to this version.
  * Above change also allowed really fixing escaped slashes from the blogpost
    form.

2.51:
  * Improve toplevel parentlink to link directly to index.html when usedirs is
    disabled.
  * map: Add a "show" parameter. "show=title" can be used to display page
    titles, rather than the default page name. Based on a patch from
    Jaldhar H. Vyas, Closes: #484510
  * hnb: New plugin, contributed by Axel Beckert.
  * meta: Store "description" in pagestate for use by other plugins.
  * map: Support show=description.
  * textile: The Text::Textile perl module has some regexps that fail if
    input is flagged as utf-8, but contains invalid characters such as 0x92.
    To prevent it from crashing, re-encode the content before calling it,
    which will ensure that it's really utf-8.
  * Version the suggests of xapian-omega to a version known to be new enough
    to work with ikiwiki. Reportedly, version 0.9.9 is too old to work.
    Closes: #486592
  * creole: New plugin from Bernd Zeimetz. Closes: #486930
  * aggregate: Add template parameter.
  * Add support for the universal edit button <http://universaleditbutton.org/>
    (To get this on all pages of an exiting wiki, rebuild the wiki.)
  * txt: New plugin, contributed by Gabriel McManus.
  * smiley: Generate links relative to the destpage. (Fixes a reversion from
    2.41.)
  * toc: Revert change in 2.45 that made it run at sanitize time. That broke
    use of toc in a sidebar.
  * Call format hooks when generating page previews, thus fixing toc display
    there, as well as fixing inlins to again display in page previews, since
    it's started using format hooks. This also allows several other things,
    like embed, that use format hooks, to work during page preview time.
  * Format hooks should not rely on getting an entire html document, as they
    will only get the body during page preview.
  * toggle: Deal with preview mode when adding javascript.

2.50:
  * img: Support captions.
  * img: Don't generate empty title attributes, etc.
  * img: Allow setting defaults for class and id too.
  * ikiwiki-mass-rebuild: Make group list comparison more robust.
  * search: Work around xapian bug #486138 by only stemming locales
    in a whitelist.

2.49:
  * haiku: Generate valid xhtml.
  * ikiwiki-mass-rebuild: Don't trust $! when setting $)
  * inline: The optimisation in 2.41 broke nested inlines. Detect those
    and avoid overoptimising.
  * search: Converted to use xapian-omega.
  * Filter hooks are no longer called during the scan phase. This will
    prevent wikilinks added by filters from being scanned properly. But
    no known filter hook does that, so let's not waste time on it.
  * Pass a destpage parameter to the sanitize hook.
  * The search interface now allows searching for a page by title
    ("title:foo"), as well as for pages that contain a given link
    ("link:bar").

3 files changed, 12 insertions, 9 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index cdb0837ec90..ceac1fefa18 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2008/06/05 14:22:24 reed Exp $
+# $NetBSD: Makefile,v 1.15 2008/07/26 20:03:43 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_2.48
+DISTNAME=	ikiwiki_2.54
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	1
 CATEGORIES=	www textproc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 
@@ -67,7 +66,7 @@ INSTALLATION_DIRS+=	share/doc/ikiwiki
 WRKSRC=		${WRKDIR}/ikiwiki
 PERL5_PACKLIST=	auto/IkiWiki/.packlist
 USE_LANGUAGES=	# none
-USE_TOOLS=	gmake perl:run xgettext
+USE_TOOLS+=	gmake perl:run xgettext
 
 # TODO: check these
 REPLACE_PERL+=	IkiWiki.pm ikiwiki-w3m.cgi mdwn2man pm_filter
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index 15c207f203b..7ade41ab744 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/06/05 13:57:09 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/07/26 20:03:43 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-makerepo
 bin/ikiwiki-transition
@@ -22,7 +22,9 @@ share/ikiwiki/basewiki/ikiwiki/formatting.mdwn
 share/ikiwiki/basewiki/ikiwiki/markdown.mdwn
 share/ikiwiki/basewiki/ikiwiki/openid.mdwn
 share/ikiwiki/basewiki/ikiwiki/pagespec.mdwn
+share/ikiwiki/basewiki/ikiwiki/pagespec/attachment.mdwn
 share/ikiwiki/basewiki/ikiwiki/preprocessordirective.mdwn
+share/ikiwiki/basewiki/ikiwiki/searching.mdwn
 share/ikiwiki/basewiki/ikiwiki/subpage.mdwn
 share/ikiwiki/basewiki/ikiwiki/subpage/linkingrules.mdwn
 share/ikiwiki/basewiki/ikiwiki/wikilink.mdwn
@@ -88,6 +90,7 @@ share/ikiwiki/templates/recentchanges.tmpl
 share/ikiwiki/templates/rssitem.tmpl
 share/ikiwiki/templates/rsspage.tmpl
 share/ikiwiki/templates/searchform.tmpl
+share/ikiwiki/templates/searchquery.tmpl
 share/ikiwiki/templates/titlepage.tmpl
 share/locale/bg/LC_MESSAGES/ikiwiki.mo
 share/locale/cs/LC_MESSAGES/ikiwiki.mo
@@ -105,6 +108,7 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo
 @dirrm share/ikiwiki/basewiki/wikiicons
 @dirrm share/ikiwiki/basewiki/templates
 @dirrm share/ikiwiki/basewiki/ikiwiki/subpage
+@dirrm share/ikiwiki/basewiki/ikiwiki/pagespec
 @dirrm share/ikiwiki/basewiki/ikiwiki
 @dirrm share/ikiwiki/basewiki
 @dirrm share/ikiwiki
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index a32b5c2f4e3..d0e820e0e9e 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2008/06/05 13:57:09 reed Exp $
+$NetBSD: distinfo,v 1.6 2008/07/26 20:03:43 schmonz Exp $
 
-SHA1 (ikiwiki_2.48.tar.gz) = dcca59d164f7cafb9e638a02df04c1f6bd967e42
-RMD160 (ikiwiki_2.48.tar.gz) = 03c3f2b30977645e4113a5d00e14c183332c4868
-Size (ikiwiki_2.48.tar.gz) = 729477 bytes
+SHA1 (ikiwiki_2.54.tar.gz) = 87e997187a4ae60b36105c070e2879d2c757bcdd
+RMD160 (ikiwiki_2.54.tar.gz) = ca245468ae561937ad9d40f1fc8d0a27fd7be574
+Size (ikiwiki_2.54.tar.gz) = 876160 bytes