Sat Feb 26 03:04:38 2011 UTC ()
Update to 3.20110225. From the changelog:

   * editpage: Avoid inheriting internal page types.
   * htmltidy: Avoid breaking the sidebar when websetup is running.
   * transient: New utility plugin that allows transient pages to
     be stored in .ikiwiki/transient/ (smcv)
   * aggregate: Aggregated content is stored in the transient underlay.
     (Existing aggregated content is not moved, since it will eventually
     expire and be removed) (smcv)
   * autoindex, tag: Added autoindex_commit and tag_autocreate_commit that
     can be unset to make index files and tags respectively not be committed,
     and instead be stored in the transient underlay.
     Closes: #544322 (smcv)
   * autoindex: Adapted to use add_autofile. Slight behavior changes
     in edge cases that are probably really bug fixes. (smcv)
   * recentchanges: Use transient underlay (smcv)
   * map: Avoid unnecessary ul's in maps with nested directories.
     (Giuseppe Bilotta)
   * Fix broken baseurl in cgi mode when usedirs is disabled. Bug introduced
     in 3.20101231.
   * inline: Fix link to nested inlined pages's feeds. (Giuseppe Bilotta)
   * inline: Add 'id' parameter that can be used when styling individual
     feedlinks and postforms. (Giuseppe Bilotta)


(schmonz)
diff -r1.73 -r1.74 pkgsrc/www/ikiwiki/Makefile
diff -r1.58 -r1.59 pkgsrc/www/ikiwiki/distinfo
cvs diff -r1.73 -r1.74 pkgsrc/www/ikiwiki/Makefile (switch to unified diff)

--- pkgsrc/www/ikiwiki/Makefile 2011/01/25 11:59:48 1.73
+++ pkgsrc/www/ikiwiki/Makefile 2011/02/26 03:04:38 1.74
@@ -1,75 +1,75 @@ @@ -1,75 +1,75 @@
1# $NetBSD: Makefile,v 1.73 2011/01/25 11:59:48 schmonz Exp $ 1# $NetBSD: Makefile,v 1.74 2011/02/26 03:04:38 schmonz Exp $
2# 2#
3 3
4DISTNAME= ikiwiki_3.20110124 4DISTNAME= ikiwiki_3.20110225
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
18DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser 18DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
19DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template 19DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
20DEPENDS+= p5-CGI-Session-[0-9]*:../../www/p5-CGI-Session 20DEPENDS+= p5-CGI-Session-[0-9]*:../../www/p5-CGI-Session
21DEPENDS+= p5-CGI-FormBuilder>=3.05:../../www/p5-CGI-FormBuilder 21DEPENDS+= p5-CGI-FormBuilder>=3.05:../../www/p5-CGI-FormBuilder
22DEPENDS+= p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail 22DEPENDS+= p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail
23DEPENDS+= p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration 23DEPENDS+= p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration
24DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate 24DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
25DEPENDS+= p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber 25DEPENDS+= p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
26DEPENDS+= p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML 26DEPENDS+= p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML
27DEPENDS+= p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom 27DEPENDS+= p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom
28DEPENDS+= p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed 28DEPENDS+= p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed
29DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple 29DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple
30DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS 30DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS
31DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo 31DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo
32DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext 32DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext
33#DEPENDS+= po4a-[0-9]*:../../textproc/po4a 33#DEPENDS+= po4a-[0-9]*:../../textproc/po4a
34 34
35WRKSRC= ${WRKDIR}/${PKGBASE} 35WRKSRC= ${WRKDIR}/${PKGBASE}
36PERL5_PACKLIST= auto/IkiWiki/.packlist 36PERL5_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= post-patch
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= post-patch
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
69.include "options.mk" 69.include "options.mk"
70 70
71pre-configure: 71pre-configure:
72 find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f 72 find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f
73 73
74.include "../../lang/perl5/module.mk" 74.include "../../lang/perl5/module.mk"
75.include "../../mk/bsd.pkg.mk" 75.include "../../mk/bsd.pkg.mk"
cvs diff -r1.58 -r1.59 pkgsrc/www/ikiwiki/distinfo (switch to unified diff)

--- pkgsrc/www/ikiwiki/distinfo 2011/01/25 11:59:48 1.58
+++ pkgsrc/www/ikiwiki/distinfo 2011/02/26 03:04:38 1.59
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.58 2011/01/25 11:59:48 schmonz Exp $ 1$NetBSD: distinfo,v 1.59 2011/02/26 03:04:38 schmonz Exp $
2 2
3SHA1 (ikiwiki_3.20110124.tar.gz) = 0057ea2b08292ff5da71d8d227741bf260ee0a2c 3SHA1 (ikiwiki_3.20110225.tar.gz) = 863d61e87897f0cc1f4a1658b7d42d8df65b4234
4RMD160 (ikiwiki_3.20110124.tar.gz) = 148b2c7d3227034d19b834cd5a8fc96da745b77f 4RMD160 (ikiwiki_3.20110225.tar.gz) = d7f8719e5cba5c455c1c72bd4f2e9ccf79e8cb1c
5Size (ikiwiki_3.20110124.tar.gz) = 2308029 bytes 5Size (ikiwiki_3.20110225.tar.gz) = 2327000 bytes
6SHA1 (patch-aa) = 3f6c613520fdb979d68e0b4eda7698e62d4d8961 6SHA1 (patch-aa) = 3f6c613520fdb979d68e0b4eda7698e62d4d8961
7SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903 7SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903
8SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d 8SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
9SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f 9SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f