ports/115807: [patch] Update www/ikiwiki to v2.6

Sat Aug 25 10:50:01 UTC 2007

>Number:         115807
>Category:       ports
>Synopsis:       [patch] Update www/ikiwiki to v2.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 25 10:50:00 GMT 2007
>Closed-Date:
>Last-Modified:
>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 #65: Thu Aug 23 11:39:20 CEST 2007 root at lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386


	
>Description:
* Update www/ikiwiki to v2.6 (note that the files/patch-graphviz.pm
  file needs to be removed with this upgrade)
* Minor rewording of pkg-descr and pkg-message
	
>How-To-Repeat:
	
>Fix:

--- ikiwiki.patch begins here ---
diff -urp /usr/ports/www/ikiwiki/Makefile www/ikiwiki/Makefile
--- /usr/ports/www/ikiwiki/Makefile	2007-08-02 22:11:55.000000000 +0200
+++ www/ikiwiki/Makefile	2007-08-25 12:03:58.000000000 +0200
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/www/ikiwiki/Makefile,v 1.5 2007/08/02 20:11:55 miwi Exp $
 
 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 -urp /usr/ports/www/ikiwiki/distinfo www/ikiwiki/distinfo
--- /usr/ports/www/ikiwiki/distinfo	2007-08-02 22:11:55.000000000 +0200
+++ www/ikiwiki/distinfo	2007-08-25 12:04:57.000000000 +0200
@@ -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
Only in /usr/ports/www/ikiwiki: files
diff -urp /usr/ports/www/ikiwiki/pkg-descr www/ikiwiki/pkg-descr
--- /usr/ports/www/ikiwiki/pkg-descr	2007-04-23 11:00:59.000000000 +0200
+++ www/ikiwiki/pkg-descr	2007-08-25 12:13:06.000000000 +0200
@@ -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 -urp /usr/ports/www/ikiwiki/pkg-message www/ikiwiki/pkg-message
--- /usr/ports/www/ikiwiki/pkg-message	2007-04-23 11:00:59.000000000 +0200
+++ www/ikiwiki/pkg-message	2007-08-25 12:15:44.000000000 +0200
@@ -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 -urp /usr/ports/www/ikiwiki/pkg-plist www/ikiwiki/pkg-plist
--- /usr/ports/www/ikiwiki/pkg-plist	2007-08-02 22:11:55.000000000 +0200
+++ www/ikiwiki/pkg-plist	2007-08-25 12:23:00.000000000 +0200
@@ -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
+ at dirrm lib/ikiwiki/plugins
+ at dirrm lib/ikiwiki
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki
 @dirrm %%DATADIR%%/basewiki/smileys
 @dirrm %%DATADIR%%/basewiki/subpage
--- ikiwiki.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

