Update to 3.20110431. From the changelog:

   * Danish translation update. Closes: #625721
   * Danish underlay translation update. Closes: #625765
     (Thanks, Jonas Smedegaard)
   * Support YAML::XS by not passing decoded unicode to Load. Closes: #625713
   * openid, aggregate, pinger: Use Net::INET6Glue if available to
     support making ipv6 connections. (Note that if LWPx::ParanoidAgent
     is installed, it defeats this for openid.)
   * Add additional directive quoting styles, to better support nested
     directives. Both triple-single-quote and heredoc quotes can be used.
     (Thanks, Timo Paulssen)
   * Changed license of madduck's python plugins from GPL-2 to BSD-2-clause.
   * po: support language codes in the form of 'es_AR', and 'arn'. (intrigeri)
     Closes: #627844
   * po: Make po4a warn, not error on a malformed document. (intrigeri)
   * Support the Hiawatha web server which sets HTTPS=off rather than not
     setting it. (There does not seem to be a standard here.)

pkgsrc changes:
* Adjust local modifications to improve our upstream chances.
* Quell pkglint.
* Indent consistently.

7 files changed, 103 insertions, 114 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 2ddaa042ccf..7306abd99d3 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,71 +1,63 @@
-# $NetBSD: Makefile,v 1.77 2011/05/01 03:12:52 schmonz Exp $
+# $NetBSD: Makefile,v 1.78 2011/06/04 15:23:35 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.20110430
-PKGNAME=	${DISTNAME:S/_/-/}
-CATEGORIES=	www textproc
-MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
+DISTNAME=		ikiwiki_3.20110431
+PKGNAME=		${DISTNAME:S/_/-/}
+CATEGORIES=		www textproc
+MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 
-MAINTAINER=	schmonz@NetBSD.org
-HOMEPAGE=	http://ikiwiki.info/
-COMMENT=	Wiki compiler
-LICENSE=	gnu-gpl-v2
+MAINTAINER=		schmonz@NetBSD.org
+HOMEPAGE=		http://ikiwiki.info/
+COMMENT=		Wiki compiler
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	p5-Text-Markdown-[0-9]*:../../textproc/p5-Text-Markdown
-DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
-DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
-DEPENDS+=	p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
-DEPENDS+=	p5-CGI-Session-[0-9]*:../../www/p5-CGI-Session
-DEPENDS+=	p5-CGI-FormBuilder>=3.05:../../www/p5-CGI-FormBuilder
-DEPENDS+=	p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail
-DEPENDS+=	p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration
-DEPENDS+=	p5-TimeDate-[0-9]*:../../time/p5-TimeDate
-DEPENDS+=	p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
-DEPENDS+=	p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML
-DEPENDS+=	p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom
-DEPENDS+=	p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed
-DEPENDS+=	p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple
-DEPENDS+=	p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS
-DEPENDS+=	p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo
-DEPENDS+=	p5-gettext-[0-9]*:../../devel/p5-gettext
-DEPENDS+=	p5-YAML-[0-9]*:../../textproc/p5-YAML
-#DEPENDS+=	po4a-[0-9]*:../../textproc/po4a
+DEPENDS+=		p5-Text-Markdown-[0-9]*:../../textproc/p5-Text-Markdown
+DEPENDS+=		p5-URI-[0-9]*:../../www/p5-URI
+DEPENDS+=		p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
+DEPENDS+=		p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
+DEPENDS+=		p5-CGI-Session-[0-9]*:../../www/p5-CGI-Session
+DEPENDS+=		p5-CGI-FormBuilder>=3.05:../../www/p5-CGI-FormBuilder
+DEPENDS+=		p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail
+DEPENDS+=		p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration
+DEPENDS+=		p5-TimeDate-[0-9]*:../../time/p5-TimeDate
+DEPENDS+=		p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
+DEPENDS+=		p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML
+DEPENDS+=		p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom
+DEPENDS+=		p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed
+DEPENDS+=		p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple
+DEPENDS+=		p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS
+DEPENDS+=		p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo
+DEPENDS+=		p5-gettext-[0-9]*:../../devel/p5-gettext
+DEPENDS+=		p5-YAML-[0-9]*:../../textproc/p5-YAML
+#DEPENDS+=		po4a-[0-9]*:../../textproc/po4a
 
 WRKSRC=			${WRKDIR}/${PKGBASE}
 PERL5_PACKLIST=		auto/IkiWiki/.packlist
 USE_LANGUAGES=		# none
 USE_TOOLS+=		gmake msgfmt perl:run xgettext
 
