diff options
| author | schmonz <schmonz@pkgsrc.org> | 2013-02-02 19:30:43 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2013-02-02 19:30:43 +0000 |
| commit | 235740bfe603e307f9a473f40a9c634dec866753 (patch) | |
| tree | 19085fd06b0103229f35dde975eb22d85325119c /www/ikiwiki | |
| parent | 5d3aec614b7740b28b39ec576e42eff3b437b213 (diff) | |
| download | pkgsrc-235740bfe603e307f9a473f40a9c634dec866753.tar.gz | |
Apply another bugfix to the CVS backend from my git repo:
* `91b477c0`: Fix diffurl links (cvsweb expects unescaped '/').
Bump PKGREVISION.
Diffstat (limited to 'www/ikiwiki')
| -rw-r--r-- | www/ikiwiki/Makefile | 4 | ||||
| -rw-r--r-- | www/ikiwiki/distinfo | 4 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-IkiWiki_Plugin_cvs.pm | 18 |
3 files changed, 19 insertions, 7 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index ef6e7165062..d2d099aea1a 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.103 2013/01/28 04:30:14 schmonz Exp $ +# $NetBSD: Makefile,v 1.104 2013/02/02 19:30:43 schmonz Exp $ # DISTNAME= ikiwiki_3.20121212 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index a744835371c..117e5f7ab3c 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.85 2013/01/28 04:30:14 schmonz Exp $ +$NetBSD: distinfo,v 1.86 2013/02/02 19:30:43 schmonz Exp $ SHA1 (ikiwiki_3.20121212.tar.gz) = 1c9815502e90a25c5bd7b5cdf198034e6833c3ff RMD160 (ikiwiki_3.20121212.tar.gz) = a5439279166dc0d6ed1f4f5f7a71a680b08465cc Size (ikiwiki_3.20121212.tar.gz) = 2917372 bytes -SHA1 (patch-IkiWiki_Plugin_cvs.pm) = affca7fbdbd08c7b56faaf1583ad36ddba6a89f2 +SHA1 (patch-IkiWiki_Plugin_cvs.pm) = 79c984356a2633e830ffd5d2b039d9edece11196 SHA1 (patch-IkiWiki_Plugin_git.pm) = e854ea61afd3968a9dd06f1c70ab2cea993d6a1f diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_cvs.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_cvs.pm index b674c459056..f6bf1b32521 100644 --- a/www/ikiwiki/patches/patch-IkiWiki_Plugin_cvs.pm +++ b/www/ikiwiki/patches/patch-IkiWiki_Plugin_cvs.pm @@ -1,4 +1,4 @@ -$NetBSD: patch-IkiWiki_Plugin_cvs.pm,v 1.1 2013/01/28 04:30:15 schmonz Exp $ +$NetBSD: patch-IkiWiki_Plugin_cvs.pm,v 1.2 2013/02/02 19:30:43 schmonz Exp $ Bugfixes in `schmonz/cvs` I'd like to see merged: @@ -9,6 +9,7 @@ Bugfixes in `schmonz/cvs` I'd like to see merged: used for a binary file. * `b30cacdf`: If the previous working directory no longer exists after a CVS operation, don't try to `chdir()` back to it afterward. +* `91b477c0`: Fix diffurl links (cvsweb expects unescaped '/'). --- IkiWiki/Plugin/cvs.pm.orig 2012-08-25 15:12:13.000000000 +0000 +++ IkiWiki/Plugin/cvs.pm @@ -29,7 +30,18 @@ Bugfixes in `schmonz/cvs` I'd like to see merged: } } } -@@ -396,11 +394,15 @@ sub rcs_diff ($;$) { +@@ -316,7 +314,9 @@ sub rcs_recentchanges ($) { + $oldrev =~ s/INITIAL/0/; + $newrev =~ s/\(DEAD\)//; + my $diffurl = defined $config{diffurl} ? $config{diffurl} : ""; +- my $epage = uri_escape_utf8($page); ++ my $epage = join('/', ++ map { uri_escape_utf8($_) } split('/', $page) ++ ); + $diffurl=~s/\[\[file\]\]/$epage/g; + $diffurl=~s/\[\[r1\]\]/$oldrev/g; + $diffurl=~s/\[\[r2\]\]/$newrev/g; +@@ -396,11 +396,15 @@ sub rcs_diff ($;$) { my @cvsps = `env TZ=UTC cvsps -q --cvs-direct -z 30 -g -s $rev`; my $blank_lines_seen = 0; @@ -45,7 +57,7 @@ Bugfixes in `schmonz/cvs` I'd like to see merged: if (wantarray) { return @cvsps; } -@@ -491,24 +493,53 @@ sub cvs_keyword_subst_args ($) { +@@ -491,24 +495,53 @@ sub cvs_keyword_subst_args ($) { my $filemime = File::MimeInfo::default($file); # if (-T $file) { |