[pkgsrc/trunk]: pkgsrc/wm/fvwm2 Fix a build problem seen on OS X.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/62aef33e5f88
branches:  trunk
changeset: 478836:62aef33e5f88
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Sat Jul 31 01:25:33 2004 +0000

description:
Fix a build problem seen on OS X.

The Apple toolchain has some quirks with common symbols in archives
which makes it fail to pull in a file into a binary if only common
symbols are needed from that file.  Work around this by initializing
one of the variables.

diffstat:

 wm/fvwm2/distinfo         |   3 ++-
 wm/fvwm2/patches/patch-ac |  20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r f2fbfa2a7291 -r 62aef33e5f88 wm/fvwm2/distinfo
--- a/wm/fvwm2/distinfo Sat Jul 31 00:01:04 2004 +0000
+++ b/wm/fvwm2/distinfo Sat Jul 31 01:25:33 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2004/03/22 08:26:44 martti Exp $
+$NetBSD: distinfo,v 1.23 2004/07/31 01:25:33 kristerw Exp $
 
 SHA1 (fvwm-2.4.18.tar.gz) = 03360e859dfc8c4def08adec6f57408ad02dc7a7
 Size (fvwm-2.4.18.tar.gz) = 1792978 bytes
@@ -6,3 +6,4 @@
 Size (fvwm_icons.tgz) = 363406 bytes
 SHA1 (patch-aa) = 6721d48d720a242ec80dd7b50aa934f13ff26ddf
 SHA1 (patch-ab) = 7c1111f4d6d405edb0ffc91ea25704a13e2ab0d3
+SHA1 (patch-ac) = b9009cad82a5f286e54964fc770c8281cefc35d8
diff -r f2fbfa2a7291 -r 62aef33e5f88 wm/fvwm2/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fvwm2/patches/patch-ac Sat Jul 31 01:25:33 2004 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.3 2004/07/31 01:25:33 kristerw Exp $
+
+--- libs/Picture.c.orig        Sat Jul 31 02:18:29 2004
++++ libs/Picture.c     Sat Jul 31 02:27:44 2004
+@@ -75,7 +75,15 @@
+ Bool Pdefault;
+ Visual *Pvisual;
+ static Visual *FvwmVisual;
++#ifdef __APPLE__
++/* The Apple toolchain has some quirks with common symbols in archives
++ * which makes it fail to pull in a file into a binary if only common
++ * symbols are needed from that file.  Work around this by initializing
++ * one of the variables. */
++Colormap Pcmap = {0};
++#else
+ Colormap Pcmap;
++#endif
+ static Colormap FvwmCmap;
+ unsigned int Pdepth;
+ static unsigned int FvwmDepth;