-REPLACE_PERL+=	ikiwiki-calendar.in ikiwiki-mass-rebuild
-REPLACE_PERL+=	ikiwiki-transition.in ikiwiki-update-wikilist
-REPLACE_PERL+=	ikiwiki-w3m.cgi ikiwiki.in gitremotes mdwn2man pm_filter
-REPLACE_PERL+=	*.pm IkiWiki/*.pm IkiWiki/*/*.pm* *.setup */*.setup */*/*.setup
-REPLACE_PERL+=	po/po2wiki t/*.t
-REPLACE_PERL+=	plugins/externaldemo	# XXX not installed
-
-REPLACE_PYTHON+=plugins/proxy.py plugins/pythondemo plugins/rst
-
-SUBST_CLASSES+=		sysconfdir
-SUBST_STAGE.sysconfdir=	pre-configure
-SUBST_FILES.sysconfdir=	ikiwiki-mass-rebuild ikiwiki-update-wikilist
-SUBST_SED.sysconfdir+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-
-SUBST_CLASSES+=		perlpath
-SUBST_STAGE.perlpath=	pre-configure
-SUBST_FILES.perlpath=	IkiWiki/Setup/Standard.pm
-SUBST_SED.perlpath+=	-e 's,@PERL5@,${PERL5},g'
+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
 
 MAKE_FLAGS+=		W3M_CGI_BIN=${PREFIX:Q}/libexec/w3m/cgi-bin
-MAKE_FLAGS+=		CONFIGDIR=${EGDIR:Q}
+MAKE_FLAGS+=		SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 MAKE_FLAGS+=		MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}
 
+INSTALL_MAKE_FLAGS+=	SYSCONFDIR=${EGDIR:Q}
+
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+=		${EGDIR}/auto.setup ${PKG_SYSCONFDIR}/auto.setup
-CONF_FILES+=		${EGDIR}/auto-blog.setup ${PKG_SYSCONFDIR}/auto-blog.setup
-CONF_FILES+=		${EGDIR}/wikilist ${PKG_SYSCONFDIR}/wikilist
+.for f in auto.setup auto-blog.setup wikilist
+CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+.endfor
 
 .include "options.mk"
 
@@ -73,4 +65,5 @@ pre-configure:
 	find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f
 
 .include "../../lang/perl5/module.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 873dc3a7641..c37620ae531 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.62 2011/05/01 03:12:52 schmonz Exp $
+$NetBSD: distinfo,v 1.63 2011/06/04 15:23:35 schmonz Exp $
 
-SHA1 (ikiwiki_3.20110430.tar.gz) = c715d7542b26778aa108866367db5bb913b1f9dc
-RMD160 (ikiwiki_3.20110430.tar.gz) = d9d609db3524393ce2a388d3af1757c99d258640
-Size (ikiwiki_3.20110430.tar.gz) = 2356138 bytes
-SHA1 (patch-aa) = 0ddf4825daec821bf93978c665af99645c5538c0
-SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903
-SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
-SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f
+SHA1 (ikiwiki_3.20110431.tar.gz) = 1a670514f08c327c815dadc85be7c4644ee113ac
+RMD160 (ikiwiki_3.20110431.tar.gz) = 663e6110fef22aac24b8d8d05b3d1336f09abb47
+Size (ikiwiki_3.20110431.tar.gz) = 2378267 bytes
+SHA1 (patch-aa) = 748695579cc57ead26ec9524e633751b2a703b07
+SHA1 (patch-ab) = 642d25b01029955864d817e564a09bea04c06b10
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index bd771525234..cd2a00ba4e1 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2011/03/23 22:25:05 schmonz Exp $
+# $NetBSD: options.mk,v 1.13 2011/06/04 15:23:35 schmonz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ikiwiki
 PKG_SUPPORTED_OPTIONS=		cvs ikiwiki-amazon-s3 ikiwiki-search
@@ -32,14 +32,8 @@ DEPENDS+=	p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
 
 .if !empty(PKG_OPTIONS:Mpython)
 DEPENDS+=	${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
-.include "../../lang/python/application.mk"
 .else
-CHECK_INTERPRETER_SKIP+=lib/ikiwiki/plugins/*
-# and no python dependency, so let's not use a system python by mistake
-REPLACE_INTERPRETER+=	python
-REPLACE.python.old=	.*python[^[:space:]]*
-REPLACE.python.new=	${LOCALBASE}/bin/python
-REPLACE_FILES.python=	${REPLACE_PYTHON}
+PYTHON_FOR_BUILD_ONLY=	yes	# actually just defined
 .endif
 
 .if !empty(PKG_OPTIONS:Msvn)
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa
index 378a275b280..300e7eda128 100644
--- a/www/ikiwiki/patches/patch-aa
+++ b/www/ikiwiki/patches/patch-aa
@@ -1,27 +1,52 @@
-$NetBSD: patch-aa,v 1.21 2011/03/23 22:25:06 schmonz Exp $
+$NetBSD: patch-aa,v 1.22 2011/06/04 15:23:36 schmonz Exp $
 
---- Makefile.PL.orig	2011-03-19 18:02:24.000000000 +0000
+PKG_SYSCONFDIR and PKGMANDIR support, avoid GNUisms in standard utilities.
+
+--- Makefile.PL.orig	2011-06-03 16:40:11.000000000 +0000
 +++ Makefile.PL
-@@ -19,6 +19,8 @@ SED?=sed
+@@ -19,11 +19,14 @@ SED?=sed
  
  # Additional configurable path variables.
  W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
-+CONFIGDIR?=/etc/ikiwiki
++SYSCONFDIR?=/etc/ikiwiki
 +MANDIR?=$(PREFIX)/share/man
  
  tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
  extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
-@@ -50,7 +52,7 @@ extra_build: $(outprogs) ikiwiki.setup d
+ outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out
+ scripts=ikiwiki-update-wikilist ikiwiki-makerepo
++sysconfdir_scripts=ikiwiki-mass-rebuild ikiwiki-update-wikilist
+ 
+ PROBABLE_INST_LIB=$(shell \\
+ 	if [ "$(INSTALLDIRS)" = "perl" ]; then \\
+@@ -42,7 +45,7 @@ PROBABLE_INST_LIB=$(shell \\
+ ikiwiki.setup:
+ 	HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -dumpsetup ikiwiki.setup
+ 
+-extra_build: $(outprogs) ikiwiki.setup docwiki
++extra_build: $(outprogs) ikiwiki.setup docwiki sysconfdir
+ 	./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
+ 	./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
+ 	./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
+@@ -50,12 +53,15 @@ extra_build: $(outprogs) ikiwiki.setup d
  	./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
  	./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
  	$(MAKE) -C po
 -	$(SED) -i.bkp "s/Version:.*/Version: $(VER)/" ikiwiki.spec
