Wed Mar 23 22:25:06 2011 UTC ()
Update to 3.20110321. From the changelog:

* comment: Don't show comments of subpages on parent pages.
  (Fixes bug introduced in version 3.20100505.)
* darcs: Fix multiple issues preventing rcs_diff from working.
* aggregate: Read cookies from ~/.ikiwiki/cookies by default.
  Also, the cookiejar configuration setting can be used by
  other plugins to provide a custom `cookie_jar` object for LWP::UserAgent.
  (Thanks, schmonz)
* Avoid escaping / characters in filenames when building the cgiurl,
  as this confuses eg, cvsweb.


(schmonz)
diff -r1.74 -r1.75 pkgsrc/www/ikiwiki/Makefile
diff -r1.59 -r1.60 pkgsrc/www/ikiwiki/distinfo
diff -r1.11 -r1.12 pkgsrc/www/ikiwiki/options.mk
diff -r1.20 -r1.21 pkgsrc/www/ikiwiki/patches/patch-aa
diff -r0 -r1.9 pkgsrc/www/ikiwiki/patches/patch-ac
cvs diff -r1.74 -r1.75 pkgsrc/www/ikiwiki/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/Makefile 2011/02/26 03:04:38 1.74
+++ pkgsrc/www/ikiwiki/Makefile 2011/03/23 22:25:05 1.75
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.74 2011/02/26 03:04:38 schmonz Exp $ 1# $NetBSD: Makefile,v 1.75 2011/03/23 22:25:05 schmonz Exp $
2# 2#
3 3
4DISTNAME= ikiwiki_3.20110225 4DISTNAME= ikiwiki_3.20110321
5PKGNAME= ${DISTNAME:S/_/-/} 5PKGNAME= ${DISTNAME:S/_/-/}
6CATEGORIES= www textproc 6CATEGORIES= www textproc
7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} 7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://ikiwiki.info/ 10HOMEPAGE= http://ikiwiki.info/
11COMMENT= Wiki compiler 11COMMENT= Wiki compiler
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16DEPENDS+= p5-Text-Markdown-[0-9]*:../../textproc/p5-Text-Markdown 16DEPENDS+= p5-Text-Markdown-[0-9]*:../../textproc/p5-Text-Markdown
17DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI 17DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI
@@ -37,32 +37,32 @@ PERL5_PACKLIST= auto/IkiWiki/.packlist @@ -37,32 +37,32 @@ PERL5_PACKLIST= auto/IkiWiki/.packlist
37USE_LANGUAGES= # none 37USE_LANGUAGES= # none
38USE_TOOLS+= gmake msgfmt perl:run xgettext 38USE_TOOLS+= gmake msgfmt perl:run xgettext
39 39
40REPLACE_PERL+= ikiwiki-calendar.in ikiwiki-mass-rebuild 40REPLACE_PERL+= ikiwiki-calendar.in ikiwiki-mass-rebuild
41REPLACE_PERL+= ikiwiki-transition.in ikiwiki-update-wikilist 41REPLACE_PERL+= ikiwiki-transition.in ikiwiki-update-wikilist
42REPLACE_PERL+= ikiwiki-w3m.cgi ikiwiki.in gitremotes mdwn2man pm_filter 42REPLACE_PERL+= ikiwiki-w3m.cgi ikiwiki.in gitremotes mdwn2man pm_filter
43REPLACE_PERL+= *.pm IkiWiki/*.pm IkiWiki/*/*.pm* *.setup */*.setup */*/*.setup 43REPLACE_PERL+= *.pm IkiWiki/*.pm IkiWiki/*/*.pm* *.setup */*.setup */*/*.setup
44REPLACE_PERL+= po/po2wiki t/*.t 44REPLACE_PERL+= po/po2wiki t/*.t
45REPLACE_PERL+= plugins/externaldemo # XXX not installed 45REPLACE_PERL+= plugins/externaldemo # XXX not installed
46 46
47REPLACE_PYTHON+=plugins/proxy.py plugins/pythondemo plugins/rst 47REPLACE_PYTHON+=plugins/proxy.py plugins/pythondemo plugins/rst
48 48
49SUBST_CLASSES+= sysconfdir 49SUBST_CLASSES+= sysconfdir
50SUBST_STAGE.sysconfdir= post-patch 50SUBST_STAGE.sysconfdir= pre-configure
51SUBST_FILES.sysconfdir= ikiwiki-mass-rebuild ikiwiki-update-wikilist 51SUBST_FILES.sysconfdir= ikiwiki-mass-rebuild ikiwiki-update-wikilist
52SUBST_SED.sysconfdir+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' 52SUBST_SED.sysconfdir+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
53 53
54SUBST_CLASSES+= perlpath 54SUBST_CLASSES+= perlpath
55SUBST_STAGE.perlpath= post-patch 55SUBST_STAGE.perlpath= pre-configure
56SUBST_FILES.perlpath= IkiWiki/Setup/Standard.pm 56SUBST_FILES.perlpath= IkiWiki/Setup/Standard.pm
57SUBST_SED.perlpath+= -e 's,@PERL5@,${PERL5},g' 57SUBST_SED.perlpath+= -e 's,@PERL5@,${PERL5},g'
58 58
59MAKE_FLAGS+= W3M_CGI_BIN=${PREFIX:Q}/libexec/w3m/cgi-bin 59MAKE_FLAGS+= W3M_CGI_BIN=${PREFIX:Q}/libexec/w3m/cgi-bin
60MAKE_FLAGS+= CONFIGDIR=${EGDIR:Q} 60MAKE_FLAGS+= CONFIGDIR=${EGDIR:Q}
61MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q} 61MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}
62 62
63PKG_SYSCONFSUBDIR= ${PKGBASE} 63PKG_SYSCONFSUBDIR= ${PKGBASE}
64EGDIR= ${PREFIX}/share/examples/${PKGBASE} 64EGDIR= ${PREFIX}/share/examples/${PKGBASE}
65CONF_FILES+= ${EGDIR}/auto.setup ${PKG_SYSCONFDIR}/auto.setup 65CONF_FILES+= ${EGDIR}/auto.setup ${PKG_SYSCONFDIR}/auto.setup
66CONF_FILES+= ${EGDIR}/auto-blog.setup ${PKG_SYSCONFDIR}/auto-blog.setup 66CONF_FILES+= ${EGDIR}/auto-blog.setup ${PKG_SYSCONFDIR}/auto-blog.setup
67CONF_FILES+= ${EGDIR}/wikilist ${PKG_SYSCONFDIR}/wikilist 67CONF_FILES+= ${EGDIR}/wikilist ${PKG_SYSCONFDIR}/wikilist
68 68
cvs diff -r1.59 -r1.60 pkgsrc/www/ikiwiki/distinfo (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/distinfo 2011/02/26 03:04:38 1.59
+++ pkgsrc/www/ikiwiki/distinfo 2011/03/23 22:25:05 1.60
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.59 2011/02/26 03:04:38 schmonz Exp $ 1$NetBSD: distinfo,v 1.60 2011/03/23 22:25:05 schmonz Exp $
2 2
3SHA1 (ikiwiki_3.20110225.tar.gz) = 863d61e87897f0cc1f4a1658b7d42d8df65b4234 3SHA1 (ikiwiki_3.20110321.tar.gz) = b7b2d7b4c390f760f9d6c659b1048b8c176dc2fd
4RMD160 (ikiwiki_3.20110225.tar.gz) = d7f8719e5cba5c455c1c72bd4f2e9ccf79e8cb1c 4RMD160 (ikiwiki_3.20110321.tar.gz) = 568050510e31fe1908042179d42259b7fb4d5609
5Size (ikiwiki_3.20110225.tar.gz) = 2327000 bytes 5Size (ikiwiki_3.20110321.tar.gz) = 2340126 bytes
6SHA1 (patch-aa) = 3f6c613520fdb979d68e0b4eda7698e62d4d8961 6SHA1 (patch-aa) = 0ddf4825daec821bf93978c665af99645c5538c0
7SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903 7SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903
 8SHA1 (patch-ac) = 621983c0405f747566a9bed2a01261d58741a5bd
8SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d 9SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
9SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f 10SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f
cvs diff -r1.11 -r1.12 pkgsrc/www/ikiwiki/options.mk (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/options.mk 2010/10/24 15:45:34 1.11
+++ pkgsrc/www/ikiwiki/options.mk 2011/03/23 22:25:05 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.11 2010/10/24 15:45:34 schmonz Exp $ 1# $NetBSD: options.mk,v 1.12 2011/03/23 22:25:05 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki 3PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki
4PKG_SUPPORTED_OPTIONS= cvs ikiwiki-amazon-s3 ikiwiki-search 4PKG_SUPPORTED_OPTIONS= cvs ikiwiki-amazon-s3 ikiwiki-search
5PKG_SUPPORTED_OPTIONS+= imagemagick python svn w3m 5PKG_SUPPORTED_OPTIONS+= imagemagick python svn w3m
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mcvs) 9.if !empty(PKG_OPTIONS:Mcvs)
10. if !exists(/usr/bin/cvs) 10. if !exists(/usr/bin/cvs)
11DEPENDS+= cvs-[0-9]*:../../devel/scmcvs 11DEPENDS+= cvs-[0-9]*:../../devel/scmcvs
12. endif 12. endif
13DEPENDS+= cvsps-[0-9]*:../../devel/cvsps 13DEPENDS+= cvsps-[0-9]*:../../devel/cvsps
14DEPENDS+= cvsweb-[0-9]*:../../www/cvsweb 14DEPENDS+= cvsweb-[0-9]*:../../www/cvsweb
@@ -48,17 +48,17 @@ DEPENDS+= subversion-base-[0-9]*:../../d @@ -48,17 +48,17 @@ DEPENDS+= subversion-base-[0-9]*:../../d
48 48
49PLIST_VARS+= w3m 49PLIST_VARS+= w3m
50.if !empty(PKG_OPTIONS:Mw3m) 50.if !empty(PKG_OPTIONS:Mw3m)
51DEPENDS+= w3m-[0-9]*:../../www/w3m 51DEPENDS+= w3m-[0-9]*:../../www/w3m
52PLIST.w3m= yes 52PLIST.w3m= yes
53INSTALLATION_DIRS+= share/doc/${PKGBASE}/w3mmode 53INSTALLATION_DIRS+= share/doc/${PKGBASE}/w3mmode
54post-install: 54post-install:
55 ${INSTALL_DATA} ${WRKSRC}/html/w3mmode.html \ 55 ${INSTALL_DATA} ${WRKSRC}/html/w3mmode.html \
56 ${PREFIX}/share/doc/${PKGBASE} 56 ${PREFIX}/share/doc/${PKGBASE}
57 ${INSTALL_DATA} ${WRKSRC}/doc/w3mmode/ikiwiki.setup \ 57 ${INSTALL_DATA} ${WRKSRC}/doc/w3mmode/ikiwiki.setup \
58 ${PREFIX}/share/doc/${PKGBASE}/w3mmode/ikiwiki.setup 58 ${PREFIX}/share/doc/${PKGBASE}/w3mmode/ikiwiki.setup
59.else 59.else
60SUBST_CLASSES+= w3m 60SUBST_CLASSES+= w3m
61SUBST_STAGE.w3m= post-patch 61SUBST_STAGE.w3m= pre-configure
62SUBST_FILES.w3m= Makefile.PL 62SUBST_FILES.w3m= Makefile.PL
63SUBST_SED.w3m+= -e 's,^\(.*install .*W3M_CGI_BIN\),\#\1,' 63SUBST_SED.w3m+= -e 's,^\(.*install .*W3M_CGI_BIN\),\#\1,'
64.endif 64.endif
cvs diff -r1.20 -r1.21 pkgsrc/www/ikiwiki/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/patches/Attic/patch-aa 2011/01/02 05:13:02 1.20
+++ pkgsrc/www/ikiwiki/patches/Attic/patch-aa 2011/03/23 22:25:06 1.21
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-aa,v 1.20 2011/01/02 05:13:02 schmonz Exp $ 1$NetBSD: patch-aa,v 1.21 2011/03/23 22:25:06 schmonz Exp $
2 2
3--- Makefile.PL.orig 2010-12-11 18:33:22.000000000 +0000 3--- Makefile.PL.orig 2011-03-19 18:02:24.000000000 +0000
4+++ Makefile.PL 4+++ Makefile.PL
5@@ -19,6 +19,8 @@ SED?=sed 5@@ -19,6 +19,8 @@ SED?=sed
6  6
7 # Additional configurable path variables. 7 # Additional configurable path variables.
8 W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin 8 W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
9+CONFIGDIR?=/etc/ikiwiki 9+CONFIGDIR?=/etc/ikiwiki
10+MANDIR?=$(PREFIX)/share/man 10+MANDIR?=$(PREFIX)/share/man
11  11
12 tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi) 12 tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
13 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi) 13 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
14@@ -50,7 +52,7 @@ extra_build: $(outprogs) ikiwiki.setup d 14@@ -50,7 +52,7 @@ extra_build: $(outprogs) ikiwiki.setup d
15 ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man 15 ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
16 ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man 16 ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
17 $(MAKE) -C po 17 $(MAKE) -C po
18- $(SED) -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec 18- $(SED) -i.bkp "s/Version:.*/Version: $(VER)/" ikiwiki.spec
19+ #$(SED) -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec 19+ #$(SED) -i.bkp "s/Version:.*/Version: $(VER)/" ikiwiki.spec
20 rm -f ikiwiki.spec.bkp 20 rm -f ikiwiki.spec.bkp
21  21
22 docwiki: 22 docwiki:
23@@ -70,7 +72,7 @@ underlay_install: 23@@ -70,7 +72,7 @@ underlay_install:
24 for dir in `cd underlays && $(FIND) . -follow -type d ! -regex '.*\.svn.*'`; do \ 24 for dir in `cd underlays && $(FIND) . -follow -type d ! -regex '.*\.svn.*'`; do \
25 install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ 25 install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
26 for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f`; do \ 26 for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f`; do \
27- cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ 27- cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
28+ cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ 28+ cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
29 install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ 29 install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
30 done; \ 30 done; \
31 done 31 done
32@@ -79,7 +81,7 @@ underlay_install: 32@@ -79,7 +81,7 @@ underlay_install:
File Added: pkgsrc/www/ikiwiki/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.9 2011/03/23 22:25:06 schmonz Exp $

--- IkiWiki/Plugin/aggregate.pm.orig	2011-03-21 18:44:36.000000000 +0000
+++ IkiWiki/Plugin/aggregate.pm
@@ -70,8 +70,8 @@ sub checkconfig () {
 	if (! defined $config{aggregateinternal}) {
 		$config{aggregateinternal}=1;
 	}
-	if (! defined $config{cookies}) {
-		$config{cookies}={ file => "$ENV{HOME}/.ikiwiki/cookies" };
+	if (! defined $config{cookiejar}) {
+		$config{cookiejar}={ file => "$ENV{HOME}/.ikiwiki/cookies" };
 	}
 
 	# This is done here rather than in a refresh hook because it