Update IkiWiki to version 2.51.

The IkiWiki search plug-in now uses www/xapian-omega as backend
instead of textproc/hyperestraier. You will need to update the
configuration of any search enabled ikiwiki installations and
rebuild them since the search form has changed.

Approved by:	erwin (mentor, implicit)

3 files changed, 24 insertions, 8 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index a23d57b995bd..ca3daa21aee4 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	2.48
-PORTREVISION=	1
+PORTVERSION=	2.51
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL} \
 		http://kitenet.net/~joey/debian/unstable/
@@ -38,7 +37,8 @@ PERL_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 
-OPTIONS=	W3M "Install w3m CGI wrapper" off
+OPTIONS=	SEARCH "Install search backend" On \
+		W3M "Install w3m CGI wrapper" Off
 
 MAN1=		ikiwiki.1 ikiwiki-makerepo.1 ikiwiki-transition.1 ikiwiki-update-wikilist.1
 MAN8=		ikiwiki-mass-rebuild.8
@@ -47,6 +47,12 @@ PORTEXAMPLES=	ikiwiki.setup
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_SEARCH)
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+		${SITE_PERL}/${PERL_ARCH}/Search/Xapian.pm:${PORTSDIR}/databases/p5-Search-Xapian \
+		${LOCALBASE}/www/xapian-omega/cgi-bin/omega:${PORTSDIR}/www/xapian-omega
+.endif
+
 .if defined(WITH_W3M)
 PLIST_SUB=	W3M=""
 .else
@@ -54,10 +60,12 @@ PLIST_SUB=	W3M="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \
+	@${REINPLACE_CMD} -e \
+		"s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \
 		${WRKSRC}/IkiWiki/Plugin/mdwn.pm
 	@${RM} ${WRKSRC}/IkiWiki/Plugin/mdwn.pm.bak
-	@${REINPLACE_CMD} -e "s|/etc/ikiwiki/wikilist|${LOCALBASE}/etc/ikiwiki/wikilist|" \
+	@${REINPLACE_CMD} -e \
+		"s|/etc/ikiwiki/wikilist|${LOCALBASE}/etc/ikiwiki/wikilist|" \
 		${WRKSRC}/ikiwiki-mass-rebuild \
 		${WRKSRC}/doc/ikiwiki-mass-rebuild.mdwn \
 		${WRKSRC}/ikiwiki-update-wikilist \
@@ -67,6 +75,9 @@ post-patch:
 		-e 's|$$(PREFIX)/lib/w3m|$$(PREFIX)/libexec/w3m|' \
 		-e 's|-wholename|-path|' \
 		${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -e \
+		"s|/usr/lib/cgi-bin/omega/omega|${LOCALBASE}/www/xapian-omega/cgi-bin/omega|" \
+		${WRKSRC}/doc/ikiwiki.setup
 .ifndef(WITH_W3M)
 	@${REINPLACE_CMD} -e '/w3m/d' ${WRKSRC}/Makefile.PL
 .endif
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 333e61ebd5f0..83c2eaa7a5ce 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (ikiwiki_2.48.tar.gz) = 6b293f6e8a08578533d0268b25dae5b3
-SHA256 (ikiwiki_2.48.tar.gz) = 5c728a3d175f28e80fde4049c1f93b6805f79f5caaa00cb6a2279f2723bef778
-SIZE (ikiwiki_2.48.tar.gz) = 729477
+MD5 (ikiwiki_2.51.tar.gz) = 4423258ab049d5441225027704fd2d1a
+SHA256 (ikiwiki_2.51.tar.gz) = 503002f5b6d918b3e05216bb9a664f7c17bc7ece3e52b9874ae5f6bc79562fd7
+SIZE (ikiwiki_2.51.tar.gz) = 754178
diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index 237104aba8e1..8ec9c8a4f184 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -9,6 +9,7 @@
 %%DATADIR%%/basewiki/ikiwiki/openid.mdwn
 %%DATADIR%%/basewiki/ikiwiki/pagespec.mdwn
 %%DATADIR%%/basewiki/ikiwiki/preprocessordirective.mdwn
+%%DATADIR%%/basewiki/ikiwiki/searching.mdwn
 %%DATADIR%%/basewiki/ikiwiki/subpage.mdwn
 %%DATADIR%%/basewiki/ikiwiki/subpage/linkingrules.mdwn
 %%DATADIR%%/basewiki/ikiwiki/wikilink.mdwn
@@ -73,6 +74,7 @@
 %%DATADIR%%/templates/rssitem.tmpl
 %%DATADIR%%/templates/rsspage.tmpl
 %%DATADIR%%/templates/searchform.tmpl
+%%DATADIR%%/templates/searchquery.tmpl
 %%DATADIR%%/templates/titlepage.tmpl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki/.packlist
 %%SITE_PERL%%/IkiWiki.pm
@@ -84,6 +86,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/calendar.pm
 %%SITE_PERL%%/IkiWiki/Plugin/camelcase.pm
 %%SITE_PERL%%/IkiWiki/Plugin/conditional.pm
+%%SITE_PERL%%/IkiWiki/Plugin/creole.pm
 %%SITE_PERL%%/IkiWiki/Plugin/ddate.pm
 %%SITE_PERL%%/IkiWiki/Plugin/editdiff.pm
 %%SITE_PERL%%/IkiWiki/Plugin/edittemplate.pm
@@ -95,6 +98,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/googlecalendar.pm
 %%SITE_PERL%%/IkiWiki/Plugin/graphviz.pm
 %%SITE_PERL%%/IkiWiki/Plugin/haiku.pm
+%%SITE_PERL%%/IkiWiki/Plugin/hnb.pm
 %%SITE_PERL%%/IkiWiki/Plugin/html.pm
 %%SITE_PERL%%/IkiWiki/Plugin/htmlscrubber.pm
 %%SITE_PERL%%/IkiWiki/Plugin/htmltidy.pm
@@ -141,6 +145,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/textile.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/wikitext.pm