12 files changed, 91 insertions, 81 deletions

diff --git a/net/freenx/Makefile b/net/freenx/Makefile
index b85dfe2601de..e2da04cde42c 100644
--- a/net/freenx/Makefile
+++ b/net/freenx/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	freenx
-PORTVERSION=	0.3.1
+PORTVERSION=	0.4.1
 CATEGORIES=	net
 MASTER_SITES=	http://debian.tu-bs.de/knoppix/nx/
 
 MAINTAINER=	freenx@deweyonline.com
-COMMENT=	Low-bandwidth X network server
+COMMENT=	Frontend (auth/session management) for nxserver backend compression libraries
 
 RUN_DEPENDS=	${NXPREFIX}/bin/nxagent:${PORTSDIR}/net/nxserver \
 		bash:${PORTSDIR}/shells/bash2 \
@@ -25,12 +25,15 @@ WRKSRC=		${WRKDIR}
 
 do-install:
 	${MKDIR} ${NXPREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.3.1/nxclient ${NXPREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.3.1/nxnode ${NXPREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.3.1/nxnode-login ${NXPREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.3.1/nxserver ${NXPREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.3.1/nxsetup ${NXPREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.3.1/nxkeygen ${NXPREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.3.1/nxloadconfig ${NXPREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxclient ${NXPREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxnode ${NXPREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxnode-login ${NXPREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxserver ${NXPREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxsetup ${NXPREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxkeygen ${NXPREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxloadconfig ${NXPREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/nxprint ${NXPREFIX}/bin
+	${MKDIR} ${NXPREFIX}/etc/nxserver
+	${INSTALL_SCRIPT} ${WRKSRC}/freenx-0.4.1/node.conf.sample ${NXPREFIX}/etc/nxserver
 
 .include <bsd.port.mk>
diff --git a/net/freenx/distinfo b/net/freenx/distinfo
index 5e9523b9d5ad..6372e4fa57f6 100644
--- a/net/freenx/distinfo
+++ b/net/freenx/distinfo
@@ -1,2 +1,2 @@
-MD5 (freenx-0.3.1.tar.gz) = 73295358543aa8b785d2fd817f118424
-SIZE (freenx-0.3.1.tar.gz) = 32804
+MD5 (freenx-0.4.1.tar.gz) = 0196eb9642e77bae930f06f69beb18f2
+SIZE (freenx-0.4.1.tar.gz) = 42898
diff --git a/net/freenx/files/patch-freenx-nxclient b/net/freenx/files/patch-freenx-nxclient
index 1b65e9feafd8..adb5d755a3e4 100644
--- a/net/freenx/files/patch-freenx-nxclient
+++ b/net/freenx/files/patch-freenx-nxclient
@@ -1,5 +1,5 @@
---- freenx-0.3.1/nxclient.orig	Fri Sep 10 10:04:51 2004
-+++ freenx-0.3.1/nxclient	Fri Sep 17 12:24:22 2004
+--- freenx-0.4.1/nxclient.orig	Fri Sep 10 10:04:51 2004
++++ freenx-0.4.1/nxclient	Fri Sep 17 12:24:22 2004
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/usr/local/bin/bash
diff --git a/net/freenx/files/patch-freenx-nxkeygen b/net/freenx/files/patch-freenx-nxkeygen
index deb8b2014c80..dc24978e46a2 100644
--- a/net/freenx/files/patch-freenx-nxkeygen
+++ b/net/freenx/files/patch-freenx-nxkeygen
@@ -1,5 +1,5 @@
---- freenx-0.3.1/nxkeygen.orig	Sun Feb 13 20:52:08 2005
-+++ freenx-0.3.1/nxkeygen	Mon Mar 28 15:26:50 2005
+--- freenx-0.4.1/nxkeygen.orig	Sun Feb 13 20:52:08 2005
++++ freenx-0.4.1/nxkeygen	Mon Mar 28 15:26:50 2005
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/usr/local/bin/bash
diff --git a/net/freenx/files/patch-freenx-nxloadconfig b/net/freenx/files/patch-freenx-nxloadconfig
index a6df85fe7cb7..3cb829d7df87 100644
--- a/net/freenx/files/patch-freenx-nxloadconfig
+++ b/net/freenx/files/patch-freenx-nxloadconfig
@@ -1,6 +1,12 @@
---- freenx-0.3.1/nxloadconfig.orig	Thu Mar 10 19:11:15 2005
-+++ freenx-0.3.1/nxloadconfig	Mon Mar 28 12:35:11 2005
-@@ -18,12 +18,12 @@
+--- freenx-0.4.1/nxloadconfig.orig	Thu May  5 04:34:20 2005
++++ freenx-0.4.1/nxloadconfig	Mon Jun 27 13:55:28 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/local/bin/bash
+ #
+ # Copyright (c) 2005 by Fabian Franz <freenx@fabian-franz.de>
+ #           (c) 2005 by Jon Severinsson <jonno@users.berlios.de>
+@@ -53,12 +53,12 @@
  NX_LICENSE="OS (GPL)"
  
  # Where can different nx components be found
@@ -15,5 +21,14 @@
 +NX_SESS_DIR=/var/lib/nxserver/
 +NX_HOME_DIR=/home/nx/
  
- # adds PATH_LIB to the startup of nxagents
- # Should be set to 1 if PATH_LIB is not a system default library path
+ # Advanced users ONLY
+ AGENT_LIBRARY_PATH="" #Calculated
+@@ -152,7 +152,7 @@
+ COMMAND_XAUTH=/usr/X11R6/bin/xauth
+ COMMAND_SMBMOUNT=smbmount
+ COMMAND_SMBUMOUNT=smbumount
+-COMMAND_NETCAT=netcat
++COMMAND_NETCAT=nc
+ COMMAND_SSH=ssh
+ COMMAND_SSH_KEYGEN=ssh-keygen
+ COMMAND_CUPSD=/usr/sbin/cupsd
diff --git a/net/freenx/files/patch-freenx-nxnode b/net/freenx/files/patch-freenx-nxnode
index 6fd627be0c33..1156eaf49bde 100644
--- a/net/freenx/files/patch-freenx-nxnode
+++ b/net/freenx/files/patch-freenx-nxnode
@@ -1,43 +1,21 @@
---- freenx-0.3.1/nxnode.orig	Sat Mar 12 12:57:35 2005
-+++ freenx-0.3.1/nxnode	Mon Mar 28 12:10:41 2005
+--- freenx-0.4.1/nxnode.orig	Thu Jun 23 11:42:52 2005
++++ freenx-0.4.1/nxnode	Tue Jun 28 09:38:40 2005
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/usr/local/bin/bash
  
  # Free implementation of nxserver components
  #
-@@ -198,7 +198,7 @@
- 		P=""
- 		[ -n "$agent_user" ] && U="-u $agent_user"
- 		[ -n "$agent_password" ] && P="-p -"
--		echo "$agent_password" | $PATH_BIN/nxdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $K $G $U $P $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>>~/.nx/C-$sess_id/session &
-+		echo "$agent_password" | LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $K $G $U $P $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>>~/.nx/C-$sess_id/session &
- 	else
+@@ -42,7 +42,7 @@
+ # Reread boot command line; echo last parameter's argument or return false.
+ getparam(){
+ stringinstring "&$1=" "$CMDLINE" || return 1
+-echo "$CMDLINE" | awk "/^$1=/"' { VAL=$2 } END { print VAL }' FS="=" RS="(&|\n)"
++echo "$CMDLINE" |  tr "&" "\n" | egrep "^"$1"=" | awk -F= '{ VAL=$2 } END { print VAL }'
+ return 0
+ }
  
- 	# nxviewer session
-@@ -206,17 +206,17 @@
- 	if [ "$type" = "vnc" ]
- 	then
- 		mkdir -p ~/.nx/C-$sess_id/scripts/
--		echo "$agent_password" | $PATH_BIN/nxpasswd ~/.nx/C-$sess_id/scripts/.passwd doit
--		$PATH_BIN/nxviewer -encodings tight hextile copyrect raw -passwd ~/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)"  $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>>~/.nx/C-$sess_id/session &
-+		echo "$agent_password" | LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxpasswd ~/.nx/C-$sess_id/scripts/.passwd doit
-+		LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxviewer -encodings tight hextile copyrect raw -passwd ~/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)"  $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>>~/.nx/C-$sess_id/session &
- 	else
- 		# "normal" nxagent session
- 		if [ -n "$R" -a "$ENABLE_ROOTLESS_MODE" != "1" ]
- 		then
- 			# nxproxy single application mode session
--			$PATH_BIN/nxproxy -C :$display $PROXY_EXTRA_OPTIONS 2>>~/.nx/C-$sess_id/session &
-+			LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxproxy -C :$display $PROXY_EXTRA_OPTIONS 2>>~/.nx/C-$sess_id/session &
- 		else
- 			# nxagent session
--			$PATH_BIN/nxagent -persistent $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $K $G $B :$display $AGENT_EXTRA_OPTIONS_X 2>>~/.nx/C-$sess_id/session &
-+			LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxagent -persistent $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $K $G $B :$display $AGENT_EXTRA_OPTIONS_X 2>>~/.nx/C-$sess_id/session &
- 		fi
- 	fi
- 	fi
-@@ -460,7 +460,7 @@
+@@ -621,7 +621,7 @@
  	# TODO: imagecompressionmethod ...
  	[ "$imagecompressionmethod" = "0" ] && PACK="pack=nopack,"
  	
@@ -46,12 +24,4 @@
  
  	# write options file
  	[ -z "$samba" ] && samba=0
-@@ -573,7 +573,7 @@
- 	$COMMAND_SMBMOUNT //$computername/$rdir $HOME/$dir -o username $username ip 127.0.0.1 port $port
- 	if [ $? -eq 0 ]
- 	then
--		$PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' mounted on: '$HOME/$dir'" -noautokill -display :$display
-+		LD_LIBRARY_PATH=$NX_DIR/lib $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' mounted on: '$HOME/$dir'" -noautokill -display :$display
- 	fi
- }
  
diff --git a/net/freenx/files/patch-freenx-nxnode-login b/net/freenx/files/patch-freenx-nxnode-login
new file mode 100644
index 000000000000..a56fe5c777e1
--- /dev/null
+++ b/net/freenx/files/patch-freenx-nxnode-login
@@ -0,0 +1,8 @@
+--- freenx-0.4.1/nxnode-login.orig	Tue Jun 28 12:15:43 2005
++++ freenx-0.4.1/nxnode-login	Tue Jun 28 11:53:16 2005
+@@ -1,4 +1,4 @@
+-#!/usr/bin/expect
++#!/usr/local/bin/expect
+ # nxnode-login: spawns and controls ssh 
+ # Copyright (c) 2004 by Fabian Franz.
+ # License: GPL, version 2
diff --git a/net/freenx/files/patch-freenx-nxprint b/net/freenx/files/patch-freenx-nxprint
new file mode 100644
index 000000000000..0c9eee3c5559
--- /dev/null
+++ b/net/freenx/files/patch-freenx-nxprint
@@ -0,0 +1,8 @@
+--- freenx-0.4.1/nxprint.orig	Mon Jun 27 13:38:09 2005
++++ freenx-0.4.1/nxprint	Mon Jun 27 13:53:08 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/local/bin/bash
+ #
+ # nxprint - Prints a list of available drivers or printers
+ # 
diff --git a/net/freenx/files/patch-freenx-nxserver b/net/freenx/files/patch-freenx-nxserver
index 0fb6112053f4..79b5a2333394 100644
--- a/net/freenx/files/patch-freenx-nxserver
+++ b/net/freenx/files/patch-freenx-nxserver
@@ -1,12 +1,21 @@
---- freenx-0.3.1/nxserver.orig	Sun Mar 13 19:56:34 2005
-+++ freenx-0.3.1/nxserver	Mon Mar 28 16:49:04 2005
+--- freenx-0.4.1/nxserver.orig	Sat Jun 25 08:26:22 2005
++++ freenx-0.4.1/nxserver	Tue Jun 28 09:38:25 2005
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/usr/local/bin/bash
  
  # Free implementation of nxserver components
  #
-@@ -48,7 +48,7 @@
+@@ -27,7 +27,7 @@
+ # Reread boot command line; echo last parameter's argument or return false.
+ getparam(){
+ stringinstring "&$1=" "$CMDLINE" || return 1
+-echo "$CMDLINE" | awk "/^$1=/"' { VAL=$2 } END { print VAL }' FS="=" RS="(&|\n)"
++echo "$CMDLINE" |  tr "&" "\n" | egrep "^"$1"=" | awk -F= '{ VAL=$2 } END { print VAL }'
+ return 0
+ }
+ 
+@@ -46,7 +46,7 @@
  
  passdb_get_crypt_pass()
  {
@@ -15,25 +24,16 @@
  }
  
  passdb_get_pass()
-@@ -697,7 +697,7 @@
- 		
+@@ -836,7 +836,7 @@
+ 
  		rm -f "$SESS_LOCKFILE"
  	
 -		uniqueid=$(echo $[$RANDOM*$RANDOM] | md5sum | cut -d" " -f1 | tr "[a-z]" "[A-Z]")
 +		uniqueid=$(echo $[$RANDOM*$RANDOM] | md5 | cut -d" " -f1 | tr "[a-z]" "[A-Z]")
  		FULL_PARAMS="user=$USER&userip=$USERIP&uniqueid=$uniqueid&display=$SESS_DISPLAY&$PARAMS"
- 		log "$FULL_PARAMS"
+ 		log 6 "$FULL_PARAMS"
  
-@@ -755,7 +755,7 @@
- 			if [ "$ENCRYPTION" = "1" ] 
- 			then 
- 				let PROXY_DISPLAY=$SESS_DISPLAY+4000
--				netcat 127.0.0.1 $PROXY_DISPLAY
-+				nc 127.0.0.1 $PROXY_DISPLAY
- 				exit 0
- 			else
- 				echo_x "NX> 1001 Bye."
-@@ -953,7 +953,7 @@
+@@ -1091,7 +1091,7 @@
  	
  	[ ${#CMD_CHUSER} -ge 32 ] && cmd_abort "Error: User $CMD_CHUSER must be shorter than 32 characters."
  	egrep -q "^$CMD_CHUSER:" $NX_ETC_DIR/passwords && cmd_abort "Error: User $CMD_CHUSER already in database."
diff --git a/net/freenx/files/patch-freenx-nxsetup b/net/freenx/files/patch-freenx-nxsetup
index 3d3c7b37d20e..0483fbcb2477 100644
--- a/net/freenx/files/patch-freenx-nxsetup
+++ b/net/freenx/files/patch-freenx-nxsetup
@@ -1,5 +1,5 @@
---- freenx-0.3.1/nxsetup.orig	Tue Feb 15 19:00:31 2005
-+++ freenx-0.3.1/nxsetup	Mon Mar 28 15:53:10 2005
+--- freenx-0.4.1/nxsetup.orig	Tue Feb 15 19:00:31 2005
++++ freenx-0.4.1/nxsetup	Mon Mar 28 15:53:10 2005
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/usr/local/bin/bash
diff --git a/net/freenx/pkg-descr b/net/freenx/pkg-descr
index 725991f2768a..0f77f53a5c7f 100644
--- a/net/freenx/pkg-descr
+++ b/net/freenx/pkg-descr
@@ -2,7 +2,9 @@ NoMachine NX is the next-generation X compression and roundtrip suppression
 scheme. It can operate remote X11 sessions over 56k modem dialup links or 
 anything better. 
 
-This package contains a free (GPL) implementation of the nxserver component.
+This package contains a free (GPL) implementation of the nxserver component,
+which is a front-end (auth/session management) for the nxserver back-end 
+compression libraries.
 
 WWW: http://www.nomachine.com/
-WWW: http://www.kalyxo.org/twiki/bin/view/Main/FreeNX
+WWW: http://freenx.berlios.de/
diff --git a/net/freenx/pkg-plist b/net/freenx/pkg-plist
index f70706abe870..0199f8e8a1a4 100644
--- a/net/freenx/pkg-plist
+++ b/net/freenx/pkg-plist
@@ -1,7 +1,11 @@
 NX/bin/nxclient
 NX/bin/nxnode
 NX/bin/nxnode-login
+NX/bin/nxprint
 NX/bin/nxserver
 NX/bin/nxsetup
 NX/bin/nxkeygen
 NX/bin/nxloadconfig
+NX/etc/nxserver/node.conf.sample
+@dirrm NX/etc/nxserver
+@dirrm NX/etc