16 files changed, 334 insertions, 0 deletions

diff --git a/net/nxserver/Makefile b/net/nxserver/Makefile
new file mode 100644
index 000000000000..4bf650740280
--- /dev/null
+++ b/net/nxserver/Makefile
@@ -0,0 +1,90 @@
+# New ports collection makefile for:    nxserver
+# Date created:                         Sun 5 Sep 2004
+# Whom:                                 Will Andrews <will@freebsd.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	nxserver
+PORTVERSION=	1.4.0
+CATEGORIES=	net
+MASTER_SITES=	${URL}/nx-X11/:X11 \
+		${URL}/nxagent/:agent \
+		${URL}/nxcomp/:comp \
+		${URL}/nxcompext/:compext \
+		${URL}/nxproxy/:proxy \
+		${URL}/nxauth/:auth \
+		${URL}/nxviewer/:viewer \
+		${URL}/nxdesktop/:desktop
+DISTFILES=	nx-X11-1.4.0-10.tar.gz:X11 \
+		nxagent-1.4.0-65.tar.gz:agent \
+		nxcomp-1.4.0-31.tar.gz:comp \
+		nxcompext-1.4.0-3.tar.gz:compext \
+		nxproxy-1.4.0-2.tar.gz:proxy \
+		nxauth-1.4.0-2.tar.gz:auth \
+		nxviewer-1.4.0-4.tar.gz:viewer \
+		nxdesktop-1.4.0-61.tar.gz:desktop
+
+MAINTAINER=	freenx@deweyonline.com
+COMMENT=	Low-bandwidth X network server
+
+LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
+		jpeg:${PORTSDIR}/graphics/jpeg
+RUN_DEPENDS=	nc:${PORTSDIR}/net/netcat
+
+URL=		http://www.nomachine.com/download/nxsources
+WRKSRC=		${WRKDIR}
+ALL_TARGET=	World
+NXPREFIX?=	${PREFIX}/NX
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+USE_IMAKE=	yes
+NO_FILTER_SHLIBS=	yes
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+BROKEN=		needs a lot of -fPIC added
+.endif
+
+.if ${OSVERSION} < 500014
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nx-X11-programs-Xserver-hw-nxagent-Reconnect.c
+.endif
+
+.if ${OSVERSION} > 502126
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nxcomp-types.h
+.endif
+
+do-configure:
+	cd ${WRKSRC} && \
+	for i in nx[cp]* ; do ( cd $$i ; ./configure "$$*" ); done && \
+	(cd nxviewer ; ${XMKMF} -a)
+
+do-build:
+	cd ${WRKSRC}/nx-X11 && ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
+	cd ${WRKSRC}/nxcomp && ${SETENV} ${MAKE_ENV} \
+		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
+	cd ${WRKSRC}/nxcompext && ${SETENV} ${MAKE_ENV} \
+		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
+	cd ${WRKSRC}/nxproxy && ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
+	cd ${WRKSRC}/nxdesktop &&  \
+		${GMAKE}
+	cd ${WRKSRC}/nxviewer && ${SETENV} ${MAKE_ENV} \
+		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
+
+do-install:
+	${MKDIR} ${NXPREFIX}/lib ${NXPREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/nx-X11/lib/X11/libX11.so* ${NXPREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/nx-X11/lib/Xext/libXext.so* ${NXPREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/nx-X11/lib/Xrender/libXrender.so* ${NXPREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/nxcomp/libXcomp.so* ${NXPREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/nxcompext/libXcompext.so* ${NXPREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/nx-X11/programs/Xserver/nxagent ${NXPREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/nxdesktop/nxdesktop ${NXPREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/nxproxy/nxproxy ${NXPREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/nxviewer/nxpasswd/nxpasswd ${NXPREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/nxviewer/nxviewer/nxviewer ${NXPREFIX}/bin
+
+.include <bsd.port.post.mk>
diff --git a/net/nxserver/distinfo b/net/nxserver/distinfo
new file mode 100644
index 000000000000..b3b2d01579cb
--- /dev/null
+++ b/net/nxserver/distinfo
@@ -0,0 +1,16 @@
+MD5 (nx-X11-1.4.0-10.tar.gz) = a8c6ab48021c91e55b902cd25097f33d
+SIZE (nx-X11-1.4.0-10.tar.gz) = 32329453
+MD5 (nxagent-1.4.0-65.tar.gz) = e39f2a3384edc9e33d8b68405fb91228
+SIZE (nxagent-1.4.0-65.tar.gz) = 305264
+MD5 (nxcomp-1.4.0-31.tar.gz) = c2eb354e141e9f0e81f4cd1673b2a3ae
+SIZE (nxcomp-1.4.0-31.tar.gz) = 455621
+MD5 (nxcompext-1.4.0-3.tar.gz) = ab12f1f32329f5da0f53dd0969fe897e
+SIZE (nxcompext-1.4.0-3.tar.gz) = 111409
+MD5 (nxproxy-1.4.0-2.tar.gz) = 15d89810730c7ed0e669b5525e5f3620
+SIZE (nxproxy-1.4.0-2.tar.gz) = 75223
+MD5 (nxauth-1.4.0-2.tar.gz) = 274319eb06fbab8bbd486836668e1e0a
+SIZE (nxauth-1.4.0-2.tar.gz) = 23070
+MD5 (nxviewer-1.4.0-4.tar.gz) = 629f90c1f8ef50517e8b1de2c30adcb4
+SIZE (nxviewer-1.4.0-4.tar.gz) = 84538
+MD5 (nxdesktop-1.4.0-61.tar.gz) = 9399fa94c59fbde2a158618e507635d7
+SIZE (nxdesktop-1.4.0-61.tar.gz) = 235550
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
new file mode 100644
index 000000000000..6ab1d83c6aa1
--- /dev/null
+++ b/net/nxserver/files/extra-patch-nx-X11-programs-Xserver-hw-nxagent-Reconnect.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..280c2c0ce86b
--- /dev/null
+++ b/net/nxserver/files/extra-patch-nxcomp-types.h
@@ -0,0 +1,57 @@
+--- 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
new file mode 100644
index 000000000000..151f507a02d7
--- /dev/null
+++ b/net/nxserver/files/patch-lib-xtrans-Xtranssock.c
@@ -0,0 +1,17 @@
+--- 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-lib-x11-imakefile b/net/nxserver/files/patch-nx-x11-lib-x11-imakefile
new file mode 100644
index 000000000000..0c594f3e3cae
--- /dev/null
+++ b/net/nxserver/files/patch-nx-x11-lib-x11-imakefile
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..5f545848a7c2
--- /dev/null
+++ b/net/nxserver/files/patch-nx-x11-programs-xserver-hw-nxagent-imakefile
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..31bbb48a329f
--- /dev/null
+++ b/net/nxserver/files/patch-nxcomp-makefile.in
@@ -0,0 +1,21 @@
+--- 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
new file mode 100644
index 000000000000..17ef115d17da
--- /dev/null
+++ b/net/nxserver/files/patch-nxcompext-Clean.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..30b755d4b3a8
--- /dev/null
+++ b/net/nxserver/files/patch-nxdesktop-Makeconf
@@ -0,0 +1,10 @@
+--- 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-proto.h b/net/nxserver/files/patch-nxdesktop-proto.h
new file mode 100644
index 000000000000..d4861ca74772
--- /dev/null
+++ b/net/nxserver/files/patch-nxdesktop-proto.h
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..faf56776ab61
--- /dev/null
+++ b/net/nxserver/files/patch-nxdesktop-rdesktop.h
@@ -0,0 +1,10 @@
+--- 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-nxviewer-nxviewer-Imakefile b/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile
new file mode 100644
index 000000000000..507df6a03a06
--- /dev/null
+++ b/net/nxserver/files/patch-nxviewer-nxviewer-Imakefile
@@ -0,0 +1,21 @@
+--- 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 @@
+ #endif
+ 
+ 
+-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/usr/X11R6/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 @@
+ #endif
+ 
+ DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
++XPLIBSRC = 
++XPLIB = 
++
+ 
+ LOCAL_LIBRARIES =  XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) $(NX_LIB)
+ 
diff --git a/net/nxserver/pkg-descr b/net/nxserver/pkg-descr
new file mode 100644
index 000000000000..c0b03392c942
--- /dev/null
+++ b/net/nxserver/pkg-descr
@@ -0,0 +1,4 @@
+This is a port of NoMachine's NX server, which is a way to
+use X connections over slow links without noticeable lag.
+
+WWW: http://www.nomachine.com/
diff --git a/net/nxserver/pkg-message b/net/nxserver/pkg-message
new file mode 100644
index 000000000000..89c61e8c7914
--- /dev/null
+++ b/net/nxserver/pkg-message
@@ -0,0 +1,10 @@
+*******************************************************************************
+
+This port provides only the NX core binaries and libraries as were released
+by NoMachine as source code. To make them work and be used as an NX server,
+you will need to:
+* either install FreeNX (net/freenx) additionally,
+* or install the commercial NoMachine server product (currently not available
+  in native FreeBSD form)
+
+*******************************************************************************
diff --git a/net/nxserver/pkg-plist b/net/nxserver/pkg-plist
new file mode 100644
index 000000000000..0a56956af189
--- /dev/null
+++ b/net/nxserver/pkg-plist
@@ -0,0 +1,23 @@
+NX/lib/libXrender.so.1.2
+NX/lib/libXrender.so.1
+NX/lib/libXrender.so
+NX/lib/libXext.so.6.4
+NX/lib/libXext.so.6
+NX/lib/libXext.so
+NX/lib/libXcompext.so.1.4.0
+NX/lib/libXcompext.so.1
+NX/lib/libXcompext.so
+NX/lib/libXcomp.so.1.4.0
+NX/lib/libXcomp.so.1
+NX/lib/libXcomp.so
+NX/lib/libX11.so.6.2
+NX/lib/libX11.so.6
+NX/lib/libX11.so
+NX/bin/nxviewer
+NX/bin/nxproxy
+NX/bin/nxpasswd
+NX/bin/nxdesktop
+NX/bin/nxagent
+@dirrm NX/lib
+@dirrm NX/bin
+@dirrm NX