From 75b3a41b9a5d6fa4f33456f8029ee97c4f9ec9f9 Mon Sep 17 00:00:00 2001 From: schmonz Date: Wed, 20 Oct 2010 02:56:12 +0000 Subject: Update to 3.20101019. From the changelog: * Fix test suite failure on other side of date line. * htmltidy: Allow configuring tidy parameters in setup file. (W. Trevor King) * Updated French program translation. Closes: #598918 * git: Added new rcs_revert and rcs_preprevert hooks. * recentchanges: Add revert buttons to RecentChanges page, and implement web-based reversion interface. * Thanks to Peter Gammie for his assistance with the web-based reversion feature. * actiontabs: More consistent styling of Hn tags. * websetup: Fix saving of advanced mode changes. * websetup: Fix defaults of checkboxes in advanced mode. * monotone: Fix recentchanges page when the srcdir is not at the top of the monotone workspace. Thanks, tommyd. * img: If a class is specified, don't also put the img in the img class. * auto-blog.setup: Don't enable opendiscussion by default; require users be logged in to post comments. Updating this leaf package during the freeze for bugfixes. --- www/ikiwiki/Makefile | 8 ++++---- www/ikiwiki/PLIST | 4 +++- www/ikiwiki/distinfo | 10 +++++----- www/ikiwiki/options.mk | 4 ++-- www/ikiwiki/patches/patch-aa | 44 +++++++++++++++++++++++++++++++------------- 5 files changed, 45 insertions(+), 25 deletions(-) (limited to 'www/ikiwiki') diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 57c091e881d..eef4250bae2 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.64 2010/09/29 01:03:59 schmonz Exp $ +# $NetBSD: Makefile,v 1.65 2010/10/20 02:56:12 schmonz Exp $ # -DISTNAME= ikiwiki_3.20100926 +DISTNAME= ikiwiki_3.20101019 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} @@ -47,12 +47,12 @@ REPLACE_PERL+= plugins/externaldemo # XXX not installed REPLACE_PYTHON+=plugins/proxy.py plugins/pythondemo plugins/rst SUBST_CLASSES+= sysconfdir -SUBST_STAGE.sysconfdir= post-patch +SUBST_STAGE.sysconfdir= pre-configure SUBST_FILES.sysconfdir= ikiwiki-mass-rebuild ikiwiki-update-wikilist SUBST_SED.sysconfdir+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' SUBST_CLASSES+= perlpath -SUBST_STAGE.perlpath= post-patch +SUBST_STAGE.perlpath= pre-configure SUBST_FILES.perlpath= IkiWiki/Setup/Standard.pm SUBST_SED.perlpath+= -e 's,@PERL5@,${PERL5},g' diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index 18bced2f75c..ff303dfd704 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.28 2010/09/01 05:13:41 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.29 2010/10/20 02:56:13 schmonz Exp $ bin/ikiwiki bin/ikiwiki-calendar bin/ikiwiki-makerepo @@ -44,6 +44,7 @@ share/ikiwiki/basewiki/templates/note.mdwn share/ikiwiki/basewiki/templates/popup.mdwn share/ikiwiki/basewiki/wikiicons/diff.png share/ikiwiki/basewiki/wikiicons/openidlogin-bg.gif +share/ikiwiki/basewiki/wikiicons/revert.png share/ikiwiki/basewiki/wikiicons/search-bg.gif share/ikiwiki/directives/ikiwiki/directive/aggregate.mdwn share/ikiwiki/directives/ikiwiki/directive/brokenlinks.mdwn @@ -406,6 +407,7 @@ share/ikiwiki/templates/passwordmail.tmpl share/ikiwiki/templates/pocreatepage.tmpl share/ikiwiki/templates/recentchanges.tmpl share/ikiwiki/templates/renamesummary.tmpl +share/ikiwiki/templates/revert.tmpl share/ikiwiki/templates/rssitem.tmpl share/ikiwiki/templates/rsspage.tmpl share/ikiwiki/templates/searchform.tmpl diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index 4495c3ebafe..e8240490dff 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.49 2010/09/29 01:03:59 schmonz Exp $ +$NetBSD: distinfo,v 1.50 2010/10/20 02:56:13 schmonz Exp $ -SHA1 (ikiwiki_3.20100926.tar.gz) = 6d68d75185f8b6d5abffd896319039c205b72b37 -RMD160 (ikiwiki_3.20100926.tar.gz) = ad6691b1903dffb1e2f895ff6c17e79db7173587 -Size (ikiwiki_3.20100926.tar.gz) = 1953269 bytes -SHA1 (patch-aa) = 7feab1b6e6d27afc5884f107dd8d7364a9b475be +SHA1 (ikiwiki_3.20101019.tar.gz) = 8c368e49718223db39b3c32a37830fc8800ca82c +RMD160 (ikiwiki_3.20101019.tar.gz) = 9477b27db5713032e470102f71cb379eda2130dd +Size (ikiwiki_3.20101019.tar.gz) = 1973737 bytes +SHA1 (patch-aa) = 06e339584f95ad52842daf7cd0be705e242bdb06 SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk index c2bfe485fb1..7b7fa7bd429 100644 --- a/www/ikiwiki/options.mk +++ b/www/ikiwiki/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2010/08/04 15:25:11 schmonz Exp $ +# $NetBSD: options.mk,v 1.10 2010/10/20 02:56:13 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki PKG_SUPPORTED_OPTIONS= cvs ikiwiki-amazon-s3 ikiwiki-search @@ -58,7 +58,7 @@ post-install: ${PREFIX}/share/doc/${PKGBASE}/w3mmode/ikiwiki.setup .else SUBST_CLASSES+= w3m -SUBST_STAGE.w3m= post-patch +SUBST_STAGE.w3m= pre-configure SUBST_FILES.w3m= Makefile.PL SUBST_SED.w3m+= -e 's,^\(.*install .*W3M_CGI_BIN\),\#\1,' .endif diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa index 2a3c92f0861..30e0bc4680a 100644 --- a/www/ikiwiki/patches/patch-aa +++ b/www/ikiwiki/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.18 2010/06/23 23:52:12 schmonz Exp $ +$NetBSD: patch-aa,v 1.19 2010/10/20 02:56:13 schmonz Exp $ ---- Makefile.PL.orig 2010-06-16 23:17:18.000000000 +0000 +--- Makefile.PL.orig 2010-10-09 00:09:24.000000000 +0000 +++ Makefile.PL -@@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\ +@@ -19,6 +19,8 @@ SED?=sed # Additional configurable path variables. W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin @@ -11,34 +11,52 @@ $NetBSD: patch-aa,v 1.18 2010/06/23 23:52:12 schmonz Exp $ tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi) extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi) -@@ -46,7 +48,7 @@ extra_build: $(outprogs) ikiwiki.setup d +@@ -50,7 +52,7 @@ extra_build: $(outprogs) 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.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/';print m/\((.*?)\)/';print m/\((.*?)\)/';print m/\((.*?)\)/'/dev/null || \ + cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ done; \ done -@@ -99,7 +101,7 @@ extra_install: underlay_install +@@ -79,7 +81,7 @@ underlay_install: + install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive + for file in doc/ikiwiki/directive/*; do \ + if [ -f "$$file" ]; then \ +- cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \ ++ cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \ + install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \ + fi \ + done +@@ -91,7 +93,7 @@ underlay_install: + if echo "$$file" | grep -q style.css; then \ + (cat doc/style.css; cat $$file) >> $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \ + elif [ -f "$$file" ]; then \ +- cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \ ++ cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \ + install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \ + fi \ + done; \ +@@ -103,7 +105,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 \ + for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*\.svn.*'`; do \ - cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \ + cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \ install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ done -@@ -118,15 +120,15 @@ extra_install: underlay_install +@@ -122,15 +124,15 @@ extra_install: underlay_install install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ done @@ -62,7 +80,7 @@ $NetBSD: patch-aa,v 1.18 2010/06/23 23:52:12 schmonz Exp $ install -d $(DESTDIR)$(PREFIX)/sbin install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin -@@ -143,10 +145,10 @@ extra_install: underlay_install +@@ -147,10 +149,10 @@ extra_install: underlay_install # These might fail if a regular user is installing into a home # directory. -- cgit v1.2.3