- Update to v2.65.

4 files changed, 58 insertions, 33 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index db140859a207..a1b8de450f8f 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	2.61
+PORTVERSION=	2.65
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL} \
 		http://kitenet.net/~joey/debian/unstable/
@@ -74,9 +74,9 @@ post-patch:
 		-e 's|$$(PREFIX)/share/man|$$(PREFIX)/man|' \
 		-e 's|$$(PREFIX)/lib/w3m|$$(PREFIX)/libexec/w3m|' \
 		-e 's|-wholename|-path|' \
-		-e 's|\(install -d $$(DESTDIR)/etc/ikiwiki\)|#\1|' \
-		-e 's|\(install -m 0644 wikilist\)|#\1|' \
-		-e 's|\(install -m 0644 auto.setup\)|#\1|' \
+		-e 's|\(-install -d $$(DESTDIR)/etc/ikiwiki\)|#\1|' \
+		-e 's|\(-install -m 0644 wikilist\)|#\1|' \
+		-e 's|\(-install -m 0644 auto.setup\)|#\1|' \
 		${WRKSRC}/Makefile.PL
 	@${REINPLACE_CMD} -e \
 		"s|/usr/lib/cgi-bin/omega/omega|${LOCALBASE}/www/xapian-omega/cgi-bin/omega|g" \
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 2059d06bbfb2..80a5d8842459 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (ikiwiki_2.61.tar.gz) = 17e76b7f374b6724172deebdaf35d07e
-SHA256 (ikiwiki_2.61.tar.gz) = c48bcd68562ee152e7639e84895304ca48f4771216a046523fd6eef30673abd8
-SIZE (ikiwiki_2.61.tar.gz) = 924879
+MD5 (ikiwiki_2.65.tar.gz) = 60f4118bb9c471fba530c66ad766bde8
+SHA256 (ikiwiki_2.65.tar.gz) = 24acca53907b3335514f3db48c156e0629e5d7d65936f6548c25e26858097f8e
+SIZE (ikiwiki_2.65.tar.gz) = 996289
diff --git a/www/ikiwiki/files/patch-Makefile.PL b/www/ikiwiki/files/patch-Makefile.PL
deleted file mode 100644
index e5df313f20c9..000000000000
--- a/www/ikiwiki/files/patch-Makefile.PL
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.PL.orig	2008-08-16 14:57:00.000000000 +0200
-+++ Makefile.PL	2008-08-16 15:03:45.000000000 +0200
-@@ -67,9 +67,12 @@ extra_install:
- 	done
- 	
- 	install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
--	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* | grep -v demo`; do \
--		cp -a $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
--	done \
-+	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* -name \*.py`; do \
-+		install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
-+	done
-+	for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* ! -name \*demo\* ! -name \*.py`; do \
-+		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
-+	done
- 
- 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
- 	install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index bcc94833cc6d..16804992e587 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -1,9 +1,9 @@
-%%DATADIR%%/basewiki/blog.mdwn
+%%DATADIR%%/basewiki/directive.mdwn
 %%DATADIR%%/basewiki/favicon.ico
-%%DATADIR%%/basewiki/helponformatting.mdwn
 %%DATADIR%%/basewiki/index.mdwn
 %%DATADIR%%/basewiki/ikiwiki.mdwn
 %%DATADIR%%/basewiki/ikiwiki/blog.mdwn
+%%DATADIR%%/basewiki/ikiwiki/directive.mdwn
 %%DATADIR%%/basewiki/ikiwiki/formatting.mdwn
 %%DATADIR%%/basewiki/ikiwiki/markdown.mdwn
 %%DATADIR%%/basewiki/ikiwiki/openid.mdwn
@@ -15,22 +15,57 @@
 %%DATADIR%%/basewiki/ikiwiki/subpage/linkingrules.mdwn
 %%DATADIR%%/basewiki/ikiwiki/wikilink.mdwn
 %%DATADIR%%/basewiki/local.css
-%%DATADIR%%/basewiki/markdown.mdwn
-%%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
-%%DATADIR%%/basewiki/subpage.mdwn
 %%DATADIR%%/basewiki/templates.mdwn
 %%DATADIR%%/basewiki/templates/note.mdwn
 %%DATADIR%%/basewiki/templates/popup.mdwn
 %%DATADIR%%/basewiki/wikiicons/diff.png
 %%DATADIR%%/basewiki/wikiicons/openidlogin-bg.gif
 %%DATADIR%%/basewiki/wikiicons/search-bg.gif
-%%DATADIR%%/basewiki/wikilink.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/aggregate.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/brokenlinks.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/calendar.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/color.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/copy.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/cut.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/cutpaste.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/edittemplate.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/fortune.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/graph.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/haiku.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/if.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/img.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/inline.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/linkmap.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/listdirectives.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/map.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/meta.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/more.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/orphans.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/pagecount.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/pagestats.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/pagetemplate.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/paste.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/ping.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/poll.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/polygen.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/postsparkline.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/progress.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/shortcut.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/sparkline.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/table.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/tag.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/taglink.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/template.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/testpagespec.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/teximg.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/toc.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/toggle.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/toggleable.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/version.mdwn
 %%DATADIR%%/smiley/smileys.mdwn
 %%DATADIR%%/smiley/smileys/alert.png
 %%DATADIR%%/smiley/smileys/angry.png
@@ -95,15 +130,18 @@
 %%SITE_PERL%%/IkiWiki/Plugin/bzr.pm
 %%SITE_PERL%%/IkiWiki/Plugin/calendar.pm
 %%SITE_PERL%%/IkiWiki/Plugin/camelcase.pm
+%%SITE_PERL%%/IkiWiki/Plugin/color.pm
 %%SITE_PERL%%/IkiWiki/Plugin/conditional.pm
 %%SITE_PERL%%/IkiWiki/Plugin/creole.pm
 %%SITE_PERL%%/IkiWiki/Plugin/cutpaste.pm
 %%SITE_PERL%%/IkiWiki/Plugin/ddate.pm
 %%SITE_PERL%%/IkiWiki/Plugin/editdiff.pm
+%%SITE_PERL%%/IkiWiki/Plugin/editpage.pm
 %%SITE_PERL%%/IkiWiki/Plugin/edittemplate.pm
 %%SITE_PERL%%/IkiWiki/Plugin/embed.pm
 %%SITE_PERL%%/IkiWiki/Plugin/external.pm
 %%SITE_PERL%%/IkiWiki/Plugin/favicon.pm
+%%SITE_PERL%%/IkiWiki/Plugin/filecheck.pm
 %%SITE_PERL%%/IkiWiki/Plugin/fortune.pm
 %%SITE_PERL%%/IkiWiki/Plugin/git.pm
 %%SITE_PERL%%/IkiWiki/Plugin/goodstuff.pm
@@ -119,6 +157,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/inline.pm
 %%SITE_PERL%%/IkiWiki/Plugin/link.pm
 %%SITE_PERL%%/IkiWiki/Plugin/linkmap.pm
+%%SITE_PERL%%/IkiWiki/Plugin/listdirectives.pm
 %%SITE_PERL%%/IkiWiki/Plugin/lockedit.pm
 %%SITE_PERL%%/IkiWiki/Plugin/map.pm
 %%SITE_PERL%%/IkiWiki/Plugin/mdwn.pm
@@ -143,6 +182,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/polygen.pm
 %%SITE_PERL%%/IkiWiki/Plugin/postsparkline.pm
 %%SITE_PERL%%/IkiWiki/Plugin/prettydate.pm
+%%SITE_PERL%%/IkiWiki/Plugin/progress.pm
 %%SITE_PERL%%/IkiWiki/Plugin/rawhtml.pm
 %%SITE_PERL%%/IkiWiki/Plugin/recentchanges.pm
 %%SITE_PERL%%/IkiWiki/Plugin/recentchangesdiff.pm
@@ -205,6 +245,9 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo
 @dirrm %%DATADIR%%/basewiki/templates
 @dirrm %%DATADIR%%/basewiki/wikiicons
 @dirrm %%DATADIR%%/basewiki
+@dirrm %%DATADIR%%/directives/ikiwiki/directive
+@dirrm %%DATADIR%%/directives/ikiwiki
+@dirrm %%DATADIR%%/directives
 @dirrm %%DATADIR%%/smiley/smileys
 @dirrm %%DATADIR%%/smiley
 @dirrm %%DATADIR%%/templates