Fix build on SunOS.

5 files changed, 47 insertions, 5 deletions

diff --git a/security/MyPasswordSafe/distinfo b/security/MyPasswordSafe/distinfo
index 3b788a6d10c..79a54d8ac7e 100644
--- a/security/MyPasswordSafe/distinfo
+++ b/security/MyPasswordSafe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2011/11/22 20:05:25 joerg Exp $
+$NetBSD: distinfo,v 1.11 2012/03/02 15:07:16 hans Exp $
 
 SHA1 (MyPasswordSafe-20061216.src.tgz) = 37bb3f7491b42c8aac5d71cc6546ced018a15119
 RMD160 (MyPasswordSafe-20061216.src.tgz) = b61f1525aed3160b88c1ef6c6922ff131ad2248c
@@ -6,7 +6,7 @@ Size (MyPasswordSafe-20061216.src.tgz) = 834084 bytes
 SHA1 (patch-aa) = ef524bde4c75a822bdf035a828242e6eec5fd652
 SHA1 (patch-ab) = 41f42aa0fa4f9d97431a9a01807a0a2cc838a753
 SHA1 (patch-ac) = b6bd898a248da7052087a233e7aac215ad1196e2
-SHA1 (patch-ad) = 56179239b4ab92ee83f792432bc07c1501e1cdad
+SHA1 (patch-ad) = dabddc12850f2b323c5fc09d88b2b81eef1c4585
 SHA1 (patch-ae) = e5dca33f49895f5b30d757fd41dc58d6e8bb55a0
 SHA1 (patch-src-crypto-bfproxy.cpp) = cb84b4c5f474f057f0b702ff541d0587369a21e8
 SHA1 (patch-src-encryptedstring.cpp) = 715f7918fce45d3c4516acbcadd99e87f58a6492
diff --git a/security/MyPasswordSafe/patches/patch-ad b/security/MyPasswordSafe/patches/patch-ad
index 193d57c74ee..9cc36cf5ade 100644
--- a/security/MyPasswordSafe/patches/patch-ad
+++ b/security/MyPasswordSafe/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2006/01/19 23:39:19 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2012/03/02 15:07:16 hans Exp $
 
 --- src/myendian.h.orig	2006-01-19 23:32:41.000000000 +0000
 +++ src/myendian.h
-@@ -8,7 +8,7 @@
+@@ -8,10 +8,19 @@
  #    define BYTE_ORDER LITTLE_ENDIAN
  #  endif
  #else
@@ -11,3 +11,15 @@ $NetBSD: patch-ad,v 1.1 2006/01/19 23:39:19 joerg Exp $
  #    include <sys/endian.h>
  #  elif __APPLE__
  #    include <ppc/endian.h>
++#  elif __sun
++#    include <sys/byteorder.h>
++#    define LITTLE_ENDIAN 1234
++#    define BIG_ENDIAN 4321
++#    ifdef _BIG_ENDIAN
++#      define BYTE_ORDER BIG_ENDIAN
++#    else
++#      define BYTE_ORDER LITTLE_ENDIAN
++#    endif
+ #  else
+ #    include <endian.h>
+ #  endif
diff --git a/wm/3ddesktop/distinfo b/wm/3ddesktop/distinfo
index 6199452faf1..ba9fb63cf74 100644
--- a/wm/3ddesktop/distinfo
+++ b/wm/3ddesktop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2011/11/25 22:20:28 joerg Exp $
+$NetBSD: distinfo,v 1.8 2012/03/02 14:57:07 hans Exp $
 
 SHA1 (3ddesktop-0.2.9.tar.gz) = 33ff86b559d0c0407ef4c6c989a9fcbf804f7e5f
 RMD160 (3ddesktop-0.2.9.tar.gz) = 86ca9d9df57a83d2f4719ce45708e129bdc75fb4
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = bf6d06462cb2b0e48f15296a7238980dec0e8e17
 SHA1 (patch-ab) = e078b55d2a0fc7344f59dcbddd25644b31f8f201
 SHA1 (patch-ad) = 3e24c98b58b27e2e7384bb96ece20cb604dd900f
 SHA1 (patch-config.cpp) = e3352c5b93aa574b5de8d77b4c56d1fbf65f7ecf
+SHA1 (patch-config.hpp) = 75e530ef6d024236a14a4e8e7f2fe44badc012d7
+SHA1 (patch-util.h) = 8207e3ffc523b56902860abac3a80dbe03abb6e2
diff --git a/wm/3ddesktop/patches/patch-config.hpp b/wm/3ddesktop/patches/patch-config.hpp
new file mode 100644
index 00000000000..2ec15421ae9
--- /dev/null
+++ b/wm/3ddesktop/patches/patch-config.hpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-config.hpp,v 1.1 2012/03/02 14:57:08 hans Exp $
+
+--- config.hpp.orig	2005-06-20 13:28:29.000000000 +0200
++++ config.hpp	2012-03-02 15:50:39.263891839 +0100
+@@ -35,6 +35,7 @@
+ #define _GNU_SOURCE
+ #endif
+ #include <dirent.h>  // for PATH_MAX?
++#include <limits.h>
+ #include <getopt.h>
+ 
+ #include <X11/keysym.h>
diff --git a/wm/3ddesktop/patches/patch-util.h b/wm/3ddesktop/patches/patch-util.h
new file mode 100644
index 00000000000..e532eee6f94
--- /dev/null
+++ b/wm/3ddesktop/patches/patch-util.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-util.h,v 1.1 2012/03/02 14:57:08 hans Exp $
+
+--- util.h.orig	2005-06-20 13:06:50.000000000 +0200
++++ util.h	2012-03-02 15:48:57.476209637 +0100
+@@ -24,6 +24,11 @@
+ #include <sys/param.h> // BSD 
+ #ifdef BSD
+ #include <sys/endian.h>
++#elif defined(__sun)
++#include <sys/byteorder.h>
++#ifdef _BIG_ENDIAN
++#define __BIG_ENDIAN__
++#endif
+ #else
+ #include <endian.h>
+ #endif