3 files changed, 28 insertions, 19 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index c77d97ca923a..a4fc8affcc93 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	2.56
+PORTVERSION=	2.60
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL} \
 		http://kitenet.net/~joey/debian/unstable/
@@ -43,7 +43,7 @@ OPTIONS=	SEARCH "Install search backend" On \
 MAN1=		ikiwiki.1 ikiwiki-makerepo.1 ikiwiki-transition.1 ikiwiki-update-wikilist.1
 MAN8=		ikiwiki-mass-rebuild.8
 PORTDOCS=	CHANGELOG NEWS README
-PORTEXAMPLES=	ikiwiki.setup
+PORTEXAMPLES=	ikiwiki.setup wikilist
 
 .include <bsd.port.pre.mk>
 
@@ -65,7 +65,7 @@ post-patch:
 		${WRKSRC}/IkiWiki/Plugin/mdwn.pm
 	@${RM} ${WRKSRC}/IkiWiki/Plugin/mdwn.pm.bak
 	@${REINPLACE_CMD} -e \
-		"s|/etc/ikiwiki/wikilist|${LOCALBASE}/etc/ikiwiki/wikilist|" \
+		"s|/etc/ikiwiki/wikilist|${PREFIX}/etc/ikiwiki/wikilist|" \
 		${WRKSRC}/ikiwiki-mass-rebuild \
 		${WRKSRC}/doc/ikiwiki-mass-rebuild.mdwn \
 		${WRKSRC}/ikiwiki-update-wikilist \
@@ -74,22 +74,29 @@ post-patch:
 		-e 's|$$(PREFIX)/share/man|$$(PREFIX)/man|' \
 		-e 's|$$(PREFIX)/lib/w3m|$$(PREFIX)/libexec/w3m|' \
 		-e 's|-wholename|-path|' \
+		-e 's|cp -a|install -m 755|' \
+		-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|" \
-		${WRKSRC}/doc/ikiwiki.setup
+		"s|/usr/lib/cgi-bin/omega/omega|${LOCALBASE}/www/xapian-omega/cgi-bin/omega|g" \
+		${WRKSRC}/IkiWiki/Plugin/search.pm
+	@${RM} ${WRKSRC}/IkiWiki/Plugin/search.pm.bak
 .ifndef(WITH_W3M)
 	@${REINPLACE_CMD} -e '/w3m/d' ${WRKSRC}/Makefile.PL
 .endif
 
 post-install:
