3 files changed, 29 insertions, 18 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 680ecd9b0903..320fffe58f2b 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	3.08
-PORTREVISION=	1
+PORTVERSION=	3.1415
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL} \
 		http://kitenet.net/~joey/debian/unstable/
@@ -62,17 +61,16 @@ PLIST_SUB=	W3M="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		"s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \
+	@${REINPLACE_CMD} -i '' \
+		-e "s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \
 		${WRKSRC}/IkiWiki/Plugin/mdwn.pm
-	@${RM} ${WRKSRC}/IkiWiki/Plugin/mdwn.pm.bak
-	@${REINPLACE_CMD} -e \
-		"s|/etc/ikiwiki/wikilist|${PREFIX}/etc/ikiwiki/wikilist|" \
+	@${REINPLACE_CMD} -i '' \
+		-e "s|/etc/ikiwiki/wikilist|${PREFIX}/etc/ikiwiki/wikilist|" \
 		${WRKSRC}/ikiwiki-mass-rebuild \
 		${WRKSRC}/doc/ikiwiki-mass-rebuild.mdwn \
 		${WRKSRC}/ikiwiki-update-wikilist \
 		${WRKSRC}/doc/ikiwiki-update-wikilist.mdwn
-	@${REINPLACE_CMD} \
+	@${REINPLACE_CMD} -i '' \
 		-e 's|$$(PREFIX)/share/man|$$(PREFIX)/man|' \
 		-e 's|-wholename|-path|' \
 		-e 's|\(-install -d $$(DESTDIR)/etc/ikiwiki\)|#\1|' \
@@ -81,15 +79,24 @@ post-patch:
 		-e 's|\(-install -m 0644 auto-blog.setup\)|#\1|' \
 		-e 's|$$(DESTDIR)$$(PREFIX)/share/ikiwiki/examples|${EXAMPLESDIR}|' \
 		${WRKSRC}/Makefile.PL
-	@${REINPLACE_CMD} -e \
-		"s|/usr/lib/cgi-bin/omega/omega|${LOCALBASE}/www/xapian-omega/cgi-bin/omega|g" \
+	@${REINPLACE_CMD} -i '' \
+		-e "s|share/ikiwiki/examples|share/examples/ikiwiki|" \
+		${WRKSRC}/IkiWiki/Setup/Automator.pm
+	@${REINPLACE_CMD} -i '' \
+		-e "s|/usr/lib/cgi-bin/omega/omega|${LOCALBASE}/www/xapian-omega/cgi-bin/omega|g" \
 		${WRKSRC}/IkiWiki/Plugin/search.pm
-	@${RM} ${WRKSRC}/IkiWiki/Plugin/search.pm.bak
+	@${REINPLACE_CMD} -i '' \
+		-e "s|/etc/highlight|${LOCALBASE}/etc/highlight|" \
+		-e "s|/usr/share/highlight|${LOCALBASE}/share/highlight|" \
+		${WRKSRC}/IkiWiki/Plugin/highlight.pm
 .ifndef(WITH_W3M)
-	@${REINPLACE_CMD} -e '/w3m/d' -e '/W3M/d' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -i '' \
+		-e '/w3m/d' \
+		-e '/W3M/d' \
+		 ${WRKSRC}/Makefile.PL
 .endif
 .if defined(NOPORTEXAMPLES)
-	@${REINPLACE_CMD} \
+	@${REINPLACE_CMD} -i '' \
 		-e 's|\(install -d ${EXAMPLESDIR}\)|#\1|' \
 		-e 's|\(cp -aL doc/examples\)|#\1|' \
 		-e 's|\(install -m 644 doc/examples\)|#\1|' \
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 1cb14467ecc5..5355e690eee3 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (ikiwiki_3.08.tar.gz) = 69008333a00d5046be4e08b62c49f13a
-SHA256 (ikiwiki_3.08.tar.gz) = 9db79cc641bd9d7a8e23b3c51bfef4303f4e80f419547114e65d82b73865f826
-SIZE (ikiwiki_3.08.tar.gz) = 1145516
+MD5 (ikiwiki_3.1415.tar.gz) = db35d8f3c526b80648a3d34316d6a5f3
+SHA256 (ikiwiki_3.1415.tar.gz) = 8d40cce4bd24cbc6b2cade36b953805e0f1df669aba93f2ff747902b17a506b1
+SIZE (ikiwiki_3.1415.tar.gz) = 1218824
diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index 3aa08930d865..f495c5908300 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -1,5 +1,4 @@
 %%DATADIR%%/basewiki/favicon.ico
-%%DATADIR%%/basewiki/index.mdwn
 %%DATADIR%%/basewiki/ikiwiki.mdwn
 %%DATADIR%%/basewiki/ikiwiki/blog.mdwn
 %%DATADIR%%/basewiki/ikiwiki/directive.mdwn
@@ -13,6 +12,7 @@
 %%DATADIR%%/basewiki/ikiwiki/subpage.mdwn
 %%DATADIR%%/basewiki/ikiwiki/subpage/linkingrules.mdwn
 %%DATADIR%%/basewiki/ikiwiki/wikilink.mdwn
+%%DATADIR%%/basewiki/index.mdwn
 %%DATADIR%%/basewiki/local.css
 %%DATADIR%%/basewiki/recentchanges.mdwn
 %%DATADIR%%/basewiki/sandbox.mdwn
@@ -28,6 +28,7 @@
 %%DATADIR%%/directives/ikiwiki/directive/brokenlinks.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/calendar.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/color.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/comment.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/copy.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/cut.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/cutpaste.mdwn
@@ -107,14 +108,15 @@
 %%DATADIR%%/templates/comment.tmpl
 %%DATADIR%%/templates/commentmoderation.tmpl
 %%DATADIR%%/templates/editcomment.tmpl
-%%DATADIR%%/templates/editpage.tmpl
 %%DATADIR%%/templates/editconflict.tmpl
 %%DATADIR%%/templates/editcreationconflict.tmpl
 %%DATADIR%%/templates/editfailedsave.tmpl
+%%DATADIR%%/templates/editpage.tmpl
 %%DATADIR%%/templates/editpagegone.tmpl
 %%DATADIR%%/templates/feedlink.tmpl
 %%DATADIR%%/templates/googleform.tmpl
 %%DATADIR%%/templates/inlinepage.tmpl
+%%DATADIR%%/templates/microblog.tmpl
 %%DATADIR%%/templates/misc.tmpl
 %%DATADIR%%/templates/page.tmpl
 %%DATADIR%%/templates/passwordmail.tmpl
@@ -144,6 +146,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/conditional.pm
 %%SITE_PERL%%/IkiWiki/Plugin/creole.pm
 %%SITE_PERL%%/IkiWiki/Plugin/cutpaste.pm
+%%SITE_PERL%%/IkiWiki/Plugin/darcs.pm
 %%SITE_PERL%%/IkiWiki/Plugin/ddate.pm
 %%SITE_PERL%%/IkiWiki/Plugin/editdiff.pm
 %%SITE_PERL%%/IkiWiki/Plugin/editpage.pm
@@ -160,6 +163,7 @@
 %%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