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.

4 files changed, 52 insertions, 48 deletions

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";
- }