[pkgsrc/trunk]: pkgsrc/x11/XmHTML stdout may not be a link-time constant. E.g...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/72e18b8bc560
branches:  trunk
changeset: 500183:72e18b8bc560
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Oct 03 17:52:10 2005 +0000

description:
stdout may not be a link-time constant. E.g. on DragonFly, it is just an
extern pointer. Move the compile-time initialisation to run time.

diffstat:

 x11/XmHTML/distinfo         |   3 ++-
 x11/XmHTML/patches/patch-ai |  42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletions(-)

diffs (60 lines):

diff -r eae6dae60d96 -r 72e18b8bc560 x11/XmHTML/distinfo
--- a/x11/XmHTML/distinfo       Mon Oct 03 16:45:08 2005 +0000
+++ b/x11/XmHTML/distinfo       Mon Oct 03 17:52:10 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/09/18 16:03:47 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2005/10/03 17:52:10 joerg Exp $
 
 SHA1 (XmHTML-1.1.7.tar.gz) = 4d8c82f88cf0700f6fc8898323d865b83d2a1ff1
 RMD160 (XmHTML-1.1.7.tar.gz) = 0e5cf4a0d24fc73277186a726a3997dea4ea82db
@@ -11,3 +11,4 @@
 SHA1 (patch-af) = 41d5a342cd13ad188289b115cbd3bfc36725b961
 SHA1 (patch-ag) = 335c1139ee826ab8d04d8a7584d21675a3ae2d93
 SHA1 (patch-ah) = 78ad8dc486da8aad6911f79eb8bd22d8417aec1f
+SHA1 (patch-ai) = 300b35e24698d6e717f0b1bdfd577df91244fba4
diff -r eae6dae60d96 -r 72e18b8bc560 x11/XmHTML/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/XmHTML/patches/patch-ai       Mon Oct 03 17:52:10 2005 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-ai,v 1.1 2005/10/03 17:52:10 joerg Exp $
+
+--- lib/common/debug.c.orig    2005-08-16 19:40:17.000000000 +0000
++++ lib/common/debug.c
+@@ -110,7 +110,7 @@ int debug_disable_warnings = 0;
+ /*** Private Function Prototype Declarations ****/
+ 
+ /*** Private Variable Declarations ***/
+-static FILE *__rsd_debug_file = stdout;
++static FILE *__rsd_debug_file = NULL;
+ 
+ /*****
+ * When debug output is send to a file, we register an exit func to close
+@@ -128,7 +128,8 @@ __rsd_at_exit(void)
+ #endif
+ {
+       /* close output file */
+-      fclose(__rsd_debug_file);
++      if (__rsd_debug_file != NULL)
++              fclose(__rsd_debug_file);
+ }
+ 
+ /*****
+@@ -159,6 +160,9 @@ __rsd_fprintf(fmt, va_alist)
+       va_start(arg_list);
+ #endif /* __STDC__ */
+ 
++      if (__rsd_debug_file == NULL)
++              __rsd_debug_file = stdout;
++
+       /* flush to file */
+       vfprintf(__rsd_debug_file, fmt, arg_list);
+       va_end(arg_list);
+@@ -298,7 +302,7 @@ __rsd_setDebugLevels(int *argc, char **a
+                               if((chPtr = strstr(argv[i], ":")) != NULL)
+                               {
+                                       /* close any existing output file */
+-                                      if(__rsd_debug_file != stdout)
++                                      if(__rsd_debug_file != stdout && __rsd_debug_file != NULL)
+                                               fclose(__rsd_debug_file);
+ 
+                                       chPtr++;        /* skip : */