Date: Tue, 23 Jun 2015 14:13:26 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390410 - head/www/ikiwiki Message-ID: <201506231413.t5NEDQat056134@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Jun 23 14:13:25 2015 New Revision: 390410 URL: https://svnweb.freebsd.org/changeset/ports/390410 Log: Update to 3.20150614. Sponsored by: Absolight Modified: head/www/ikiwiki/Makefile head/www/ikiwiki/distinfo head/www/ikiwiki/pkg-plist Modified: head/www/ikiwiki/Makefile ============================================================================== --- head/www/ikiwiki/Makefile Tue Jun 23 14:13:05 2015 (r390409) +++ head/www/ikiwiki/Makefile Tue Jun 23 14:13:25 2015 (r390410) @@ -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:${PORTSDI 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> Modified: head/www/ikiwiki/distinfo ============================================================================== --- head/www/ikiwiki/distinfo Tue Jun 23 14:13:05 2015 (r390409) +++ head/www/ikiwiki/distinfo Tue Jun 23 14:13:25 2015 (r390410) @@ -1,2 +1,2 @@ -SHA256 (ikiwiki_3.20141016.2.tar.gz) = 53ff251cb4726f9b974190a270969c9bdebf96812760b6e28690a127b124227a -SIZE (ikiwiki_3.20141016.2.tar.gz) = 3257633 +SHA256 (ikiwiki_3.20150614.tar.gz) = 42f199e26458e8ca79d2f85d7d190c2dc2e1df70f3ec2c2e0f5729771a2a7a69 +SIZE (ikiwiki_3.20150614.tar.gz) = 3344970 Modified: head/www/ikiwiki/pkg-plist ============================================================================== --- head/www/ikiwiki/pkg-plist Tue Jun 23 14:13:05 2015 (r390409) +++ head/www/ikiwiki/pkg-plist Tue Jun 23 14:13:25 2015 (r390410) @@ -1,10 +1,12 @@ bin/ikiwiki bin/ikiwiki-calendar +bin/ikiwiki-comment bin/ikiwiki-makerepo bin/ikiwiki-transition bin/ikiwiki-update-wikilist @sample %%ETCDIR%%/auto-blog.setup.sample @sample %%ETCDIR%%/auto.setup.sample +@sample %%ETCDIR%%/wikilist.sample lib/ikiwiki/plugins/proxy.py lib/ikiwiki/plugins/rst %%SITE_PERL%%/IkiWiki.pm @@ -32,6 +34,7 @@ lib/ikiwiki/plugins/rst %%SITE_PERL%%/IkiWiki/Plugin/editdiff.pm %%SITE_PERL%%/IkiWiki/Plugin/editpage.pm %%SITE_PERL%%/IkiWiki/Plugin/edittemplate.pm +%%SITE_PERL%%/IkiWiki/Plugin/emailauth.pm %%SITE_PERL%%/IkiWiki/Plugin/embed.pm %%SITE_PERL%%/IkiWiki/Plugin/external.pm %%SITE_PERL%%/IkiWiki/Plugin/favicon.pm @@ -61,6 +64,7 @@ lib/ikiwiki/plugins/rst %%SITE_PERL%%/IkiWiki/Plugin/listdirectives.pm %%SITE_PERL%%/IkiWiki/Plugin/localstyle.pm %%SITE_PERL%%/IkiWiki/Plugin/lockedit.pm +%%SITE_PERL%%/IkiWiki/Plugin/loginselector.pm %%SITE_PERL%%/IkiWiki/Plugin/map.pm %%SITE_PERL%%/IkiWiki/Plugin/mdwn.pm %%SITE_PERL%%/IkiWiki/Plugin/mercurial.pm @@ -137,6 +141,7 @@ lib/ikiwiki/plugins/rst %%SITE_PERL%%/IkiWiki/Wrapper.pm %%W3M%%libexec/w3m/cgi-bin/ikiwiki-w3m.cgi man/man1/ikiwiki-calendar.1.gz +man/man1/ikiwiki-comment.1.gz man/man1/ikiwiki-makerepo.1.gz man/man1/ikiwiki-transition.1.gz man/man1/ikiwiki-update-wikilist.1.gz @@ -187,6 +192,7 @@ sbin/ikiwiki-mass-rebuild %%DATADIR%%/basewiki/templates/note.mdwn %%DATADIR%%/basewiki/templates/popup.mdwn %%DATADIR%%/basewiki/wikiicons/diff.png +%%DATADIR%%/basewiki/wikiicons/email.png %%DATADIR%%/basewiki/wikiicons/openidlogin-bg.gif %%DATADIR%%/basewiki/wikiicons/revert.png %%DATADIR%%/basewiki/wikiicons/search-bg.gif @@ -282,8 +288,6 @@ sbin/ikiwiki-mass-rebuild %%PO4A%%%%DATADIR%%/locale/da/basewiki/sandbox.mdwn %%PO4A%%%%DATADIR%%/locale/da/basewiki/shortcuts.mdwn %%PO4A%%%%DATADIR%%/locale/da/basewiki/templates.mdwn -%%PO4A%%%%DATADIR%%/locale/da/basewiki/templates/note.mdwn -%%PO4A%%%%DATADIR%%/locale/da/basewiki/templates/popup.mdwn %%PO4A%%%%DATADIR%%/locale/da/directives/ikiwiki/directive/aggregate.mdwn %%PO4A%%%%DATADIR%%/locale/da/directives/ikiwiki/directive/brokenlinks.mdwn %%PO4A%%%%DATADIR%%/locale/da/directives/ikiwiki/directive/calendar.mdwn @@ -454,14 +458,12 @@ sbin/ikiwiki-mass-rebuild %%PO4A%%%%DATADIR%%/locale/fr/directives/ikiwiki/directive/toggle.mdwn %%PO4A%%%%DATADIR%%/locale/fr/directives/ikiwiki/directive/version.mdwn %%PO4A%%%%DATADIR%%/locale/fr/smiley/smileys.mdwn -%%DATADIR%%/openid-selector/ikiwiki/openid/aol.png -%%DATADIR%%/openid-selector/ikiwiki/openid/goa-account-flickr.png -%%DATADIR%%/openid-selector/ikiwiki/openid/goa-account-google.png -%%DATADIR%%/openid-selector/ikiwiki/openid/goa-account-yahoo.png -%%DATADIR%%/openid-selector/ikiwiki/openid/livejournal.png -%%DATADIR%%/openid-selector/ikiwiki/openid/openid-jquery.js -%%DATADIR%%/openid-selector/ikiwiki/openid/verisign.png -%%DATADIR%%/openid-selector/ikiwiki/openid/wordpress.png +%%DATADIR%%/login-selector/ikiwiki/login-selector/aol.png +%%DATADIR%%/login-selector/ikiwiki/login-selector/goa-account-flickr.png +%%DATADIR%%/login-selector/ikiwiki/login-selector/goa-account-yahoo.png +%%DATADIR%%/login-selector/ikiwiki/login-selector/login-selector.js +%%DATADIR%%/login-selector/ikiwiki/login-selector/verisign.png +%%DATADIR%%/login-selector/ikiwiki/login-selector/wordpress.png %%DATADIR%%/osm/ikiwiki/images/osm.png %%DATADIR%%/osm/ikiwiki/osm.js %%DATADIR%%/po/cs/basewiki/ikiwiki.cs.po @@ -739,12 +741,13 @@ sbin/ikiwiki-mass-rebuild %%DATADIR%%/templates/editfailedsave.tmpl %%DATADIR%%/templates/editpage.tmpl %%DATADIR%%/templates/editpagegone.tmpl +%%DATADIR%%/templates/emailauth.tmpl %%DATADIR%%/templates/feedlink.tmpl %%DATADIR%%/templates/googleform.tmpl %%DATADIR%%/templates/inlinepage.tmpl +%%DATADIR%%/templates/login-selector.tmpl %%DATADIR%%/templates/microblog.tmpl %%DATADIR%%/templates/notifyemail.tmpl -%%DATADIR%%/templates/openid-selector.tmpl %%DATADIR%%/templates/page.tmpl %%DATADIR%%/templates/passwordmail.tmpl %%DATADIR%%/templates/pocreatepage.tmpl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506231413.t5NEDQat056134>