Fix build on DragonFly.

5 files changed, 26 insertions, 13 deletions

diff --git a/wm/metisse/distinfo b/wm/metisse/distinfo
index 8246b4c7407..5a74c87c552 100644
--- a/wm/metisse/distinfo
+++ b/wm/metisse/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.2 2007/06/29 22:46:48 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/06/30 15:22:09 joerg Exp $
 
 SHA1 (metisse-0.4.0-rc4.tar.bz2) = 01b4893fd68d46eb44d8ab7d8d11bee442de3017
 RMD160 (metisse-0.4.0-rc4.tar.bz2) = 9ff492c68081b01d51c564d2d5c2136d8db1c19c
 Size (metisse-0.4.0-rc4.tar.bz2) = 6017779 bytes
 SHA1 (patch-aa) = 4773fb8ba08d82bc3b4317c1bb91cdfbcf299e6f
-SHA1 (patch-ab) = bc0818f6b2a2afec8f2d42865d858bcfad83f21d
+SHA1 (patch-ab) = 8f74e223ba8344e35a4e43ce286466738a53c8ca
 SHA1 (patch-ac) = 4f8bb2c57834d927907c56a1a9413866e05cf99b
-SHA1 (patch-ad) = a46283deeffa06aeb23e44add909ff7a382429a0
-SHA1 (patch-ae) = c2f24e4b9e3a4685b22ee17699cda4bea9c22d51
+SHA1 (patch-ad) = d66bc0a8fa3d0d1397c2e59cd0c1d8a997c7f920
+SHA1 (patch-ae) = 4bafefd35ba57588b50d5d4d1eb0fc50dc8ff74d
+SHA1 (patch-af) = 546e808741ed585594336ca918dc8903b2e55884
diff --git a/wm/metisse/patches/patch-ab b/wm/metisse/patches/patch-ab
index 30e1447c0b4..c87329ce000 100644
--- a/wm/metisse/patches/patch-ab
+++ b/wm/metisse/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/06/02 19:07:33 agc Exp $
+$NetBSD: patch-ab,v 1.2 2007/06/30 15:22:09 joerg Exp $
 
---- xserver/os/osdep.h	2007/06/02 10:45:12	1.1
-+++ xserver/os/osdep.h	2007/06/02 10:48:18
-@@ -117,6 +117,12 @@
+--- xserver/os/osdep.h.orig	2006-12-01 00:19:58.000000000 +0000
++++ xserver/os/osdep.h
+@@ -117,6 +117,12 @@ SOFTWARE.
  
  #include <stddef.h>
  #include <sys/types.h>
 +#include <sys/param.h>
 +
-+#if (defined(BSD) && BSD >= 199506)
++#if (defined(BSD) && BSD >= 199506) && !defined(__DragonFly__)
 +#include <sys/select.h>
 +typedef __fd_mask	fd_mask;
 +#endif
diff --git a/wm/metisse/patches/patch-ad b/wm/metisse/patches/patch-ad
index 02bc3d6fba7..4454a277495 100644
--- a/wm/metisse/patches/patch-ad
+++ b/wm/metisse/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/06/02 19:07:33 agc Exp $
+$NetBSD: patch-ad,v 1.2 2007/06/30 15:22:09 joerg Exp $
 
 --- FvwmCompositor/renderer/WindowRenderer.cxx	2007/06/02 12:23:48	1.1
 +++ FvwmCompositor/renderer/WindowRenderer.cxx	2007/06/02 12:27:40
@@ -6,7 +6,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/06/02 19:07:33 agc Exp $
  // ---------------------------------------------------------------------------
  //
  
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +static inline double
 +fmin(double x, double y)
 +{
diff --git a/wm/metisse/patches/patch-ae b/wm/metisse/patches/patch-ae
index 1de50bbad45..4f03eb146b5 100644
--- a/wm/metisse/patches/patch-ae
+++ b/wm/metisse/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2007/06/02 19:07:33 agc Exp $
+$NetBSD: patch-ae,v 1.2 2007/06/30 15:22:09 joerg Exp $
 
 --- FvwmCompositor/main/LayerManager.cxx	2007/06/02 12:31:01	1.1
 +++ FvwmCompositor/main/LayerManager.cxx	2007/06/02 12:32:00
@@ -6,7 +6,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2007/06/02 19:07:33 agc Exp $
  #define A_PAGER_MODE_MARGIN_P 0.02
  
  // --------------------------------------------------------------------
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +static inline double
 +fmin(double x, double y)
 +{
diff --git a/wm/metisse/patches/patch-af b/wm/metisse/patches/patch-af
new file mode 100644
index 00000000000..0c715897658
--- /dev/null
+++ b/wm/metisse/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2007/06/30 15:22:09 joerg Exp $
+
+--- FvwmCompositor/main/AScreen.cxx.orig	2007-06-30 14:47:06.000000000 +0000
++++ FvwmCompositor/main/AScreen.cxx
+@@ -32,6 +32,7 @@
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdexcept>
++#include <unistd.h>
+ 
+ #define SR_SNAP_DIST 12
+