Update to 3.14159. From the changelog:

* svn: Fix rcs_rename to properly scope call to dirname.
* img: Pass the align parameter through to the generated img tag.
* Move OpenID pretty-printing from openid plugin to core (smcv)

pkgsrc changes:

* Add PKG_SYSCONFDIR support.
* Parameterize pkgsrc-configured paths in Makefile.PL so the patch
    can go upstream.
* Retire legacy amazon_s3 option.

7 files changed, 82 insertions, 38 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 3015de9227a..ce256d8e735 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2009/07/09 22:15:09 schmonz Exp $
+# $NetBSD: Makefile,v 1.27 2009/07/24 05:09:02 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.1415
+DISTNAME=	ikiwiki_3.14159
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	www textproc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
@@ -41,16 +41,20 @@ REPLACE_PERL+=	ikiwiki-w3m.cgi ikiwiki.in mdwn2man pm_filter
 REPLACE_PERL+=	*.pm IkiWiki/*.pm IkiWiki/*/*.pm* *.setup */*/*.setup t/*.t
 REPLACE_PERL+=	plugins/externaldemo	# XXX not installed
 
-SUBST_CLASSES+=		makefile
-SUBST_STAGE.makefile=	post-patch
-SUBST_FILES.makefile=	Makefile.PL
-SUBST_SED.makefile+=	-e 's,share/man/man,${PKGMANDIR}/man,g'
+SUBST_CLASSES+=		sysconfdir
+SUBST_STAGE.sysconfdir=	post-patch
+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=	post-patch
 SUBST_FILES.perlpath=	IkiWiki/Setup/Standard.pm
 SUBST_SED.perlpath+=	-e 's,@PERL5@,${PERL5},g'
 
+MAKE_FLAGS+=		W3M_CGI_BIN=${PREFIX:Q}/libexec/w3m/cgi-bin
+MAKE_FLAGS+=		CONFIGDIR=${EGDIR:Q}
+MAKE_FLAGS+=		MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}
+
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES+=		${EGDIR}/auto.setup ${PKG_SYSCONFDIR}/auto.setup
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 9383fff24f5..203e29b7d3b 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.16 2009/07/09 22:15:09 schmonz Exp $
+$NetBSD: distinfo,v 1.17 2009/07/24 05:09:02 schmonz Exp $
 
-SHA1 (ikiwiki_3.1415.tar.gz) = 06735b45165a54dca1a3106d857b6867606b8fab
-RMD160 (ikiwiki_3.1415.tar.gz) = 10fb97e6dde14eb1837290fe53c5e47c9e89edbe
-Size (ikiwiki_3.1415.tar.gz) = 1218824 bytes
-SHA1 (patch-aa) = e3ae3104f9445e15244a2b65c4867536cdfdcbca
+SHA1 (ikiwiki_3.14159.tar.gz) = bbfb095776d14a5e2737e9008fa49072b36f8fd6
+RMD160 (ikiwiki_3.14159.tar.gz) = c7330c8964669f598343918bfc85ace2585459cf
+Size (ikiwiki_3.14159.tar.gz) = 1222039 bytes
+SHA1 (patch-aa) = e8c8e6ca75d3afe7ac36a3bb2295a69283be6607
 SHA1 (patch-ab) = bbec6e7a4e6772d995a0b084a3875b83950eb194
-SHA1 (patch-ac) = 1cac904d17297b6372161cbc4d62afa769718296
+SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
+SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index b014f83e24b..0f39c75cbf7 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -1,9 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2009/04/22 02:33:06 schmonz Exp $
+# $NetBSD: options.mk,v 1.3 2009/07/24 05:09:02 schmonz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ikiwiki
 PKG_SUPPORTED_OPTIONS=		ikiwiki-amazon-s3 ikiwiki-search
 PKG_SUPPORTED_OPTIONS+=		imagemagick python svn w3m
-PKG_OPTIONS_LEGACY_OPTS+=	amazon_s3:ikiwiki-amazon-s3
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa
index 7eaef83ea86..95469360973 100644
--- a/www/ikiwiki/patches/patch-aa
+++ b/www/ikiwiki/patches/patch-aa
@@ -1,8 +1,39 @@
-$NetBSD: patch-aa,v 1.8 2009/04/21 16:34:43 schmonz Exp $
+$NetBSD: patch-aa,v 1.9 2009/07/24 05:09:02 schmonz Exp $
 
---- Makefile.PL.orig	2009-04-04 17:26:07.000000000 -0400
+--- Makefile.PL.orig	2009-05-27 16:32:36.000000000 -0400
 +++ Makefile.PL
-@@ -117,10 +117,10 @@ extra_install:
+@@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\
+ 
+ # Additional configurable path variables.
+ W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
++CONFIGDIR?=/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:Profile"; fi)
+@@ -94,14 +96,14 @@ extra_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 -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 -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
+@@ -117,10 +119,10 @@ extra_install:
  	
  	# These might fail if a regular user is installing into a home
  	# directory.
@@ -10,10 +41,10 @@ $NetBSD: patch-aa,v 1.8 2009/04/21 16:34:43 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)$(PREFIX)/share/examples/ikiwiki
-+	-install -m 0644 wikilist $(DESTDIR)$(PREFIX)/share/examples/ikiwiki
-+	-install -m 0644 auto.setup $(DESTDIR)$(PREFIX)/share/examples/ikiwiki
-+	-install -m 0644 auto-blog.setup $(DESTDIR)$(PREFIX)/share/examples/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)
  }
  }
  
diff --git a/www/ikiwiki/patches/patch-ac b/www/ikiwiki/patches/patch-ac
deleted file mode 100644
index 761657b4372..00000000000
--- a/www/ikiwiki/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/07/09 22:15:09 schmonz Exp $
-
---- IkiWiki/Plugin/svn.pm.orig	2009-05-27 16:32:36.000000000 -0400
-+++ IkiWiki/Plugin/svn.pm
-@@ -243,10 +243,10 @@ sub rcs_rename ($$) {
- 	
- 	if (-d "$config{srcdir}/.svn") {
- 		# Add parent directory for $dest
--		my $parent=dirname($dest);
-+		my $parent=IkiWiki::dirname($dest);
- 		if (! -d "$config{srcdir}/$parent/.svn") {
- 			while (! -d "$config{srcdir}/$parent/.svn") {
--				$parent=dirname($dest);
-+				$parent=IkiWiki::dirname($dest);
- 			}
- 			if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
- 				warn("svn add $parent failed\n");
diff --git a/www/ikiwiki/patches/patch-ad b/www/ikiwiki/patches/patch-ad
new file mode 100644
index 00000000000..72a640ee8ff
--- /dev/null
+++ b/www/ikiwiki/patches/patch-ad
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..daa8e16facc
--- /dev/null
+++ b/www/ikiwiki/patches/patch-ae
@@ -0,0 +1,13 @@
+$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";
+ }