Update to 3.20150614.

Sponsored by:	Absolight

1 files changed, 7 insertions, 42 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 53d1024b59bb..276327a40ca3 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	3.20141016.2
+PORTVERSION=	3.20150614
 CATEGORIES=	www
 MASTER_SITES=	DEBIAN_POOL \
-		http://kitenet.net/~joey/debian/unstable/ \
 		LOCAL/mat/${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -39,6 +38,8 @@ USES=		gettext perl5 gmake cpe
 USE_PERL5=	configure
 
 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
@@ -54,39 +55,27 @@ PO4A_BUILD_DEPENDS=	po4a>=0.39:${PORTSDIR}/textproc/po4a
 SEARCH_RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
 		p5-Search-Xapian>=0:${PORTSDIR}/databases/p5-Search-Xapian \
 		${LOCALBASE}/www/xapian-omega/cgi-bin/omega:${PORTSDIR}/www/xapian-omega
-W3M_MAKE_ENV=	W3M_CGI_BIN=${PREFIX}/libexec/w3m/cgi-bin
 MULTI_RUN_DEPENDS=	p5-Text-MultiMarkdown>=0:${PORTSDIR}/textproc/p5-Text-MultiMarkdown
 
 PORTDOCS=	CHANGELOG NEWS README
 PORTEXAMPLES=	*
 
-.include <bsd.port.options.mk>
-
 post-patch:
-	@${GREP} -rl '^#!/usr/bin/perl' ${WRKSRC} | \
-		${XARGS} ${REINPLACE_CMD} -i '' \
-		-e "s|#!/usr/bin/perl|#!${PERL}|"
 	@${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}/ikiwiki-mass-rebuild \
 		${WRKSRC}/doc/ikiwiki-mass-rebuild.mdwn \
-		${WRKSRC}/ikiwiki-update-wikilist \
 		${WRKSRC}/doc/ikiwiki-update-wikilist.mdwn
 	@${REINPLACE_CMD} -i '' \
 		-e 's|$$(PREFIX)/share/man|$$(PREFIX)/man|' \
-		-e 's|-wholename|-path|' \
-		-e 's|\(-install -d $$(DESTDIR)$$(SYSCONFDIR)\)|#\1|' \
-		-e 's|\(-install -m 0644 wikilist\)|#\1|' \
-		-e 's|\(-install -m 0644 auto.setup\)|#\1|' \
-		-e 's|\(-install -m 0644 auto-blog.setup\)|#\1|' \
-		-e 's|/share/ikiwiki/examples|${EXAMPLESDIR:S/${PREFIX}//}|' \
+		-e 's|share/ikiwiki/examples|${EXAMPLESDIR_REL}|' \
+		-e 's/\.\/pm_filter/$$(PERL) &/' \
 		${WRKSRC}/Makefile.PL
 	@${REINPLACE_CMD} -i '' \
-		-e "s|share/ikiwiki/examples|share/examples/ikiwiki|" \
+		-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" \
@@ -95,37 +84,13 @@ post-patch:
 		-e "s|/etc/highlight|${LOCALBASE}/etc/highlight|" \
 		-e "s|/usr/share/highlight|${LOCALBASE}/share/highlight|" \
 		${WRKSRC}/IkiWiki/Plugin/highlight.pm
-.if ! ${PORT_OPTIONS:MPO4A}
-	@${REINPLACE_CMD} -i '' \
-		-e 's|^\(TRANSLATED_UNDERLAYS=\).*|\1|' \
-		${WRKSRC}/po/Makefile
-.endif
-.if ! ${PORT_OPTIONS:MW3M}
-	@${REINPLACE_CMD} -i '' \
-		-e '/w3m/d' \
-		-e '/W3M/d' \
-		 ${WRKSRC}/Makefile.PL
-.endif
-.if ! ${PORT_OPTIONS:MEXAMPLES}
-	@${REINPLACE_CMD} -i '' \
-		-e 's|\(install -d ${EXAMPLESDIR}\)|#\1|' \
-		-e 's|\(cp -aL doc/examples\)|#\1|' \
-		-e 's|\(install -m 644 doc/examples\)|#\1|' \
-		${WRKSRC}/Makefile.PL
-.endif
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/auto.setup ${STAGEDIR}${ETCDIR}/auto.setup.sample
-	${INSTALL_DATA} ${WRKSRC}/auto-blog.setup ${STAGEDIR}${ETCDIR}/auto-blog.setup.sample
-.if ${PORT_OPTIONS:MDOCS}
+	for i in ${STAGEDIR}${ETCDIR}/*; do ${MV} $$i $$i.sample; done
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/ikiwiki.setup ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/wikilist ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>