diff options
| author | schmonz <schmonz@pkgsrc.org> | 2016-03-06 19:30:06 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2016-03-06 19:30:06 +0000 |
| commit | a7335d2fd39839cde23553ceee4aef70d246566c (patch) | |
| tree | 0ff8565c25ecde9e990db2637a7b9374e662f3c1 /www | |
| parent | 4e7fec3b72225c02c4512a9859211cfb49b3fdc3 (diff) | |
| download | pkgsrc-a7335d2fd39839cde23553ceee4aef70d246566c.tar.gz | |
Apply upstream patch to make the CVS tests pass again. While here,
uncomment a maintainer make target to find where REPLACE_PERL might be
needed, and remove one that's no longer needed. (No change to the
installed package, so no PKGREVISION bump.)
Diffstat (limited to 'www')
| -rw-r--r-- | www/ikiwiki/Makefile | 10 | ||||
| -rw-r--r-- | www/ikiwiki/distinfo | 3 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-t_cvs.t | 19 |
3 files changed, 27 insertions, 5 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 481cf4dfb27..97063b27fa9 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.137 2016/01/21 18:36:38 schmonz Exp $ +# $NetBSD: Makefile,v 1.138 2016/03/06 19:30:06 schmonz Exp $ # DISTNAME= ikiwiki_3.20160121 @@ -39,9 +39,6 @@ PERL5_PACKLIST= auto/IkiWiki/.packlist USE_LANGUAGES= c USE_TOOLS+= gmake msgfmt perl:run xgettext -REPLACE_PERL+= IkiWiki/Plugin/calendar.pm -# find . -type f -print | \ -# perl -ne 'open(F, "<$_"); $l=<F>; print if $l =~ m|^#!/usr/bin/perl|' REPLACE_PYTHON+= plugins/proxy.py plugins/pythondemo plugins/rst BUILD_TARGET= extra_build all @@ -62,6 +59,11 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} TEST_TARGET= test +maintainer-find-default-perl-shebangs-not-substed: + cd ${WRKSRC} && \ + find . -type f -print | \ + perl -ne 'open(F, "<$$_"); $$l=<F>; print if $$l =~ m|^#!/usr/bin/perl|' + .include "options.mk" pre-configure: diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index 79ffb04fcc0..ca97dfc2e0b 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.110 2016/01/21 18:36:38 schmonz Exp $ +$NetBSD: distinfo,v 1.111 2016/03/06 19:30:06 schmonz Exp $ SHA1 (ikiwiki_3.20160121.tar.gz) = add644497a852e52d87b03fa8eafa496a5ecd71a RMD160 (ikiwiki_3.20160121.tar.gz) = e9aadc3a36077d0c1fbb9333a1b65d77cc7b56dd SHA512 (ikiwiki_3.20160121.tar.gz) = bbbf37e6c9413db158c80ee85953019f4dc0bb862ecc06b934c037372ffcb414e8a8927cf8bd19585fb4069849679ac16b6ea79fe6601ab11be5a4702224e1c9 Size (ikiwiki_3.20160121.tar.gz) = 3403392 bytes +SHA1 (patch-t_cvs.t) = f4076b1670e5a3b8e10f23a4c714eb230f9d28b4 diff --git a/www/ikiwiki/patches/patch-t_cvs.t b/www/ikiwiki/patches/patch-t_cvs.t new file mode 100644 index 00000000000..6f6258323a4 --- /dev/null +++ b/www/ikiwiki/patches/patch-t_cvs.t @@ -0,0 +1,19 @@ +$NetBSD: patch-t_cvs.t,v 1.1 2016/03/06 19:30:06 schmonz Exp $ + +From upstream git (b422295): Fix CVS tests by uninverting $installed. + +--- t/cvs.t.orig 2016-01-21 09:53:28.000000000 +0000 ++++ t/cvs.t +@@ -609,10 +609,10 @@ sub _generate_and_configure_post_commit_ + + require IkiWiki::Wrapper; + if ($installed) { +- $IkiWiki::program_to_wrap = 'ikiwiki.out'; ++ $IkiWiki::program_to_wrap = `which ikiwiki`; + } + else { +- $IkiWiki::program_to_wrap = `which ikiwiki`; ++ $IkiWiki::program_to_wrap = './ikiwiki.out'; + } + # XXX substitute its interpreter to Makefile's $(PERL) + # XXX best solution: do this to all scripts during build |