- Update to 2.6.

PR:		ports/115807
Submitted by:	Henrik Brix Andersen <henrik@brixandersen.dk> (maintainer)
Approved by:	stas (mentor)

6 files changed, 18 insertions, 25 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 5d39ad700d19..d7187bba76bd 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	2.5
+PORTVERSION=	2.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -51,7 +51,6 @@ PLIST_SUB=	W3M="@comment "
 .endif
 
 post-patch:
-	@${RM} ${WRKSRC}/IkiWiki/Plugin/graphviz.pm.orig
 	@${REINPLACE_CMD} -e "s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \
 		${WRKSRC}/IkiWiki/Plugin/mdwn.pm
 	@${REINPLACE_CMD} \
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index f8931fd762dc..a00e2ee1f76f 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (ikiwiki_2.5.tar.gz) = c93f8e2fa4d4121b6a18a43637c88cf0
-SHA256 (ikiwiki_2.5.tar.gz) = 78a4f7d72bdaa8ffaa3cd0d1b087c7df64f65270425605afa0c2c06eacf0d2ee
-SIZE (ikiwiki_2.5.tar.gz) = 475905
+MD5 (ikiwiki_2.6.tar.gz) = 3602c512008e43fcb52e739c55aef81a
+SHA256 (ikiwiki_2.6.tar.gz) = 7b0e862248c2e69f6575a37b425e15d213f983c3f6b21d44181339a791619dcf
+SIZE (ikiwiki_2.6.tar.gz) = 520609
diff --git a/www/ikiwiki/files/patch-graphviz.pm b/www/ikiwiki/files/patch-graphviz.pm
deleted file mode 100644
index f19138e23847..000000000000
--- a/www/ikiwiki/files/patch-graphviz.pm
+++ /dev/null
@@ -1,16 +0,0 @@
---- IkiWiki/Plugin/graphviz.pm.orig	2007-07-27 11:35:05.000000000 +0200
-+++ IkiWiki/Plugin/graphviz.pm	2007-07-27 11:36:02.000000000 +0200
-@@ -69,7 +69,12 @@ sub render_graph (\%) { #{{{
- 		}
- 	}
- 
--	return "<img src=\"".urlto($dest, $params{page})."\" />\n";
-+	if ($params{preview}) {
-+		return "<img src=\"".urlto($dest, "")."\" />\n";
-+	}
-+	else {
-+		return "<img src=\"".urlto($dest, $params{page})."\" />\n";
-+	}
- } #}}}
- 
- sub graph (@) { #{{{
diff --git a/www/ikiwiki/pkg-descr b/www/ikiwiki/pkg-descr
index e6114dc4d2be..d1347ba3655e 100644
--- a/www/ikiwiki/pkg-descr
+++ b/www/ikiwiki/pkg-descr
@@ -1,6 +1,10 @@
 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 such as Subversion.
+uses a revision control system (currently supported is git, mercurial,
+monotone, tla and subversion).
+
+There are many other features, including support for blogging, as well
+as a large array of plugins.
 
 WWW: http://ikiwiki.info/
diff --git a/www/ikiwiki/pkg-message b/www/ikiwiki/pkg-message
index 8c4c12893f55..4cd11bddc4e4 100644
--- a/www/ikiwiki/pkg-message
+++ b/www/ikiwiki/pkg-message
@@ -1,10 +1,8 @@
 ===============================================================================
-
 Some of the non-default ikiwiki plug-ins may require additional perl
-modules installed. Please see the following URL for more information:
+modules. Please see the following URL for more information:
 
 http://ikiwiki.info/plugins/
 
 NOTE: Remember to regenerate any ikiwiki wrappers after upgrading.
-
 ===============================================================================
diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index c0baac3c54dd..37951560acbb 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -73,6 +73,9 @@
 %%SITE_PERL%%/IkiWiki/Plugin/camelcase.pm
 %%SITE_PERL%%/IkiWiki/Plugin/conditional.pm
 %%SITE_PERL%%/IkiWiki/Plugin/ddate.pm
+%%SITE_PERL%%/IkiWiki/Plugin/editdiff.pm
+%%SITE_PERL%%/IkiWiki/Plugin/embed.pm
+%%SITE_PERL%%/IkiWiki/Plugin/external.pm
 %%SITE_PERL%%/IkiWiki/Plugin/favicon.pm
 %%SITE_PERL%%/IkiWiki/Plugin/fortune.pm
 %%SITE_PERL%%/IkiWiki/Plugin/goodstuff.pm
@@ -118,6 +121,7 @@
 %%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/toc.pm
 %%SITE_PERL%%/IkiWiki/Plugin/toggle.pm
@@ -126,6 +130,7 @@
 %%SITE_PERL%%/IkiWiki/Rcs/Stub.pm
 %%SITE_PERL%%/IkiWiki/Rcs/git.pm
 %%SITE_PERL%%/IkiWiki/Rcs/mercurial.pm
+%%SITE_PERL%%/IkiWiki/Rcs/monotone.pm
 %%SITE_PERL%%/IkiWiki/Rcs/svn.pm
 %%SITE_PERL%%/IkiWiki/Rcs/tla.pm
 %%SITE_PERL%%/IkiWiki/Render.pm
@@ -134,6 +139,7 @@
 %%SITE_PERL%%/IkiWiki/UserInfo.pm
 %%SITE_PERL%%/IkiWiki/Wrapper.pm
 bin/ikiwiki
+lib/ikiwiki/plugins/externaldemo
 %%W3M%%libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
 sbin/ikiwiki-mass-rebuild
 share/locale/bg/LC_MESSAGES/ikiwiki.mo
@@ -144,6 +150,8 @@ share/locale/gu/LC_MESSAGES/ikiwiki.mo
 share/locale/pl/LC_MESSAGES/ikiwiki.mo
 share/locale/sv/LC_MESSAGES/ikiwiki.mo
 share/locale/vi/LC_MESSAGES/ikiwiki.mo
+@dirrm lib/ikiwiki/plugins
+@dirrm lib/ikiwiki
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki
 @dirrm %%DATADIR%%/basewiki/smileys
 @dirrm %%DATADIR%%/basewiki/subpage