Update this generally stable leaf package during the freeze, mainly

for a handful of bugfixes, to 3.20100623. From the changelog:

   * openid: Add openid_realm and openid_cgiurl configuration options,
     useful in a few edge case setups.
   * attachment: Show files from underlay in attachments list.
   * img: Support hspace and vspace attributes.
   * editpage: Rename "comments" field to avoid CSS conflict with the
     comments div.
   * edittemplate: Make silent mode not disable display when the template
     page does not exist, so it can be easily created.
   * edittemplate: Look for template pages under templates/ like everything
     else (still looks in old location for backwards compatibility).
   * attachment: When inserting links, insert img directives for images,
     if that plugin is enabled.
   * websetup: Allow enabling plugins listed in disable_plugins.
   * editpage, comments: Fix broken links in sidebar (due to forcebaseurl).
     (Thanks, privat)
   * calendar: Tune archive_pagespec to only match pages, not other files.
   * Fix issues with combining unicode srcdirs and source files.
     (Workaround bug #586045)
   * Make --gettime be honored after initial setup.
   * git: Fix --gettime to properly support utf8 filenames.
   * attachment: Support Windows paths when taking basename of client-supplied
     file name.
   * theme: New plugin, allows easily themeing a site via the underlay.
   * Added actiontabs theme by Svend Sorensen.
   * Added blueview theme by Bernd Zeimetz.
   * mercurial: Fix buggy getctime code. Closes: #586279
   * link: Enhanced to handle URLs and email addresses. (Bernd Zeimetz)

4 files changed, 17 insertions, 13 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index cd1bd9e0eed..6d428f810d9 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2010/06/11 15:15:57 schmonz Exp $
+# $NetBSD: Makefile,v 1.56 2010/06/23 23:52:12 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.20100610
+DISTNAME=	ikiwiki_3.20100623
 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 bf6f939ae02..3a094c7dec1 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2010/06/11 15:15:57 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.26 2010/06/23 23:52:12 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
 bin/ikiwiki-makerepo
@@ -409,6 +409,10 @@ share/ikiwiki/templates/rsspage.tmpl
 share/ikiwiki/templates/searchform.tmpl
 share/ikiwiki/templates/searchquery.tmpl
 share/ikiwiki/templates/titlepage.tmpl
+share/ikiwiki/themes/actiontabs/style.css
+share/ikiwiki/themes/blueview/background_darkness.png
+share/ikiwiki/themes/blueview/header_background.png
+share/ikiwiki/themes/blueview/style.css
 share/locale/bg/LC_MESSAGES/ikiwiki.mo
 share/locale/cs/LC_MESSAGES/ikiwiki.mo
 share/locale/da/LC_MESSAGES/ikiwiki.mo
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index c91ec6e0d69..f21f8cdfd51 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.41 2010/06/11 15:15:57 schmonz Exp $
+$NetBSD: distinfo,v 1.42 2010/06/23 23:52:12 schmonz Exp $
 
-SHA1 (ikiwiki_3.20100610.tar.gz) = 2c90c9b7d730b8c516aebe645c7b6d496d5a55fc
-RMD160 (ikiwiki_3.20100610.tar.gz) = e481bb4a5a1c8674a4d91896b59ad85ead5a06d2
-Size (ikiwiki_3.20100610.tar.gz) = 1766439 bytes
-SHA1 (patch-aa) = 12cfd5be1b6e8b66e3e78cdf36e848a10b9642c3
+SHA1 (ikiwiki_3.20100623.tar.gz) = 977c389b745b9b9dc49f370e99fb128717d497df
+RMD160 (ikiwiki_3.20100623.tar.gz) = 106b42c6b1e1325b14e9a6dd656967f6c6260a0a
+Size (ikiwiki_3.20100623.tar.gz) = 1833124 bytes
+SHA1 (patch-aa) = 7feab1b6e6d27afc5884f107dd8d7364a9b475be
 SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903
 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
 SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa
index 2534b818ace..2a3c92f0861 100644
--- a/www/ikiwiki/patches/patch-aa
+++ b/www/ikiwiki/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.17 2010/04/27 13:15:46 schmonz Exp $
+$NetBSD: patch-aa,v 1.18 2010/06/23 23:52:12 schmonz Exp $
 
---- Makefile.PL.orig	2010-04-25 00:42:59.000000000 +0000
+--- Makefile.PL.orig	2010-06-16 23:17:18.000000000 +0000
 +++ Makefile.PL
 @@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.17 2010/04/27 13:15:46 schmonz Exp $
  			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
  		done; \
  	done
-@@ -85,7 +87,7 @@ extra_install: underlay_install
+@@ -99,7 +101,7 @@ extra_install: underlay_install
  		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
  	done
  	for file in `cd doc/examples; find . -type f ! -regex '.*\.svn.*'`; do \
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.17 2010/04/27 13:15:46 schmonz Exp $
  		install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
  	done
  
-@@ -104,15 +106,15 @@ extra_install: underlay_install
+@@ -118,15 +120,15 @@ extra_install: underlay_install
  		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
  	done
  
@@ -62,7 +62,7 @@ $NetBSD: patch-aa,v 1.17 2010/04/27 13:15:46 schmonz Exp $
  	
  	install -d $(DESTDIR)$(PREFIX)/sbin
  	install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
-@@ -129,10 +131,10 @@ extra_install: underlay_install
+@@ -143,10 +145,10 @@ extra_install: underlay_install
  	
  	# These might fail if a regular user is installing into a home
  	# directory.