Update to 3.20130212. From the changelog:

   * htmlscrubber: Allow the bitcoin URI scheme.
   * htmlscrubber: Allow the URI schemes of major VCS's.
   * aggregate: When run with --aggregate, if an aggregation is already
     running, don't go on and --refresh.
   * trail: Avoid excess dependencies between pages in the trail
     and the page defining the trail. Thanks, smcv.
   * opendiscussion: Don't allow editing discussion pages if discussion pages
     are disabled. (smcv)
   * poll: Add expandable option to allow users to easily add new choices to
     a poll.
   * trail: Avoid massive slowdown caused by pagetemplate hook when displaying
     dynamic cgi pages, which cannot use trail anyway.
   * Deal with empty diffurl in configuration.
   * cvs: Various fixes. (schmonz)
   * highlight: Now adds a span with class highlight-<extension> around
     highlighted content, allowing for language-specific css styling.

4 files changed, 6 insertions, 156 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index d2d099aea1a..93e8089f33d 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.104 2013/02/02 19:30:43 schmonz Exp $
+# $NetBSD: Makefile,v 1.105 2013/02/13 10:16:14 schmonz Exp $
 #
 
-DISTNAME=		ikiwiki_3.20121212
+DISTNAME=		ikiwiki_3.20130212
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		3
 CATEGORIES=		www textproc
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 117e5f7ab3c..652a4dac169 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.86 2013/02/02 19:30:43 schmonz Exp $
+$NetBSD: distinfo,v 1.87 2013/02/13 10:16:14 schmonz Exp $
 
