[pkgsrc/trunk]: pkgsrc/print/scribus The <cmath> header in NetBSD 1.6 is bugg...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5cff7c639dbd
branches:  trunk
changeset: 469737:5cff7c639dbd
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Fri Feb 27 21:14:08 2004 +0000

description:
The <cmath> header in NetBSD 1.6 is buggy in that it undefines NULL.
Include <cmath> before the other headers, to make sure that NULL
can be used later in the files.

diffstat:

 print/scribus/distinfo         |   4 +++-
 print/scribus/patches/patch-ad |  17 +++++++++++++++++
 print/scribus/patches/patch-ae |  20 ++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletions(-)

diffs (59 lines):

diff -r a461498004d3 -r 5cff7c639dbd print/scribus/distinfo
--- a/print/scribus/distinfo    Fri Feb 27 18:28:05 2004 +0000
+++ b/print/scribus/distinfo    Fri Feb 27 21:14:08 2004 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2003/11/19 11:54:48 agc Exp $
+$NetBSD: distinfo,v 1.4 2004/02/27 21:14:08 kristerw Exp $
 
 SHA1 (scribus-1.1.1.tar.gz) = 640e1007fd0b16c1b4f797910d8628b2be0923a2
 Size (scribus-1.1.1.tar.gz) = 2053257 bytes
 SHA1 (patch-aa) = 74c57344608436ab449f042016495d6895c80f76
 SHA1 (patch-ab) = d2430e5b81c2ff00390f8135a753ce6a40653af7
 SHA1 (patch-ac) = c874f71ca7d93ece073a11e73cb6ef54c62f968d
+SHA1 (patch-ad) = 5c8e0cdacd63ce38a15bcb94c3473d531bb4b836
+SHA1 (patch-ae) = fa4f8e30c2492686ab4fb631910a07bf5e1dae3f
diff -r a461498004d3 -r 5cff7c639dbd print/scribus/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/scribus/patches/patch-ad    Fri Feb 27 21:14:08 2004 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1 2004/02/27 21:14:08 kristerw Exp $
+
+--- scribus/plugins/svgimplugin/svgplugin.cpp.orig     Fri Feb 27 21:24:53 2004
++++ scribus/plugins/svgimplugin/svgplugin.cpp  Fri Feb 27 21:25:07 2004
+@@ -1,3 +1,4 @@
++#include <cmath>
+ #include "svgplugin.h"
+ #include "svgplugin.moc"
+ #include "config.h"
+@@ -7,7 +8,6 @@
+ #include <qfile.h>
+ #include <qtextstream.h>
+ #include <qregexp.h>
+-#include <cmath>
+ #ifdef HAVE_LIBZ
+ #include <zlib.h>
+ #endif
diff -r a461498004d3 -r 5cff7c639dbd print/scribus/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/scribus/patches/patch-ae    Fri Feb 27 21:14:08 2004 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1 2004/02/27 21:14:08 kristerw Exp $
+
+--- scribus/scribusXml.cpp.orig        Fri Feb 27 21:30:26 2004
++++ scribus/scribusXml.cpp     Fri Feb 27 21:30:45 2004
+@@ -5,6 +5,7 @@
+     copyright            : (C) 2001 by Christian Töpp
+     email                : christian.toepp@mr-ct%gmx.de@localhost
+  ***************************************************************************/
++#include <cmath>
+ #include "scribusXml.h"
+ #include "scribusXml.moc"
+ #include <qfile.h>
+@@ -17,7 +18,6 @@
+ #include <qdir.h>
+ #include <qtextcodec.h>
+ #include <cstdlib>
+-#include <cmath>
+ #include "missing.h"
+ #include "config.h"
+ #ifdef HAVE_LIBZ