From 4fc0d7bd0b2e07e72fcccb29ad97049c78b740eb Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Thu, 2 Aug 2007 20:11:55 +0000
Subject: - Update to 2.5

PR:		115056
Submitted by:	Henrik Brix Andersen <henrik@brixandersen.dk> (maintainer)
---
 www/ikiwiki/Makefile                |  3 ++-
 www/ikiwiki/distinfo                |  6 +++---
 www/ikiwiki/files/patch-graphviz.pm | 16 ++++++++++++++++
 www/ikiwiki/pkg-plist               |  1 +
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 www/ikiwiki/files/patch-graphviz.pm

(limited to 'www/ikiwiki')

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 5bf5df425a16..5d39ad700d19 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	2.1
+PORTVERSION=	2.5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -51,6 +51,7 @@ 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 3fc442c63895..f8931fd762dc 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (ikiwiki_2.1.tar.gz) = b58413be01c3c1ee557b074b78632d19
-SHA256 (ikiwiki_2.1.tar.gz) = d9944e85d788ba836bcaf7615011d4d2fdb35c1b998cc5878e49d8a81a0d3d92
-SIZE (ikiwiki_2.1.tar.gz) = 432312
+MD5 (ikiwiki_2.5.tar.gz) = c93f8e2fa4d4121b6a18a43637c88cf0
+SHA256 (ikiwiki_2.5.tar.gz) = 78a4f7d72bdaa8ffaa3cd0d1b087c7df64f65270425605afa0c2c06eacf0d2ee
+SIZE (ikiwiki_2.5.tar.gz) = 475905
diff --git a/www/ikiwiki/files/patch-graphviz.pm b/www/ikiwiki/files/patch-graphviz.pm
new file mode 100644
index 000000000000..f19138e23847
--- /dev/null
+++ b/www/ikiwiki/files/patch-graphviz.pm
@@ -0,0 +1,16 @@
+--- 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-plist b/www/ikiwiki/pkg-plist
index 96007f6a385f..c0baac3c54dd 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -99,6 +99,7 @@
 %%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/passwordauth.pm
 %%SITE_PERL%%/IkiWiki/Plugin/poll.pm
 %%SITE_PERL%%/IkiWiki/Plugin/polygen.pm
-- 
cgit v1.2.3