Update to 3.20140102. From the changelog:

* aggregate: Improve display of post author.
* poll: Fix behavior of poll buttons when inlined.
* Fixed unncessary tight loop hash copy in saveindex where a pointer
  can be used instead. Can speed up refreshes by nearly 50% in some
  circumstances.
* Optimized loadindex by caching the page name in the index.
* Added only_committed_changes config setting, which speeds up wiki
  refresh by querying git to find the files that were changed, rather
  than looking at the work tree. Not enabled by default as it can
  break some setups where not all files get committed to git.
* comments: Write pending moderation comments to the transient underlay
  to avoid conflict with only_committed_changes.
* search: Added google_search option, which makes it search google
  rather than using the internal xapain database.
  (googlesearch plugin is too hard to turn on when xapain databases
  corrupt themselves, which happens all too frequently).
* osm: Remove invalid use of charset on embedded javascript tags.
  Closes: #731197
* style.css: Add compatibility definitions for more block-level
  html5 elements. Closes: #731199
* aggregrate: Fix several bugs in handling of empty and colliding
  titles when generating filenames.

3 files changed, 7 insertions, 23 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 2810294adb1..086c6df9683 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2013/09/15 16:26:11 schmonz Exp $
+# $NetBSD: Makefile,v 1.115 2014/01/03 02:28:11 schmonz Exp $
 #
 
-DISTNAME=		ikiwiki_3.20130904.1
-PKGREVISION=		1
+DISTNAME=		ikiwiki_3.20140102
 PKGNAME=		${DISTNAME:S/_/-/}
 CATEGORIES=		www textproc
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
@@ -66,6 +65,7 @@ TEST_TARGET=		test
 .include "options.mk"
 
 pre-configure:
+	rm -f ${WRKSRC}/doc/examples/blog/posts/Test.html
 	find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index b83ce0d6dea..f24dcc10d4b 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.93 2013/09/15 16:26:11 schmonz Exp $
+$NetBSD: distinfo,v 1.94 2014/01/03 02:28:11 schmonz Exp $
 
-SHA1 (ikiwiki_3.20130904.1.tar.gz) = 9697b43f2dadcdf57c0ba64ddc204339b9c47cdb
-RMD160 (ikiwiki_3.20130904.1.tar.gz) = 6840ec86bb2710d3017c0ad6011e8a1433934d78
-Size (ikiwiki_3.20130904.1.tar.gz) = 3111307 bytes
-SHA1 (patch-IkiWiki_Wrapper.pm) = 3974bc1ab111c5fc58476e6c1ad9ab0e4b7f47c3
+SHA1 (ikiwiki_3.20140102.tar.gz) = 1f66efdc436f7753b89889d3825a4e2cf91155be
+RMD160 (ikiwiki_3.20140102.tar.gz) = ef0b6f39b53f0944b5457fbf2ef6208133204ba3
+Size (ikiwiki_3.20140102.tar.gz) = 3157017 bytes
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Wrapper.pm b/www/ikiwiki/patches/patch-IkiWiki_Wrapper.pm
deleted file mode 100644
index 89a9f27dc21..00000000000
--- a/www/ikiwiki/patches/patch-IkiWiki_Wrapper.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-IkiWiki_Wrapper.pm,v 1.1 2013/09/15 16:26:11 schmonz Exp $
-
-Specify return type to quell clang warnings.
-
---- IkiWiki/Wrapper.pm.orig	2013-09-03 18:53:37.000000000 +0000
-+++ IkiWiki/Wrapper.pm
-@@ -182,7 +182,7 @@ void addenv(char *var, char *val) {
- 	newenviron[i++]=s;
- }
- 
--set_cgilock_fd (int lockfd) {
-+void set_cgilock_fd (int lockfd) {
- 	char *fd_s=malloc(8);
- 	sprintf(fd_s, "%i", lockfd);
- 	setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);