- Update to 3.20130904.1

- Support staging
- Use new options framework

maintainer timeout.

PR:		ports/184538
Submitted by:	mat

3 files changed, 318 insertions, 285 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 665519a99642..d2d513b71d66 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	3.20110608
-PORTREVISION=	1
+PORTVERSION=	3.20130904.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL} \
 		http://kitenet.net/~joey/debian/unstable/
@@ -12,6 +11,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	brix@FreeBSD.org
 COMMENT=	A wiki compiler
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
 		p5-CGI-FormBuilder>=0:${PORTSDIR}/www/p5-CGI-FormBuilder \
@@ -23,7 +24,8 @@ BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-Text-Markdown>=0:${PORTSDIR}/textproc/p5-Text-Markdown \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI \
 		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
+		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo \
 		p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML \
@@ -32,45 +34,29 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-LICENSE=	GPLv2
 USES=		gettext perl5 gmake
 USE_PERL5=	configure
 
-OPTIONS_DEFINE=	PO4A SEARCH W3M
+OPTIONS_DEFINE=	PO4A SEARCH W3M DOCS EXAMPLES
 OPTIONS_DEFAULT=	PO4A SEARCH
+OPTIONS_SUB=
+
 PO4A_DESC=	Install translated underlays
 SEARCH_DESC=	Install search backend
 W3M_DESC=	Install w3m CGI wrapper
 
-MAN1=		ikiwiki.1 ikiwiki-calendar.1 ikiwiki-makerepo.1 ikiwiki-transition.1 ikiwiki-update-wikilist.1
-MAN8=		ikiwiki-mass-rebuild.8
+PO4A_RUN_DEPENDS=	po4a>=0.39:${PORTSDIR}/textproc/po4a
+PO4A_BUILD_DEPENDS=	po4a>=0.39:${PORTSDIR}/textproc/po4a
+SEARCH_RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
+		p5-Search-Xapian>=0:${PORTSDIR}/databases/p5-Search-Xapian \
+		${LOCALBASE}/www/xapian-omega/cgi-bin/omega:${PORTSDIR}/www/xapian-omega
+W3M_MAKE_ENV=	W3M_CGI_BIN=${PREFIX}/libexec/w3m/cgi-bin
+
 PORTDOCS=	CHANGELOG NEWS README
 PORTEXAMPLES=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MPO4A}
-PLIST_SUB+=	PO4A=""
-RUN_DEPENDS+=	po4a>=0.39:${PORTSDIR}/textproc/po4a
-BUILD_DEPENDS+=	po4a>=0.39:${PORTSDIR}/textproc/po4a
-.else
-PLIST_SUB+=	PO4A="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSEARCH}
-RUN_DEPENDS+=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Search-Xapian>=0:${PORTSDIR}/databases/p5-Search-Xapian \
-		${LOCALBASE}/www/xapian-omega/cgi-bin/omega:${PORTSDIR}/www/xapian-omega
-.endif
-
-.if ${PORT_OPTIONS:MW3M}
-MAKE_ENV+=	W3M_CGI_BIN=${PREFIX}/libexec/w3m/cgi-bin
-PLIST_SUB+=	W3M=""
-.else
-PLIST_SUB+=	W3M="@comment "
-.endif
-
 post-patch:
 	@${GREP} -rl '^#!/usr/bin/perl' ${WRKSRC} | \
 		${XARGS} ${REINPLACE_CMD} -i '' \
@@ -91,7 +77,7 @@ post-patch:
 		-e 's|\(-install -m 0644 wikilist\)|#\1|' \
 		-e 's|\(-install -m 0644 auto.setup\)|#\1|' \
 		-e 's|\(-install -m 0644 auto-blog.setup\)|#\1|' \
-		-e 's|$$(DESTDIR)$$(PREFIX)/share/ikiwiki/examples|${EXAMPLESDIR}|' \
+		-e 's|/share/ikiwiki/examples|${EXAMPLESDIR:S/${PREFIX}//}|' \
 		${WRKSRC}/Makefile.PL
 	@${REINPLACE_CMD} -i '' \
 		-e "s|share/ikiwiki/examples|share/examples/ikiwiki|" \
@@ -123,18 +109,13 @@ post-patch:
 .endif
 
 post-install:
