Update to 3.1415926. From the changelog:

 * [ Joey Hess ]
   * po: Detect if nowrapi18n can't be passed to po4a, and warn about
     the old version, but continue. Closes: #541205
   * inline: Avoid use of my $_ as it fails with older perls.
     Closes: #541215
   * Add discussionpage configuration setting.
   * Several optimisations, including speedups to orphans and brokenlinks
     calculation.
   * meta, img: Fix bugs in dependency code. (smcv)
   * Allow building ikiwiki on systems w/o po4a --
     building of the translated underlays will be skipped in this case.
   * Add basic styling of po plugin's languages list.
   * inline: Display an error if feedpages is specified and fails to match
     due to a problem such as created_before being told to check against
     a page that does not exist.
   * Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective
     pages from the basewiki.
   * Updated French program translation from Philippe Batailler.
     Closes: #542036
   * po: Fixed to run rcs_add ralative to srcdir.
   * Italian program translation from Luca Bruno.
   * Fix example blog's tags/life to not have a broken PageSpec.
     Closes: #543510
   * Optimize the dependencies list. This also fixes a bug
     that could cause repeated refreshes of the wiki to grow
     increasingly larger dependency lists, and get increasingly
     slower. (smcv)
   * Rebuild wikis on upgrade to this version to fix bloat caused
     by the dependency bug.
   * Further optimisation of dependency handling by adding a special
     case for simple page dependencies. (smcv)
   * htmltidy: Return an error message if tidy fails. Closes: #543722
   * po: Fix name of translated toplevel index page. (intrigeri)
   * po: Fix display of links from a translated page to itself (ntrigeri)
   * Add Czech basewiki translation from Miroslav Kure.
   * po: fix interdiction to create pages of type po (intrigeri)
   * po: po: favor the type of linking page's masterpage on page creation
     (intrigeri)
   * img: Don't generate new verison of image if it is scaled to be
     larger in either dimension.
 * [ Josh Triplett ]
   * teximg: Replace the insufficient blacklist with the built-in security
     mechanisms of TeX. (CVE-2009-2944)

In order to fix a performance bug, all wikis need to be rebuilt on
upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist,
use ikiwiki-mass-rebuild to force a rebuild.

5 files changed, 7 insertions, 110 deletions

diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa
index ff90550c910..1203fc68302 100644
--- a/www/ikiwiki/patches/patch-aa
+++ b/www/ikiwiki/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2009/08/12 21:14:35 schmonz Exp $
+$NetBSD: patch-aa,v 1.11 2009/08/30 23:30:08 schmonz Exp $
 
---- Makefile.PL.orig	2009-07-23 09:25:36.000000000 -0400
+--- Makefile.PL.orig	2009-08-30 15:09:22.000000000 -0400
 +++ Makefile.PL
 @@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\
  
@@ -10,23 +10,8 @@ $NetBSD: patch-aa,v 1.10 2009/08/12 21:14:35 schmonz Exp $
 +MANDIR?=$(PREFIX)/share/man
  
  tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
- extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi)
-@@ -42,7 +44,6 @@ extra_build: ikiwiki.out ikiwiki.setup d
- 	./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
- 	./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man
- 	./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
--	$(MAKE) -C po
- 	
- docwiki: ikiwiki.out
- 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
-@@ -50,14 +51,13 @@ docwiki: ikiwiki.out
- extra_clean:
- 	rm -rf html doc/.ikiwiki
- 	rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
--	$(MAKE) -C po clean
- 
- underlay_install:
- 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
+ extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
+@@ -57,7 +59,7 @@ underlay_install:
  	for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
  		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
  		for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \
@@ -35,7 +20,7 @@ $NetBSD: patch-aa,v 1.10 2009/08/12 21:14:35 schmonz Exp $
  			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
  		done; \
  	done
-@@ -76,7 +76,7 @@ extra_install: underlay_install
+@@ -76,7 +78,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 \
@@ -44,7 +29,7 @@ $NetBSD: patch-aa,v 1.10 2009/08/12 21:14:35 schmonz Exp $
  		install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
  	done
  
-@@ -95,14 +95,14 @@ extra_install: underlay_install
+@@ -95,14 +97,14 @@ extra_install: underlay_install
  		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
  	done
  
@@ -66,11 +51,7 @@ $NetBSD: patch-aa,v 1.10 2009/08/12 21:14:35 schmonz Exp $
  	
  	install -d $(DESTDIR)$(PREFIX)/sbin
  	install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
-@@ -114,14 +114,13 @@ extra_install: underlay_install
- 	install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
- 	install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/
- 
--	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
+@@ -118,10 +120,10 @@ extra_install: underlay_install
  	
  	# These might fail if a regular user is installing into a home
  	# directory.
