diff options
| author | tv <tv@pkgsrc.org> | 2005-03-14 04:36:52 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-03-14 04:36:52 +0000 |
| commit | 46f86bd4c26e20ea34be9b56aa995b87b32ecc3f (patch) | |
| tree | ea84ce3b924edceee77b1d56423e00899b8d7160 /textproc/groff | |
| parent | 3064bfd5199c492989f0133c87634404f6c88f91 (diff) | |
| download | pkgsrc-46f86bd4c26e20ea34be9b56aa995b87b32ecc3f.tar.gz | |
Make build/work on Interix.
How ugly: a hypot(near0, near0) can result in a NaN if round-off error
somehow makes the a^2+b^2 result negative. Work around it with an
"#ifdef __INTERIX"-only fix.
Diffstat (limited to 'textproc/groff')
| -rw-r--r-- | textproc/groff/Makefile | 4 | ||||
| -rw-r--r-- | textproc/groff/distinfo | 3 | ||||
| -rw-r--r-- | textproc/groff/patches/patch-af | 21 |
3 files changed, 24 insertions, 4 deletions
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile index b46383c6513..16a4336d3d8 100644 --- a/textproc/groff/Makefile +++ b/textproc/groff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/01/18 12:54:59 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/03/14 04:36:52 tv Exp $ # DISTNAME= groff-1.19.1 @@ -13,8 +13,6 @@ COMMENT= GNU roff text processing suite DEPENDS+= netpbm>=10.0:../../graphics/netpbm DEPENDS+= psutils>=1.17:../../print/psutils -NOT_FOR_PLATFORM= Interix-*-* # endless loop in build - USE_LANGUAGES= c c++ GNU_CONFIGURE= YES USE_PERL5= YES diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo index 241c1800519..d76b328afea 100644 --- a/textproc/groff/distinfo +++ b/textproc/groff/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2005/02/24 14:48:42 agc Exp $ +$NetBSD: distinfo,v 1.11 2005/03/14 04:36:53 tv Exp $ SHA1 (groff-1.19.1.tar.gz) = 82ba1b29b01c36bf41149ce8813cea712e3e6cbf RMD160 (groff-1.19.1.tar.gz) = 6c0732088cbdce3fde2d31f0cd2b149ee5022210 @@ -8,5 +8,6 @@ SHA1 (patch-ab) = 3c50a8b758cf3ad9d31e449864bf07c09b396b92 SHA1 (patch-ac) = 38f75d8261ca39aff8a37771a283c99ad39142bd SHA1 (patch-ad) = 3480c6ebf29aa986cffcf9bba705153e5335224d SHA1 (patch-ae) = 18d553fe99ca6915d42de5f6edf74fc56e2fc650 +SHA1 (patch-af) = b7329a5606c5979c3676685b0e3421eb500cf6b8 SHA1 (patch-ba) = cdafeefbde9490d0ed599a118fd34c06afac0f96 SHA1 (patch-bb) = ddd9ef807a09eaaf7b09a3c05be3443945c67379 diff --git a/textproc/groff/patches/patch-af b/textproc/groff/patches/patch-af new file mode 100644 index 00000000000..3b71971cbd0 --- /dev/null +++ b/textproc/groff/patches/patch-af @@ -0,0 +1,21 @@ +$NetBSD: patch-af,v 1.3 2005/03/14 04:36:53 tv Exp $ + +--- src/preproc/pic/object.cpp.orig Wed Apr 7 11:27:56 2004 ++++ src/preproc/pic/object.cpp +@@ -202,7 +202,15 @@ double operator*(const position &a, cons + + double hypot(const position &a) + { +- return hypot(a.x, a.y); ++ double result = hypot(a.x, a.y); ++ ++#ifdef __INTERIX ++ /* prevents an endless loop that pops up particularly on Interix */ ++ if (isnan(result) && !isnan(a.x) && !isnan(a.y)) ++ return 0.0; ++#endif ++ ++ return result; + } + + struct arrow_head_type { |