diff options
author | gdt <gdt@pkgsrc.org> | 2012-11-21 01:49:54 +0000 |
---|---|---|
committer | gdt <gdt@pkgsrc.org> | 2012-11-21 01:49:54 +0000 |
commit | bbe351b51fcfd3e8f2f9256aad8c154e770f491b (patch) | |
tree | 8200e80f88c09d79e75b310ad9e60664cb951cfd /devel | |
parent | 2f4ae9249dadbd2420a3f3ca82481726d0deda25 (diff) | |
download | pkgsrc-bbe351b51fcfd3e8f2f9256aad8c154e770f491b.tar.gz |
Add patch to work around upstream bug assuming beyond-POSIX behavior
in sed.
In GNU sed, "\n" in the RHS of a substitution becomes a newline.
POSIX says that \n in the RHS is undefined. BSD sed treats it as "n".
Because this is in scheme code, and scheme doesn't care about " " vs
"\n", just substitute a space.
Resolves failure of test cases; now "make test" passes.
(This change has been reported upstream and applied to the upstream VCS.)
Diffstat (limited to 'devel')
-rw-r--r-- | devel/guile-www/distinfo | 3 | ||||
-rw-r--r-- | devel/guile-www/patches/patch-v_Makefile.in | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/devel/guile-www/distinfo b/devel/guile-www/distinfo index 0b65c475e67..f29a218f2db 100644 --- a/devel/guile-www/distinfo +++ b/devel/guile-www/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.12 2012/11/07 00:50:05 gdt Exp $ +$NetBSD: distinfo,v 1.13 2012/11/21 01:49:54 gdt Exp $ SHA1 (guile-www-2.35.tar.xz) = 31619996edd2dfd86286650a9db5298f579ac740 RMD160 (guile-www-2.35.tar.xz) = a75d79ae25a8dd23306a52b9bfa144a701820bd8 Size (guile-www-2.35.tar.xz) = 614004 bytes +SHA1 (patch-v_Makefile.in) = 6790ad019783b5a8c1ab7443b401fbf7f89ca2e7 diff --git a/devel/guile-www/patches/patch-v_Makefile.in b/devel/guile-www/patches/patch-v_Makefile.in new file mode 100644 index 00000000000..686a3d22409 --- /dev/null +++ b/devel/guile-www/patches/patch-v_Makefile.in @@ -0,0 +1,21 @@ +$NetBSD: patch-v_Makefile.in,v 1.1 2012/11/21 01:49:54 gdt Exp $ + +guile-www assumes that sed treats \n in the RHS of a substitution as a +newline. However, POSIX says that is unspecified, and NetBSD sed treats \n +as n. Therefore, just use a space instead, as the form of whitespace does +not matter. + +This was reported to the upstream author on 20121107, and is already +fixed in the upstream VCS. + +--- v/Makefile.in.orig 2012-11-06 10:55:00.000000000 +0000 ++++ v/Makefile.in +@@ -527,7 +527,7 @@ x000: all-modules.list + + $(single): all-modules.list + @n=`echo $@ | sed 's/x0*//'` ; \ +- sed -e "$${n}!d" -e 's/.*/(use-modules &)\n(exit #t)/' $< > $@ ++ sed -e "$${n}!d" -e 's/.*/(use-modules &) (exit #t)/' $< > $@ + + clean-local: + -rm -rf all-modules.list .fake x000 $(single) |