Update to 3.20101231. From the changelog:

   * Better support for serving the same site on multiple urls. (Such as
     a http and a https url, or a ipv4 and an ipv6 url.)
     (Thanks, smcv)
   * API: urlto without a defined second parameter now generates an url
     that starts with "/" (when possible; eg when the site's url and cgiurl
     are on the same domain).
   * Now when users log in via https, ikiwiki sends a secure cookie, that can
     only be used over https. If the user switches to using http, they will
     need to re-login. (smcv)
   * inline: Display feed buttons for nested inlines, linking to the inlined
     page's feed. (Giuseppe Bilotta)
   * goldtype: New theme, based on blueview, contributed by Lars Wirzenius.
   * po: do not override homepage title when it was overridden. (intrigeri)
   * Set HTML::Template's parent_global_vars option to allow using parameters
     like title_overridden that do not appear on the template. (intrigeri)
     (See https://rt.cpan.org/Public/Bug/Display.html?id=64158)
   * inline: Force an absolute page location when the inline postform is used.
   * editpage, comment: Clean up title when editing or creating a page or
     comment.
   * teximg: Use `[` and `]` instead of not recommended `$$`. (Paul Menzel)
     Closes: #596084
   * monotone: Improve version parsing to support patch and development
     versions of the monotone binary. (tommyd3mdi)
   * highlight: Support highlight 3.2+svn19 (note that released version 3.2
     is not supported). Closes: #605779 (David Bremner)
   * Add a second parameter to the rcs_diff hook, and avoid bloating memory
     reading in enormous commits.
   * git: Fix bug involving attempting to web revert a commit that included
     changes to attachments.

Updating during the freeze for bugfixes to this leaf package.

4 files changed, 20 insertions, 16 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index af06789aa42..935ab3ea9d8 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2010/12/03 05:00:35 schmonz Exp $
+# $NetBSD: Makefile,v 1.70 2011/01/02 05:13:02 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.20101201
+DISTNAME=	ikiwiki_3.20101231
 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 ff303dfd704..f2f1e35b36b 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2010/10/20 02:56:13 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.30 2011/01/02 05:13:02 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
 bin/ikiwiki-makerepo
@@ -99,6 +99,7 @@ share/ikiwiki/examples/blog/comments.mdwn
 share/ikiwiki/examples/blog/index.mdwn
 share/ikiwiki/examples/blog/posts.mdwn
 share/ikiwiki/examples/blog/posts/first_post.mdwn
+share/ikiwiki/examples/blog/posts/ugachaka/discussion.mdwn
 share/ikiwiki/examples/blog/sidebar.mdwn
 share/ikiwiki/examples/blog/tags.mdwn
 share/ikiwiki/examples/softwaresite.mdwn
@@ -417,6 +418,9 @@ 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/ikiwiki/themes/goldtype/background_darkness.png
+share/ikiwiki/themes/goldtype/header_background.png
+share/ikiwiki/themes/goldtype/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 9b900ac5483..31ee071d2d7 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.54 2010/12/03 05:00:35 schmonz Exp $
+$NetBSD: distinfo,v 1.55 2011/01/02 05:13:02 schmonz Exp $
 
-SHA1 (ikiwiki_3.20101201.tar.gz) = 2a0e0114da03c8d862916df5aaf44d1e4010e378
-RMD160 (ikiwiki_3.20101201.tar.gz) = b1a60911a32533a90bb5d51fc83d181a10825ed1
-Size (ikiwiki_3.20101201.tar.gz) = 1996789 bytes
-SHA1 (patch-aa) = 06e339584f95ad52842daf7cd0be705e242bdb06
+SHA1 (ikiwiki_3.20101231.tar.gz) = 176d78c6bc729ec6f8db828ce22a07df8aca3752
+RMD160 (ikiwiki_3.20101231.tar.gz) = f6aacf2ff434884b166ca0c192bc4d9437196c06
+Size (ikiwiki_3.20101231.tar.gz) = 2287698 bytes
+SHA1 (patch-aa) = 3f6c613520fdb979d68e0b4eda7698e62d4d8961
 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 30e0bc4680a..f5420173cd3 100644
--- a/www/ikiwiki/patches/patch-aa
+++ b/www/ikiwiki/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.19 2010/10/20 02:56:13 schmonz Exp $
+$NetBSD: patch-aa,v 1.20 2011/01/02 05:13:02 schmonz Exp $
 
---- Makefile.PL.orig	2010-10-09 00:09:24.000000000 +0000
+--- Makefile.PL.orig	2010-12-11 18:33:22.000000000 +0000
 +++ Makefile.PL
 @@ -19,6 +19,8 @@ SED?=sed
  
@@ -38,16 +38,16 @@ $NetBSD: patch-aa,v 1.19 2010/10/20 02:56:13 schmonz Exp $
  			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
  		fi \
  	done
-@@ -91,7 +93,7 @@ underlay_install:
- 			if echo "$$file" | grep -q style.css; then \
- 				(cat doc/style.css; cat $$file) >> $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \
+@@ -94,7 +96,7 @@ underlay_install:
+ 			elif echo "$$file" | grep -q base.css; then \
+ 				:; \
  			elif [ -f "$$file" ]; then \
 -				cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \
 +				cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \
  				install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
  			fi \
  		done; \
-@@ -103,7 +105,7 @@ extra_install: underlay_install
+@@ -106,7 +108,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 \
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.19 2010/10/20 02:56:13 schmonz Exp $
  		install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
  	done
  
-@@ -122,15 +124,15 @@ extra_install: underlay_install
+@@ -125,15 +127,15 @@ extra_install: underlay_install
  		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
  	done
  
@@ -80,7 +80,7 @@ $NetBSD: patch-aa,v 1.19 2010/10/20 02:56:13 schmonz Exp $
  	
  	install -d $(DESTDIR)$(PREFIX)/sbin
  	install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
-@@ -147,10 +149,10 @@ extra_install: underlay_install
+@@ -150,10 +152,10 @@ extra_install: underlay_install
  	
  	# These might fail if a regular user is installing into a home
  	# directory.