diff options
| -rw-r--r-- | www/ikiwiki/MESSAGE | 12 | ||||
| -rw-r--r-- | www/ikiwiki/Makefile | 4 | ||||
| -rw-r--r-- | www/ikiwiki/PLIST | 11 | ||||
| -rw-r--r-- | www/ikiwiki/distinfo | 10 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-aa | 14 |
5 files changed, 25 insertions, 26 deletions
diff --git a/www/ikiwiki/MESSAGE b/www/ikiwiki/MESSAGE index 2ca9825f98b..6f99118430c 100644 --- a/www/ikiwiki/MESSAGE +++ b/www/ikiwiki/MESSAGE @@ -1,14 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.7 2009/12/02 21:38:43 schmonz Exp $ +$NetBSD: MESSAGE,v 1.8 2010/04/27 13:15:46 schmonz Exp $ For a new wiki, see <URL:http://ikiwiki.info/setup/>. -If you use custom templates, make sure they are correct when -upgrading. - -To take advantage of significant performance improvements, all wikis -need to be rebuilt on upgrade to 3.20091017. If you listed your -wiki in ${PKG_SYSCONFDIR}/wikilist, use ikiwiki-mass-rebuild to force a -rebuild. +If you use custom templates, make sure they are correct when upgrading. +All wikis need to be rebuilt on upgrade to 3.20100427. If you listed your +wiki in ${PKG_SYSCONFDIR}/wikilist, simply run ikiwiki-mass-rebuild. =========================================================================== diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index b7c0b4d4707..a04be1f2104 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2010/04/12 00:29:22 schmonz Exp $ +# $NetBSD: Makefile,v 1.50 2010/04/27 13:15:46 schmonz Exp $ # -DISTNAME= ikiwiki_3.20100403 +DISTNAME= ikiwiki_3.20100427 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index 8f69dde20e3..b1f258920af 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2010/04/04 17:23:29 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.23 2010/04/27 13:15:46 schmonz Exp $ bin/ikiwiki bin/ikiwiki-calendar bin/ikiwiki-makerepo @@ -78,6 +78,7 @@ share/ikiwiki/directives/ikiwiki/directive/polygen.mdwn share/ikiwiki/directives/ikiwiki/directive/postsparkline.mdwn share/ikiwiki/directives/ikiwiki/directive/progress.mdwn share/ikiwiki/directives/ikiwiki/directive/shortcut.mdwn +share/ikiwiki/directives/ikiwiki/directive/sidebar.mdwn share/ikiwiki/directives/ikiwiki/directive/sparkline.mdwn share/ikiwiki/directives/ikiwiki/directive/table.mdwn share/ikiwiki/directives/ikiwiki/directive/tag.mdwn @@ -90,6 +91,7 @@ share/ikiwiki/directives/ikiwiki/directive/toggle.mdwn share/ikiwiki/directives/ikiwiki/directive/toggleable.mdwn share/ikiwiki/directives/ikiwiki/directive/version.mdwn share/ikiwiki/examples/blog.mdwn +share/ikiwiki/examples/blog/archives.mdwn share/ikiwiki/examples/blog/comments.mdwn share/ikiwiki/examples/blog/index.mdwn share/ikiwiki/examples/blog/posts.mdwn @@ -114,9 +116,9 @@ share/ikiwiki/examples/softwaresite/index.mdwn share/ikiwiki/examples/softwaresite/news.mdwn share/ikiwiki/examples/softwaresite/news/version_1.0.mdwn share/ikiwiki/examples/softwaresite/templates/release.mdwn -share/ikiwiki/javascript/ikiwiki.js -share/ikiwiki/javascript/relativedate.js -share/ikiwiki/javascript/toggle.js +share/ikiwiki/javascript/ikiwiki/ikiwiki.js +share/ikiwiki/javascript/ikiwiki/relativedate.js +share/ikiwiki/javascript/ikiwiki/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 @@ -379,6 +381,7 @@ share/ikiwiki/templates/archivepage.tmpl share/ikiwiki/templates/atomitem.tmpl share/ikiwiki/templates/atompage.tmpl share/ikiwiki/templates/autoindex.tmpl +share/ikiwiki/templates/autotag.tmpl share/ikiwiki/templates/blogpost.tmpl share/ikiwiki/templates/calendarmonth.tmpl share/ikiwiki/templates/calendaryear.tmpl diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index eac0bb610bf..2473f16f056 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.35 2010/04/04 17:23:30 schmonz Exp $ +$NetBSD: distinfo,v 1.36 2010/04/27 13:15:46 schmonz Exp $ -SHA1 (ikiwiki_3.20100403.tar.gz) = e3e9102b43f73afd186b1780762c83da45244893 -RMD160 (ikiwiki_3.20100403.tar.gz) = 8e89f568d731f3dc2f33035e54dea74f63dcb73c -Size (ikiwiki_3.20100403.tar.gz) = 1672835 bytes -SHA1 (patch-aa) = 443db0d2b109d26a05ea15a0a75a51000d9ea5e5 +SHA1 (ikiwiki_3.20100427.tar.gz) = afb510cda0fd1e03e6ebf09a77a21ca45f893082 +RMD160 (ikiwiki_3.20100427.tar.gz) = 31690f4df9d6c94dad4c62fd90a3ca018721f9e6 +Size (ikiwiki_3.20100427.tar.gz) = 1725253 bytes +SHA1 (patch-aa) = 12cfd5be1b6e8b66e3e78cdf36e848a10b9642c3 SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa index 16c6d70e2bc..2534b818ace 100644 --- a/www/ikiwiki/patches/patch-aa +++ b/www/ikiwiki/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.16 2010/04/04 17:23:30 schmonz Exp $ +$NetBSD: patch-aa,v 1.17 2010/04/27 13:15:46 schmonz Exp $ ---- Makefile.PL.orig 2010-04-03 18:29:02.000000000 +0000 +--- Makefile.PL.orig 2010-04-25 00:42:59.000000000 +0000 +++ Makefile.PL @@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\ @@ -19,8 +19,8 @@ $NetBSD: patch-aa,v 1.16 2010/04/04 17:23:30 schmonz Exp $ + #sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec rm -f ikiwiki.spec.bkp - docwiki: ikiwiki.out -@@ -62,7 +64,7 @@ underlay_install: + docwiki: +@@ -66,7 +68,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 +29,7 @@ $NetBSD: patch-aa,v 1.16 2010/04/04 17:23:30 schmonz Exp $ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ done; \ done -@@ -81,7 +83,7 @@ extra_install: underlay_install +@@ -85,7 +87,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 +38,7 @@ $NetBSD: patch-aa,v 1.16 2010/04/04 17:23:30 schmonz Exp $ install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ done -@@ -100,15 +102,15 @@ extra_install: underlay_install +@@ -104,15 +106,15 @@ extra_install: underlay_install install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ done @@ -62,7 +62,7 @@ $NetBSD: patch-aa,v 1.16 2010/04/04 17:23:30 schmonz Exp $ install -d $(DESTDIR)$(PREFIX)/sbin install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin -@@ -125,10 +127,10 @@ extra_install: underlay_install +@@ -129,10 +131,10 @@ extra_install: underlay_install # These might fail if a regular user is installing into a home # directory. |