- update to 2.1.0

- make portlint happier
- fix missing USE_LDCONFIG
PR:		112887
Obtained from:	http://www.deweyonline.com/nx/freebsd.html

23 files changed, 248 insertions, 184 deletions

diff --git a/net/nxserver/files/extra-patch-nx-X11-programs-Xserver-hw-nxagent-Reconnect.c b/net/nxserver/files/extra-patch-nx-X11-programs-Xserver-hw-nxagent-Reconnect.c
deleted file mode 100644
index 6ab1d83c6aa1..000000000000
--- a/net/nxserver/files/extra-patch-nx-X11-programs-Xserver-hw-nxagent-Reconnect.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c.orig	Sat Sep 11 16:04:08 2004
-+++ nx-X11/programs/Xserver/hw/nxagent/Reconnect.c	Sat Sep 11 16:04:23 2004
-@@ -308,7 +308,7 @@
-   while (sessionState == SESSION_SLEEPING)
-   {
-     /* Blocking SIG_ALRM. */
--    pselect(0, NULL, NULL, NULL, NULL, &sleep_set); 
-+    select(0, NULL, NULL, NULL, &sleep_set); 
-   }
- 
-   if (sessionState == SESSION_TERM)
diff --git a/net/nxserver/files/extra-patch-nxcomp-types.h b/net/nxserver/files/extra-patch-nxcomp-types.h
deleted file mode 100644
index 280c2c0ce86b..000000000000
--- a/net/nxserver/files/extra-patch-nxcomp-types.h
+++ /dev/null
@@ -1,57 +0,0 @@
---- nxcomp/Types.h.orig	Sat Feb  5 15:56:14 2005
-+++ nxcomp/Types.h	Tue Mar 29 09:52:13 2005
-@@ -74,11 +74,11 @@
- 
-   void clear()
-   {
--    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-+    #if defined(__STL_USE_STD_ALLOCATORS) || defined(_VECTOR_H)
- 
--    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
-+    #if defined(_VECTOR_H)
- 
--    _Destroy(_M_start, _M_finish);
-+    _Destroy(_M_impl._M_start, _M_impl._M_finish);
- 
-     #else /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
- 
-@@ -86,9 +86,9 @@
- 
-     #endif /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
- 
--    _M_deallocate(_M_start, _M_end_of_storage - _M_start);
-+    _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
- 
--    _M_start = _M_finish = _M_end_of_storage = 0;
-+    _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
- 
-     #else /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
- 
-@@ -120,21 +120,21 @@
- 
-   void clear()
-   {
--    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-+    #if defined(__STL_USE_STD_ALLOCATORS) || defined(_VECTOR_H)
- 
--    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
-+    #if defined(_VECTOR_H)
- 
--    _Destroy(_M_start, _M_finish);
-+    _Destroy(_M_impl._M_start, _M_impl._M_finish);
- 
-     #else /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
- 
--    destroy(_M_start, _M_finish);
-+    destroy(_M_impl._M_start, _M_impl._M_finish);
- 
-     #endif /* #if defined(__GLIBCPP_INTERNAL_VECTOR_H) */
- 
--    _M_deallocate(_M_start, _M_end_of_storage - _M_start);
-+    _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
- 
--    _M_start = _M_finish = _M_end_of_storage = 0;
-+    _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
- 
-     #else /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
- 
diff --git a/net/nxserver/files/patch-lib-xtrans-Xtranssock.c b/net/nxserver/files/patch-lib-xtrans-Xtranssock.c
deleted file mode 100644
index 151f507a02d7..000000000000
--- a/net/nxserver/files/patch-lib-xtrans-Xtranssock.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- nx-X11/lib/xtrans/Xtranssock.c.orig	Wed Mar  3 19:47:29 2004
-+++ nx-X11/lib/xtrans/Xtranssock.c	Wed Sep  1 22:39:47 2004
-@@ -2118,11 +2118,11 @@
-          * platforms as well.
-          */
- 
--        #ifndef __sun
-+	/*        #ifndef __sun */
- 
--        sa.sa_restorer = NULL;
-+	/*        sa.sa_restorer = NULL; */
- 
--        #endif
-+        /* #endif */
- 
-         sigemptyset(&(sa.sa_mask));
- 
diff --git a/net/nxserver/files/patch-nx-X11-config-cf-NX-FreeBSD.def b/net/nxserver/files/patch-nx-X11-config-cf-NX-FreeBSD.def
new file mode 100644
index 000000000000..b392a0a281f0
--- /dev/null
+++ b/net/nxserver/files/patch-nx-X11-config-cf-NX-FreeBSD.def
@@ -0,0 +1,20 @@
+--- nx-X11/config/cf/NX-FreeBSD.def.orig	Thu Feb  1 07:43:43 2007
++++ nx-X11/config/cf/NX-FreeBSD.def
+@@ -622,7 +622,7 @@
+  *
+ #define BuildGlxExt             NO
+  */
+-#define BuildGlxExt             NO
++#define BuildGlxExt             YES
+ 
+ /*
+  * If you want to build support for the old dlopen style external GLX
+@@ -918,3 +918,8 @@
+  */ 
+ 
+ 
++/*
++ * Avoid the warning due to "SharedLibGLw" being not defined.
++ */
++
++#define SharedLibGLw		NO
diff --git a/net/nxserver/files/patch-nx-X11-programs-Xserver-nxagent-Atoms.c b/net/nxserver/files/patch-nx-X11-programs-Xserver-nxagent-Atoms.c
new file mode 100644
index 000000000000..03dd02e7ffce
--- /dev/null
+++ b/net/nxserver/files/patch-nx-X11-programs-Xserver-nxagent-Atoms.c
@@ -0,0 +1,11 @@
+--- nx-X11/programs/Xserver/hw/nxagent/Atoms.c.orig	2006-04-18 11:40:18.000000000 -0355
++++ nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+@@ -785,6 +785,8 @@
+ 
+     nxagentWriteAtom(local, remote, string, True);
+ 
++    XFree(string);
++
+     return local;
+   }
+ 
diff --git a/net/nxserver/files/patch-nx-X11-programs-Xserver-nxagent-NXdixfonts.c b/net/nxserver/files/patch-nx-X11-programs-Xserver-nxagent-NXdixfonts.c
new file mode 100644
index 000000000000..5c770baea5e7
--- /dev/null
+++ b/net/nxserver/files/patch-nx-X11-programs-Xserver-nxagent-NXdixfonts.c
@@ -0,0 +1,11 @@
+--- nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c.orig	2006-11-09 12:22:35.000000000 -0455
++++ nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c	
+@@ -2521,7 +2521,7 @@
+ 		err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases)
+ 		    ((pointer) c->client, fpe, c->current.pattern,
+ 		     c->current.patlen, c->current.max_names - c->names->nnames,
+-		     &c->current.private);
++		     &c->current.private); /* FIXME: returned mem c->current.private (needed by list_next_font_or_alias) may never be freed */
+ 		if (err == Suspended) {
+ 		    if (!c->slept) {
+ 			ClientSleep(client,
diff --git a/net/nxserver/files/patch-nx-X11-programs-Xserver-nxagent-Pixmap.c b/net/nxserver/files/patch-nx-X11-programs-Xserver-nxagent-Pixmap.c
new file mode 100644
index 000000000000..ad00e8098bbd
--- /dev/null
+++ b/net/nxserver/files/patch-nx-X11-programs-Xserver-nxagent-Pixmap.c
@@ -0,0 +1,100 @@
+--- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c.orig	2006-11-09 12:18:00.000000000 -0455
++++ nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+@@ -1115,6 +1115,7 @@
+     {
+       FatalError("XGetImage: Failed.\n");
+ 
++      free(data);
+       return False;
+     }
+ 
+@@ -1600,6 +1601,7 @@
+         fprintf(stderr, "nxagentSynchronizeDrawableData: WARNING! Failed to create the temporary GC.\n");
+         #endif
+ 
++        xfree(data);
+         return 0;
+       }
+ 
+@@ -1661,6 +1663,7 @@
+           fprintf(stderr, "nxagentSynchronizeDrawableData: WARNING! Failed to create the temporary GC.\n");
+           #endif
+ 
++          xfree(data);
+           return 0;
+         }
+ 
+@@ -1772,6 +1775,7 @@
+   int useExtents;
+   int imageLength, corruptedLength;
+   int corruptedWidth, corruptedHeight;
++  int ret = 0; /* Used by error handling. 0 is error(?, based on previous code) */
+ 
+   #ifdef TEST
+   static int totalLength;
+@@ -1812,7 +1816,7 @@
+                             (void *) pDrawable);
+     #endif
+ 
+-    return 0;
++    goto SR_FREE_CLIP;
+   }
+ 
+   /*
+@@ -1836,7 +1840,7 @@
+                               (void *) pDrawable);
+       #endif
+ 
+-      return 0;
++      goto SR_FREE_CLIP;
+     }
+   }
+ 
+@@ -1861,7 +1865,7 @@
+     fprintf(stderr, "nxagentSynchronizeRegion: WARNING! Failed to allocate memory for the operation.\n");
+     #endif
+ 
+-    return 0;
++    goto SR_FREE_CLIP;
+   }
+ 
+   pSrcDrawable = (pDrawable -> type == DRAWABLE_PIXMAP ?
+@@ -1876,7 +1880,7 @@
+     fprintf(stderr, "nxagentSynchronizeRegion: WARNING! Failed to create the temporary GC.\n");
+     #endif
+ 
+-    return 0;
++    goto SR_FREE_XALLOC;
+   }
+ 
+   ValidateGC(pDrawable, pGC);
+@@ -1935,7 +1939,7 @@
+ 
+     #endif
+ 
+-    return 1;
++    goto SR_FREE_GC;
+   }
+ 
+   /*
+@@ -2029,13 +2033,17 @@
+ 
+   nxagentGCTrap = saveTrap;
+ 
+-  nxagentFreeRegion(pDrawable, clipRegion);
++SR_FREE_GC:
++  ret = 1;
++  FreeScratchGC(pGC);
+ 
++SR_FREE_XALLOC:
+   xfree(data);
+ 
+-  FreeScratchGC(pGC);
++SR_FREE_CLIP:
++  nxagentFreeRegion(pDrawable, clipRegion);
+ 
+-  return 1;
++  return ret;
+ }
+ 
+ void nxagentSynchronizeBox(DrawablePtr pDrawable, BoxPtr pBox)
diff --git a/net/nxserver/files/patch-nx-X11-programs-Xserver-xkb-ddxLoad.c b/net/nxserver/files/patch-nx-X11-programs-Xserver-xkb-ddxLoad.c
new file mode 100644
index 000000000000..c69c31a521bf
--- /dev/null
+++ b/net/nxserver/files/patch-nx-X11-programs-Xserver-xkb-ddxLoad.c
@@ -0,0 +1,12 @@
+--- nx-X11/programs/Xserver/xkb/ddxLoad.c.orig	Thu May 18 14:14:35 2006
++++ nx-X11/programs/Xserver/xkb/ddxLoad.c
+@@ -74,6 +74,9 @@
+ 
+ #ifdef NXAGENT_SERVER
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
++
+ #define NX_XKB_BASE_DIRECTORY            "/usr/lib/X11/xkb"
+ #define NX_XKB_ALTERNATE_BASE_DIRECTORY  "/usr/share/X11/xkb"
+ #define NX_KEYMAP_DIR_FILE               "keymap.dir"
diff --git a/net/nxserver/files/patch-nx-x11-lib-x11-imakefile b/net/nxserver/files/patch-nx-x11-lib-x11-imakefile
deleted file mode 100644
index 0c594f3e3cae..000000000000
--- a/net/nxserver/files/patch-nx-x11-lib-x11-imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- nx-X11/lib/X11/Imakefile.orig	Thu Sep  2 00:22:34 2004
-+++ nx-X11/lib/X11/Imakefile	Thu Sep  2 00:22:46 2004
-@@ -22,7 +22,7 @@
- #ifdef SunArchitecture
- NX_INCLUDES = -I../../../nxcomp -I../../../nxcompext -I/usr/sfw/include
- #else
--NX_INCLUDES = -I../../../nxcomp -I../../../nxcompext
-+NX_INCLUDES = -I../../../nxcomp -I../../../nxcompext -I/usr/local/include
- #endif
-                                                                                                                                               
- NX_DEFINES = -DNX_CLEAN_ALLOC     \
diff --git a/net/nxserver/files/patch-nx-x11-programs-xserver-hw-nxagent-imakefile b/net/nxserver/files/patch-nx-x11-programs-xserver-hw-nxagent-imakefile
deleted file mode 100644
index 5f545848a7c2..000000000000
--- a/net/nxserver/files/patch-nx-x11-programs-xserver-hw-nxagent-imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- nx-X11/programs/Xserver/hw/nxagent/Imakefile.orig	Sun Apr 18 11:57:27 2004
-+++ nx-X11/programs/Xserver/hw/nxagent/Imakefile	Thu Sep  2 01:46:12 2004
-@@ -102,7 +102,7 @@
- 	   -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
- 	   -I../../mi -I../../include -I../../os \
-            -I$(EXTINCSRC) -I$(XINCLUDESRC) \
--	   $(VFBINCLUDES) $(NXFONTINCLUDES)
-+	   $(VFBINCLUDES) $(NXFONTINCLUDES) -I/usr/local/include
- #ifdef SunArchitecture
- INCLUDES = -I../../../../../nxcomp -I../../../../../nxcompext \
- 	   -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
diff --git a/net/nxserver/files/patch-nxcomp-makefile.in b/net/nxserver/files/patch-nxcomp-makefile.in
deleted file mode 100644
index 31bbb48a329f..000000000000
--- a/net/nxserver/files/patch-nxcomp-makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- nxcomp/Makefile.in.orig	Sun Nov  9 06:30:58 2003
-+++ nxcomp/Makefile.in	Thu Sep  2 00:41:27 2004
-@@ -11,14 +11,14 @@
- #
- 
- CXX         = @CXX@
--CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
--              -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
--CXXINCLUDES =
-+CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ -fpermissive -fPIC
-+#              -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
-+CXXINCLUDES = -I/usr/local/include
- CXXDEFINES  =
- 
- CC          = @CC@
- CCFLAGS     = $(CXXFLAGS)
--CCINCLUDES  =
-+CCINCLUDES  = -I/usr/local/include
- CCDEFINES   =
- 
- LDFLAGS     = @LDFLAGS@
diff --git a/net/nxserver/files/patch-nxcompext-Clean.c b/net/nxserver/files/patch-nxcompext-Clean.c
deleted file mode 100644
index 17ef115d17da..000000000000
--- a/net/nxserver/files/patch-nxcompext-Clean.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nxcompext/Clean.c	Thu Apr 29 03:00:45 2004
-+++ nxcompext/Clean.c.new	Sun Sep  5 17:41:01 2004
-@@ -672,7 +672,7 @@
- 
-   sig_act.sa_handler = &SignalHandler;
- 
--  #ifdef __sun
-+  #if defined(__sun) || defined(__FreeBSD__)
- 
-   sig_act.sa_flags = SA_SIGINFO | SA_NODEFER;
- 
diff --git a/net/nxserver/files/patch-nxdesktop-Makeconf b/net/nxserver/files/patch-nxdesktop-Makeconf
deleted file mode 100644
index 30b755d4b3a8..000000000000
--- a/net/nxserver/files/patch-nxdesktop-Makeconf
+++ /dev/null
@@ -1,10 +0,0 @@
---- nxdesktop/Makeconf.orig	Sat Sep 11 14:23:17 2004
-+++ nxdesktop/Makeconf	Sat Sep 11 14:23:53 2004
-@@ -3,6 +3,6 @@
- INSTALL     = install
- CRYPTOBJ    =
- SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o
--CFLAGS      = -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" -Wall -O2 -I../nx-X11/exports/include -DWITH_OPENSSL -DWITH_RDPSND -DL_ENDIAN
-+CFLAGS      = -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" -O2 -I../nx-X11/exports/include -I/usr/local/include -DWITH_OPENSSL -DWITH_RDPSND -DL_ENDIAN
- LDFLAGS     =  -L../nx-X11/exports/lib -lcrypto
- TARGETS     =  nxdesktop
diff --git a/net/nxserver/files/patch-nxdesktop-configure b/net/nxserver/files/patch-nxdesktop-configure
new file mode 100644
index 000000000000..791e0718ba7d
--- /dev/null
+++ b/net/nxserver/files/patch-nxdesktop-configure
@@ -0,0 +1,11 @@
+--- nxdesktop/configure.orig	Mon Sep 18 03:22:22 2006
++++ nxdesktop/configure
+@@ -405,7 +405,7 @@
+   HP-UX)
+     cflags="$cflags -D_XOPEN_SOURCE_EXTENDED"
+     ;;
+-  Linux)
++  Linux|FreeBSD)
+     cflags="$cflags -DHAVE_DECL_DIRFD=1"
+     ;;
+ esac
diff --git a/net/nxserver/files/patch-nxdesktop-proto.h b/net/nxserver/files/patch-nxdesktop-proto.h
deleted file mode 100644
index d4861ca74772..000000000000
--- a/net/nxserver/files/patch-nxdesktop-proto.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- nxdesktop/proto.h.orig	Wed Sep 15 18:29:24 2004
-+++ nxdesktop/proto.h	Wed Apr  6 12:02:30 2005
-@@ -133,7 +133,7 @@
- int get_device_index(HANDLE handle);
- void convert_to_unix_filename(char *filename);
- BOOL rdpdr_init(void);
--void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout);
-+/* void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout); */
- struct async_iorequest *rdpdr_remove_iorequest(struct async_iorequest *prev,
- 					       struct async_iorequest *iorq);
- void rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out);
diff --git a/net/nxserver/files/patch-nxdesktop-rdesktop.h b/net/nxserver/files/patch-nxdesktop-rdesktop.h
deleted file mode 100644
index faf56776ab61..000000000000
--- a/net/nxserver/files/patch-nxdesktop-rdesktop.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- nxdesktop/rdesktop.h.orig	Sat Sep 11 00:16:52 2004
-+++ nxdesktop/rdesktop.h	Sat Sep 11 00:17:06 2004
-@@ -39,6 +39,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <dirent.h>
-+#include <sys/types.h>
- 
- #define VERSION "1.3.1"
- 
diff --git a/net/nxserver/files/patch-nxesd-audio_oss.c b/net/nxserver/files/patch-nxesd-audio_oss.c
new file mode 100644
index 000000000000..880000354cd3
--- /dev/null
+++ b/net/nxserver/files/patch-nxesd-audio_oss.c
@@ -0,0 +1,14 @@
+--- nxesd/audio_oss.c.orig	Wed Aug 18 12:01:41 2004
++++ nxesd/audio_oss.c
+@@ -11,11 +11,6 @@
+ #endif
+ 
+ 
+-/* FreeBSD uses a different identifier? what other BSDs? */
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#define SNDCTL_DSP_SETDUPLEX DSP_CAP_DUPLEX
+-#endif
+-
+ #define ARCH_esd_audio_devices
+ const char *esd_audio_devices()
+ {
diff --git a/net/nxserver/files/patch-nxesd-esddsp.c b/net/nxserver/files/patch-nxesd-esddsp.c
new file mode 100644
index 000000000000..130205b8194e
--- /dev/null
+++ b/net/nxserver/files/patch-nxesd-esddsp.c
@@ -0,0 +1,11 @@
+--- nxesd/esddsp.c.orig	Wed May 25 17:40:19 2005
++++ nxesd/esddsp.c
+@@ -227,7 +227,7 @@
+   dsp_init ();
+ 
+   va_start (args, flags);
+-  mode = va_arg (args, mode_t);
++  mode = va_arg (args, int);
+   va_end (args);
+ 
+   if (!strcmp (pathname, "/dev/dsp"))
diff --git a/net/nxserver/files/patch-nxviewer-include-vncauth.h b/net/nxserver/files/patch-nxviewer-include-vncauth.h
new file mode 100644
index 000000000000..a2a2dc1bae18
--- /dev/null
+++ b/net/nxserver/files/patch-nxviewer-include-vncauth.h
@@ -0,0 +1,11 @@
+--- nxviewer/include/vncauth.h.orig	Tue Oct 24 03:22:20 2006
++++ nxviewer/include/vncauth.h
+@@ -42,6 +42,8 @@
+ #define CHALLENGESIZE 16
+ 
+ extern int vncEncryptAndStorePasswd(char *passwd, char *fname);
++extern int vncEncryptAndStorePasswd2(char *passwd, char *passwdViewOnly,
++    char *fname);
+ extern char *vncDecryptPasswdFromFile(char *fname);
+ extern void vncRandomBytes(unsigned char *bytes);
+ extern void vncEncryptBytes(unsigned char *bytes, char *passwd);
diff --git a/net/nxserver/files/patch-nxviewer-libvncauth-vncauth.c b/net/nxserver/files/patch-nxviewer-libvncauth-vncauth.c
new file mode 100644
index 000000000000..ecf03de482ba
--- /dev/null
+++ b/net/nxserver/files/patch-nxviewer-libvncauth-vncauth.c
@@ -0,0 +1,11 @@
+--- nxviewer/libvncauth/vncauth.c.orig	Fri Dec  1 09:01:41 2006
++++ nxviewer/libvncauth/vncauth.c
+@@ -140,6 +140,8 @@
+ char *
+ vncDecryptPasswdFromFile(char *fname)
+ {
++    int vncDecryptPasswdFromFile2(char *fname,
++	char *passwdFullControl, char *passwdViewOnly);
+     char *passwd;
+ 
+     passwd = malloc(9);
diff --git a/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile b/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile
index 177a4eace7e5..0d13d258dc49 100644
--- a/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile
+++ b/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile
@@ -1,21 +1,23 @@
---- nxviewer/nxviewer/Imakefile.orig	Thu Jun 17 11:44:40 2004
-+++ nxviewer/nxviewer/Imakefile	Mon Feb  7 02:22:45 2005
-@@ -37,7 +37,7 @@
+--- nxviewer/nxviewer/Imakefile.orig	Fri Dec  1 08:54:17 2006
++++ nxviewer/nxviewer/Imakefile
+@@ -26,6 +26,11 @@
+ DEFINES = -DMITSHM
  #endif
  
++#if defined(i386Architecture) && defined(FreeBSDArchitecture)
++DEFINES = -DMITSHM
++JPEG_INC = -I/usr/local/include
++#endif
++
+ NX_INC = -I../../nxcomp -I../../nxcompext -I../../nx-X11/exports/include
+ NX_LIB = -L../../nxcomp -lXcomp -L../../nxcompext -lXcompext
  
--INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include/X11 $(NX_INC)
-+INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/local/include -I$(X11BASE)/include/X11 $(NX_INC)
- VNCAUTH_LIB = ./libvncauth.a
- ZLIB_LIB = -L/usr/local/lib -lz
- JPEG_LIB = -L/usr/local/lib -ljpeg
-@@ -50,6 +50,9 @@
+@@ -37,7 +42,7 @@
  #endif
  
- DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
-+XPLIBSRC = 
-+XPLIB = 
-+
  
- LOCAL_LIBRARIES =  XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) $(NX_LIB)
+-INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include/X11 $(NX_INC)
++INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I../../nx-X11/exports/include/X11 $(NX_INC)
  
+ VNCAUTH_LIB = ../libvncauth/libvncauth.a
+ ZLIB_LIB = -L/usr/local/lib -lz
diff --git a/net/nxserver/files/patch-nxviewer-nxviewer-misc.c b/net/nxserver/files/patch-nxviewer-nxviewer-misc.c
new file mode 100644
index 000000000000..7aa2e2651839
--- /dev/null
+++ b/net/nxserver/files/patch-nxviewer-nxviewer-misc.c
@@ -0,0 +1,10 @@
+--- nxviewer/nxviewer/misc.c.orig	Wed Nov 15 10:32:49 2006
++++ nxviewer/nxviewer/misc.c
+@@ -337,6 +337,7 @@
+     return (*defaultXErrorHandler)(dpy, error);
+   }  
+   nxviewerEnableSharedMemory = FALSE;
++  return 0;
+ }
+ 
+ static int
diff --git a/net/nxserver/files/patch-nxviewer-nxviewer-vncviewer.h b/net/nxserver/files/patch-nxviewer-nxviewer-vncviewer.h
new file mode 100644
index 000000000000..97d742c4e71f
--- /dev/null
+++ b/net/nxserver/files/patch-nxviewer-nxviewer-vncviewer.h
@@ -0,0 +1,10 @@
+--- nxviewer/nxviewer/vncviewer.h.orig	Thu Nov 16 02:42:11 2006
++++ nxviewer/nxviewer/vncviewer.h
+@@ -44,6 +44,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
++#include <sys/wait.h>
+ #include <unistd.h>
+ #include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>