Update to 3.20120202. From the changelog:

* mdwn: Added nodiscount setting, which can be used to avoid using the
  markdown discount engine, when maximum compatability is needed.
* Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533
* cvs: Ensure text files are added in non-binary mode. (Amitai Schlair)
* cvs: Various cleanups and testing. (Amitai Schlair)
* calendar: Fix strftime encoding bug.
* shortcuts: Fixed a broken shortcut to wikipedia (accidentially
  made into a shortcut to wikiMedia).
* Various portability improvements. (Amitai Schlair)

5 files changed, 13 insertions, 142 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 88ce3db5ca0..ed6d3e8a818 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2012/01/16 04:43:29 schmonz Exp $
+# $NetBSD: Makefile,v 1.90 2012/02/03 12:38:00 schmonz Exp $
 #
 
-DISTNAME=		ikiwiki_3.20120115
+DISTNAME=		ikiwiki_3.20120202
 PKGNAME=		${DISTNAME:S/_/-/}
 CATEGORIES=		www textproc
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index 648eff82b6e..a7d55cc8e76 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2011/09/05 22:07:28 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.34 2012/02/03 12:38:01 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
 bin/ikiwiki-makerepo
@@ -110,7 +110,6 @@ share/ikiwiki/examples/blog/archives.mdwn
 share/ikiwiki/examples/blog/comments.mdwn
 share/ikiwiki/examples/blog/index.mdwn
 share/ikiwiki/examples/blog/posts.mdwn
-share/ikiwiki/examples/blog/posts/Discussion.mdwn
 share/ikiwiki/examples/blog/posts/first_post.mdwn
 share/ikiwiki/examples/blog/sidebar.mdwn
 share/ikiwiki/examples/blog/tags.mdwn
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 8cd654b4356..8d668769d9e 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.74 2012/01/16 04:43:29 schmonz Exp $
+$NetBSD: distinfo,v 1.75 2012/02/03 12:38:01 schmonz Exp $
 
-SHA1 (ikiwiki_3.20120115.tar.gz) = 457efc9c7d7b7b72c2856b88a55fa556fc50e356
-RMD160 (ikiwiki_3.20120115.tar.gz) = a4903cee1a407634a01ea6f5f590def2f0812e27
-Size (ikiwiki_3.20120115.tar.gz) = 2744405 bytes
-SHA1 (patch-aa) = 63e0282c3b9c2093b5951c21ee1730bf2ad2d67b
-SHA1 (patch-ab) = 3e571af1894a9c88c39180a0059cc6b136a949d0
+SHA1 (ikiwiki_3.20120202.tar.gz) = 09c787f7609defa475416a648affc82505bcddc0
+RMD160 (ikiwiki_3.20120202.tar.gz) = 4ff6ac78a0de6d56ee0d8e997a6bd5535188fffc
+Size (ikiwiki_3.20120202.tar.gz) = 2761253 bytes
+SHA1 (patch-aa) = 998c23d0df8aa18797221b3a310f78880baa689e
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa
index 4ba36cfa791..a758f41acb8 100644
--- a/www/ikiwiki/patches/patch-aa
+++ b/www/ikiwiki/patches/patch-aa
@@ -1,124 +1,15 @@
-$NetBSD: patch-aa,v 1.25 2011/12/29 21:47:56 schmonz Exp $
+$NetBSD: patch-aa,v 1.26 2012/02/03 12:38:01 schmonz Exp $
 
-PKG_SYSCONFDIR and PKGMANDIR support, avoid GNUisms in standard utilities.
+Avoid a GNUism in find(1).
 
---- Makefile.PL.orig	2011-12-06 18:57:23.000000000 +0000
+--- Makefile.PL.orig	2012-01-30 19:20:54.000000000 +0000
 +++ Makefile.PL
-@@ -19,11 +19,14 @@ SED?=sed
- 
- # Additional configurable path variables.
- W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
-+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)
- 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
-+	$(PERL) -pi.bkp -e "s/Version:.*/Version: $(VER)/" ikiwiki.spec
- 	rm -f ikiwiki.spec.bkp
- 	
- docwiki:
- 	$(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
-@@ -69,8 +75,8 @@ underlay_install:
+@@ -75,7 +75,7 @@ underlay_install:
  	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
  	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 -not -name \\*.full.js -not -name \\*.full.css`; do \
--			cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
 +		for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name \\*.full.js ! -name \\*.full.css`; do \
-+			cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
+ 			cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
  			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
  		done; \
- 	done
-@@ -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 \
--			cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \
-+			cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \
- 			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
- 		fi \
- 	done
-@@ -94,7 +100,7 @@ underlay_install:
- 			elif echo "$$file" | grep -q base.css; then \
- 				:; \
- 			elif [ -f "$$file" ]; then \
--				cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \
-+				cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \
- 				install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
- 			fi \
- 		done; \
-@@ -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 '.*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 +131,15 @@ extra_install: underlay_install
- 		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
- 	done
- 
--	install -d $(DESTDIR)$(PREFIX)/share/man/man1
--	install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
--	install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-makerepo.1
--	install -m 644 ikiwiki-transition.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-transition.1
--	install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1
--	install -m 644 ikiwiki-calendar.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-calendar.1
-+	install -d $(DESTDIR)$(MANDIR)/man1
-+	install -m 644 ikiwiki.man $(DESTDIR)$(MANDIR)/man1/ikiwiki.1
-+	install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-makerepo.1
-+	install -m 644 ikiwiki-transition.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-transition.1
-+	install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-update-wikilist.1
-+	install -m 644 ikiwiki-calendar.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-calendar.1
- 	
--	install -d $(DESTDIR)$(PREFIX)/share/man/man8
--	install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8
-+	install -d $(DESTDIR)$(MANDIR)/man8
-+	install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(MANDIR)/man8/ikiwiki-mass-rebuild.8
- 	
- 	install -d $(DESTDIR)$(PREFIX)/sbin
- 	install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
-@@ -150,10 +156,10 @@ extra_install: underlay_install
- 	
- 	# These might fail if a regular user is installing into a home
- 	# directory.
--	-install -d $(DESTDIR)/etc/ikiwiki
--	-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)$(SYSCONFDIR)
-+	-install -m 0644 wikilist $(DESTDIR)$(SYSCONFDIR)
-+	-install -m 0644 auto.setup $(DESTDIR)$(SYSCONFDIR)
-+	-install -m 0644 auto-blog.setup $(DESTDIR)$(SYSCONFDIR)
- 
- # The git/hg plugins want to chdir; so does Devel::Cover. Skip those tests
- # to stop them hurting each other.
diff --git a/www/ikiwiki/patches/patch-ab b/www/ikiwiki/patches/patch-ab
deleted file mode 100644
index e79b3421239..00000000000
--- a/www/ikiwiki/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2011/09/05 22:07:28 schmonz Exp $
-
-When generating scripts, give them the interpreter we generated them with.
-
---- IkiWiki/Setup/Standard.pm.orig	2011-07-29 10:59:11.000000000 +0000
-+++ IkiWiki/Setup/Standard.pm
-@@ -14,7 +14,10 @@ sub import {
- sub gendump ($@) {
- 	my $class=shift;
- 
--	"#!/usr/bin/perl",
-+	my $thisperl = eval q{use Config; $Config{perlpath}};
-+	error($@) if $@;
-+
-+	"#!$thisperl",
- 	"#",
- 	(map { "# $_" } @_),
- 	"use IkiWiki::Setup::Standard {",