-	${MKDIR} ${PREFIX}/etc/ikiwiki
-	${INSTALL_DATA} ${WRKSRC}/auto.setup ${PREFIX}/etc/ikiwiki
-	${INSTALL_DATA} ${WRKSRC}/auto-blog.setup ${PREFIX}/etc/ikiwiki
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/ikiwiki.setup ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/wikilist ${EXAMPLESDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/ikiwiki
+	${INSTALL_DATA} ${WRKSRC}/auto.setup ${STAGEDIR}${PREFIX}/etc/ikiwiki
+	${INSTALL_DATA} ${WRKSRC}/auto-blog.setup ${STAGEDIR}${PREFIX}/etc/ikiwiki
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/ikiwiki.setup ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/wikilist ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index d1ac2c8a76e1..9bd7e4f6ba57 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ikiwiki_3.20110608.tar.gz) = b2e0d05be85135a8e44ffcbbbcaa29a17c45b4373899ab10c6096c4298791ecc
-SIZE (ikiwiki_3.20110608.tar.gz) = 2377663
+SHA256 (ikiwiki_3.20130904.1.tar.gz) = 1014c30060fc2567845a3a782bf2dd022786cffb5fedbc6800c8f844be66bedb
+SIZE (ikiwiki_3.20130904.1.tar.gz) = 3111307
diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index ea328777b4ea..3258cc775b18 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -1,3 +1,168 @@
+bin/ikiwiki
+bin/ikiwiki-calendar
+bin/ikiwiki-makerepo
+bin/ikiwiki-transition
+bin/ikiwiki-update-wikilist
+%%ETCDIR%%/auto-blog.setup
+%%ETCDIR%%/auto.setup
+lib/ikiwiki/plugins/proxy.py
+lib/ikiwiki/plugins/rst
+%%SITE_PERL%%/IkiWiki.pm
+%%SITE_PERL%%/IkiWiki/CGI.pm
+%%SITE_PERL%%/IkiWiki/Plugin/404.pm
+%%SITE_PERL%%/IkiWiki/Plugin/aggregate.pm
+%%SITE_PERL%%/IkiWiki/Plugin/amazon_s3.pm
+%%SITE_PERL%%/IkiWiki/Plugin/anonok.pm
+%%SITE_PERL%%/IkiWiki/Plugin/attachment.pm
+%%SITE_PERL%%/IkiWiki/Plugin/autoindex.pm
+%%SITE_PERL%%/IkiWiki/Plugin/blogspam.pm
+%%SITE_PERL%%/IkiWiki/Plugin/brokenlinks.pm
+%%SITE_PERL%%/IkiWiki/Plugin/bzr.pm
+%%SITE_PERL%%/IkiWiki/Plugin/calendar.pm
+%%SITE_PERL%%/IkiWiki/Plugin/camelcase.pm
+%%SITE_PERL%%/IkiWiki/Plugin/color.pm
+%%SITE_PERL%%/IkiWiki/Plugin/comments.pm
+%%SITE_PERL%%/IkiWiki/Plugin/conditional.pm
+%%SITE_PERL%%/IkiWiki/Plugin/creole.pm
+%%SITE_PERL%%/IkiWiki/Plugin/cutpaste.pm
+%%SITE_PERL%%/IkiWiki/Plugin/cvs.pm
+%%SITE_PERL%%/IkiWiki/Plugin/darcs.pm
+%%SITE_PERL%%/IkiWiki/Plugin/date.pm
+%%SITE_PERL%%/IkiWiki/Plugin/ddate.pm
+%%SITE_PERL%%/IkiWiki/Plugin/editdiff.pm
+%%SITE_PERL%%/IkiWiki/Plugin/editpage.pm
+%%SITE_PERL%%/IkiWiki/Plugin/edittemplate.pm
+%%SITE_PERL%%/IkiWiki/Plugin/embed.pm
+%%SITE_PERL%%/IkiWiki/Plugin/external.pm
+%%SITE_PERL%%/IkiWiki/Plugin/favicon.pm
+%%SITE_PERL%%/IkiWiki/Plugin/filecheck.pm
+%%SITE_PERL%%/IkiWiki/Plugin/flattr.pm
+%%SITE_PERL%%/IkiWiki/Plugin/format.pm
+%%SITE_PERL%%/IkiWiki/Plugin/fortune.pm
+%%SITE_PERL%%/IkiWiki/Plugin/getsource.pm
+%%SITE_PERL%%/IkiWiki/Plugin/git.pm
+%%SITE_PERL%%/IkiWiki/Plugin/goodstuff.pm
+%%SITE_PERL%%/IkiWiki/Plugin/google.pm
+%%SITE_PERL%%/IkiWiki/Plugin/goto.pm
+%%SITE_PERL%%/IkiWiki/Plugin/graphviz.pm
+%%SITE_PERL%%/IkiWiki/Plugin/haiku.pm
+%%SITE_PERL%%/IkiWiki/Plugin/headinganchors.pm
+%%SITE_PERL%%/IkiWiki/Plugin/highlight.pm
+%%SITE_PERL%%/IkiWiki/Plugin/hnb.pm
+%%SITE_PERL%%/IkiWiki/Plugin/html.pm
+%%SITE_PERL%%/IkiWiki/Plugin/htmlbalance.pm
+%%SITE_PERL%%/IkiWiki/Plugin/htmlscrubber.pm
+%%SITE_PERL%%/IkiWiki/Plugin/htmltidy.pm
+%%SITE_PERL%%/IkiWiki/Plugin/httpauth.pm
+%%SITE_PERL%%/IkiWiki/Plugin/img.pm
+%%SITE_PERL%%/IkiWiki/Plugin/inline.pm
+%%SITE_PERL%%/IkiWiki/Plugin/link.pm
+%%SITE_PERL%%/IkiWiki/Plugin/linkmap.pm
+%%SITE_PERL%%/IkiWiki/Plugin/listdirectives.pm
+%%SITE_PERL%%/IkiWiki/Plugin/localstyle.pm
+%%SITE_PERL%%/IkiWiki/Plugin/lockedit.pm
+%%SITE_PERL%%/IkiWiki/Plugin/map.pm
+%%SITE_PERL%%/IkiWiki/Plugin/mdwn.pm
+%%SITE_PERL%%/IkiWiki/Plugin/mercurial.pm
+%%SITE_PERL%%/IkiWiki/Plugin/meta.pm
+%%SITE_PERL%%/IkiWiki/Plugin/mirrorlist.pm
+%%SITE_PERL%%/IkiWiki/Plugin/moderatedcomments.pm
+%%SITE_PERL%%/IkiWiki/Plugin/monotone.pm
+%%SITE_PERL%%/IkiWiki/Plugin/more.pm
+%%SITE_PERL%%/IkiWiki/Plugin/norcs.pm
+%%SITE_PERL%%/IkiWiki/Plugin/notifyemail.pm
+%%SITE_PERL%%/IkiWiki/Plugin/opendiscussion.pm
+%%SITE_PERL%%/IkiWiki/Plugin/openid.pm
+%%SITE_PERL%%/IkiWiki/Plugin/orphans.pm
+%%SITE_PERL%%/IkiWiki/Plugin/osm.pm
+%%SITE_PERL%%/IkiWiki/Plugin/otl.pm
+%%SITE_PERL%%/IkiWiki/Plugin/pagecount.pm
+%%SITE_PERL%%/IkiWiki/Plugin/pagestats.pm
+%%SITE_PERL%%/IkiWiki/Plugin/pagetemplate.pm
+%%SITE_PERL%%/IkiWiki/Plugin/parentlinks.pm
+%%SITE_PERL%%/IkiWiki/Plugin/passwordauth.pm
+%%SITE_PERL%%/IkiWiki/Plugin/pingee.pm
+%%SITE_PERL%%/IkiWiki/Plugin/pinger.pm
+%%SITE_PERL%%/IkiWiki/Plugin/po.pm
+%%SITE_PERL%%/IkiWiki/Plugin/poll.pm
+%%SITE_PERL%%/IkiWiki/Plugin/polygen.pm
+%%SITE_PERL%%/IkiWiki/Plugin/postsparkline.pm
+%%SITE_PERL%%/IkiWiki/Plugin/prettydate.pm
+%%SITE_PERL%%/IkiWiki/Plugin/progress.pm
+%%SITE_PERL%%/IkiWiki/Plugin/rawhtml.pm
+%%SITE_PERL%%/IkiWiki/Plugin/recentchanges.pm
+%%SITE_PERL%%/IkiWiki/Plugin/recentchangesdiff.pm
+%%SITE_PERL%%/IkiWiki/Plugin/relativedate.pm
+%%SITE_PERL%%/IkiWiki/Plugin/remove.pm
+%%SITE_PERL%%/IkiWiki/Plugin/rename.pm
+%%SITE_PERL%%/IkiWiki/Plugin/repolist.pm
+%%SITE_PERL%%/IkiWiki/Plugin/rsync.pm
+%%SITE_PERL%%/IkiWiki/Plugin/search.pm
+%%SITE_PERL%%/IkiWiki/Plugin/shortcut.pm
+%%SITE_PERL%%/IkiWiki/Plugin/sidebar.pm
+%%SITE_PERL%%/IkiWiki/Plugin/signinedit.pm
+%%SITE_PERL%%/IkiWiki/Plugin/skeleton.pm.example
+%%SITE_PERL%%/IkiWiki/Plugin/smiley.pm
+%%SITE_PERL%%/IkiWiki/Plugin/sortnaturally.pm
+%%SITE_PERL%%/IkiWiki/Plugin/sparkline.pm
+%%SITE_PERL%%/IkiWiki/Plugin/svn.pm
+%%SITE_PERL%%/IkiWiki/Plugin/table.pm
+%%SITE_PERL%%/IkiWiki/Plugin/tag.pm
+%%SITE_PERL%%/IkiWiki/Plugin/template.pm
+%%SITE_PERL%%/IkiWiki/Plugin/testpagespec.pm
+%%SITE_PERL%%/IkiWiki/Plugin/teximg.pm
+%%SITE_PERL%%/IkiWiki/Plugin/textile.pm
+%%SITE_PERL%%/IkiWiki/Plugin/theme.pm
+%%SITE_PERL%%/IkiWiki/Plugin/tla.pm
+%%SITE_PERL%%/IkiWiki/Plugin/toc.pm
+%%SITE_PERL%%/IkiWiki/Plugin/toggle.pm
+%%SITE_PERL%%/IkiWiki/Plugin/trail.pm
+%%SITE_PERL%%/IkiWiki/Plugin/transient.pm
+%%SITE_PERL%%/IkiWiki/Plugin/txt.pm
+%%SITE_PERL%%/IkiWiki/Plugin/typography.pm
+%%SITE_PERL%%/IkiWiki/Plugin/underlay.pm
+%%SITE_PERL%%/IkiWiki/Plugin/userlist.pm
+%%SITE_PERL%%/IkiWiki/Plugin/version.pm
+%%SITE_PERL%%/IkiWiki/Plugin/websetup.pm
+%%SITE_PERL%%/IkiWiki/Plugin/wikitext.pm
+%%SITE_PERL%%/IkiWiki/Plugin/wmd.pm
+%%SITE_PERL%%/IkiWiki/Receive.pm
+%%SITE_PERL%%/IkiWiki/Render.pm
+%%SITE_PERL%%/IkiWiki/Setup.pm
+%%SITE_PERL%%/IkiWiki/Setup/Automator.pm
+%%SITE_PERL%%/IkiWiki/Setup/Standard.pm
+%%SITE_PERL%%/IkiWiki/Setup/Yaml.pm
+%%SITE_PERL%%/IkiWiki/UserInfo.pm
+%%SITE_PERL%%/IkiWiki/Wrapper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki/.packlist
+%%W3M%%libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
+man/man1/ikiwiki-calendar.1.gz
+man/man1/ikiwiki-makerepo.1.gz
+man/man1/ikiwiki-transition.1.gz
+man/man1/ikiwiki-update-wikilist.1.gz
+man/man1/ikiwiki.1.gz
+man/man8/ikiwiki-mass-rebuild.8.gz
+sbin/ikiwiki-mass-rebuild
+%%DATADIR%%/attachment/ikiwiki/images/pbar-ani.gif
+%%DATADIR%%/attachment/ikiwiki/images/ui-bg_flat_0_aaaaaa_40x100.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-bg_flat_75_ffffff_40x100.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-bg_glass_55_fbf9ee_1x400.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-bg_glass_65_ffffff_1x400.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-bg_glass_75_dadada_1x400.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-bg_glass_75_e6e6e6_1x400.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-bg_glass_95_fef1ec_1x400.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-icons_222222_256x240.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-icons_2e83ff_256x240.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-icons_454545_256x240.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-icons_888888_256x240.png
+%%DATADIR%%/attachment/ikiwiki/images/ui-icons_cd0a0a_256x240.png
+%%DATADIR%%/attachment/ikiwiki/jquery-ui.min.css
+%%DATADIR%%/attachment/ikiwiki/jquery-ui.min.js
+%%DATADIR%%/attachment/ikiwiki/jquery.fileupload-ui.js
+%%DATADIR%%/attachment/ikiwiki/jquery.fileupload.js
+%%DATADIR%%/attachment/ikiwiki/jquery.iframe-transport.js
+%%DATADIR%%/attachment/ikiwiki/jquery.tmpl.min.js
 %%DATADIR%%/basewiki/favicon.ico
 %%DATADIR%%/basewiki/ikiwiki.mdwn
 %%DATADIR%%/basewiki/ikiwiki/directive.mdwn
