3 files changed, 37 insertions, 0 deletions
diff --git a/net/nxserver/Makefile b/net/nxserver/Makefile
index 23ba0125980f..0987a46a6a93 100644
--- a/net/nxserver/Makefile
+++ b/net/nxserver/Makefile
@@ -55,6 +55,8 @@ post-patch:
 		${WRKSRC}/nxdesktop/Makefile
 	@${REINPLACE_CMD} -e "s|/usr/local/|${PREFIX}/|" \
 		${WRKSRC}/nxviewer/nxviewer/Imakefile
+	@${REINPLACE_CMD} -e "s|objformat=.*|objformat=elf|" \
+		 ${WRKSRC}/nxesd/configure
 
 do-configure:
 .if defined(TEMPLATES) && exists(${TEMPLATES}/config.guess) && exists(${TEMPLATES}/config.sub)
diff --git a/net/nxserver/files/patch-nx-X11-config-cf-FreeBSD.cf b/net/nxserver/files/patch-nx-X11-config-cf-FreeBSD.cf
new file mode 100644
index 000000000000..abf5bf1ebd66
--- /dev/null
+++ b/net/nxserver/files/patch-nx-X11-config-cf-FreeBSD.cf
@@ -0,0 +1,15 @@
+--- nx-X11/config/cf/FreeBSD.cf.orig	2006-06-19 16:18:55.000000000 +0200
++++ nx-X11/config/cf/FreeBSD.cf	2008-04-11 21:21:29.000000000 +0200
+@@ -105,11 +105,7 @@
+ #   define BuildThreadStubLibrary  YES
+ #   define NeedUIThrStubs          YES
+ #  endif
+-#  if (OSRelVersion >= 500016)
+-#   define ThreadsLibraries	-lc_r
+-#  else
+-#   define ThreadsLibraries	-pthread
+-#  endif
++#  define ThreadsLibraries	-pthread
+ #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
+ #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
+ # endif
diff --git a/net/nxserver/files/patch-nx-X11-config-imake-imake.c b/net/nxserver/files/patch-nx-X11-config-imake-imake.c
new file mode 100644
index 000000000000..d32a5e153cdd
--- /dev/null
+++ b/net/nxserver/files/patch-nx-X11-config-imake-imake.c
@@ -0,0 +1,20 @@
+--- nx-X11/config/imake/imake.c.orig	2002-12-16 23:48:28.000000000 +0100
++++ nx-X11/config/imake/imake.c	2008-04-11 21:05:32.000000000 +0200
+@@ -1146,6 +1146,7 @@
+ static void
+ get_binary_format(FILE *inFile)
+ {
++#if 0
+   int mib[2];
+   size_t len;
+   int osrel = 0;
+@@ -1173,6 +1174,9 @@
+   if (objprog)
+     pclose(objprog);
+ 
++#else
++  int iself = 1;
++#endif
+   fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO");
+ }
+ #endif