Wed Jan 7 16:09:23 2015 UTC ()
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).


(schmonz)
diff -r1.130 -r1.131 pkgsrc/www/ikiwiki/Makefile
diff -r1.41 -r1.42 pkgsrc/www/ikiwiki/PLIST
diff -r1.103 -r1.104 pkgsrc/www/ikiwiki/distinfo
diff -r0 -r1.1 pkgsrc/www/ikiwiki/patches/patch-IkiWiki_Plugin_comments.pm

cvs diff -r1.130 -r1.131 pkgsrc/www/ikiwiki/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/Makefile 2014/12/04 17:28:43 1.130
+++ pkgsrc/www/ikiwiki/Makefile 2015/01/07 16:09:23 1.131
@@ -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
4DISTNAME= ikiwiki_3.20141016 4DISTNAME= ikiwiki_3.20150107
5PKGNAME= ${DISTNAME:S/_/-/} 5PKGNAME= ${DISTNAME:S/_/-/}
6PKGREVISION= 1 
7CATEGORIES= www textproc 6CATEGORIES= www textproc
8MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} 7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
9 8
10MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= http://ikiwiki.info/ 10HOMEPAGE= http://ikiwiki.info/
12COMMENT= Flexible static site generator with dynamic features 11COMMENT= Flexible static site generator with dynamic features
13LICENSE= gnu-gpl-v2 12LICENSE= 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
17MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
18 17
19DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount 18DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount
20DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI 19DEPENDS+= p5-URI>=1.36:../../www/p5-URI
21DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser 20DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
22DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template 21DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
23DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree 22DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
24DEPENDS+= p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail 23DEPENDS+= p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail
25DEPENDS+= p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration 24DEPENDS+= p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration
26DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate 25DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
27DEPENDS+= p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber 26DEPENDS+= p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
 27DEPENDS+= p5-JSON-[0-9]*:../../converters/p5-JSON
28DEPENDS+= p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML 28DEPENDS+= p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML
29DEPENDS+= p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom 29DEPENDS+= p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom
30DEPENDS+= p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed 30DEPENDS+= p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed
31DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple 31DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple
32DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS 32DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS
33DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo 33DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo
34DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext 34DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext
35DEPENDS+= p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML 35DEPENDS+= p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML
36#DEPENDS+= po4a-[0-9]*:../../textproc/po4a 
37 36
38WRKSRC= ${WRKDIR}/${PKGBASE} 37WRKSRC= ${WRKDIR}/${PKGBASE}
39PERL5_PACKLIST= auto/IkiWiki/.packlist 38PERL5_PACKLIST= auto/IkiWiki/.packlist
40USE_LANGUAGES= c 39USE_LANGUAGES= c
41USE_TOOLS+= gmake msgfmt perl:run xgettext 40USE_TOOLS+= gmake msgfmt perl:run xgettext
42 41
43REPLACE_PERL+= IkiWiki/Plugin/calendar.pm 42REPLACE_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|'
46REPLACE_PYTHON+= plugins/proxy.py plugins/pythondemo plugins/rst 45REPLACE_PYTHON+= plugins/proxy.py plugins/pythondemo plugins/rst
47 46
48BUILD_TARGET= extra_build all 47BUILD_TARGET= extra_build all
49 48

cvs diff -r1.41 -r1.42 pkgsrc/www/ikiwiki/PLIST (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/PLIST 2014/12/04 17:28:43 1.41
+++ pkgsrc/www/ikiwiki/PLIST 2015/01/07 16:09:23 1.42
@@ -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 $
2bin/ikiwiki 2bin/ikiwiki
3bin/ikiwiki-calendar 3bin/ikiwiki-calendar
 4bin/ikiwiki-comment
4bin/ikiwiki-makerepo 5bin/ikiwiki-makerepo
5bin/ikiwiki-transition 6bin/ikiwiki-transition
6bin/ikiwiki-update-wikilist 7bin/ikiwiki-update-wikilist
7lib/ikiwiki/plugins/proxy.py 8lib/ikiwiki/plugins/proxy.py
8lib/ikiwiki/plugins/rst 9lib/ikiwiki/plugins/rst
9${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi 10${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
10man/man1/ikiwiki-calendar.1 11man/man1/ikiwiki-calendar.1
 12man/man1/ikiwiki-comment.1
11man/man1/ikiwiki-makerepo.1 13man/man1/ikiwiki-makerepo.1
12man/man1/ikiwiki-transition.1 14man/man1/ikiwiki-transition.1
13man/man1/ikiwiki-update-wikilist.1 15man/man1/ikiwiki-update-wikilist.1
14man/man1/ikiwiki.1 16man/man1/ikiwiki.1
15man/man8/ikiwiki-mass-rebuild.8 17man/man8/ikiwiki-mass-rebuild.8
16sbin/ikiwiki-mass-rebuild 18sbin/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
19share/examples/ikiwiki/auto-blog.setup 21share/examples/ikiwiki/auto-blog.setup
20share/examples/ikiwiki/auto.setup 22share/examples/ikiwiki/auto.setup
21share/examples/ikiwiki/wikilist 23share/examples/ikiwiki/wikilist
22share/ikiwiki/attachment/ikiwiki/images/pbar-ani.gif 24share/ikiwiki/attachment/ikiwiki/images/pbar-ani.gif
23share/ikiwiki/attachment/ikiwiki/images/ui-bg_flat_0_aaaaaa_40x100.png 25share/ikiwiki/attachment/ikiwiki/images/ui-bg_flat_0_aaaaaa_40x100.png

cvs diff -r1.103 -r1.104 pkgsrc/www/ikiwiki/distinfo (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/distinfo 2014/10/17 11:50:42 1.103
+++ pkgsrc/www/ikiwiki/distinfo 2015/01/07 16:09:23 1.104
@@ -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
3SHA1 (ikiwiki_3.20141016.tar.gz) = 472b3899eb3ca64b5a8d564b0de29f62e1847318 3SHA1 (ikiwiki_3.20150107.tar.gz) = 9ef9f03c8565c2dda6fb78f26e1ec5349039818c
4RMD160 (ikiwiki_3.20141016.tar.gz) = db9ebfa5fa61516f089611804d9f15073b2f1b89 4RMD160 (ikiwiki_3.20150107.tar.gz) = 2ccb7097a4c72944bc073f115975fe541299837f
5Size (ikiwiki_3.20141016.tar.gz) = 3254923 bytes 5Size (ikiwiki_3.20150107.tar.gz) = 3285794 bytes
 6SHA1 (patch-IkiWiki_Plugin_comments.pm) = fd0dffac8e7f3928e48425e1840e70b8a4d68808

File Added: pkgsrc/www/ikiwiki/patches/Attic/patch-IkiWiki_Plugin_comments.pm
$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;
 	}