@@ -50,6 +215,7 @@
 %%DATADIR%%/directives/ikiwiki/directive/meta.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/more.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/orphans.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/osm.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/pagecount.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/pagestats.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/pagetemplate.mdwn
@@ -71,10 +237,16 @@
 %%DATADIR%%/directives/ikiwiki/directive/toc.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/toggle.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/toggleable.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/trailitem.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/trailitems.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/traillink.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/trailoptions.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/version.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/waypoint.mdwn
 %%DATADIR%%/javascript/ikiwiki/ikiwiki.js
 %%DATADIR%%/javascript/ikiwiki/relativedate.js
 %%DATADIR%%/javascript/ikiwiki/toggle.js
+%%DATADIR%%/jquery/ikiwiki/jquery.min.js
 %%PO4A%%%%DATADIR%%/locale/cs/basewiki/ikiwiki.mdwn
 %%PO4A%%%%DATADIR%%/locale/cs/basewiki/ikiwiki/directive.mdwn
 %%PO4A%%%%DATADIR%%/locale/cs/basewiki/ikiwiki/formatting.mdwn
@@ -281,8 +453,9 @@
 %%PO4A%%%%DATADIR%%/locale/fr/directives/ikiwiki/directive/toggle.mdwn
 %%PO4A%%%%DATADIR%%/locale/fr/directives/ikiwiki/directive/version.mdwn
 %%PO4A%%%%DATADIR%%/locale/fr/smiley/smileys.mdwn
