Fri Feb 3 12:38:01 2012 UTC ()
Update to 3.20120202. From the changelog:

* mdwn: Added nodiscount setting, which can be used to avoid using the
  markdown discount engine, when maximum compatability is needed.
* Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533
* cvs: Ensure text files are added in non-binary mode. (Amitai Schlair)
* cvs: Various cleanups and testing. (Amitai Schlair)
* calendar: Fix strftime encoding bug.
* shortcuts: Fixed a broken shortcut to wikipedia (accidentially
  made into a shortcut to wikiMedia).
* Various portability improvements. (Amitai Schlair)


(schmonz)
diff -r1.89 -r1.90 pkgsrc/www/ikiwiki/Makefile
diff -r1.33 -r1.34 pkgsrc/www/ikiwiki/PLIST
diff -r1.74 -r1.75 pkgsrc/www/ikiwiki/distinfo
diff -r1.25 -r1.26 pkgsrc/www/ikiwiki/patches/patch-aa
diff -r1.7 -r0 pkgsrc/www/ikiwiki/patches/patch-ab
cvs diff -r1.89 -r1.90 pkgsrc/www/ikiwiki/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/Makefile 2012/01/16 04:43:29 1.89
+++ pkgsrc/www/ikiwiki/Makefile 2012/02/03 12:38:00 1.90
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.89 2012/01/16 04:43:29 schmonz Exp $ 1# $NetBSD: Makefile,v 1.90 2012/02/03 12:38:00 schmonz Exp $
2# 2#
3 3
4DISTNAME= ikiwiki_3.20120115 4DISTNAME= ikiwiki_3.20120202
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-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount 16DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount
17DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI 17DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI
cvs diff -r1.33 -r1.34 pkgsrc/www/ikiwiki/PLIST (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/PLIST 2011/09/05 22:07:28 1.33
+++ pkgsrc/www/ikiwiki/PLIST 2012/02/03 12:38:01 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.33 2011/09/05 22:07:28 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.34 2012/02/03 12:38:01 schmonz Exp $
2bin/ikiwiki 2bin/ikiwiki
3bin/ikiwiki-calendar 3bin/ikiwiki-calendar
4bin/ikiwiki-makerepo 4bin/ikiwiki-makerepo
5bin/ikiwiki-transition 5bin/ikiwiki-transition
6bin/ikiwiki-update-wikilist 6bin/ikiwiki-update-wikilist
7lib/ikiwiki/plugins/proxy.py 7lib/ikiwiki/plugins/proxy.py
8lib/ikiwiki/plugins/rst 8lib/ikiwiki/plugins/rst
9${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi 9${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
10man/man1/ikiwiki-calendar.1 10man/man1/ikiwiki-calendar.1
11man/man1/ikiwiki-makerepo.1 11man/man1/ikiwiki-makerepo.1
12man/man1/ikiwiki-transition.1 12man/man1/ikiwiki-transition.1
13man/man1/ikiwiki-update-wikilist.1 13man/man1/ikiwiki-update-wikilist.1
14man/man1/ikiwiki.1 14man/man1/ikiwiki.1
@@ -100,27 +100,26 @@ share/ikiwiki/directives/ikiwiki/directi @@ -100,27 +100,26 @@ share/ikiwiki/directives/ikiwiki/directi
100share/ikiwiki/directives/ikiwiki/directive/taglink.mdwn 100share/ikiwiki/directives/ikiwiki/directive/taglink.mdwn
101share/ikiwiki/directives/ikiwiki/directive/template.mdwn 101share/ikiwiki/directives/ikiwiki/directive/template.mdwn
102share/ikiwiki/directives/ikiwiki/directive/testpagespec.mdwn 102share/ikiwiki/directives/ikiwiki/directive/testpagespec.mdwn
103share/ikiwiki/directives/ikiwiki/directive/teximg.mdwn 103share/ikiwiki/directives/ikiwiki/directive/teximg.mdwn
104share/ikiwiki/directives/ikiwiki/directive/toc.mdwn 104share/ikiwiki/directives/ikiwiki/directive/toc.mdwn
105share/ikiwiki/directives/ikiwiki/directive/toggle.mdwn 105share/ikiwiki/directives/ikiwiki/directive/toggle.mdwn
106share/ikiwiki/directives/ikiwiki/directive/toggleable.mdwn 106share/ikiwiki/directives/ikiwiki/directive/toggleable.mdwn
107share/ikiwiki/directives/ikiwiki/directive/version.mdwn 107share/ikiwiki/directives/ikiwiki/directive/version.mdwn
108share/ikiwiki/examples/blog.mdwn 108share/ikiwiki/examples/blog.mdwn
109share/ikiwiki/examples/blog/archives.mdwn 109share/ikiwiki/examples/blog/archives.mdwn
110share/ikiwiki/examples/blog/comments.mdwn 110share/ikiwiki/examples/blog/comments.mdwn
111share/ikiwiki/examples/blog/index.mdwn 111share/ikiwiki/examples/blog/index.mdwn
112share/ikiwiki/examples/blog/posts.mdwn 112share/ikiwiki/examples/blog/posts.mdwn
113share/ikiwiki/examples/blog/posts/Discussion.mdwn 
114share/ikiwiki/examples/blog/posts/first_post.mdwn 113share/ikiwiki/examples/blog/posts/first_post.mdwn
115share/ikiwiki/examples/blog/sidebar.mdwn 114share/ikiwiki/examples/blog/sidebar.mdwn
116share/ikiwiki/examples/blog/tags.mdwn 115share/ikiwiki/examples/blog/tags.mdwn
117share/ikiwiki/examples/softwaresite.mdwn 116share/ikiwiki/examples/softwaresite.mdwn
118share/ikiwiki/examples/softwaresite/Makefile 117share/ikiwiki/examples/softwaresite/Makefile
119share/ikiwiki/examples/softwaresite/bugs.mdwn 118share/ikiwiki/examples/softwaresite/bugs.mdwn
120share/ikiwiki/examples/softwaresite/bugs/done.mdwn 119share/ikiwiki/examples/softwaresite/bugs/done.mdwn
121share/ikiwiki/examples/softwaresite/bugs/fails_to_frobnicate.mdwn 120share/ikiwiki/examples/softwaresite/bugs/fails_to_frobnicate.mdwn
122share/ikiwiki/examples/softwaresite/bugs/needs_more_bugs.mdwn 121share/ikiwiki/examples/softwaresite/bugs/needs_more_bugs.mdwn
123share/ikiwiki/examples/softwaresite/contact.mdwn 122share/ikiwiki/examples/softwaresite/contact.mdwn
124share/ikiwiki/examples/softwaresite/doc.mdwn 123share/ikiwiki/examples/softwaresite/doc.mdwn
125share/ikiwiki/examples/softwaresite/doc/faq.mdwn 124share/ikiwiki/examples/softwaresite/doc/faq.mdwn
126share/ikiwiki/examples/softwaresite/doc/install.mdwn 125share/ikiwiki/examples/softwaresite/doc/install.mdwn
cvs diff -r1.74 -r1.75 pkgsrc/www/ikiwiki/distinfo (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/distinfo 2012/01/16 04:43:29 1.74
+++ pkgsrc/www/ikiwiki/distinfo 2012/02/03 12:38:01 1.75
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.74 2012/01/16 04:43:29 schmonz Exp $ 1$NetBSD: distinfo,v 1.75 2012/02/03 12:38:01 schmonz Exp $
2 2
3SHA1 (ikiwiki_3.20120115.tar.gz) = 457efc9c7d7b7b72c2856b88a55fa556fc50e356 3SHA1 (ikiwiki_3.20120202.tar.gz) = 09c787f7609defa475416a648affc82505bcddc0
4RMD160 (ikiwiki_3.20120115.tar.gz) = a4903cee1a407634a01ea6f5f590def2f0812e27 4RMD160 (ikiwiki_3.20120202.tar.gz) = 4ff6ac78a0de6d56ee0d8e997a6bd5535188fffc
5Size (ikiwiki_3.20120115.tar.gz) = 2744405 bytes 5Size (ikiwiki_3.20120202.tar.gz) = 2761253 bytes
6SHA1 (patch-aa) = 63e0282c3b9c2093b5951c21ee1730bf2ad2d67b 6SHA1 (patch-aa) = 998c23d0df8aa18797221b3a310f78880baa689e
7SHA1 (patch-ab) = 3e571af1894a9c88c39180a0059cc6b136a949d0 
cvs diff -r1.25 -r1.26 pkgsrc/www/ikiwiki/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/patches/Attic/patch-aa 2011/12/29 21:47:56 1.25
+++ pkgsrc/www/ikiwiki/patches/Attic/patch-aa 2012/02/03 12:38:01 1.26
@@ -1,124 +1,15 @@ @@ -1,124 +1,15 @@
1$NetBSD: patch-aa,v 1.25 2011/12/29 21:47:56 schmonz Exp $ 1$NetBSD: patch-aa,v 1.26 2012/02/03 12:38:01 schmonz Exp $
2 2
3PKG_SYSCONFDIR and PKGMANDIR support, avoid GNUisms in standard utilities. 3Avoid a GNUism in find(1).
4 4
5--- Makefile.PL.orig 2011-12-06 18:57:23.000000000 +0000 5--- Makefile.PL.orig 2012-01-30 19:20:54.000000000 +0000
6+++ Makefile.PL 6+++ Makefile.PL
7@@ -19,11 +19,14 @@ SED?=sed 7@@ -75,7 +75,7 @@ underlay_install:
8  
9 # Additional configurable path variables. 
10 W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin 
11+SYSCONFDIR?=/etc/ikiwiki 
12+MANDIR?=$(PREFIX)/share/man 
13  
14 tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi) 
15 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi) 
16 outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out 
17 scripts=ikiwiki-update-wikilist ikiwiki-makerepo 
18+sysconfdir_scripts=ikiwiki-mass-rebuild ikiwiki-update-wikilist 
19  
20 PROBABLE_INST_LIB=$(shell \\ 
21 if [ "$(INSTALLDIRS)" = "perl" ]; then \\ 
22@@ -42,7 +45,7 @@ PROBABLE_INST_LIB=$(shell \\ 
23 ikiwiki.setup: 
24 HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -dumpsetup ikiwiki.setup 
25  
26-extra_build: $(outprogs) ikiwiki.setup docwiki 
27+extra_build: $(outprogs) ikiwiki.setup docwiki sysconfdir 
28 ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man 
29 ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man 
30 ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man 
31@@ -50,12 +53,15 @@ extra_build: $(outprogs) ikiwiki.setup d 
32 ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man 
33 ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man 
34 $(MAKE) -C po 
35- $(SED) -i.bkp "s/Version:.*/Version: $(VER)/" ikiwiki.spec 
36+ $(PERL) -pi.bkp -e "s/Version:.*/Version: $(VER)/" ikiwiki.spec 
37 rm -f ikiwiki.spec.bkp 
38  
39 docwiki: 
40 $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh 
41  
42+sysconfdir: 
43+ $(PERL) -pi -e "s|/etc/ikiwiki|$(SYSCONFDIR)|g" $(sysconfdir_scripts) 
44+  
45 extra_clean: 
46 $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean 
47 rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc 
48@@ -69,8 +75,8 @@ underlay_install: 
49 install -d $(DESTDIR)$(PREFIX)/share/ikiwiki 8 install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
50 for dir in `cd underlays && $(FIND) . -follow -type d`; do \ 9 for dir in `cd underlays && $(FIND) . -follow -type d`; do \
51 install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ 10 install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
52- for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f -not -name \\*.full.js -not -name \\*.full.css`; do \ 11- for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f -not -name \\*.full.js -not -name \\*.full.css`; do \
53- cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ 
54+ for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name \\*.full.js ! -name \\*.full.css`; do \ 12+ for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name \\*.full.js ! -name \\*.full.css`; do \
55+ cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ 13 cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
56 install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ 14 install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
57 done; \ 15 done; \
58 done 
59@@ -79,7 +85,7 @@ underlay_install: 
60 install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 
61 for file in doc/ikiwiki/directive/*; do \ 
62 if [ -f "$$file" ]; then \ 
63- cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \ 
64+ cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \ 
65 install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \ 
66 fi \ 
67 done 
68@@ -94,7 +100,7 @@ underlay_install: 
69 elif echo "$$file" | grep -q base.css; then \ 
70 :; \ 
71 elif [ -f "$$file" ]; then \ 
72- cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \ 
73+ cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \ 
74 install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \ 
75 fi \ 
76 done; \ 
77@@ -106,7 +112,7 @@ extra_install: underlay_install 
78 install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \ 
79 done 
80 for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \ 
81- cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \ 
82+ cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \ 
83 install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ 
84 done 
85  
86@@ -125,15 +131,15 @@ extra_install: underlay_install 
87 install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ 
88 done 
89  
90- install -d $(DESTDIR)$(PREFIX)/share/man/man1 
91- install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1 
92- install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-makerepo.1 
93- install -m 644 ikiwiki-transition.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-transition.1 
94- install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1 
95- install -m 644 ikiwiki-calendar.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-calendar.1 
96+ install -d $(DESTDIR)$(MANDIR)/man1 
97+ install -m 644 ikiwiki.man $(DESTDIR)$(MANDIR)/man1/ikiwiki.1 
98+ install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-makerepo.1 
99+ install -m 644 ikiwiki-transition.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-transition.1 
100+ install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-update-wikilist.1 
101+ install -m 644 ikiwiki-calendar.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-calendar.1 
102  
103- install -d $(DESTDIR)$(PREFIX)/share/man/man8 
104- install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8 
105+ install -d $(DESTDIR)$(MANDIR)/man8 
106+ install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(MANDIR)/man8/ikiwiki-mass-rebuild.8 
107  
108 install -d $(DESTDIR)$(PREFIX)/sbin 
109 install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin 
110@@ -150,10 +156,10 @@ extra_install: underlay_install 
111  
112 # These might fail if a regular user is installing into a home 
113 # directory. 
114- -install -d $(DESTDIR)/etc/ikiwiki 
115- -install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki 
116- -install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki 
117- -install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki 
118+ -install -d $(DESTDIR)$(SYSCONFDIR) 
119+ -install -m 0644 wikilist $(DESTDIR)$(SYSCONFDIR) 
120+ -install -m 0644 auto.setup $(DESTDIR)$(SYSCONFDIR) 
121+ -install -m 0644 auto-blog.setup $(DESTDIR)$(SYSCONFDIR) 
122  
123 # The git/hg plugins want to chdir; so does Devel::Cover. Skip those tests 
124 # to stop them hurting each other. 
File Deleted: pkgsrc/www/ikiwiki/patches/Attic/patch-ab