4 files changed, 58 insertions, 23 deletions
diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
index c1381c63e60..c31cf6d673d 100644
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2011/11/10 06:29:44 obache Exp $
+# $NetBSD: Makefile,v 1.15 2012/05/06 09:08:36 obache Exp $
 #
 
-DISTNAME=		LibVNCServer-0.9.8.2
-PKGNAME=		libVNCServer-0.9.8.2
+DISTNAME=		LibVNCServer-0.9.9
+PKGNAME=		libVNCServer-0.9.9
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libvncserver/}
 
diff --git a/net/libvncserver/distinfo b/net/libvncserver/distinfo
index e55d1b40266..b5ae8fa02b5 100644
--- a/net/libvncserver/distinfo
+++ b/net/libvncserver/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2012/02/22 09:50:24 cheusov Exp $
+$NetBSD: distinfo,v 1.8 2012/05/06 09:08:36 obache Exp $
 
-SHA1 (LibVNCServer-0.9.8.2.tar.gz) = 26995fd92fed9ddeecf40a4bdf0067fdae8c647c
-RMD160 (LibVNCServer-0.9.8.2.tar.gz) = 0dbb7bd53f0298be948a2b47a5f900eb6543102e
-Size (LibVNCServer-0.9.8.2.tar.gz) = 1238439 bytes
-SHA1 (patch-configure) = f58e0bf55c00db9c0bfe1eb5477e06db12bcd303
+SHA1 (LibVNCServer-0.9.9.tar.gz) = 2004c6ae493baeff3da40b61e0a0f73c83182dad
+RMD160 (LibVNCServer-0.9.9.tar.gz) = e62e0903124abb85746bcac6498214fe09c3b4d7
+Size (LibVNCServer-0.9.9.tar.gz) = 1678609 bytes
+SHA1 (patch-libvncserver_websockets.c) = 059c8a3d0971caa3a43eb48a69b8ca81e6df0a78
diff --git a/net/libvncserver/patches/patch-configure b/net/libvncserver/patches/patch-configure
deleted file mode 100644
index 7d0da491fe1..00000000000
--- a/net/libvncserver/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2012/02/22 09:50:24 cheusov Exp $
-# PR 42289
---- configure.orig	2011-11-09 11:58:39.000000000 +0000
-+++ configure
-@@ -24066,8 +24066,8 @@ else
- fi
- 
- 
--# Check if /dev/vcsa1 exists, if so, define LINUX
-- if test -c /dev/vcsa1; then
-+# Define LINUX_TRUE on Linux
-+ if test `uname -s` = Linux; then
-   LINUX_TRUE=
-   LINUX_FALSE='#'
- else
diff --git a/net/libvncserver/patches/patch-libvncserver_websockets.c b/net/libvncserver/patches/patch-libvncserver_websockets.c
new file mode 100644
index 00000000000..a46c0c2010d
--- /dev/null
+++ b/net/libvncserver/patches/patch-libvncserver_websockets.c
@@ -0,0 +1,50 @@
+$NetBSD: patch-libvncserver_websockets.c,v 1.1 2012/05/06 09:08:36 obache Exp $
+
+* byte-order handling for !Linux.
+
+--- libvncserver/websockets.c.orig	2012-05-04 14:19:00.000000000 +0000
++++ libvncserver/websockets.c
+@@ -31,12 +31,34 @@
+ /* errno */
+ #include <errno.h>
+ 
+-#include <byteswap.h>
+ #include <string.h>
+ #include "rfbconfig.h"
+ #include "rfbssl.h"
+ #include "rfbcrypto.h"
+ 
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#include <sys/endian.h>
++#define WS_NTOH64(n) be64toh(n)
++#define WS_NTOH32(n) be32toh(n)
++#define WS_NTOH16(n) be16toh(n)
++#define WS_HTON64(n) htobe64(n)
++#define WS_HTON16(n) htobe16(n)
++#elif defined(__OpenBSD__)
++#include <sys/types.h>
++#define WS_NTOH64(n) betoh64(n)
++#define WS_NTOH32(n) betoh32(n)
++#define WS_NTOH16(n) betoh16(n)
++#define WS_HTON64(n) htobe64(n)
++#define WS_HTON16(n) htobe16(n)
++#elif defined(__APPLE__)
++#include <libkern/OSByteOrder.h>
++#define WS_NTOH64(n) OSSwapBigToHostInt64(n)
++#define WS_NTOH32(n) OSSwapBigToHostInt32(n)
++#define WS_NTOH16(n) OSSwapBigToHostInt16(n)
++#define WS_HTON64(n) OSSwapHostToBigInt64(n)
++#define WS_HTON16(n) OSSwapHostToBitInt16(n)
++#else
++#include <byteswap.h>
+ #if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN
+ #define WS_NTOH64(n) (n)
+ #define WS_NTOH32(n) (n)
+@@ -50,6 +72,7 @@
+ #define WS_HTON64(n) bswap_64(n)
+ #define WS_HTON16(n) bswap_16(n)
+ #endif
++#endif
+ 
+ #define B64LEN(__x) (((__x + 2) / 3) * 12 / 3)
+ #define WSHLENMAX 14  /* 2 + sizeof(uint64_t) + sizeof(uint32_t) */