-%%DATADIR%%/openid-selector/ikiwiki/openid/jquery.js
 %%DATADIR%%/openid-selector/ikiwiki/openid/openid-jquery.js
+%%DATADIR%%/osm/ikiwiki/images/osm.png
+%%DATADIR%%/osm/ikiwiki/osm.js
 %%DATADIR%%/po/cs/basewiki/ikiwiki.cs.po
 %%DATADIR%%/po/cs/basewiki/ikiwiki/directive.cs.po
 %%DATADIR%%/po/cs/basewiki/ikiwiki/formatting.cs.po
@@ -562,6 +735,7 @@
 %%DATADIR%%/templates/googleform.tmpl
 %%DATADIR%%/templates/inlinepage.tmpl
 %%DATADIR%%/templates/microblog.tmpl
+%%DATADIR%%/templates/notifyemail.tmpl
 %%DATADIR%%/templates/openid-selector.tmpl
 %%DATADIR%%/templates/page.tmpl
 %%DATADIR%%/templates/passwordmail.tmpl
@@ -574,6 +748,7 @@
 %%DATADIR%%/templates/searchform.tmpl
 %%DATADIR%%/templates/searchquery.tmpl
 %%DATADIR%%/templates/titlepage.tmpl
+%%DATADIR%%/templates/trails.tmpl
 %%DATADIR%%/themes/actiontabs/style.css
 %%DATADIR%%/themes/blueview/background_darkness.png
 %%DATADIR%%/themes/blueview/header_background.png