-SHA1 (ikiwiki_3.20121212.tar.gz) = 1c9815502e90a25c5bd7b5cdf198034e6833c3ff
-RMD160 (ikiwiki_3.20121212.tar.gz) = a5439279166dc0d6ed1f4f5f7a71a680b08465cc
-Size (ikiwiki_3.20121212.tar.gz) = 2917372 bytes
-SHA1 (patch-IkiWiki_Plugin_cvs.pm) = 79c984356a2633e830ffd5d2b039d9edece11196
-SHA1 (patch-IkiWiki_Plugin_git.pm) = e854ea61afd3968a9dd06f1c70ab2cea993d6a1f
+SHA1 (ikiwiki_3.20130212.tar.gz) = aa362ca1bedfd4aa91ade98e1334aa915418a1fb
+RMD160 (ikiwiki_3.20130212.tar.gz) = 9defe2fb562fb727ae0e07b72fc1d44bf092cc81
+Size (ikiwiki_3.20130212.tar.gz) = 2931573 bytes
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_cvs.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_cvs.pm
deleted file mode 100644
index f6bf1b32521..00000000000
--- a/www/ikiwiki/patches/patch-IkiWiki_Plugin_cvs.pm
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-IkiWiki_Plugin_cvs.pm,v 1.2 2013/02/02 19:30:43 schmonz Exp $
-
-Bugfixes in `schmonz/cvs` I'd like to see merged:
-
-* `6753235d`: Return bounded output from `rcs_diff()` when asked, as
-  the API states.
-* `e45175d5`: Always explicitly set CVS keyword substitution behavior.
-  Fixes behavior when a text file is added under a name formerly
-  used for a binary file.
-* `b30cacdf`: If the previous working directory no longer exists after
-  a CVS operation, don't try to `chdir()` back to it afterward.
-* `91b477c0`: Fix diffurl links (cvsweb expects unescaped '/').
-
---- IkiWiki/Plugin/cvs.pm.orig	2012-08-25 15:12:13.000000000 +0000
-+++ IkiWiki/Plugin/cvs.pm
-@@ -216,14 +216,12 @@ sub rcs_add ($) {
- 
- 	while ($file = pop @files_to_add) {
- 		if (@files_to_add == 0) {
--			# file
- 			cvs_runcvs('add', cvs_keyword_subst_args($file)) ||
--				warn("cvs add $file failed\n");
-+				warn("cvs add file $file failed\n");
- 		}
- 		else {
--			# directory
- 			cvs_runcvs('add', $file) ||
--				warn("cvs add $file failed\n");
-+				warn("cvs add dir $file failed\n");
- 		}
- 	}
- }
-@@ -316,7 +314,9 @@ sub rcs_recentchanges ($) {
- 			$oldrev =~ s/INITIAL/0/;
- 			$newrev =~ s/\(DEAD\)//;
- 			my $diffurl = defined $config{diffurl} ? $config{diffurl} : "";
--			my $epage = uri_escape_utf8($page);
-+			my $epage = join('/',
-+				map { uri_escape_utf8($_) } split('/', $page)
-+			);
- 			$diffurl=~s/\[\[file\]\]/$epage/g;
- 			$diffurl=~s/\[\[r1\]\]/$oldrev/g;
- 			$diffurl=~s/\[\[r2\]\]/$newrev/g;
-@@ -396,11 +396,15 @@ sub rcs_diff ($;$) {
- 	my @cvsps = `env TZ=UTC cvsps -q --cvs-direct -z 30 -g -s $rev`;
- 	my $blank_lines_seen = 0;
- 
-+	# skip log, get to the diff
- 	while (my $line = shift @cvsps) {
- 		$blank_lines_seen++ if ($line =~ /^$/);
- 		last if $blank_lines_seen == 2;
- 	}
- 
-+	@cvsps = @cvsps[0..$maxlines-1]
-+		if defined $maxlines && @cvsps > $maxlines;
-+
- 	if (wantarray) {
- 		return @cvsps;
- 	}
-@@ -491,24 +495,53 @@ sub cvs_keyword_subst_args ($) {
- 	my $filemime = File::MimeInfo::default($file);
- 	# if (-T $file) {
- 
--	if (defined($filemime) && $filemime eq 'text/plain') {
--		return ($file);
--	}
--	else {
--		return ('-kb', $file);
--	}
-+	defined($filemime) && $filemime eq 'text/plain'
-+		? return ('-kkv', $file)
-+		: return ('-kb', $file);
- }
- 
- sub cvs_runcvs(@) {
- 	my @cmd = @_;
- 	unshift @cmd, 'cvs', '-Q';
- 
--	local $CWD = $config{srcdir};
-+	# CVS can't operate outside a srcdir, so we're always setting $CWD.
-+	# "local $CWD" restores the previous value when we go out of scope.
-+	# Usually that's correct. But if we're removing the last file from
-+	# a directory, the post-commit hook will exec in a working directory
-+	# that's about to not exist (CVS will prune it).
-+	#
-+	# chdir() manually here, so we can selectively not chdir() back.
-+
-+	my $oldcwd = $CWD;
-+	chdir($config{srcdir});
-+
-+	eval q{
-+		use IPC::Open3;
-+		use Symbol qw(gensym);
-+		use IO::File;
-+	};
-+	error($@) if $@;
-+
-+	my $cvsout = '';
-+	my $cvserr = '';
-+	local *CATCHERR = IO::File->new_tmpfile;
-+	my $pid = open3(gensym(), \*CATCHOUT, ">&CATCHERR", @cmd);
-+	while (my $l = <CATCHOUT>) {
-+		$cvsout .= $l
-+			unless 1;
-+	}
-+	waitpid($pid, 0);
-+	my $ret = $? >> 8;
-+	seek CATCHERR, 0, 0;
-+	while (my $l = <CATCHERR>) {
-+		$cvserr .= $l
-+			unless $l =~ /^cvs commit: changing keyword expansion /;
-+	}
-+
-+	print STDOUT $cvsout;
-+	print STDERR $cvserr;
- 
--	open(my $savedout, ">&STDOUT");
--	open(STDOUT, ">", "/dev/null");
--	my $ret = system(@cmd);
--	open(STDOUT, ">&", $savedout);
-+	chdir($oldcwd) if -d $oldcwd;
- 
- 	return ($ret == 0) ? 1 : 0;
- }
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_git.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_git.pm
deleted file mode 100644
index 332827e5290..00000000000
--- a/www/ikiwiki/patches/patch-IkiWiki_Plugin_git.pm
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-IkiWiki_Plugin_git.pm,v 1.1 2013/01/15 23:10:57 schmonz Exp $
-
-commit 12c9219d671c672fedcf9e9ab7f9187b23b8f7f4
-Author: Shlomi Fish <shlomif@shlomifish.org>
-Date:   Mon Dec 17 22:44:54 2012 +0200
-
-    Fix some warnigns in recent perls.
-    
-    All existing tests pass.
-
---- IkiWiki/Plugin/git.pm.orig	2012-08-25 15:12:13.000000000 +0000
-+++ IkiWiki/Plugin/git.pm
-@@ -341,8 +341,8 @@ sub parse_diff_tree ($) {
- 	my $dt_ref = shift;
- 
- 	# End of stream?
--	return if !defined @{ $dt_ref } ||
--		  !defined @{ $dt_ref }[0] || !length @{ $dt_ref }[0];
-+	return if ! @{ $dt_ref } ||
-+		  !defined $dt_ref->[0] || !length $dt_ref->[0];
- 
- 	my %ci;
- 	# Header line.