Update to 3.20141016. From the changelog:

[ Joey Hess ]
* Fix crash that can occur when only_committed_changes is set and a
  file is deleted from the underlay.

[ Simon McVittie ]
* core: avoid dangerous use of CGI->param in list context, which led
  to a security flaw in Bugzilla; as far as we can tell, ikiwiki
  is not vulnerable to a similar attack, but it's best to be safe
* core: new reverse_proxy option prevents ikiwiki from trying to detect
  how to make self-referential URLs by using the CGI environment variables,
  for instance when it's deployed behind a HTTP reverse proxy
  (Closes: #745759)
* core: the default User-Agent is now "ikiwiki/$version" to work around
  ModSecurity rules assuming that only malware uses libwww-perl
* core: use protocol-relative URLs (e.g. //www.example.com/wiki) so that
  https stays on https and http stays on http, particularly if the
  html5 option is enabled
* core: avoid mixed content when a https cgiurl links to http static pages
  on the same server (the static pages are assumed to be accessible via
  https too)
* core: force the correct top URL in w3mmode
* google plugin: Use search form
* docwiki: replace Paypal and Flattr buttons with text links
* comments: don't record the IP address in the wiki if the user is
  logged in via passwordauth or httpauth
* templates: add ARIA roles to some page elements, if html5 is enabled.
  Thanks, Patrick

pkgsrc changes:
* For the python option, add missing py-expat dependency.

4 files changed, 8 insertions, 30 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index d6f5315bc72..13598e4c4ed 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.126 2014/10/03 18:37:11 schmonz Exp $
+# $NetBSD: Makefile,v 1.127 2014/10/17 11:50:42 schmonz Exp $
 #
 
-DISTNAME=		ikiwiki_3.20140916
+DISTNAME=		ikiwiki_3.20141016
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		1
 CATEGORIES=		www textproc
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 
@@ -36,11 +35,6 @@ PERL5_PACKLIST=		auto/IkiWiki/.packlist
 USE_LANGUAGES=		c
 USE_TOOLS+=		gmake msgfmt perl:run xgettext
 
-REPLACE_PERL+=		Makefile.PL *.in *.cgi *.pm* */*.pm* */*/*.pm* */*.t
-REPLACE_PERL+=		*.setup */*.setup */*/*.setup
-REPLACE_PERL+=		ikiwiki-mass-rebuild ikiwiki-update-wikilist
-REPLACE_PERL+=		gitremotes mdwn2man pm_filter po/po2wiki
-REPLACE_PERL+=		plugins/externaldemo	# XXX not installed
 # find . -type f -print | \
 # perl -ne 'open(F, "<$_"); $l=<F>; print if $l =~ m|^#!/usr/bin/perl|'
 REPLACE_PYTHON+=	plugins/proxy.py plugins/pythondemo plugins/rst
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index d0243674615..62146ca06bc 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.102 2014/09/19 05:24:15 schmonz Exp $
+$NetBSD: distinfo,v 1.103 2014/10/17 11:50:42 schmonz Exp $
 
-SHA1 (ikiwiki_3.20140916.tar.gz) = a9f167e736caf480143e3086e11143b2b2ee9946
-RMD160 (ikiwiki_3.20140916.tar.gz) = 22f37b96f91a4c0303655538c0762c1c8caace49
-Size (ikiwiki_3.20140916.tar.gz) = 3213411 bytes
-SHA1 (patch-Makefile.PL) = 283bbdbecf1248b2c1d2244be8462f8bfe2d950f
+SHA1 (ikiwiki_3.20141016.tar.gz) = 472b3899eb3ca64b5a8d564b0de29f62e1847318
+RMD160 (ikiwiki_3.20141016.tar.gz) = db9ebfa5fa61516f089611804d9f15073b2f1b89
+Size (ikiwiki_3.20141016.tar.gz) = 3254923 bytes
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index 28dc2c09b13..415bb176909 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2014/09/16 17:53:01 schmonz Exp $
+# $NetBSD: options.mk,v 1.17 2014/10/17 11:50:42 schmonz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ikiwiki
 PKG_SUPPORTED_OPTIONS=		cgi imagemagick python w3m
@@ -51,6 +51,7 @@ DEPENDS+=	p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
 
 .if !empty(PKG_OPTIONS:Mpython)
 DEPENDS+=	${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
+DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 .else
 PYTHON_FOR_BUILD_ONLY=	yes
 .endif
diff --git a/www/ikiwiki/patches/patch-Makefile.PL b/www/ikiwiki/patches/patch-Makefile.PL
deleted file mode 100644
index 73859c8650b..00000000000
--- a/www/ikiwiki/patches/patch-Makefile.PL
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile.PL,v 1.1 2014/09/19 05:24:15 schmonz Exp $
-
-Apply 053de54 from upstream git to fix paths in installed binaries
-with the default PKG_SYSCONFBASE.
-
---- Makefile.PL.orig	2014-09-10 07:48:12.000000000 +0000
-+++ Makefile.PL
-@@ -60,7 +60,7 @@ docwiki:
- 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh
- 
- sysconfdir:
--	$(PERL) -pi -e "s|/etc/ikiwiki|$(SYSCONFDIR)|g" $(sysconfdir_scripts)
-+	$(PERL) -pi -e "s|\"/etc/ikiwiki|\"$(SYSCONFDIR)|g" $(sysconfdir_scripts)
- 	
- extra_clean:
- 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean