From brix@lothlorien.brixandersen.dk  Mon Jul 30 17:54:32 2007
Return-Path: <brix@lothlorien.brixandersen.dk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 70EEF16A41B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 30 Jul 2007 17:54:32 +0000 (UTC)
	(envelope-from brix@lothlorien.brixandersen.dk)
Received: from solow.pil.dk (relay.pil.dk [195.41.47.164])
	by mx1.freebsd.org (Postfix) with ESMTP id 3F2CC13C48A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 30 Jul 2007 17:54:32 +0000 (UTC)
	(envelope-from brix@lothlorien.brixandersen.dk)
Received: from lothlorien.brixandersen.dk (osgiliath.brixandersen.dk [87.53.223.189])
	by solow.pil.dk (Postfix) with ESMTP id 76D331CC0C9
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 30 Jul 2007 19:54:31 +0200 (CEST)
Received: by lothlorien.brixandersen.dk (Postfix, from userid 1001)
	id 2036811425; Mon, 30 Jul 2007 19:54:31 +0200 (CEST)
Message-Id: <20070730175431.2036811425@lothlorien.brixandersen.dk>
Date: Mon, 30 Jul 2007 19:54:31 +0200 (CEST)
From: Henrik Brix Andersen <henrik@brixandersen.dk>
Reply-To: Henrik Brix Andersen <henrik@brixandersen.dk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] Update www/ikiwiki to v2.5
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         115056
>Category:       ports
>Synopsis:       [patch] Update www/ikiwiki to v2.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 30 18:00:09 GMT 2007
>Closed-Date:    Thu Aug 02 20:12:09 GMT 2007
>Last-Modified:  Thu Aug  2 20:20:01 GMT 2007
>Originator:     Henrik Brix Andersen
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
pil.dk
>Environment:
System: FreeBSD lothlorien.brixandersen.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #59: Sun Jul 29 13:32:00 CEST 2007 root@lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386


	
>Description:
Update www/ikiwiki to v2.5.

The graphviz.pm patch is already included upstream and will be part of
the next official release.
	
>How-To-Repeat:
	
>Fix:

	

--- ikiwiki.patch begins here ---
diff -urpN /usr/ports/www/ikiwiki/Makefile www/ikiwiki/Makefile
--- /usr/ports/www/ikiwiki/Makefile	2007-06-09 00:19:01.000000000 +0200
+++ www/ikiwiki/Makefile	2007-07-27 11:20:29.000000000 +0200
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/www/ikiwiki/Makefile,v 1.4 2007/06/08 22:19:01 miwi Exp $
 
 PORTNAME=	ikiwiki
-PORTVERSION=	2.1
+PORTVERSION=	2.5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff -urpN /usr/ports/www/ikiwiki/distinfo www/ikiwiki/distinfo
--- /usr/ports/www/ikiwiki/distinfo	2007-06-09 00:19:01.000000000 +0200
+++ www/ikiwiki/distinfo	2007-07-27 11:22:31.000000000 +0200
@@ -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 -urpN /usr/ports/www/ikiwiki/files/patch-graphviz.pm www/ikiwiki/files/patch-graphviz.pm
--- /usr/ports/www/ikiwiki/files/patch-graphviz.pm	1970-01-01 01:00:00.000000000 +0100
+++ www/ikiwiki/files/patch-graphviz.pm	2007-07-27 11:37:10.000000000 +0200
@@ -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 -urpN /usr/ports/www/ikiwiki/pkg-plist www/ikiwiki/pkg-plist
--- /usr/ports/www/ikiwiki/pkg-plist	2007-04-29 23:10:08.000000000 +0200
+++ www/ikiwiki/pkg-plist	2007-07-27 11:25:33.000000000 +0200
@@ -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
--- ikiwiki.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Jul 30 19:54:09 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115056 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Aug 2 20:12:07 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115056 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115056: commit references a PR
Date: Thu,  2 Aug 2007 20:12:00 +0000 (UTC)

 miwi        2007-08-02 20:11:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/ikiwiki          Makefile distinfo pkg-plist 
   Added files:
     www/ikiwiki/files    patch-graphviz.pm 
   Log:
   - Update to 2.5
   
   PR:             115056
   Submitted by:   Henrik Brix Andersen <henrik@brixandersen.dk> (maintainer)
   
   Revision  Changes    Path
   1.5       +2 -1      ports/www/ikiwiki/Makefile
   1.5       +3 -3      ports/www/ikiwiki/distinfo
   1.1       +16 -0     ports/www/ikiwiki/files/patch-graphviz.pm (new)
   1.3       +1 -0      ports/www/ikiwiki/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