@@ -581,140 +756,8 @@
 %%DATADIR%%/themes/goldtype/background_darkness.png
 %%DATADIR%%/themes/goldtype/header_background.png
 %%DATADIR%%/themes/goldtype/style.css
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki/.packlist
-%%SITE_PERL%%/IkiWiki.pm
-%%SITE_PERL%%/IkiWiki/CGI.pm
-%%SITE_PERL%%/IkiWiki/Plugin/404.pm
-%%SITE_PERL%%/IkiWiki/Plugin/aggregate.pm
-%%SITE_PERL%%/IkiWiki/Plugin/amazon_s3.pm
-%%SITE_PERL%%/IkiWiki/Plugin/anonok.pm
-%%SITE_PERL%%/IkiWiki/Plugin/attachment.pm
-%%SITE_PERL%%/IkiWiki/Plugin/autoindex.pm
-%%SITE_PERL%%/IkiWiki/Plugin/blogspam.pm
-%%SITE_PERL%%/IkiWiki/Plugin/brokenlinks.pm
-%%SITE_PERL%%/IkiWiki/Plugin/bzr.pm
-%%SITE_PERL%%/IkiWiki/Plugin/calendar.pm
-%%SITE_PERL%%/IkiWiki/Plugin/camelcase.pm
-%%SITE_PERL%%/IkiWiki/Plugin/color.pm
-%%SITE_PERL%%/IkiWiki/Plugin/comments.pm
-%%SITE_PERL%%/IkiWiki/Plugin/conditional.pm
-%%SITE_PERL%%/IkiWiki/Plugin/creole.pm
-%%SITE_PERL%%/IkiWiki/Plugin/cutpaste.pm
-%%SITE_PERL%%/IkiWiki/Plugin/cvs.pm
-%%SITE_PERL%%/IkiWiki/Plugin/darcs.pm
-%%SITE_PERL%%/IkiWiki/Plugin/date.pm
-%%SITE_PERL%%/IkiWiki/Plugin/ddate.pm
-%%SITE_PERL%%/IkiWiki/Plugin/editdiff.pm
-%%SITE_PERL%%/IkiWiki/Plugin/editpage.pm
-%%SITE_PERL%%/IkiWiki/Plugin/edittemplate.pm
-%%SITE_PERL%%/IkiWiki/Plugin/embed.pm
-%%SITE_PERL%%/IkiWiki/Plugin/external.pm
-%%SITE_PERL%%/IkiWiki/Plugin/favicon.pm
-%%SITE_PERL%%/IkiWiki/Plugin/filecheck.pm
-%%SITE_PERL%%/IkiWiki/Plugin/flattr.pm
-%%SITE_PERL%%/IkiWiki/Plugin/format.pm
-%%SITE_PERL%%/IkiWiki/Plugin/fortune.pm
-%%SITE_PERL%%/IkiWiki/Plugin/getsource.pm
-%%SITE_PERL%%/IkiWiki/Plugin/git.pm
-%%SITE_PERL%%/IkiWiki/Plugin/goodstuff.pm
-%%SITE_PERL%%/IkiWiki/Plugin/google.pm
-%%SITE_PERL%%/IkiWiki/Plugin/goto.pm
-%%SITE_PERL%%/IkiWiki/Plugin/graphviz.pm
-%%SITE_PERL%%/IkiWiki/Plugin/haiku.pm
-%%SITE_PERL%%/IkiWiki/Plugin/highlight.pm
-%%SITE_PERL%%/IkiWiki/Plugin/hnb.pm
-%%SITE_PERL%%/IkiWiki/Plugin/html.pm
-%%SITE_PERL%%/IkiWiki/Plugin/htmlbalance.pm
-%%SITE_PERL%%/IkiWiki/Plugin/htmlscrubber.pm
-%%SITE_PERL%%/IkiWiki/Plugin/htmltidy.pm
-%%SITE_PERL%%/IkiWiki/Plugin/httpauth.pm
-%%SITE_PERL%%/IkiWiki/Plugin/img.pm
-%%SITE_PERL%%/IkiWiki/Plugin/inline.pm
-%%SITE_PERL%%/IkiWiki/Plugin/link.pm
-%%SITE_PERL%%/IkiWiki/Plugin/linkmap.pm
-%%SITE_PERL%%/IkiWiki/Plugin/listdirectives.pm
-%%SITE_PERL%%/IkiWiki/Plugin/localstyle.pm
-%%SITE_PERL%%/IkiWiki/Plugin/lockedit.pm
-%%SITE_PERL%%/IkiWiki/Plugin/map.pm
-%%SITE_PERL%%/IkiWiki/Plugin/mdwn.pm
-%%SITE_PERL%%/IkiWiki/Plugin/mercurial.pm
-%%SITE_PERL%%/IkiWiki/Plugin/meta.pm
-%%SITE_PERL%%/IkiWiki/Plugin/mirrorlist.pm
-%%SITE_PERL%%/IkiWiki/Plugin/moderatedcomments.pm
-%%SITE_PERL%%/IkiWiki/Plugin/monotone.pm
-%%SITE_PERL%%/IkiWiki/Plugin/more.pm
-%%SITE_PERL%%/IkiWiki/Plugin/norcs.pm
-%%SITE_PERL%%/IkiWiki/Plugin/opendiscussion.pm
-%%SITE_PERL%%/IkiWiki/Plugin/openid.pm
-%%SITE_PERL%%/IkiWiki/Plugin/orphans.pm
-%%SITE_PERL%%/IkiWiki/Plugin/otl.pm
-%%SITE_PERL%%/IkiWiki/Plugin/pagecount.pm
-%%SITE_PERL%%/IkiWiki/Plugin/pagestats.pm
-%%SITE_PERL%%/IkiWiki/Plugin/pagetemplate.pm
-%%SITE_PERL%%/IkiWiki/Plugin/parentlinks.pm
-%%SITE_PERL%%/IkiWiki/Plugin/passwordauth.pm
-%%SITE_PERL%%/IkiWiki/Plugin/pingee.pm
-%%SITE_PERL%%/IkiWiki/Plugin/pinger.pm
-%%SITE_PERL%%/IkiWiki/Plugin/po.pm
-%%SITE_PERL%%/IkiWiki/Plugin/poll.pm
-%%SITE_PERL%%/IkiWiki/Plugin/polygen.pm
-%%SITE_PERL%%/IkiWiki/Plugin/postsparkline.pm
-%%SITE_PERL%%/IkiWiki/Plugin/prettydate.pm
-%%SITE_PERL%%/IkiWiki/Plugin/progress.pm
-%%SITE_PERL%%/IkiWiki/Plugin/rawhtml.pm
-%%SITE_PERL%%/IkiWiki/Plugin/recentchanges.pm
-%%SITE_PERL%%/IkiWiki/Plugin/recentchangesdiff.pm
-%%SITE_PERL%%/IkiWiki/Plugin/relativedate.pm
-%%SITE_PERL%%/IkiWiki/Plugin/remove.pm
-%%SITE_PERL%%/IkiWiki/Plugin/rename.pm
-%%SITE_PERL%%/IkiWiki/Plugin/repolist.pm
-%%SITE_PERL%%/IkiWiki/Plugin/rsync.pm
-%%SITE_PERL%%/IkiWiki/Plugin/search.pm
-%%SITE_PERL%%/IkiWiki/Plugin/shortcut.pm
-%%SITE_PERL%%/IkiWiki/Plugin/sidebar.pm
-%%SITE_PERL%%/IkiWiki/Plugin/signinedit.pm
-%%SITE_PERL%%/IkiWiki/Plugin/skeleton.pm.example
-%%SITE_PERL%%/IkiWiki/Plugin/smiley.pm
-%%SITE_PERL%%/IkiWiki/Plugin/sortnaturally.pm
-%%SITE_PERL%%/IkiWiki/Plugin/sparkline.pm
-%%SITE_PERL%%/IkiWiki/Plugin/svn.pm
-%%SITE_PERL%%/IkiWiki/Plugin/table.pm
-%%SITE_PERL%%/IkiWiki/Plugin/tag.pm
-%%SITE_PERL%%/IkiWiki/Plugin/template.pm
-%%SITE_PERL%%/IkiWiki/Plugin/testpagespec.pm
-%%SITE_PERL%%/IkiWiki/Plugin/teximg.pm
-%%SITE_PERL%%/IkiWiki/Plugin/textile.pm
-%%SITE_PERL%%/IkiWiki/Plugin/theme.pm
-%%SITE_PERL%%/IkiWiki/Plugin/tla.pm
-%%SITE_PERL%%/IkiWiki/Plugin/toc.pm
-%%SITE_PERL%%/IkiWiki/Plugin/toggle.pm
-%%SITE_PERL%%/IkiWiki/Plugin/transient.pm
-%%SITE_PERL%%/IkiWiki/Plugin/txt.pm
-%%SITE_PERL%%/IkiWiki/Plugin/typography.pm
-%%SITE_PERL%%/IkiWiki/Plugin/underlay.pm
-%%SITE_PERL%%/IkiWiki/Plugin/version.pm
-%%SITE_PERL%%/IkiWiki/Plugin/websetup.pm
-%%SITE_PERL%%/IkiWiki/Plugin/wikitext.pm
-%%SITE_PERL%%/IkiWiki/Plugin/wmd.pm
-%%SITE_PERL%%/IkiWiki/Receive.pm
-%%SITE_PERL%%/IkiWiki/Render.pm
-%%SITE_PERL%%/IkiWiki/Setup.pm
-%%SITE_PERL%%/IkiWiki/Setup/Automator.pm
-%%SITE_PERL%%/IkiWiki/Setup/Standard.pm
-%%SITE_PERL%%/IkiWiki/Setup/Yaml.pm
-%%SITE_PERL%%/IkiWiki/UserInfo.pm
-%%SITE_PERL%%/IkiWiki/Wrapper.pm
-bin/ikiwiki
-bin/ikiwiki-calendar
-bin/ikiwiki-makerepo
-bin/ikiwiki-transition
-bin/ikiwiki-update-wikilist
-etc/ikiwiki/auto-blog.setup
-etc/ikiwiki/auto.setup
-lib/ikiwiki/plugins/proxy.py
-lib/ikiwiki/plugins/rst
-%%W3M%%libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
-sbin/ikiwiki-mass-rebuild
+%%DATADIR%%/themes/monochrome/gradient.png
+%%DATADIR%%/themes/monochrome/style.css
 share/locale/bg/LC_MESSAGES/ikiwiki.mo
 share/locale/cs/LC_MESSAGES/ikiwiki.mo
 share/locale/da/LC_MESSAGES/ikiwiki.mo
