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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/80c24ff25a20
branches:  trunk
changeset: 566967:80c24ff25a20
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Nov 02 04:23:37 2009 +0000

description:
Update to 3.20091031. From the changelog:

   * po: Fix breakage caused by changes to render code.
   * mdwn: Avoid trying to use multimarkdown if it is not installed.
   * moderatedcomments: New plugin to allow comment moderation w/o relying
     on blogspam.net.
   * When redirecting to a page, ie, after editing, ensure that the
     url is uri-encoded. Most browsers other than MSIE don't care, but it's
     the right thing to do.
   * Add a spec file to allow building rpm from the source package.
   * google: Pass the whole wiki url to google, not just the domain,
     so that search works correctly for wikis that are located in
     subdirectories of domains.

diffstat:

 www/ikiwiki/MESSAGE          |   3 +--
 www/ikiwiki/Makefile         |   4 ++--
 www/ikiwiki/distinfo         |  10 +++++-----
 www/ikiwiki/patches/patch-aa |  21 +++++++++++++++------
 4 files changed, 23 insertions(+), 15 deletions(-)

diffs (103 lines):

diff -r eb40eb5f1e45 -r 80c24ff25a20 www/ikiwiki/MESSAGE
--- a/www/ikiwiki/MESSAGE       Mon Nov 02 04:19:26 2009 +0000
+++ b/www/ikiwiki/MESSAGE       Mon Nov 02 04:23:37 2009 +0000
@@ -1,10 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2009/10/18 04:43:16 schmonz Exp $
+$NetBSD: MESSAGE,v 1.6 2009/11/02 04:23:37 schmonz Exp $
 
 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
diff -r eb40eb5f1e45 -r 80c24ff25a20 www/ikiwiki/Makefile
--- a/www/ikiwiki/Makefile      Mon Nov 02 04:19:26 2009 +0000
+++ b/www/ikiwiki/Makefile      Mon Nov 02 04:23:37 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2009/10/24 15:51:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.38 2009/11/02 04:23:37 schmonz Exp $
 #
 
-DISTNAME=      ikiwiki_3.20091023
+DISTNAME=      ikiwiki_3.20091031
 PKGNAME=       ${DISTNAME:S/_/-/}
 CATEGORIES=    www textproc
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
diff -r eb40eb5f1e45 -r 80c24ff25a20 www/ikiwiki/distinfo
--- a/www/ikiwiki/distinfo      Mon Nov 02 04:19:26 2009 +0000
+++ b/www/ikiwiki/distinfo      Mon Nov 02 04:23:37 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2009/10/24 15:51:16 schmonz Exp $
+$NetBSD: distinfo,v 1.25 2009/11/02 04:23:37 schmonz Exp $
 
-SHA1 (ikiwiki_3.20091023.tar.gz) = b97e2b1c3ec776d3f47189bf630a0745a56d3508
-RMD160 (ikiwiki_3.20091023.tar.gz) = bdba28770a95af4cb72e49b6d435ee43eff6b03a
-Size (ikiwiki_3.20091023.tar.gz) = 1486940 bytes
-SHA1 (patch-aa) = 16937124fbe7f4186dea5101ef9a1559a7712071
+SHA1 (ikiwiki_3.20091031.tar.gz) = a9cc49432087991e3336c3f2a2981f5ac78fb79a
+RMD160 (ikiwiki_3.20091031.tar.gz) = 4c3467118fc5e18dfbe202e170d0c5f166f12a0f
+Size (ikiwiki_3.20091031.tar.gz) = 1491046 bytes
+SHA1 (patch-aa) = 49a2baa2a832e94bf29a18d79d640ee262d38edb
 SHA1 (patch-ab) = bbec6e7a4e6772d995a0b084a3875b83950eb194
 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
 SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f
diff -r eb40eb5f1e45 -r 80c24ff25a20 www/ikiwiki/patches/patch-aa
--- a/www/ikiwiki/patches/patch-aa      Mon Nov 02 04:19:26 2009 +0000
+++ b/www/ikiwiki/patches/patch-aa      Mon Nov 02 04:23:37 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2009/10/18 04:43:16 schmonz Exp $
+$NetBSD: patch-aa,v 1.13 2009/11/02 04:23:37 schmonz Exp $
 
---- Makefile.PL.orig   2009-10-14 13:24:13.000000000 -0400
+--- Makefile.PL.orig   2009-10-29 11:36:03.000000000 -0400
 +++ Makefile.PL
 @@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\
  
@@ -11,7 +11,16 @@
  
  tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
  extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
-@@ -58,7 +60,7 @@ underlay_install:
+@@ -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:
        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 \
@@ -20,7 +29,7 @@
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                done; \
        done
-@@ -77,7 +79,7 @@ extra_install: underlay_install
+@@ -78,7 +80,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 \
@@ -29,7 +38,7 @@
                install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
        done
  
-@@ -96,15 +98,15 @@ extra_install: underlay_install
+@@ -97,15 +99,15 @@ extra_install: underlay_install
                install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done
  
@@ -53,7 +62,7 @@
        
        install -d $(DESTDIR)$(PREFIX)/sbin
        install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
-@@ -120,10 +122,10 @@ extra_install: underlay_install
+@@ -121,10 +123,10 @@ extra_install: underlay_install
        
        # These might fail if a regular user is installing into a home
        # directory.