diff options
author | schmonz <schmonz> | 2009-11-16 22:51:14 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2009-11-16 22:51:14 +0000 |
commit | 045ed576e485a45d9720c25f360f82c17da46eb3 (patch) | |
tree | 37f28112c1595b6924795a24ff6d0e0e201adcba /www/ikiwiki/patches | |
parent | 387131f7541ed6ebfdee9abd2155d011ed986423 (diff) | |
download | pkgsrc-045ed576e485a45d9720c25f360f82c17da46eb3.tar.gz |
Update to 3.20091113. From the changelog:
* underlay: Fix example values put in setup file to be array references.
* underlay: Avoid crashing if lists of underlays (or template
directories) are not configured.
* Moved the postscan hook to run on the raw html of a page, before
the template is filled out. This improves the search plugin's
indexing, since it will not include navigational elements from
the page template or sidebar.
* localstyle: New plugin, allows overrding the toplevel local.css
with one that is closer to a page.
* httpauth: Add cgiauthurl setting that can be used to do http basic
auth only when ikiwiki needs authentication, rather than for any
access to the cgi/wiki.
* inline: Do not generated feeds for nested inlines.
* inline: Allow direct inclusion of non-page files in raw mode.
* inline: Fix display of all pages when archive=yes or show=0 are used.
Diffstat (limited to 'www/ikiwiki/patches')
-rw-r--r-- | www/ikiwiki/patches/patch-aa | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa index 496f50df609..72245df6467 100644 --- a/www/ikiwiki/patches/patch-aa +++ b/www/ikiwiki/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.13 2009/11/02 04:23:37 schmonz Exp $ +$NetBSD: patch-aa,v 1.14 2009/11/16 22:51:14 schmonz Exp $ ---- Makefile.PL.orig 2009-10-29 11:36:03.000000000 -0400 +--- Makefile.PL.orig 2009-11-13 15:06:57.000000000 -0500 +++ Makefile.PL @@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\ @@ -11,16 +11,7 @@ $NetBSD: patch-aa,v 1.13 2009/11/02 04:23:37 schmonz Exp $ tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi) extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi) -@@ -44,7 +46,7 @@ extra_build: ikiwiki.out ikiwiki.setup d - ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man - ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man - $(MAKE) -C po -- sed -i "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec -+# sed -i "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec - - docwiki: ikiwiki.out - $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh -@@ -59,7 +61,7 @@ underlay_install: +@@ -60,7 +62,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 \ @@ -29,7 +20,7 @@ $NetBSD: patch-aa,v 1.13 2009/11/02 04:23:37 schmonz Exp $ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ done; \ done -@@ -78,7 +80,7 @@ extra_install: underlay_install +@@ -79,7 +81,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 \ @@ -38,7 +29,7 @@ $NetBSD: patch-aa,v 1.13 2009/11/02 04:23:37 schmonz Exp $ install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ done -@@ -97,15 +99,15 @@ extra_install: underlay_install +@@ -98,15 +100,15 @@ extra_install: underlay_install install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ done @@ -62,7 +53,7 @@ $NetBSD: patch-aa,v 1.13 2009/11/02 04:23:37 schmonz Exp $ install -d $(DESTDIR)$(PREFIX)/sbin install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin -@@ -121,10 +123,10 @@ extra_install: underlay_install +@@ -122,10 +124,10 @@ extra_install: underlay_install # These might fail if a regular user is installing into a home # directory. |