[pkgsrc/trunk]: pkgsrc/www/ikiwiki Update to 3.1415926. From the changelog:

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1dcbf2d84ad6
branches:  trunk
changeset: 398441:1dcbf2d84ad6
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Aug 30 23:30:08 2009 +0000

description:
Update to 3.1415926. From the changelog:

 * [ Joey Hess ]
   * po: Detect if nowrapi18n can't be passed to po4a, and warn about
     the old version, but continue. Closes: #541205
   * inline: Avoid use of my $_ as it fails with older perls.
     Closes: #541215
   * Add discussionpage configuration setting.
   * Several optimisations, including speedups to orphans and brokenlinks
     calculation.
   * meta, img: Fix bugs in dependency code. (smcv)
   * Allow building ikiwiki on systems w/o po4a --
     building of the translated underlays will be skipped in this case.
   * Add basic styling of po plugin's languages list.
   * inline: Display an error if feedpages is specified and fails to match
     due to a problem such as created_before being told to check against
     a page that does not exist.
   * Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective
     pages from the basewiki.
   * Updated French program translation from Philippe Batailler.
     Closes: #542036
   * po: Fixed to run rcs_add ralative to srcdir.
   * Italian program translation from Luca Bruno.
   * Fix example blog's tags/life to not have a broken PageSpec.
     Closes: #543510
   * Optimize the dependencies list. This also fixes a bug
     that could cause repeated refreshes of the wiki to grow
     increasingly larger dependency lists, and get increasingly
     slower. (smcv)
   * Rebuild wikis on upgrade to this version to fix bloat caused
     by the dependency bug.
   * Further optimisation of dependency handling by adding a special
     case for simple page dependencies. (smcv)
   * htmltidy: Return an error message if tidy fails. Closes: #543722
   * po: Fix name of translated toplevel index page. (intrigeri)
   * po: Fix display of links from a translated page to itself (ntrigeri)
   * Add Czech basewiki translation from Miroslav Kure.
   * po: fix interdiction to create pages of type po (intrigeri)
   * po: po: favor the type of linking page's masterpage on page creation
     (intrigeri)
   * img: Don't generate new verison of image if it is scaled to be
     larger in either dimension.
 * [ Josh Triplett ]
   * teximg: Replace the insufficient blacklist with the built-in security
     mechanisms of TeX. (CVE-2009-2944)

In order to fix a performance bug, all wikis need to be rebuilt on
upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist,
use ikiwiki-mass-rebuild to force a rebuild.

diffstat:

 www/ikiwiki/MESSAGE          |   9 +--
 www/ikiwiki/Makefile         |   4 +-
 www/ikiwiki/PLIST            |  97 ++++++++++++++++++++++++++++++++++++++++++-
 www/ikiwiki/distinfo         |  14 ++----
 www/ikiwiki/patches/patch-aa |  33 +++-----------
 www/ikiwiki/patches/patch-ac |  19 --------
 www/ikiwiki/patches/patch-af |  24 ----------
 www/ikiwiki/patches/patch-ag |  23 ----------
 www/ikiwiki/patches/patch-ah |  18 --------
 9 files changed, 112 insertions(+), 129 deletions(-)

diffs (truncated from 353 to 300 lines):

diff -r 8284b55d93c2 -r 1dcbf2d84ad6 www/ikiwiki/MESSAGE
--- a/www/ikiwiki/MESSAGE       Sun Aug 30 23:00:14 2009 +0000
+++ b/www/ikiwiki/MESSAGE       Sun Aug 30 23:30:08 2009 +0000
@@ -1,12 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2009/06/01 20:24:42 schmonz Exp $
+$NetBSD: MESSAGE,v 1.4 2009/08/30 23:30:08 schmonz Exp $
 
 If you use custom templates, make sure they are correct when
 upgrading.
 
-You may want to run ikiwiki-transition deduplinks my.setup after
-upgrading to this version of ikiwiki. This command will optimise
-your wiki's saved state, removing duplicate information that can
-slow ikiwiki down.
+In order to fix a performance bug, all wikis need to be rebuilt on
+upgrade to 3.1415926. If you listed your wiki in /etc/ikiwiki/wikilist,
+use ikiwiki-mass-rebuild to force a rebuild.
 
 ===========================================================================
diff -r 8284b55d93c2 -r 1dcbf2d84ad6 www/ikiwiki/Makefile
--- a/www/ikiwiki/Makefile      Sun Aug 30 23:00:14 2009 +0000
+++ b/www/ikiwiki/Makefile      Sun Aug 30 23:30:08 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2009/08/12 21:14:35 schmonz Exp $
+# $NetBSD: Makefile,v 1.30 2009/08/30 23:30:08 schmonz Exp $
 #
 
