Update to 3.20110707. From the changelog:

* userlist: New plugin, lets admins see a list of users and their info.
* aggregate: Improve checking for too long aggregated filenames.
* Updated to jQuery 1.6.1.
* attachment: Speed up multiple file uploads by storing uploaded files
  in a staging area until the page is saved/previewed, rather than
  refreshing the site after each upload.
  (Sponsored by The TOVA Company.)
* attachment: Files can be dragged into the edit page to upload them.
  Multiple file batch upload support. Upload progress bars.
  AJAX special effects. Impemented using the jQuery-File-Upload widget.
  (If you don't have javascript don't worry, I kept that working too.)
  (Sponsored by The TOVA Company.)
* Add libtext-multimarkdown-perl to Suggests. Closes: #630705
* headinganchors: Plugin by Paul Wise that adds ids to <hn> headings.
* html5 is not experimental anymore. But not the default either, quite yet.
* Support svg as a inlinable image type; svg images can be included on a
  page by simply linking to them, or by using the img directive.
  Note that sanitizing svg files is still not addressed.
* img: Generate png format thumbnails for svg images.
* Preserve mixed case in page creation links, and when creating a page
  whose title is mixed case, allow selecting between the mixed case and
  all lower-case names.
* Fix ikiwiki-update-wikilist -r to actually work.
* comments: collect metadata in a scan-phase preprocess hook, which
  fixes sorting comments by date. (smcv)
* Run scan hooks for internal pages (preprocess hooks already run in scan
  mode) (smcv)
* inline: Handle obfuscated urls, such as the mailto urls generated by
  markdown when forcing urls absolute.
* Bugfix for wikilink containing an email address not showing up in
  brokenlinks list.
* Bugfix for trying to attach files to a subpage of the index page.

Updating this leaf package during the freeze for bugfix purposes.

3 files changed, 20 insertions, 8 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index e51b3f15923..c62d9028444 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2011/06/09 02:57:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.80 2011/07/08 03:16:12 schmonz Exp $
 #
 
-DISTNAME=		ikiwiki_3.20110608
+DISTNAME=		ikiwiki_3.20110707
 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 3fe850c55bc..9f4bb1da657 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2011/01/24 04:38:50 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.32 2011/07/08 03:16:12 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
 bin/ikiwiki-makerepo
@@ -19,6 +19,18 @@ ${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup
 share/examples/ikiwiki/auto-blog.setup
 share/examples/ikiwiki/auto.setup
 share/examples/ikiwiki/wikilist
+share/ikiwiki/attachment/ikiwiki/images/pbar-ani.gif
+share/ikiwiki/attachment/ikiwiki/images/ui-bg_flat_75_ffffff_40x100.png
+share/ikiwiki/attachment/ikiwiki/images/ui-bg_glass_75_e6e6e6_1x400.png
+share/ikiwiki/attachment/ikiwiki/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+share/ikiwiki/attachment/ikiwiki/images/ui-icons_222222_256x240.png
+share/ikiwiki/attachment/ikiwiki/images/ui-icons_888888_256x240.png
+share/ikiwiki/attachment/ikiwiki/jquery-ui.min.css
+share/ikiwiki/attachment/ikiwiki/jquery-ui.min.js
+share/ikiwiki/attachment/ikiwiki/jquery.fileupload-ui.js
+share/ikiwiki/attachment/ikiwiki/jquery.fileupload.js
+share/ikiwiki/attachment/ikiwiki/jquery.iframe-transport.js
+share/ikiwiki/attachment/ikiwiki/jquery.tmpl.min.js
 share/ikiwiki/basewiki/favicon.ico
 share/ikiwiki/basewiki/ikiwiki.mdwn
 share/ikiwiki/basewiki/ikiwiki/directive.mdwn
@@ -120,7 +132,7 @@ share/ikiwiki/examples/softwaresite/templates/release.mdwn
 share/ikiwiki/javascript/ikiwiki/ikiwiki.js
 share/ikiwiki/javascript/ikiwiki/relativedate.js
 share/ikiwiki/javascript/ikiwiki/toggle.js
-share/ikiwiki/openid-selector/ikiwiki/openid/jquery.js
+share/ikiwiki/jquery/ikiwiki/jquery.min.js
 share/ikiwiki/openid-selector/ikiwiki/openid/openid-jquery.js
 share/ikiwiki/po/cs/basewiki/ikiwiki.cs.po
 share/ikiwiki/po/cs/basewiki/ikiwiki/directive.cs.po
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index b526e827f2c..32809874285 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.64 2011/06/09 02:57:18 schmonz Exp $
+$NetBSD: distinfo,v 1.65 2011/07/08 03:16:12 schmonz Exp $
 
-SHA1 (ikiwiki_3.20110608.tar.gz) = 0808e5f2f03bb5d604b903b96a6a897aeeb24a9e
-RMD160 (ikiwiki_3.20110608.tar.gz) = fa3c774c148c7ef8001579a49c97c92320d18ac6
-Size (ikiwiki_3.20110608.tar.gz) = 2377663 bytes
+SHA1 (ikiwiki_3.20110707.tar.gz) = 56a25430cdd4a532703f198a3686062ae2e9051f
+RMD160 (ikiwiki_3.20110707.tar.gz) = 51a4c77b8f37f2f444889b17ecc57c4605e04fe3
+Size (ikiwiki_3.20110707.tar.gz) = 2490427 bytes
 SHA1 (patch-aa) = 748695579cc57ead26ec9524e633751b2a703b07
 SHA1 (patch-ab) = 642d25b01029955864d817e564a09bea04c06b10