diff options
| author | schmonz <schmonz@pkgsrc.org> | 2011-09-05 22:07:28 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2011-09-05 22:07:28 +0000 |
| commit | 926d31b51bd9115905933add3b38c09c4a9ee688 (patch) | |
| tree | 268e1b4489c77d92cdc4c23fdd8a05fcfa41b85a /www/ikiwiki/patches | |
| parent | 5d109fc10f1f5ba04afbacfb705b0709ba45bcb5 (diff) | |
| download | pkgsrc-926d31b51bd9115905933add3b38c09c4a9ee688.tar.gz | |
Update to 3.20110905. From the changelog:
* mercurial: Openid nicknames are now used when committing. (Daniel Andersson)
* mercurial: Implement rcs_commit_staged so comments, attachments, etc
can be used. (Daniel Andersson)
* mercurial: Implement rcs_rename, rcs_remove. (Daniel Andersson)
* mercurial: Fix viewing of a diff containing non-utf8 changes.
(Daniel Andersson)
* mercurial: Make both rcs_getctime and rcs_getmtime fast. (Daniel Andersson)
* mercurial: Implement rcs_diff. (Daniel Andersson)
* po: Add `LANG_CODE` and `LANG_NAME` template variables. (intrigeri)
* Fix typo in Danish translation of shortcuts page that caused exponential
regexp blowup.
* Fix escaping of html entities in permalinks.
* Fix escaping of html entities in tag names.
* Avoid using named capture groups in heredoc code for oldperl compatibility.
* Put in a workaround for #622591, by ensuring Search::Xapian gets loaded
before Image::Magick.
* Add unminified jquery js and css files to source.
* Update to jquery 1.6.2, and jquery-ui 1.8.14.
* Use lockf rather than flock when taking the cgilock, for better
portability.
* search: Fix encoding bug in calculation of maximum term size.
* inline: When indexing internal pages for searching, use the url of
the inlining page.
* Fix comments testsuite to not rely on Date::Parse's ability to
parse the date Columbus discovered America. Closes: #640350
* Avoid warning message when generating setup file if highlight
is not installed. Closes: #637606
* Promote RPC::XML to a Recommends, since it's used by auto-blog.setup.
Closes: #637603
* Fix web revert of a file deletion.
Diffstat (limited to 'www/ikiwiki/patches')
| -rw-r--r-- | www/ikiwiki/patches/patch-aa | 6 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-ab | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa index 300e7eda128..1660f8abe5d 100644 --- a/www/ikiwiki/patches/patch-aa +++ b/www/ikiwiki/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.22 2011/06/04 15:23:36 schmonz Exp $ +$NetBSD: patch-aa,v 1.23 2011/09/05 22:07:28 schmonz Exp $ PKG_SYSCONFDIR and PKGMANDIR support, avoid GNUisms in standard utilities. ---- Makefile.PL.orig 2011-06-03 16:40:11.000000000 +0000 +--- Makefile.PL.orig 2011-08-24 21:14:48.000000000 +0000 +++ Makefile.PL @@ -19,11 +19,14 @@ SED?=sed @@ -48,7 +48,7 @@ PKG_SYSCONFDIR and PKGMANDIR support, avoid GNUisms in standard utilities. @@ -70,7 +76,7 @@ underlay_install: for dir in `cd underlays && $(FIND) . -follow -type d`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ - for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f`; do \ + for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f -not -name \\*.full.js -not -name \\*.full.css`; 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; \ diff --git a/www/ikiwiki/patches/patch-ab b/www/ikiwiki/patches/patch-ab index e90fdd0a9cc..e79b3421239 100644 --- a/www/ikiwiki/patches/patch-ab +++ b/www/ikiwiki/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2011/06/04 15:23:36 schmonz Exp $ +$NetBSD: patch-ab,v 1.7 2011/09/05 22:07:28 schmonz Exp $ When generating scripts, give them the interpreter we generated them with. ---- IkiWiki/Setup/Standard.pm.orig 2011-05-30 18:25:10.000000000 +0000 +--- IkiWiki/Setup/Standard.pm.orig 2011-07-29 10:59:11.000000000 +0000 +++ IkiWiki/Setup/Standard.pm @@ -14,7 +14,10 @@ sub import { sub gendump ($@) { |