-DISTNAME=      ikiwiki_3.141592
+DISTNAME=      ikiwiki_3.1415926
 PKGNAME=       ${DISTNAME:S/_/-/}
 CATEGORIES=    www textproc
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
diff -r 8284b55d93c2 -r 1dcbf2d84ad6 www/ikiwiki/PLIST
--- a/www/ikiwiki/PLIST Sun Aug 30 23:00:14 2009 +0000
+++ b/www/ikiwiki/PLIST Sun Aug 30 23:30:08 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/08/12 21:14:35 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/08/30 23:30:08 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-makerepo
 bin/ikiwiki-transition
@@ -19,7 +19,6 @@
 share/examples/ikiwiki/wikilist
 share/ikiwiki/basewiki/favicon.ico
 share/ikiwiki/basewiki/ikiwiki.mdwn
-share/ikiwiki/basewiki/ikiwiki/blog.mdwn
 share/ikiwiki/basewiki/ikiwiki/directive.mdwn
 share/ikiwiki/basewiki/ikiwiki/formatting.mdwn
 share/ikiwiki/basewiki/ikiwiki/markdown.mdwn
@@ -27,7 +26,6 @@
 share/ikiwiki/basewiki/ikiwiki/pagespec.mdwn
 share/ikiwiki/basewiki/ikiwiki/pagespec/attachment.mdwn
 share/ikiwiki/basewiki/ikiwiki/pagespec/po.mdwn
-share/ikiwiki/basewiki/ikiwiki/preprocessordirective.mdwn
 share/ikiwiki/basewiki/ikiwiki/searching.mdwn
 share/ikiwiki/basewiki/ikiwiki/subpage.mdwn
 share/ikiwiki/basewiki/ikiwiki/subpage/linkingrules.mdwn
@@ -114,6 +112,88 @@
 share/ikiwiki/javascript/ikiwiki.js
 share/ikiwiki/javascript/relativedate.js
 share/ikiwiki/javascript/toggle.js
+share/ikiwiki/po/cs/basewiki/ikiwiki.cs.po
+share/ikiwiki/po/cs/basewiki/ikiwiki/directive.cs.po
+share/ikiwiki/po/cs/basewiki/ikiwiki/formatting.cs.po
+share/ikiwiki/po/cs/basewiki/ikiwiki/markdown.cs.po
+share/ikiwiki/po/cs/basewiki/ikiwiki/openid.cs.po
+share/ikiwiki/po/cs/basewiki/ikiwiki/pagespec.cs.po
+share/ikiwiki/po/cs/basewiki/ikiwiki/pagespec/attachment.cs.po
+share/ikiwiki/po/cs/basewiki/ikiwiki/pagespec/po.cs.po
+share/ikiwiki/po/cs/basewiki/ikiwiki/searching.cs.po
+share/ikiwiki/po/cs/basewiki/ikiwiki/subpage.cs.po
+share/ikiwiki/po/cs/basewiki/ikiwiki/subpage/linkingrules.cs.po
+share/ikiwiki/po/cs/basewiki/ikiwiki/wikilink.cs.po
+share/ikiwiki/po/cs/basewiki/index.cs.po
+share/ikiwiki/po/cs/basewiki/recentchanges.cs.po
+share/ikiwiki/po/cs/basewiki/sandbox.cs.po
+share/ikiwiki/po/cs/basewiki/shortcuts.cs.po
+share/ikiwiki/po/cs/basewiki/templates.cs.po
+share/ikiwiki/po/cs/basewiki/templates/note.cs.po
+share/ikiwiki/po/cs/basewiki/templates/popup.cs.po
+share/ikiwiki/po/da/basewiki/ikiwiki.da.po
+share/ikiwiki/po/da/basewiki/ikiwiki/directive.da.po
+share/ikiwiki/po/da/basewiki/ikiwiki/formatting.da.po
+share/ikiwiki/po/da/basewiki/ikiwiki/markdown.da.po
+share/ikiwiki/po/da/basewiki/ikiwiki/openid.da.po
+share/ikiwiki/po/da/basewiki/ikiwiki/pagespec.da.po
+share/ikiwiki/po/da/basewiki/ikiwiki/pagespec/attachment.da.po
+share/ikiwiki/po/da/basewiki/ikiwiki/pagespec/po.da.po
+share/ikiwiki/po/da/basewiki/ikiwiki/searching.da.po
+share/ikiwiki/po/da/basewiki/ikiwiki/subpage.da.po
+share/ikiwiki/po/da/basewiki/ikiwiki/subpage/linkingrules.da.po
+share/ikiwiki/po/da/basewiki/ikiwiki/wikilink.da.po
+share/ikiwiki/po/da/basewiki/index.da.po
+share/ikiwiki/po/da/basewiki/recentchanges.da.po
+share/ikiwiki/po/da/basewiki/sandbox.da.po
+share/ikiwiki/po/da/basewiki/shortcuts.da.po
+share/ikiwiki/po/da/basewiki/templates.da.po
+share/ikiwiki/po/da/basewiki/templates/note.da.po
+share/ikiwiki/po/da/basewiki/templates/popup.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/aggregate.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/brokenlinks.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/calendar.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/color.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/comment.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/copy.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/cut.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/cutpaste.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/edittemplate.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/format.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/fortune.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/graph.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/haiku.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/if.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/img.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/inline.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/linkmap.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/listdirectives.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/map.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/meta.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/more.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/orphans.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/pagecount.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/pagestats.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/pagetemplate.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/paste.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/ping.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/poll.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/polygen.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/postsparkline.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/progress.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/shortcut.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/sparkline.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/table.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/tag.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/taglink.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/template.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/testpagespec.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/teximg.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/toc.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/toggle.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/toggleable.da.po
+share/ikiwiki/po/da/directives/ikiwiki/directive/version.da.po
+share/ikiwiki/po/da/smiley/smileys.da.po
 share/ikiwiki/smiley/smileys.mdwn
 share/ikiwiki/smiley/smileys/alert.png
 share/ikiwiki/smiley/smileys/angry.png