-+	#$(SED) -i.bkp "s/Version:.*/Version: $(VER)/" ikiwiki.spec
++	$(PERL) -pi.bkp -e "s/Version:.*/Version: $(VER)/" ikiwiki.spec
  	rm -f ikiwiki.spec.bkp
  	
  docwiki:
-@@ -70,7 +72,7 @@ underlay_install:
- 	for dir in `cd underlays && $(FIND) . -follow -type d ! -regex '.*\.svn.*'`; do \
+ 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh
+ 
++sysconfdir:
++	$(PERL) -pi -e "s|/etc/ikiwiki|$(SYSCONFDIR)|g" $(sysconfdir_scripts)
++	
+ extra_clean:
+ 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean
+ 	rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
+@@ -70,7 +76,7 @@ underlay_install:
+ 	for dir in `cd underlays && $(FIND) . -follow -type d`; do \
  		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
  		for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f`; do \
 -			cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
@@ -29,7 +54,7 @@ $NetBSD: patch-aa,v 1.21 2011/03/23 22:25:06 schmonz Exp $
  			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
  		done; \
  	done
-@@ -79,7 +81,7 @@ underlay_install:
+@@ -79,7 +85,7 @@ underlay_install:
  	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive
  	for file in doc/ikiwiki/directive/*; do \
  		if [ -f "$$file" ]; then \
@@ -38,7 +63,7 @@ $NetBSD: patch-aa,v 1.21 2011/03/23 22:25:06 schmonz Exp $
  			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
  		fi \
  	done
-@@ -94,7 +96,7 @@ underlay_install:
+@@ -94,7 +100,7 @@ underlay_install:
  			elif echo "$$file" | grep -q base.css; then \
  				:; \
  			elif [ -f "$$file" ]; then \
@@ -47,16 +72,16 @@ $NetBSD: patch-aa,v 1.21 2011/03/23 22:25:06 schmonz Exp $
  				install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
  			fi \
  		done; \
-@@ -106,7 +108,7 @@ extra_install: underlay_install
+@@ -106,7 +112,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 \
+ 	for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \
 -		cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \
 +		cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \
  		install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
  	done
  
-@@ -125,15 +127,15 @@ extra_install: underlay_install
+@@ -125,15 +131,15 @@ extra_install: underlay_install
  		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
  	done
  
@@ -80,7 +105,7 @@ $NetBSD: patch-aa,v 1.21 2011/03/23 22:25:06 schmonz Exp $
  	
  	install -d $(DESTDIR)$(PREFIX)/sbin
  	install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
-@@ -150,10 +152,10 @@ extra_install: underlay_install
+@@ -150,10 +156,10 @@ extra_install: underlay_install
  	
  	# These might fail if a regular user is installing into a home
  	# directory.
@@ -88,10 +113,10 @@ $NetBSD: patch-aa,v 1.21 2011/03/23 22:25:06 schmonz Exp $
 -	-install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
 -	-install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
 -	-install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki
-+	-install -d $(DESTDIR)/$(CONFIGDIR)
-+	-install -m 0644 wikilist $(DESTDIR)/$(CONFIGDIR)
-+	-install -m 0644 auto.setup $(DESTDIR)/$(CONFIGDIR)
-+	-install -m 0644 auto-blog.setup $(DESTDIR)/$(CONFIGDIR)
++	-install -d $(DESTDIR)$(SYSCONFDIR)
++	-install -m 0644 wikilist $(DESTDIR)$(SYSCONFDIR)
++	-install -m 0644 auto.setup $(DESTDIR)$(SYSCONFDIR)
++	-install -m 0644 auto-blog.setup $(DESTDIR)$(SYSCONFDIR)
  }
  }
  
diff --git a/www/ikiwiki/patches/patch-ab b/www/ikiwiki/patches/patch-ab
index 35119d56c72..e90fdd0a9cc 100644
--- a/www/ikiwiki/patches/patch-ab
+++ b/www/ikiwiki/patches/patch-ab
@@ -1,13 +1,18 @@
-$NetBSD: patch-ab,v 1.5 2010/04/04 17:23:30 schmonz Exp $
+$NetBSD: patch-ab,v 1.6 2011/06/04 15:23:36 schmonz Exp $
 
---- IkiWiki/Setup/Standard.pm.orig	2010-03-19 19:44:10.000000000 +0000
+When generating scripts, give them the interpreter we generated them with.
+
+--- IkiWiki/Setup/Standard.pm.orig	2011-05-30 18:25:10.000000000 +0000
 +++ IkiWiki/Setup/Standard.pm
-@@ -14,7 +14,7 @@ sub import {
+@@ -14,7 +14,10 @@ sub import {
  sub gendump ($@) {
  	my $class=shift;
  
 -	"#!/usr/bin/perl",
-+	"#!@PERL5@",
++	my $thisperl = eval q{use Config; $Config{perlpath}};
++	error($@) if $@;
++
++	"#!$thisperl",
  	"#",
  	(map { "# $_" } @_),
  	"use IkiWiki::Setup::Standard {",
diff --git a/www/ikiwiki/patches/patch-ad b/www/ikiwiki/patches/patch-ad
deleted file mode 100644
index 72a640ee8ff..00000000000
--- a/www/ikiwiki/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/07/24 05:09:02 schmonz Exp $
-
---- ikiwiki-mass-rebuild.orig	2009-05-27 16:32:38.000000000 -0400
-+++ ikiwiki-mass-rebuild
-@@ -107,7 +107,7 @@ sub processlist {
- 	close $list;
- }
- 
--my $wikilist="/etc/ikiwiki/wikilist";
-+my $wikilist="@PKG_SYSCONFDIR@/wikilist";
- 
- if (-e $wikilist) {
- 	processlist($wikilist);
diff --git a/www/ikiwiki/patches/patch-ae b/www/ikiwiki/patches/patch-ae
deleted file mode 100644
index daa8e16facc..00000000000
--- a/www/ikiwiki/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/07/24 05:09:02 schmonz Exp $
-
---- ikiwiki-update-wikilist.orig	2009-05-27 16:32:38.000000000 -0400
-+++ ikiwiki-update-wikilist
-@@ -12,7 +12,7 @@ if (! defined $username || ! length $use
- 	die "unable to determine user name for UID $REAL_USER_ID\n";
- }
- 
--my $wikilist="/etc/ikiwiki/wikilist";
-+my $wikilist="@PKG_SYSCONFDIR@/wikilist";
- if (! -e $wikilist) {
- 	die "$wikilist does not exist\n";
- }