@@ -727,116 +770,125 @@ share/locale/pl/LC_MESSAGES/ikiwiki.mo
 share/locale/sv/LC_MESSAGES/ikiwiki.mo
 share/locale/tr/LC_MESSAGES/ikiwiki.mo
 share/locale/vi/LC_MESSAGES/ikiwiki.mo
-@dirrm etc/ikiwiki
-@dirrm lib/ikiwiki/plugins
-@dirrm lib/ikiwiki
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki
-@dirrm %%DATADIR%%/basewiki/ikiwiki/pagespec
-@dirrm %%DATADIR%%/basewiki/ikiwiki/subpage
-@dirrm %%DATADIR%%/basewiki/ikiwiki
-@dirrm %%DATADIR%%/basewiki/templates
-@dirrm %%DATADIR%%/basewiki/wikiicons
-@dirrm %%DATADIR%%/basewiki
-@dirrm %%DATADIR%%/directives/ikiwiki/directive
-@dirrm %%DATADIR%%/directives/ikiwiki
-@dirrm %%DATADIR%%/directives
-@dirrm %%DATADIR%%/javascript/ikiwiki
-@dirrm %%DATADIR%%/javascript
-%%PO4A%%@dirrm %%DATADIR%%/locale/cs/basewiki/ikiwiki/pagespec
-%%PO4A%%@dirrm %%DATADIR%%/locale/cs/basewiki/ikiwiki/subpage
-%%PO4A%%@dirrm %%DATADIR%%/locale/cs/basewiki/ikiwiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/cs/basewiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/cs
-%%PO4A%%@dirrm %%DATADIR%%/locale/da/basewiki/ikiwiki/pagespec
-%%PO4A%%@dirrm %%DATADIR%%/locale/da/basewiki/ikiwiki/subpage
-%%PO4A%%@dirrm %%DATADIR%%/locale/da/basewiki/ikiwiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/da/basewiki/templates
-%%PO4A%%@dirrm %%DATADIR%%/locale/da/basewiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/da/directives/ikiwiki/directive
-%%PO4A%%@dirrm %%DATADIR%%/locale/da/directives/ikiwiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/da/directives
-%%PO4A%%@dirrm %%DATADIR%%/locale/da/smiley
-%%PO4A%%@dirrm %%DATADIR%%/locale/da
-%%PO4A%%@dirrm %%DATADIR%%/locale/de/basewiki/ikiwiki/pagespec
-%%PO4A%%@dirrm %%DATADIR%%/locale/de/basewiki/ikiwiki/subpage
-%%PO4A%%@dirrm %%DATADIR%%/locale/de/basewiki/ikiwiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/de/basewiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/de/directives/ikiwiki/directive
-%%PO4A%%@dirrm %%DATADIR%%/locale/de/directives/ikiwiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/de/directives
-%%PO4A%%@dirrm %%DATADIR%%/locale/de/smiley
-%%PO4A%%@dirrm %%DATADIR%%/locale/de
-%%PO4A%%@dirrm %%DATADIR%%/locale/es/basewiki/ikiwiki/pagespec
-%%PO4A%%@dirrm %%DATADIR%%/locale/es/basewiki/ikiwiki/subpage
-%%PO4A%%@dirrm %%DATADIR%%/locale/es/basewiki/ikiwiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/es/basewiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/es
-%%PO4A%%@dirrm %%DATADIR%%/locale/fr/basewiki/ikiwiki/pagespec
-%%PO4A%%@dirrm %%DATADIR%%/locale/fr/basewiki/ikiwiki/subpage
-%%PO4A%%@dirrm %%DATADIR%%/locale/fr/basewiki/ikiwiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/fr/basewiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/fr/directives/ikiwiki/directive
-%%PO4A%%@dirrm %%DATADIR%%/locale/fr/directives/ikiwiki
-%%PO4A%%@dirrm %%DATADIR%%/locale/fr/directives
-%%PO4A%%@dirrm %%DATADIR%%/locale/fr/smiley
-%%PO4A%%@dirrm %%DATADIR%%/locale/fr
-%%PO4A%%@dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%/openid-selector/ikiwiki/openid
-@dirrm %%DATADIR%%/openid-selector/ikiwiki
-@dirrm %%DATADIR%%/openid-selector
-@dirrm %%DATADIR%%/po/cs/basewiki/ikiwiki/pagespec
-@dirrm %%DATADIR%%/po/cs/basewiki/ikiwiki/subpage
-@dirrm %%DATADIR%%/po/cs/basewiki/ikiwiki
-@dirrm %%DATADIR%%/po/cs/basewiki/templates
-@dirrm %%DATADIR%%/po/cs/basewiki
-@dirrm %%DATADIR%%/po/cs
-@dirrm %%DATADIR%%/po/da/basewiki/ikiwiki/pagespec
-@dirrm %%DATADIR%%/po/da/basewiki/ikiwiki/subpage
-@dirrm %%DATADIR%%/po/da/basewiki/ikiwiki
-@dirrm %%DATADIR%%/po/da/basewiki/templates
-@dirrm %%DATADIR%%/po/da/basewiki
-@dirrm %%DATADIR%%/po/da/directives/ikiwiki/directive
-@dirrm %%DATADIR%%/po/da/directives/ikiwiki
-@dirrm %%DATADIR%%/po/da/directives
-@dirrm %%DATADIR%%/po/da/smiley
-@dirrm %%DATADIR%%/po/da
-@dirrm %%DATADIR%%/po/de/basewiki/ikiwiki/pagespec
-@dirrm %%DATADIR%%/po/de/basewiki/ikiwiki/subpage
-@dirrm %%DATADIR%%/po/de/basewiki/ikiwiki
-@dirrm %%DATADIR%%/po/de/basewiki/templates
-@dirrm %%DATADIR%%/po/de/basewiki
-@dirrm %%DATADIR%%/po/de/directives/ikiwiki/directive
-@dirrm %%DATADIR%%/po/de/directives/ikiwiki
-@dirrm %%DATADIR%%/po/de/directives
-@dirrm %%DATADIR%%/po/de/smiley
-@dirrm %%DATADIR%%/po/de
-@dirrm %%DATADIR%%/po/es/basewiki/ikiwiki/pagespec
-@dirrm %%DATADIR%%/po/es/basewiki/ikiwiki/subpage
-@dirrm %%DATADIR%%/po/es/basewiki/ikiwiki
-@dirrm %%DATADIR%%/po/es/basewiki/templates
-@dirrm %%DATADIR%%/po/es/basewiki
-@dirrm %%DATADIR%%/po/es
-@dirrm %%DATADIR%%/po/fr/basewiki/ikiwiki/pagespec
-@dirrm %%DATADIR%%/po/fr/basewiki/ikiwiki/subpage
-@dirrm %%DATADIR%%/po/fr/basewiki/ikiwiki
-@dirrm %%DATADIR%%/po/fr/basewiki/templates
-@dirrm %%DATADIR%%/po/fr/basewiki
+@dirrm %%DATADIR%%/themes/monochrome
+@dirrm %%DATADIR%%/themes/goldtype
+@dirrm %%DATADIR%%/themes/blueview
+@dirrm %%DATADIR%%/themes/actiontabs
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/smiley/smileys
+@dirrm %%DATADIR%%/smiley
+@dirrm %%DATADIR%%/po/fr/smiley
 @dirrm %%DATADIR%%/po/fr/directives/ikiwiki/directive
 @dirrm %%DATADIR%%/po/fr/directives/ikiwiki
 @dirrm %%DATADIR%%/po/fr/directives