diff --git a/www/ikiwiki/patches/patch-ac b/www/ikiwiki/patches/patch-ac
deleted file mode 100644
index 8008e62fb37..00000000000
--- a/www/ikiwiki/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2009/08/12 21:14:35 schmonz Exp $
-
---- po/Makefile.orig	2009-07-21 10:58:12.000000000 -0400
-+++ po/Makefile
-@@ -63,12 +63,12 @@ underlays_copy_stamp:
- 	# copy all the files we want to translate into a srcdir
- 	for file in `cd ..; find underlays -follow -name \*.mdwn`; do \
- 		install -d $$(dirname $$file); \
--		cp -aL ../$$file $$file 2>/dev/null || \
-+		cp -pRL ../$$file $$file 2>/dev/null || \
- 		install -m 644 ../$$file $$file; \
- 	done
- 	install -d underlays/directives/ikiwiki/directive
- 	for file in `cd ..; find doc/ikiwiki/directive/ -maxdepth 1 -type f`; do \
--		cp -a ../$$file underlays/directives/ikiwiki/directive ||  \
-+		cp -pR ../$$file underlays/directives/ikiwiki/directive ||  \
- 		install -m 644 ../$$file underlays/directives/ikiwiki/directive; \
- 	done
- 	install -d underlays/empty
diff --git a/www/ikiwiki/patches/patch-af b/www/ikiwiki/patches/patch-af
deleted file mode 100644
index 194203ce552..00000000000
--- a/www/ikiwiki/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.1 2009/08/12 21:14:35 schmonz Exp $
-
---- IkiWiki/Plugin/inline.pm.orig	2009-07-31 10:13:10.000000000 -0400
-+++ IkiWiki/Plugin/inline.pm
-@@ -186,7 +186,6 @@ sub preprocess_inline (@) {
- 	my @list;
- 
- 	if (exists $params{pagenames}) {
--
- 		foreach my $p (qw(sort pages)) {
- 			if (exists $params{$p}) {
- 				error sprintf(gettext("the %s and %s parameters cannot be used together"),
-@@ -194,9 +193,8 @@ sub preprocess_inline (@) {
- 			}
- 		}
- 
--		@list = split ' ', $params{pagenames};
--		my $_;
--		@list = map { bestlink($params{page}, $_) } @list;
-+		@list = map { bestlink($params{page}, $_) }
-+			split ' ', $params{pagenames};
- 
- 		$params{pages} = join(" or ", @list);
- 	}
diff --git a/www/ikiwiki/patches/patch-ag b/www/ikiwiki/patches/patch-ag
deleted file mode 100644
index bf10e92fc02..00000000000
--- a/www/ikiwiki/patches/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/08/12 21:14:35 schmonz Exp $
-
---- IkiWiki/Render.pm.orig	2009-07-31 10:13:10.000000000 -0400
-+++ IkiWiki/Render.pm
-@@ -379,12 +379,13 @@ sub refresh () {
- 			$links{$page}=[];
- 			$renderedfiles{$page}=[];
- 			$pagemtime{$page}=0;
--			prune($config{destdir}."/".$_)
--				foreach @{$oldrenderedfiles{$page}};
-+			foreach my $old (@{$oldrenderedfiles{$page}}) {
-+				prune($config{destdir}."/".$old);
-+			}
- 			delete $pagesources{$page};
--			foreach (keys %destsources) {
--				if ($destsources{$_} eq $page) {
--					delete $destsources{$_};
-+			foreach my $source (keys %destsources) {
-+				if ($destsources{$source} eq $page) {
-+					delete $destsources{$source};
- 				}
- 			}
- 		}
diff --git a/www/ikiwiki/patches/patch-ah b/www/ikiwiki/patches/patch-ah
deleted file mode 100644
index a94b94d20ee..00000000000
--- a/www/ikiwiki/patches/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/08/12 21:14:35 schmonz Exp $
-
---- IkiWiki/Plugin/po.pm.orig	2009-08-10 15:59:01.000000000 -0400
-+++ IkiWiki/Plugin/po.pm
-@@ -10,7 +10,12 @@ use warnings;
- use strict;
- use IkiWiki 3.00;
- use Encode;
--use Locale::Po4a::Common qw(nowrapi18n !/.*/);
-+eval q{use Locale::Po4a::Common qw(nowrapi18n !/.*/)};
-+if ($@) {
-+	print STDERR gettext("warning: Old po4a detected! Recommend upgrade to 0.35.")."\n";
-+	eval q{use Locale::Po4a::Common qw(!/.*/)};
-+	die $@ if $@;
-+}
- use Locale::Po4a::Chooser;
- use Locale::Po4a::Po;
- use File::Basename;