4 files changed, 15 insertions, 7 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 33365522f255..bc79c1a14b50 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	2.20
+PORTVERSION=	2.30
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -41,6 +41,7 @@ OPTIONS=	W3M "Install w3m CGI wrapper" off
 MAN1=		ikiwiki.1 ikiwiki-makerepo.1 ikiwiki-update-wikilist.1
 MAN8=		ikiwiki-mass-rebuild.8
 PORTDOCS=	CHANGELOG NEWS README
+PORTEXAMPLES=	ikiwiki.setup
 
 .include <bsd.port.pre.mk>
 
@@ -71,6 +72,10 @@ post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR}
 .endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/doc/@} ${EXAMPLESDIR}
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 1dd19b1a8f0c..89f5e0409fae 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (ikiwiki_2.20.tar.gz) = 7d63e033a6fab364f9d9b38ad5a89eea
-SHA256 (ikiwiki_2.20.tar.gz) = d9f6334bd288de57d682e689b7a608260ff73a199ba024f7f882618bd4dcd42c
-SIZE (ikiwiki_2.20.tar.gz) = 625864
+MD5 (ikiwiki_2.30.tar.gz) = ba853a1a7839772158801c62f815c0ed
+SHA256 (ikiwiki_2.30.tar.gz) = 2997a3174ebe5f69a0d8206da1329914bf96b3e5ba3cf774120d9036023d94cc
+SIZE (ikiwiki_2.30.tar.gz) = 640738
diff --git a/www/ikiwiki/pkg-descr b/www/ikiwiki/pkg-descr
index d1347ba3655e..95fe2b35af64 100644
--- a/www/ikiwiki/pkg-descr
+++ b/www/ikiwiki/pkg-descr
@@ -1,8 +1,8 @@
 ikiwiki is a wiki compiler. It converts wiki pages into html pages
 suitable for publishing on a website. Unlike many wikis, ikiwiki does
 not have its own ad-hoc means of storing page history, and instead
-uses a revision control system (currently supported is git, mercurial,
-monotone, tla and subversion).
+uses a revision control system (currently supported is bzr, git,
+mercurial, monotone, subversion and tla).
 
 There are many other features, including support for blogging, as well
 as a large array of plugins.
diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index f8887080e3b4..571dda0c88d3 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -17,6 +17,7 @@
 %%DATADIR%%/basewiki/openid.mdwn
 %%DATADIR%%/basewiki/pagespec.mdwn
 %%DATADIR%%/basewiki/preprocessordirective.mdwn
+%%DATADIR%%/basewiki/recentchanges.mdwn
 %%DATADIR%%/basewiki/sandbox.mdwn
 %%DATADIR%%/basewiki/shortcuts.mdwn
 %%DATADIR%%/basewiki/style.css
@@ -60,12 +61,12 @@
 %%DATADIR%%/templates/atomitem.tmpl
 %%DATADIR%%/templates/atompage.tmpl
 %%DATADIR%%/templates/blogpost.tmpl
+%%DATADIR%%/templates/change.tmpl
 %%DATADIR%%/templates/editpage.tmpl
 %%DATADIR%%/templates/estseek.conf
 %%DATADIR%%/templates/feedlink.tmpl
 %%DATADIR%%/templates/inlinepage.tmpl
 %%DATADIR%%/templates/misc.tmpl
-%%DATADIR%%/templates/notifymail.tmpl
 %%DATADIR%%/templates/page.tmpl
 %%DATADIR%%/templates/passwordmail.tmpl
 %%DATADIR%%/templates/recentchanges.tmpl
@@ -120,6 +121,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/postsparkline.pm
 %%SITE_PERL%%/IkiWiki/Plugin/prettydate.pm
 %%SITE_PERL%%/IkiWiki/Plugin/rawhtml.pm
+%%SITE_PERL%%/IkiWiki/Plugin/recentchanges.pm
 %%SITE_PERL%%/IkiWiki/Plugin/search.pm
 %%SITE_PERL%%/IkiWiki/Plugin/shortcut.pm
 %%SITE_PERL%%/IkiWiki/Plugin/sidebar.pm
@@ -139,6 +141,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/version.pm
 %%SITE_PERL%%/IkiWiki/Plugin/wikitext.pm
 %%SITE_PERL%%/IkiWiki/Rcs/Stub.pm
+%%SITE_PERL%%/IkiWiki/Rcs/bzr.pm
 %%SITE_PERL%%/IkiWiki/Rcs/git.pm
 %%SITE_PERL%%/IkiWiki/Rcs/mercurial.pm
 %%SITE_PERL%%/IkiWiki/Rcs/monotone.pm