3 files changed, 18 insertions, 8 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 602460c2cff8..bf128245b14c 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	2.67
+PORTVERSION=	3.01
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL} \
 		http://kitenet.net/~joey/debian/unstable/
@@ -54,6 +54,7 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-D
 .endif
 
 .if defined(WITH_W3M)
+MAKE_ENV+=	W3M_CGI_BIN=${PREFIX}/libexec/w3m/cgi-bin
 PLIST_SUB=	W3M=""
 .else
 PLIST_SUB=	W3M="@comment "
@@ -72,7 +73,6 @@ post-patch:
 		${WRKSRC}/doc/ikiwiki-update-wikilist.mdwn
 	@${REINPLACE_CMD} \
 		-e 's|$$(PREFIX)/share/man|$$(PREFIX)/man|' \
-		-e 's|$$(PREFIX)/lib/w3m|$$(PREFIX)/libexec/w3m|' \
 		-e 's|-wholename|-path|' \
 		-e 's|\(-install -d $$(DESTDIR)/etc/ikiwiki\)|#\1|' \
 		-e 's|\(-install -m 0644 wikilist\)|#\1|' \
@@ -83,7 +83,7 @@ post-patch:
 		${WRKSRC}/IkiWiki/Plugin/search.pm
 	@${RM} ${WRKSRC}/IkiWiki/Plugin/search.pm.bak
 .ifndef(WITH_W3M)
-	@${REINPLACE_CMD} -e '/w3m/d' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -e '/w3m/d' -e '/W3M/d' ${WRKSRC}/Makefile.PL
 .endif
 
 post-install:
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 668eaee25d29..7d77b4a84d38 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (ikiwiki_2.67.tar.gz) = 4d1ebcab184f25e275ba93ecd3b0c833
-SHA256 (ikiwiki_2.67.tar.gz) = c6779eeeab1fe65e3b2e6d8b8c31006278470c0c0321869713f56902c94a8450
-SIZE (ikiwiki_2.67.tar.gz) = 1015581
+MD5 (ikiwiki_3.01.tar.gz) = c05ab03698378630436a28b8332093e8
+SHA256 (ikiwiki_3.01.tar.gz) = ee9b2e602fad04a54f3afcaed0e8465003278e7dac9af789f7ca13948a0ea317
+SIZE (ikiwiki_3.01.tar.gz) = 1097352
diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index a2827fb78a81..f1164aa0111b 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -1,4 +1,3 @@
-%%DATADIR%%/basewiki/directive.mdwn
 %%DATADIR%%/basewiki/favicon.ico
 %%DATADIR%%/basewiki/index.mdwn
 %%DATADIR%%/basewiki/ikiwiki.mdwn
@@ -33,6 +32,7 @@
 %%DATADIR%%/directives/ikiwiki/directive/cut.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/cutpaste.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/edittemplate.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/format.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/fortune.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/graph.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/haiku.mdwn
@@ -66,6 +66,9 @@
 %%DATADIR%%/directives/ikiwiki/directive/toggle.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/toggleable.mdwn
 %%DATADIR%%/directives/ikiwiki/directive/version.mdwn
+%%DATADIR%%/javascript/ikiwiki.js
+%%DATADIR%%/javascript/relativedate.js
+%%DATADIR%%/javascript/toggle.js
 %%DATADIR%%/smiley/smileys.mdwn
 %%DATADIR%%/smiley/smileys/alert.png
 %%DATADIR%%/smiley/smileys/angry.png
@@ -101,6 +104,8 @@
 %%DATADIR%%/templates/autoindex.tmpl
 %%DATADIR%%/templates/blogpost.tmpl
 %%DATADIR%%/templates/change.tmpl
+%%DATADIR%%/templates/comment.tmpl
+%%DATADIR%%/templates/editcomment.tmpl
 %%DATADIR%%/templates/editpage.tmpl
 %%DATADIR%%/templates/editconflict.tmpl
 %%DATADIR%%/templates/editcreationconflict.tmpl
@@ -132,6 +137,7 @@
 %%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
@@ -143,15 +149,16 @@
 %%SITE_PERL%%/IkiWiki/Plugin/external.pm
 %%SITE_PERL%%/IkiWiki/Plugin/favicon.pm
 %%SITE_PERL%%/IkiWiki/Plugin/filecheck.pm
+%%SITE_PERL%%/IkiWiki/Plugin/format.pm
 %%SITE_PERL%%/IkiWiki/Plugin/fortune.pm
 %%SITE_PERL%%/IkiWiki/Plugin/git.pm
 %%SITE_PERL%%/IkiWiki/Plugin/goodstuff.pm
 %%SITE_PERL%%/IkiWiki/Plugin/google.pm
-%%SITE_PERL%%/IkiWiki/Plugin/googlecalendar.pm
 %%SITE_PERL%%/IkiWiki/Plugin/graphviz.pm
 %%SITE_PERL%%/IkiWiki/Plugin/haiku.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
@@ -188,6 +195,7 @@
 %%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/search.pm
@@ -212,6 +220,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/version.pm
 %%SITE_PERL%%/IkiWiki/Plugin/websetup.pm
 %%SITE_PERL%%/IkiWiki/Plugin/wikitext.pm
+%%SITE_PERL%%/IkiWiki/Receive.pm
 %%SITE_PERL%%/IkiWiki/Render.pm
 %%SITE_PERL%%/IkiWiki/Setup.pm
 %%SITE_PERL%%/IkiWiki/Setup/Automator.pm
@@ -250,6 +259,7 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo
 @dirrm %%DATADIR%%/directives/ikiwiki/directive
 @dirrm %%DATADIR%%/directives/ikiwiki
 @dirrm %%DATADIR%%/directives
+@dirrm %%DATADIR%%/javascript
 @dirrm %%DATADIR%%/smiley/smileys
 @dirrm %%DATADIR%%/smiley
 @dirrm %%DATADIR%%/templates