@@ -172,3 +252,14 @@
 share/ikiwiki/templates/searchform.tmpl
 share/ikiwiki/templates/searchquery.tmpl
 share/ikiwiki/templates/titlepage.tmpl
+share/locale/bg/LC_MESSAGES/ikiwiki.mo
+share/locale/cs/LC_MESSAGES/ikiwiki.mo
+share/locale/da/LC_MESSAGES/ikiwiki.mo
+share/locale/de/LC_MESSAGES/ikiwiki.mo
+share/locale/es/LC_MESSAGES/ikiwiki.mo
+share/locale/fr/LC_MESSAGES/ikiwiki.mo
+share/locale/gu/LC_MESSAGES/ikiwiki.mo
+share/locale/it/LC_MESSAGES/ikiwiki.mo
+share/locale/pl/LC_MESSAGES/ikiwiki.mo
+share/locale/sv/LC_MESSAGES/ikiwiki.mo
+share/locale/vi/LC_MESSAGES/ikiwiki.mo
diff -r 8284b55d93c2 -r 1dcbf2d84ad6 www/ikiwiki/distinfo
--- a/www/ikiwiki/distinfo      Sun Aug 30 23:00:14 2009 +0000
+++ b/www/ikiwiki/distinfo      Sun Aug 30 23:30:08 2009 +0000
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.18 2009/08/12 21:14:35 schmonz Exp $
+$NetBSD: distinfo,v 1.19 2009/08/30 23:30:08 schmonz Exp $
 
-SHA1 (ikiwiki_3.141592.tar.gz) = d71451f867cd8641fae64b7e2db69a2a434e35d1
-RMD160 (ikiwiki_3.141592.tar.gz) = af73196378badae022ac6176cb723d321a16fec1
-Size (ikiwiki_3.141592.tar.gz) = 1330900 bytes
-SHA1 (patch-aa) = 88c864357522f419956cf4efba509467d1670a97
+SHA1 (ikiwiki_3.1415926.tar.gz) = da7eddde774a495b770194492b676985948feacd
+RMD160 (ikiwiki_3.1415926.tar.gz) = 91c688d4b91ace4d4ac1f8fd55ceebf8b06858f7
+Size (ikiwiki_3.1415926.tar.gz) = 1361688 bytes
+SHA1 (patch-aa) = a1c77fbdf31ab25abf354678c73c10fd5897f894
 SHA1 (patch-ab) = bbec6e7a4e6772d995a0b084a3875b83950eb194
-SHA1 (patch-ac) = a9ed34c766b40dbf36069c7d2550fcec95b95304
 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
 SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f