+	${MKDIR} ${PREFIX}/etc/ikiwiki
+	${INSTALL_DATA} ${WRKSRC}/auto.setup ${PREFIX}/etc/ikiwiki
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR}
 .endif
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/doc/@} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${EXAMPLESDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 030040cdfbf7..dc89691e69c9 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (ikiwiki_2.56.tar.gz) = f7487e2cf8f6ace64ee229cf901ccb68
-SHA256 (ikiwiki_2.56.tar.gz) = 1871a9d2332dce239f5a6798080f3e94661449ad5be24c0ad15758fd15828a03
-SIZE (ikiwiki_2.56.tar.gz) = 897974
+MD5 (ikiwiki_2.60.tar.gz) = 94746e28cf66b70cd1a30cbb3f6e973b
+SHA256 (ikiwiki_2.60.tar.gz) = 4ed22793b2fb6ffedf7dc2193d4b8b0681bbc9a0f933b8bca92b5a880f54527d
+SIZE (ikiwiki_2.60.tar.gz) = 922320
diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index ab8edf373d30..bcc94833cc6d 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -29,6 +29,7 @@
 %%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%%/smiley/smileys.mdwn
 %%DATADIR%%/smiley/smileys/alert.png
@@ -91,6 +92,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/attachment.pm
 %%SITE_PERL%%/IkiWiki/Plugin/autoindex.pm
 %%SITE_PERL%%/IkiWiki/Plugin/brokenlinks.pm
+%%SITE_PERL%%/IkiWiki/Plugin/bzr.pm
 %%SITE_PERL%%/IkiWiki/Plugin/calendar.pm
 %%SITE_PERL%%/IkiWiki/Plugin/camelcase.pm
 %%SITE_PERL%%/IkiWiki/Plugin/conditional.pm
@@ -103,6 +105,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/external.pm
 %%SITE_PERL%%/IkiWiki/Plugin/favicon.pm
 %%SITE_PERL%%/IkiWiki/Plugin/fortune.pm
+%%SITE_PERL%%/IkiWiki/Plugin/git.pm
 %%SITE_PERL%%/IkiWiki/Plugin/goodstuff.pm
 %%SITE_PERL%%/IkiWiki/Plugin/googlecalendar.pm
 %%SITE_PERL%%/IkiWiki/Plugin/graphviz.pm
@@ -119,9 +122,12 @@
 %%SITE_PERL%%/IkiWiki/Plugin/lockedit.pm
 %%SITE_PERL%%/IkiWiki/Plugin/map.pm
 %%SITE_PERL%%/IkiWiki/Plugin/mdwn.pm
+%%SITE_PERL%%/IkiWiki/Plugin/mercurial.pm
 %%SITE_PERL%%/IkiWiki/Plugin/meta.pm
 %%SITE_PERL%%/IkiWiki/Plugin/mirrorlist.pm
+%%SITE_PERL%%/IkiWiki/Plugin/monotone.pm
 %%SITE_PERL%%/IkiWiki/Plugin/more.pm
+%%SITE_PERL%%/IkiWiki/Plugin/norcs.pm
 %%SITE_PERL%%/IkiWiki/Plugin/opendiscussion.pm
 %%SITE_PERL%%/IkiWiki/Plugin/openid.pm
 %%SITE_PERL%%/IkiWiki/Plugin/orphans.pm
@@ -149,27 +155,24 @@
 %%SITE_PERL%%/IkiWiki/Plugin/skeleton.pm.example
 %%SITE_PERL%%/IkiWiki/Plugin/smiley.pm
 %%SITE_PERL%%/IkiWiki/Plugin/sparkline.pm
+%%SITE_PERL%%/IkiWiki/Plugin/svn.pm
 %%SITE_PERL%%/IkiWiki/Plugin/table.pm
 %%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/tla.pm
 %%SITE_PERL%%/IkiWiki/Plugin/toc.pm
 %%SITE_PERL%%/IkiWiki/Plugin/toggle.pm
 %%SITE_PERL%%/IkiWiki/Plugin/txt.pm
 %%SITE_PERL%%/IkiWiki/Plugin/typography.pm
 %%SITE_PERL%%/IkiWiki/Plugin/version.pm
+%%SITE_PERL%%/IkiWiki/Plugin/websetup.pm
 %%SITE_PERL%%/IkiWiki/Plugin/wikitext.pm
-%%SITE_PERL%%/IkiWiki/Rcs/Stub.pm
-%%SITE_PERL%%/IkiWiki/Rcs/bzr.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
 %%SITE_PERL%%/IkiWiki/Setup.pm
+%%SITE_PERL%%/IkiWiki/Setup/Automator.pm
 %%SITE_PERL%%/IkiWiki/Setup/Standard.pm
 %%SITE_PERL%%/IkiWiki/UserInfo.pm
 %%SITE_PERL%%/IkiWiki/Wrapper.pm
@@ -177,9 +180,8 @@ bin/ikiwiki
 bin/ikiwiki-makerepo
 bin/ikiwiki-transition
 bin/ikiwiki-update-wikilist
-lib/ikiwiki/plugins/externaldemo
+etc/ikiwiki/auto.setup
 lib/ikiwiki/plugins/proxy.py
-lib/ikiwiki/plugins/pythondemo
 lib/ikiwiki/plugins/rst
 %%W3M%%libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
 sbin/ikiwiki-mass-rebuild
@@ -193,6 +195,7 @@ 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 etc/ikiwiki
 @dirrm lib/ikiwiki/plugins
 @dirrm lib/ikiwiki
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki
@@ -207,7 +210,6 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%
 @dirrm %%SITE_PERL%%/IkiWiki/Plugin
-@dirrm %%SITE_PERL%%/IkiWiki/Rcs
 @dirrm %%SITE_PERL%%/IkiWiki/Setup
 @dirrm %%SITE_PERL%%/IkiWiki
 %%W3M%%@dirrmtry libexec/w3m/cgi-bin