-@dirrm %%DATADIR%%/po/fr/smiley
+@dirrm %%DATADIR%%/po/fr/basewiki/templates
+@dirrm %%DATADIR%%/po/fr/basewiki/ikiwiki/subpage
+@dirrm %%DATADIR%%/po/fr/basewiki/ikiwiki/pagespec
+@dirrm %%DATADIR%%/po/fr/basewiki/ikiwiki
+@dirrm %%DATADIR%%/po/fr/basewiki
 @dirrm %%DATADIR%%/po/fr
+@dirrm %%DATADIR%%/po/es/basewiki/templates
+@dirrm %%DATADIR%%/po/es/basewiki/ikiwiki/subpage
+@dirrm %%DATADIR%%/po/es/basewiki/ikiwiki/pagespec
+@dirrm %%DATADIR%%/po/es/basewiki/ikiwiki
+@dirrm %%DATADIR%%/po/es/basewiki
+@dirrm %%DATADIR%%/po/es
+@dirrm %%DATADIR%%/po/de/smiley
+@dirrm %%DATADIR%%/po/de/directives/ikiwiki/directive
+@dirrm %%DATADIR%%/po/de/directives/ikiwiki
+@dirrm %%DATADIR%%/po/de/directives
+@dirrm %%DATADIR%%/po/de/basewiki/templates
+@dirrm %%DATADIR%%/po/de/basewiki/ikiwiki/subpage
+@dirrm %%DATADIR%%/po/de/basewiki/ikiwiki/pagespec
+@dirrm %%DATADIR%%/po/de/basewiki/ikiwiki
+@dirrm %%DATADIR%%/po/de/basewiki
+@dirrm %%DATADIR%%/po/de
+@dirrm %%DATADIR%%/po/da/smiley
+@dirrm %%DATADIR%%/po/da/directives/ikiwiki/directive
+@dirrm %%DATADIR%%/po/da/directives/ikiwiki
+@dirrm %%DATADIR%%/po/da/directives
+@dirrm %%DATADIR%%/po/da/basewiki/templates
+@dirrm %%DATADIR%%/po/da/basewiki/ikiwiki/subpage
+@dirrm %%DATADIR%%/po/da/basewiki/ikiwiki/pagespec
+@dirrm %%DATADIR%%/po/da/basewiki/ikiwiki
+@dirrm %%DATADIR%%/po/da/basewiki
+@dirrm %%DATADIR%%/po/da
+@dirrm %%DATADIR%%/po/cs/basewiki/templates
+@dirrm %%DATADIR%%/po/cs/basewiki/ikiwiki/subpage
+@dirrm %%DATADIR%%/po/cs/basewiki/ikiwiki/pagespec
+@dirrm %%DATADIR%%/po/cs/basewiki/ikiwiki
+@dirrm %%DATADIR%%/po/cs/basewiki
+@dirrm %%DATADIR%%/po/cs
 @dirrm %%DATADIR%%/po