-SHA1 (patch-af) = 48571175d57d24b3053d5477167a3718c6396588
-SHA1 (patch-ag) = b65b9c11ec01d481df4a3942df6b1c1dc34438a7
-SHA1 (patch-ah) = e0e15501e5f13c1667253d837539caad86676c72
diff -r 8284b55d93c2 -r 1dcbf2d84ad6 www/ikiwiki/patches/patch-aa
--- a/www/ikiwiki/patches/patch-aa      Sun Aug 30 23:00:14 2009 +0000
+++ b/www/ikiwiki/patches/patch-aa      Sun Aug 30 23:30:08 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2009/08/12 21:14:35 schmonz Exp $
+$NetBSD: patch-aa,v 1.11 2009/08/30 23:30:08 schmonz Exp $
 
---- Makefile.PL.orig   2009-07-23 09:25:36.000000000 -0400
+--- Makefile.PL.orig   2009-08-30 15:09:22.000000000 -0400
 +++ Makefile.PL
 @@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\
  
@@ -10,23 +10,8 @@
 +MANDIR?=$(PREFIX)/share/man
  
  tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
- extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi)
-@@ -42,7 +44,6 @@ extra_build: ikiwiki.out ikiwiki.setup d
-       ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
-       ./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man
-       ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
--      $(MAKE) -C po
-       
- docwiki: ikiwiki.out
-       $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
-@@ -50,14 +51,13 @@ docwiki: ikiwiki.out
- extra_clean:
-       rm -rf html doc/.ikiwiki
-       rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
--      $(MAKE) -C po clean
- 
- underlay_install:
-       install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
+ extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
+@@ -57,7 +59,7 @@ underlay_install:
        for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \
@@ -35,7 +20,7 @@
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                done; \
        done
-@@ -76,7 +76,7 @@ extra_install: underlay_install
+@@ -76,7 +78,7 @@ extra_install: underlay_install
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
        done
        for file in `cd doc/examples; find . -type f ! -regex '.*\.svn.*'`; do \
@@ -44,7 +29,7 @@
                install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
        done
  
-@@ -95,14 +95,14 @@ extra_install: underlay_install
+@@ -95,14 +97,14 @@ extra_install: underlay_install
                install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done
  
@@ -66,11 +51,7 @@
        
        install -d $(DESTDIR)$(PREFIX)/sbin
        install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
-@@ -114,14 +114,13 @@ extra_install: underlay_install
-       install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
-       install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/
- 
--      $(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
+@@ -118,10 +120,10 @@ extra_install: underlay_install
        
        # These might fail if a regular user is installing into a home
        # directory.
diff -r 8284b55d93c2 -r 1dcbf2d84ad6 www/ikiwiki/patches/patch-ac
--- a/www/ikiwiki/patches/patch-ac      Sun Aug 30 23:00:14 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2009/08/12 21:14:35 schmonz Exp $
-
---- po/Makefile.orig   2009-07-21 10:58:12.000000000 -0400
-+++ po/Makefile
-@@ -63,12 +63,12 @@ underlays_copy_stamp:
-       # copy all the files we want to translate into a srcdir
-       for file in `cd ..; find underlays -follow -name \*.mdwn`; do \
-               install -d $$(dirname $$file); \
--              cp -aL ../$$file $$file 2>/dev/null || \
-+              cp -pRL ../$$file $$file 2>/dev/null || \
-               install -m 644 ../$$file $$file; \
-       done
-       install -d underlays/directives/ikiwiki/directive
-       for file in `cd ..; find doc/ikiwiki/directive/ -maxdepth 1 -type f`; do \
--              cp -a ../$$file underlays/directives/ikiwiki/directive ||  \
-+              cp -pR ../$$file underlays/directives/ikiwiki/directive ||  \
-               install -m 644 ../$$file underlays/directives/ikiwiki/directive; \
-       done
-       install -d underlays/empty
diff -r 8284b55d93c2 -r 1dcbf2d84ad6 www/ikiwiki/patches/patch-af
--- a/www/ikiwiki/patches/patch-af      Sun Aug 30 23:00:14 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.1 2009/08/12 21:14:35 schmonz Exp $
-
---- IkiWiki/Plugin/inline.pm.orig      2009-07-31 10:13:10.000000000 -0400
-+++ IkiWiki/Plugin/inline.pm
-@@ -186,7 +186,6 @@ sub preprocess_inline (@) {
-       my @list;
- 
-       if (exists $params{pagenames}) {
--
-               foreach my $p (qw(sort pages)) {
-                       if (exists $params{$p}) {
-                               error sprintf(gettext("the %s and %s parameters cannot be used together"),
-@@ -194,9 +193,8 @@ sub preprocess_inline (@) {
-                       }
-               }
- 
--              @list = split ' ', $params{pagenames};
--              my $_;
--              @list = map { bestlink($params{page}, $_) } @list;
-+              @list = map { bestlink($params{page}, $_) }