diff options
author | schmonz <schmonz> | 2009-08-12 21:14:34 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2009-08-12 21:14:34 +0000 |
commit | 7bbe5729281140cc34dcc329fc08de3880727a3a (patch) | |
tree | ab3590cbc5cfbd06a4eb009342ed655b50b09b20 /www/ikiwiki/patches | |
parent | a1187ac689b04522b213e8ebdc607f3cee8af4c6 (diff) | |
download | pkgsrc-7bbe5729281140cc34dcc329fc08de3880727a3a.tar.gz |
Update to 3.141592. From the changelog:
* Add new hooks: canremove, canrename, rename. (intrigeri)
* rename: Refactor subpage rename handling code into rename hook.
(intrigeri)
* po: New plugin, suporting translation of wiki pages using po
files. (intrigeri)
* Add build machinery to build po files to translate the underlay wikis,
* Add further build machinery to generate translated underlays from
the po file, for use by wikis whose primary language is not English.
* Add Danish basewiki translation by Jonas Smedegaard.
* img: Fix adding of dependency from page to the image.
* pagestats: add among parameter, which only counts links from
specified pages (smcv)
* pagestats: when making a tag cloud, don't emit links where the
tag is unused (smcv)
* map: Avoid emitting an unclosed ul element if the map is empty.
(harishcm)
* inline: Add pagenames parameter that can be used to list a set
of pages to inline, in a specific order, without using a PageSpec.
(smcv)
* Add getsource plugin (Will, smcv)
Note that the new po plugin won't work until textproc/po4a is updated
to at least 0.34. Any takers?
Diffstat (limited to 'www/ikiwiki/patches')
-rw-r--r-- | www/ikiwiki/patches/patch-aa | 45 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-ac | 19 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-af | 24 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-ag | 23 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-ah | 18 |
5 files changed, 125 insertions, 4 deletions
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa index 95469360973..ff90550c910 100644 --- a/www/ikiwiki/patches/patch-aa +++ b/www/ikiwiki/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2009/07/24 05:09:02 schmonz Exp $ +$NetBSD: patch-aa,v 1.10 2009/08/12 21:14:35 schmonz Exp $ ---- Makefile.PL.orig 2009-05-27 16:32:36.000000000 -0400 +--- Makefile.PL.orig 2009-07-23 09:25:36.000000000 -0400 +++ Makefile.PL @@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\ @@ -11,7 +11,40 @@ $NetBSD: patch-aa,v 1.9 2009/07/24 05:09:02 schmonz Exp $ tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi) extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:Profile"; fi) -@@ -94,14 +96,14 @@ extra_install: +@@ -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 + 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 \ +- cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ ++ cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ + install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ + done; \ + done +@@ -76,7 +76,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 \ +- cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \ ++ cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \ + install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ + done + +@@ -95,14 +95,14 @@ extra_install: underlay_install install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ done @@ -33,7 +66,11 @@ $NetBSD: patch-aa,v 1.9 2009/07/24 05:09:02 schmonz Exp $ install -d $(DESTDIR)$(PREFIX)/sbin install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin -@@ -117,10 +119,10 @@ extra_install: +@@ -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) # These might fail if a regular user is installing into a home # directory. diff --git a/www/ikiwiki/patches/patch-ac b/www/ikiwiki/patches/patch-ac new file mode 100644 index 00000000000..8008e62fb37 --- /dev/null +++ b/www/ikiwiki/patches/patch-ac @@ -0,0 +1,19 @@ +$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 --git a/www/ikiwiki/patches/patch-af b/www/ikiwiki/patches/patch-af new file mode 100644 index 00000000000..194203ce552 --- /dev/null +++ b/www/ikiwiki/patches/patch-af @@ -0,0 +1,24 @@ +$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}, $_) } ++ split ' ', $params{pagenames}; + + $params{pages} = join(" or ", @list); + } diff --git a/www/ikiwiki/patches/patch-ag b/www/ikiwiki/patches/patch-ag new file mode 100644 index 00000000000..bf10e92fc02 --- /dev/null +++ b/www/ikiwiki/patches/patch-ag @@ -0,0 +1,23 @@ +$NetBSD: patch-ag,v 1.1 2009/08/12 21:14:35 schmonz Exp $ + +--- IkiWiki/Render.pm.orig 2009-07-31 10:13:10.000000000 -0400 ++++ IkiWiki/Render.pm +@@ -379,12 +379,13 @@ sub refresh () { + $links{$page}=[]; + $renderedfiles{$page}=[]; + $pagemtime{$page}=0; +- prune($config{destdir}."/".$_) +- foreach @{$oldrenderedfiles{$page}}; ++ foreach my $old (@{$oldrenderedfiles{$page}}) { ++ prune($config{destdir}."/".$old); ++ } + delete $pagesources{$page}; +- foreach (keys %destsources) { +- if ($destsources{$_} eq $page) { +- delete $destsources{$_}; ++ foreach my $source (keys %destsources) { ++ if ($destsources{$source} eq $page) { ++ delete $destsources{$source}; + } + } + } diff --git a/www/ikiwiki/patches/patch-ah b/www/ikiwiki/patches/patch-ah new file mode 100644 index 00000000000..a94b94d20ee --- /dev/null +++ b/www/ikiwiki/patches/patch-ah @@ -0,0 +1,18 @@ +$NetBSD: patch-ah,v 1.1 2009/08/12 21:14:35 schmonz Exp $ + +--- IkiWiki/Plugin/po.pm.orig 2009-08-10 15:59:01.000000000 -0400 ++++ IkiWiki/Plugin/po.pm +@@ -10,7 +10,12 @@ use warnings; + use strict; + use IkiWiki 3.00; + use Encode; +-use Locale::Po4a::Common qw(nowrapi18n !/.*/); ++eval q{use Locale::Po4a::Common qw(nowrapi18n !/.*/)}; ++if ($@) { ++ print STDERR gettext("warning: Old po4a detected! Recommend upgrade to 0.35.")."\n"; ++ eval q{use Locale::Po4a::Common qw(!/.*/)}; ++ die $@ if $@; ++} + use Locale::Po4a::Chooser; + use Locale::Po4a::Po; + use File::Basename; |