Index: branches/2017Q1/www/ikiwiki/Makefile
===================================================================
--- branches/2017Q1/www/ikiwiki/Makefile	(revision 435444)
+++ branches/2017Q1/www/ikiwiki/Makefile	(revision 435445)
@@ -1,101 +1,101 @@
 # Created by: Henrik Brix Andersen <henrik@brixandersen.dk>
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	3.20161219
+PORTVERSION=	3.20170111
 CATEGORIES=	www
 MASTER_SITES=	DEBIAN_POOL \
 		LOCAL/mat/${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Wiki compiler
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
 		p5-Locale-gettext>=0:devel/p5-Locale-gettext \
 		p5-CGI-FormBuilder>=0:www/p5-CGI-FormBuilder \
 		p5-CGI-Session>=0:www/p5-CGI-Session \
 		p5-TimeDate>=0:devel/p5-TimeDate \
 		p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber \
 		p5-HTML-Template>=0:www/p5-HTML-Template \
 		p5-Mail-Sendmail>=0:mail/p5-Mail-Sendmail \
 		p5-Text-Markdown>=0:textproc/p5-Text-Markdown \
 		p5-URI>=0:net/p5-URI \
 		p5-XML-Simple>=0:textproc/p5-XML-Simple \
 		p5-YAML>=0:textproc/p5-YAML \
 		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		p5-File-MimeInfo>=0:devel/p5-File-MimeInfo \
 		p5-RPC-XML>=0:net/p5-RPC-XML \
 		p5-XML-Feed>=0:textproc/p5-XML-Feed \
 		p5-Authen-Passphrase>=0:security/p5-Authen-Passphrase
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		gettext perl5 gmake cpe
+USES=		gettext perl5 gmake cpe tar:xz
 USE_PERL5=	configure
 NO_ARCH=	yes
 
 CONFIGURE_ARGS=	PERL=${PERL} FULLPERL=${PERL}
 MAKE_ENV=	SYSCONFDIR=${ETCDIR} \
 		W3M_CGI_BIN=${PREFIX}/libexec/w3m/cgi-bin
 
 OPTIONS_DEFINE=	PO4A SEARCH W3M DOCS EXAMPLES MULTI
 OPTIONS_DEFAULT=	PO4A SEARCH MULTI
 OPTIONS_SUB=
 
 PO4A_DESC=	Install translated underlays
 SEARCH_DESC=	Install search backend
 W3M_DESC=	Install w3m CGI wrapper
 MULTI_DESC=	Install Text::MultiMarkdown
 
 PO4A_RUN_DEPENDS=	po4a>=0.39:textproc/po4a
 PO4A_BUILD_DEPENDS=	po4a>=0.39:textproc/po4a
 SEARCH_RUN_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
 		p5-Search-Xapian>=0:databases/p5-Search-Xapian \
 		${LOCALBASE}/www/xapian-omega/cgi-bin/omega:www/xapian-omega
 MULTI_RUN_DEPENDS=	p5-Text-MultiMarkdown>=0:textproc/p5-Text-MultiMarkdown
 
 PORTDOCS=	CHANGELOG NEWS README
 PORTEXAMPLES=	*
 
 post-patch:
 	@${REINPLACE_CMD} -i '' \
 		-e 's|/usr/bin/markdown|${LOCALBASE}/bin/markdown|' \
 		${WRKSRC}/IkiWiki/Plugin/mdwn.pm
 	@${REINPLACE_CMD} -i '' \
 		-e 's|/etc/ikiwiki|${ETCDIR}|' \
 		${WRKSRC}/auto.setup ${WRKSRC}/auto-blog.setup \
 		${WRKSRC}/doc/ikiwiki-mass-rebuild.mdwn \
 		${WRKSRC}/doc/ikiwiki-update-wikilist.mdwn
 	@${REINPLACE_CMD} -i '' \
 		-e 's|$$(PREFIX)/share/man|$$(PREFIX)/man|; \
 		    s|share/ikiwiki/examples|${EXAMPLESDIR_REL}|; \
 		    s|\./pm_filter|$$(PERL) &|' \
 		${WRKSRC}/Makefile.PL
 	@${REINPLACE_CMD} -i '' \
 		-e 's|share/ikiwiki/examples|${EXAMPLESDIR_REL}|' \
 		${WRKSRC}/IkiWiki/Setup/Automator.pm
 	@${REINPLACE_CMD} -i '' \
 		-e 's|/usr/lib/cgi-bin/omega/omega|${LOCALBASE}/www/xapian-omega/cgi-bin/omega|g' \
 		${WRKSRC}/IkiWiki/Plugin/search.pm
 	@${REINPLACE_CMD} -i '' \
 		-e 's|/etc/highlight|${LOCALBASE}/etc/highlight|; \
 		    s|/usr/share/highlight|${LOCALBASE}/share/highlight|' \
 		${WRKSRC}/IkiWiki/Plugin/highlight.pm
 
 post-install:
 	for i in ${STAGEDIR}${ETCDIR}/*; do ${MV} $$i $$i.sample; done
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/ikiwiki.setup ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/wikilist ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: branches/2017Q1/www/ikiwiki/distinfo
===================================================================
--- branches/2017Q1/www/ikiwiki/distinfo	(revision 435444)
+++ branches/2017Q1/www/ikiwiki/distinfo	(revision 435445)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482318366
-SHA256 (ikiwiki_3.20161219.tar.gz) = 00760aef17108816fc25c39ed85333c459bb400caaecf4a364e583a34d1f748b
-SIZE (ikiwiki_3.20161219.tar.gz) = 3471888
+TIMESTAMP = 1485857936
+SHA256 (ikiwiki_3.20170111.tar.xz) = 5f0f99a4f4a5f17046e4601d628424cb2877766b4ef9bfe1c2db1941f6f7a701
+SIZE (ikiwiki_3.20170111.tar.xz) = 2614240
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 435444)
+++ branches/2017Q1	(revision 435445)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r432910