Update to 3.20150107. From the changelog: [ Joey Hess ] * Added ikiwiki-comment program. * Add missing build-depends on libcgi-formbuilder-perl, needed for t/relativity.t * openid: Stop suppressing the email field on the Preferences page. * po: If msgmerge falls over on a problem po file, print a warning message, but don't let this problem crash ikiwiki entirely. * Set Debian package maintainer to Simon McVittie as I'm retiring from Debian. [ Simon McVittie ] * calendar: add calendar_autocreate option, with which "ikiwiki --refresh" can mostly supersede the ikiwiki-calendar command. Thanks, Louis Paternault * search: add more classes as a hook for CSS. Thanks, sajolida * core: generate HTML5 by default, but keep avoiding new elements like <section> that require specific browser support unless html5 is set to 1. * Tell mobile browsers to draw our pages in a device-sized viewport, not an 800-1000px viewport designed to emulate a desktop/laptop browser. * Add new responsive_layout option which can be set to 0 if your custom CSS only works in a large viewport. * style.css, actiontabs, blueview, goldtype, monochrome: adjust layout below 600px ("responsive layout") so that horizontal scrolling is not needed on smartphone browsers or other small viewports. * core: new libdirs option alongside libdir. Thanks, Louis Paternault [ Amitai Schlair ] * core: log a debug message before waiting for the lock. Thanks, Mark Jason Dominus * build: in po/Makefile, use the same $(MAKE) as the rest of the build. Thanks, ttw * blogspam: use the 2.0 JSON API (the 1.0 XML-RPC API has been EOL'd). Closes: #774441 pkgsrc changes: Add a not-yet-upstreamed patch to link to the commenter's URL for anonymous-style comments committed directly via the VCS (i.e., imported from another CMS).diff -r1.130 -r1.131 pkgsrc/www/ikiwiki/Makefile
(schmonz)
@@ -1,49 +1,48 @@ | @@ -1,49 +1,48 @@ | |||
1 | # $NetBSD: Makefile,v 1.130 2014/12/04 17:28:43 schmonz Exp $ | 1 | # $NetBSD: Makefile,v 1.131 2015/01/07 16:09:23 schmonz Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= ikiwiki_3.20141016 | 4 | DISTNAME= ikiwiki_3.20150107 | |
5 | PKGNAME= ${DISTNAME:S/_/-/} | 5 | PKGNAME= ${DISTNAME:S/_/-/} | |
6 | PKGREVISION= 1 | |||
7 | CATEGORIES= www textproc | 6 | CATEGORIES= www textproc | |
8 | MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} | 7 | MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} | |
9 | 8 | |||
10 | MAINTAINER= schmonz@NetBSD.org | 9 | MAINTAINER= schmonz@NetBSD.org | |
11 | HOMEPAGE= http://ikiwiki.info/ | 10 | HOMEPAGE= http://ikiwiki.info/ | |
12 | COMMENT= Flexible static site generator with dynamic features | 11 | COMMENT= Flexible static site generator with dynamic features | |
13 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
14 | 13 | |||
15 | # ./pm_filter /usr/pkg 3.20141016 /usr/pkg/lib/perl5/vendor_perl/5.20.0 < ikiwiki.in > ikiwiki.out | 14 | # ./pm_filter /usr/pkg 3.20141016 /usr/pkg/lib/perl5/vendor_perl/5.20.0 < ikiwiki.in > ikiwiki.out | |
16 | # sh: ./pm_filter: not found | 15 | # sh: ./pm_filter: not found | |
17 | MAKE_JOBS_SAFE= no | 16 | MAKE_JOBS_SAFE= no | |
18 | 17 | |||
19 | DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount | 18 | DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount | |
20 | DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI | 19 | DEPENDS+= p5-URI>=1.36:../../www/p5-URI | |
21 | DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser | 20 | DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser | |
22 | DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template | 21 | DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template | |
23 | DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree | 22 | DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree | |
24 | DEPENDS+= p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail | 23 | DEPENDS+= p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail | |
25 | DEPENDS+= p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration | 24 | DEPENDS+= p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration | |
26 | DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate | 25 | DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate | |
27 | DEPENDS+= p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber | 26 | DEPENDS+= p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber | |
27 | DEPENDS+= p5-JSON-[0-9]*:../../converters/p5-JSON | |||
28 | DEPENDS+= p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML | 28 | DEPENDS+= p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML | |
29 | DEPENDS+= p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom | 29 | DEPENDS+= p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom | |
30 | DEPENDS+= p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed | 30 | DEPENDS+= p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed | |
31 | DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple | 31 | DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple | |
32 | DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS | 32 | DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS | |
33 | DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo | 33 | DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo | |
34 | DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext | 34 | DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext | |
35 | DEPENDS+= p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML | 35 | DEPENDS+= p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML | |
36 | #DEPENDS+= po4a-[0-9]*:../../textproc/po4a | |||
37 | 36 | |||
38 | WRKSRC= ${WRKDIR}/${PKGBASE} | 37 | WRKSRC= ${WRKDIR}/${PKGBASE} | |
39 | PERL5_PACKLIST= auto/IkiWiki/.packlist | 38 | PERL5_PACKLIST= auto/IkiWiki/.packlist | |
40 | USE_LANGUAGES= c | 39 | USE_LANGUAGES= c | |
41 | USE_TOOLS+= gmake msgfmt perl:run xgettext | 40 | USE_TOOLS+= gmake msgfmt perl:run xgettext | |
42 | 41 | |||
43 | REPLACE_PERL+= IkiWiki/Plugin/calendar.pm | 42 | REPLACE_PERL+= IkiWiki/Plugin/calendar.pm | |
44 | # find . -type f -print | \ | 43 | # find . -type f -print | \ | |
45 | # perl -ne 'open(F, "<$_"); $l=<F>; print if $l =~ m|^#!/usr/bin/perl|' | 44 | # perl -ne 'open(F, "<$_"); $l=<F>; print if $l =~ m|^#!/usr/bin/perl|' | |
46 | REPLACE_PYTHON+= plugins/proxy.py plugins/pythondemo plugins/rst | 45 | REPLACE_PYTHON+= plugins/proxy.py plugins/pythondemo plugins/rst | |
47 | 46 | |||
48 | BUILD_TARGET= extra_build all | 47 | BUILD_TARGET= extra_build all | |
49 | 48 |
@@ -1,23 +1,25 @@ | @@ -1,23 +1,25 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.41 2014/12/04 17:28:43 schmonz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.42 2015/01/07 16:09:23 schmonz Exp $ | |
2 | bin/ikiwiki | 2 | bin/ikiwiki | |
3 | bin/ikiwiki-calendar | 3 | bin/ikiwiki-calendar | |
4 | bin/ikiwiki-comment | |||
4 | bin/ikiwiki-makerepo | 5 | bin/ikiwiki-makerepo | |
5 | bin/ikiwiki-transition | 6 | bin/ikiwiki-transition | |
6 | bin/ikiwiki-update-wikilist | 7 | bin/ikiwiki-update-wikilist | |
7 | lib/ikiwiki/plugins/proxy.py | 8 | lib/ikiwiki/plugins/proxy.py | |
8 | lib/ikiwiki/plugins/rst | 9 | lib/ikiwiki/plugins/rst | |
9 | ${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi | 10 | ${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi | |
10 | man/man1/ikiwiki-calendar.1 | 11 | man/man1/ikiwiki-calendar.1 | |
12 | man/man1/ikiwiki-comment.1 | |||
11 | man/man1/ikiwiki-makerepo.1 | 13 | man/man1/ikiwiki-makerepo.1 | |
12 | man/man1/ikiwiki-transition.1 | 14 | man/man1/ikiwiki-transition.1 | |
13 | man/man1/ikiwiki-update-wikilist.1 | 15 | man/man1/ikiwiki-update-wikilist.1 | |
14 | man/man1/ikiwiki.1 | 16 | man/man1/ikiwiki.1 | |
15 | man/man8/ikiwiki-mass-rebuild.8 | 17 | man/man8/ikiwiki-mass-rebuild.8 | |
16 | sbin/ikiwiki-mass-rebuild | 18 | sbin/ikiwiki-mass-rebuild | |
17 | ${PLIST.w3m}share/doc/ikiwiki/w3mmode.html | 19 | ${PLIST.w3m}share/doc/ikiwiki/w3mmode.html | |
18 | ${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup | 20 | ${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup | |
19 | share/examples/ikiwiki/auto-blog.setup | 21 | share/examples/ikiwiki/auto-blog.setup | |
20 | share/examples/ikiwiki/auto.setup | 22 | share/examples/ikiwiki/auto.setup | |
21 | share/examples/ikiwiki/wikilist | 23 | share/examples/ikiwiki/wikilist | |
22 | share/ikiwiki/attachment/ikiwiki/images/pbar-ani.gif | 24 | share/ikiwiki/attachment/ikiwiki/images/pbar-ani.gif | |
23 | share/ikiwiki/attachment/ikiwiki/images/ui-bg_flat_0_aaaaaa_40x100.png | 25 | share/ikiwiki/attachment/ikiwiki/images/ui-bg_flat_0_aaaaaa_40x100.png |
@@ -1,5 +1,6 @@ | @@ -1,5 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.103 2014/10/17 11:50:42 schmonz Exp $ | 1 | $NetBSD: distinfo,v 1.104 2015/01/07 16:09:23 schmonz Exp $ | |
2 | 2 | |||
3 | SHA1 (ikiwiki_3.20141016.tar.gz) = 472b3899eb3ca64b5a8d564b0de29f62e1847318 | 3 | SHA1 (ikiwiki_3.20150107.tar.gz) = 9ef9f03c8565c2dda6fb78f26e1ec5349039818c | |
4 | RMD160 (ikiwiki_3.20141016.tar.gz) = db9ebfa5fa61516f089611804d9f15073b2f1b89 | 4 | RMD160 (ikiwiki_3.20150107.tar.gz) = 2ccb7097a4c72944bc073f115975fe541299837f | |
5 | Size (ikiwiki_3.20141016.tar.gz) = 3254923 bytes | 5 | Size (ikiwiki_3.20150107.tar.gz) = 3285794 bytes | |
6 | SHA1 (patch-IkiWiki_Plugin_comments.pm) = fd0dffac8e7f3928e48425e1840e70b8a4d68808 |
$NetBSD: patch-IkiWiki_Plugin_comments.pm,v 1.1 2015/01/07 16:09:23 schmonz Exp $
For anonymous-style comments committed directly via the VCS (i.e.,
imported from another CMS), link to the provided URL if any.
--- IkiWiki/Plugin/comments.pm.orig 2015-01-03 23:25:58.000000000 +0000
+++ IkiWiki/Plugin/comments.pm
@@ -223,22 +223,9 @@ sub preprocess {
$commentauthor = gettext("Anonymous");
}
- $commentstate{$page}{commentuser} = $commentuser;
- $commentstate{$page}{commentopenid} = $commentopenid;
- $commentstate{$page}{commentip} = $commentip;
- $commentstate{$page}{commentauthor} = $commentauthor;
- $commentstate{$page}{commentauthorurl} = $commentauthorurl;
- $commentstate{$page}{commentauthoravatar} = $params{avatar};
- if (! defined $pagestate{$page}{meta}{author}) {
- $pagestate{$page}{meta}{author} = $commentauthor;
- }
- if (! defined $pagestate{$page}{meta}{authorurl}) {
- $pagestate{$page}{meta}{authorurl} = $commentauthorurl;
- }
-
if ($config{comments_allowauthor}) {
if (defined $params{claimedauthor}) {
- $pagestate{$page}{meta}{author} = $params{claimedauthor};
+ $commentauthor = $params{claimedauthor};
}
if (defined $params{url}) {
@@ -250,12 +237,21 @@ sub preprocess {
}
if (safeurl($url)) {
- $pagestate{$page}{meta}{authorurl} = $url;
+ $commentauthorurl = $url;
}
}
}
- else {
+
+ $commentstate{$page}{commentuser} = $commentuser;
+ $commentstate{$page}{commentopenid} = $commentopenid;
+ $commentstate{$page}{commentip} = $commentip;
+ $commentstate{$page}{commentauthor} = $commentauthor;
+ $commentstate{$page}{commentauthorurl} = $commentauthorurl;
+ $commentstate{$page}{commentauthoravatar} = $params{avatar};
+ if (! defined $pagestate{$page}{meta}{author}) {
$pagestate{$page}{meta}{author} = $commentauthor;
+ }
+ if (! defined $pagestate{$page}{meta}{authorurl}) {
$pagestate{$page}{meta}{authorurl} = $commentauthorurl;
}