-@dirrm %%DATADIR%%/smiley/smileys
-@dirrm %%DATADIR%%/smiley
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/themes/actiontabs
-@dirrm %%DATADIR%%/themes/blueview
-@dirrm %%DATADIR%%/themes/goldtype
-@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/osm/ikiwiki/images
+@dirrm %%DATADIR%%/osm/ikiwiki
+@dirrm %%DATADIR%%/osm
+@dirrm %%DATADIR%%/openid-selector/ikiwiki/openid
+@dirrm %%DATADIR%%/openid-selector/ikiwiki
+@dirrm %%DATADIR%%/openid-selector
+%%PO4A%%@dirrm %%DATADIR%%/locale/fr/smiley
+%%PO4A%%@dirrm %%DATADIR%%/locale/fr/directives/ikiwiki/directive
+%%PO4A%%@dirrm %%DATADIR%%/locale/fr/directives/ikiwiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/fr/directives
+%%PO4A%%@dirrm %%DATADIR%%/locale/fr/basewiki/ikiwiki/subpage
+%%PO4A%%@dirrm %%DATADIR%%/locale/fr/basewiki/ikiwiki/pagespec
+%%PO4A%%@dirrm %%DATADIR%%/locale/fr/basewiki/ikiwiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/fr/basewiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/fr
+%%PO4A%%@dirrm %%DATADIR%%/locale/es/basewiki/ikiwiki/subpage
+%%PO4A%%@dirrm %%DATADIR%%/locale/es/basewiki/ikiwiki/pagespec
+%%PO4A%%@dirrm %%DATADIR%%/locale/es/basewiki/ikiwiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/es/basewiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/es
+%%PO4A%%@dirrm %%DATADIR%%/locale/de/smiley
+%%PO4A%%@dirrm %%DATADIR%%/locale/de/directives/ikiwiki/directive
+%%PO4A%%@dirrm %%DATADIR%%/locale/de/directives/ikiwiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/de/directives
+%%PO4A%%@dirrm %%DATADIR%%/locale/de/basewiki/ikiwiki/subpage
+%%PO4A%%@dirrm %%DATADIR%%/locale/de/basewiki/ikiwiki/pagespec
+%%PO4A%%@dirrm %%DATADIR%%/locale/de/basewiki/ikiwiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/de/basewiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/de
+%%PO4A%%@dirrm %%DATADIR%%/locale/da/smiley
+%%PO4A%%@dirrm %%DATADIR%%/locale/da/directives/ikiwiki/directive
+%%PO4A%%@dirrm %%DATADIR%%/locale/da/directives/ikiwiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/da/directives
+%%PO4A%%@dirrm %%DATADIR%%/locale/da/basewiki/templates
+%%PO4A%%@dirrm %%DATADIR%%/locale/da/basewiki/ikiwiki/subpage
+%%PO4A%%@dirrm %%DATADIR%%/locale/da/basewiki/ikiwiki/pagespec
+%%PO4A%%@dirrm %%DATADIR%%/locale/da/basewiki/ikiwiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/da/basewiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/da
+%%PO4A%%@dirrm %%DATADIR%%/locale/cs/basewiki/ikiwiki/subpage
+%%PO4A%%@dirrm %%DATADIR%%/locale/cs/basewiki/ikiwiki/pagespec
+%%PO4A%%@dirrm %%DATADIR%%/locale/cs/basewiki/ikiwiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/cs/basewiki
+%%PO4A%%@dirrm %%DATADIR%%/locale/cs
+%%PO4A%%@dirrm %%DATADIR%%/locale
+@dirrm %%DATADIR%%/jquery/ikiwiki
+@dirrm %%DATADIR%%/jquery
+@dirrm %%DATADIR%%/javascript/ikiwiki
+@dirrm %%DATADIR%%/javascript
+@dirrm %%DATADIR%%/directives/ikiwiki/directive
+@dirrm %%DATADIR%%/directives/ikiwiki
+@dirrm %%DATADIR%%/directives
+@dirrm %%DATADIR%%/basewiki/wikiicons
+@dirrm %%DATADIR%%/basewiki/templates
+@dirrm %%DATADIR%%/basewiki/ikiwiki/subpage
+@dirrm %%DATADIR%%/basewiki/ikiwiki/pagespec
+@dirrm %%DATADIR%%/basewiki/ikiwiki
+@dirrm %%DATADIR%%/basewiki
+@dirrm %%DATADIR%%/attachment/ikiwiki/images
+@dirrm %%DATADIR%%/attachment/ikiwiki
+@dirrm %%DATADIR%%/attachment
 @dirrm %%DATADIR%%
-@dirrm %%SITE_PERL%%/IkiWiki/Plugin
-@dirrm %%SITE_PERL%%/IkiWiki/Setup
-@dirrm %%SITE_PERL%%/IkiWiki
 %%W3M%%@dirrmtry libexec/w3m/cgi-bin
 %%W3M%%@dirrmtry libexec/w3m
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki
+@dirrm %%SITE_PERL%%/IkiWiki/Setup
+@dirrm %%SITE_PERL%%/IkiWiki/Plugin
+@dirrm %%SITE_PERL%%/IkiWiki
+@dirrmtry lib/ikiwiki/plugins
+@dirrmtry lib/ikiwiki
+@dirrmtry %%ETCDIR%%