diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2008-04-10 10:24:15 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2008-04-10 10:24:15 +0000 |
| commit | 1fd9f280cc9acad4b31f518e75c4814ba6e4f5b6 (patch) | |
| tree | cd902e8b9bb0f58d47bb7e933a2b401d21c9bd50 /net/freenx/files/patch-freenx-nxloadconfig | |
| parent | - update to 2.1.0 (diff) | |
- update to 2.1.0
PR: 113423
Obtained from: http://www.deweyonline.com/nx/freebsd.html
Notes
Notes:
svn path=/head/; revision=211001
Diffstat (limited to 'net/freenx/files/patch-freenx-nxloadconfig')
| -rw-r--r-- | net/freenx/files/patch-freenx-nxloadconfig | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/net/freenx/files/patch-freenx-nxloadconfig b/net/freenx/files/patch-freenx-nxloadconfig index 0eacc06825cb..eb1ed44cebd4 100644 --- a/net/freenx/files/patch-freenx-nxloadconfig +++ b/net/freenx/files/patch-freenx-nxloadconfig @@ -1,29 +1,38 @@ ---- freenx-0.4.4/nxloadconfig.orig Sat Aug 6 09:53:27 2005 -+++ freenx-0.4.4/nxloadconfig Tue Aug 9 15:15:01 2005 +--- nxloadconfig.orig Mon Jan 22 19:22:50 2007 ++++ nxloadconfig @@ -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 @@ +@@ -56,12 +56,12 @@ NX_LICENSE="OS (GPL)" # Where can different nx components be found -NX_DIR=/usr -+NX_DIR=/usr/X11R6/NX/ ++NX_DIR=/usr/NX PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys PATH_LIB=$NX_DIR/lib -NX_ETC_DIR=/etc/nxserver -NX_SESS_DIR=/var/lib/nxserver/db -NX_HOME_DIR=/var/lib/nxserver/home -+NX_ETC_DIR=/usr/X11R6/NX/etc/nxserver/ -+NX_SESS_DIR=/var/lib/nxserver/ -+NX_HOME_DIR=/home/nx/ ++NX_ETC_DIR=$NX_DIR/etc ++NX_SESS_DIR=$NX_DIR/var/db ++NX_HOME_DIR=$NX_DIR/home/nx # Advanced users ONLY AGENT_LIBRARY_PATH="" #Calculated -@@ -153,11 +153,11 @@ +@@ -144,7 +144,7 @@ + + ENABLE_KDE_CUPS="0" + KDE_PRINTRC="" # Calculated +-CUPS_ETC="/etc/cups/" ++CUPS_ETC="/usr/local/etc/cups/" + + # Path directives + +@@ -162,16 +162,16 @@ COMMAND_XAUTH=/usr/X11R6/bin/xauth COMMAND_SMBMOUNT=smbmount COMMAND_SMBUMOUNT=smbumount @@ -31,9 +40,25 @@ +COMMAND_NETCAT=nc COMMAND_SSH=ssh COMMAND_SSH_KEYGEN=ssh-keygen - COMMAND_CUPSD=/usr/sbin/cupsd +-COMMAND_CUPSD=/usr/sbin/cupsd -COMMAND_MD5SUM=md5sum ++COMMAND_CUPSD=/usr/local/sbin/cupsd +COMMAND_MD5SUM=md5 # Misc directives + +-ENABLE_2_0_0_BACKEND="" ++ENABLE_2_0_0_BACKEND="1" + ENABLE_AUTORECONNECT="0" + ENABLE_AUTORECONNECT_BEFORE_140="1" + EXPORT_USERIP="0" +@@ -263,7 +263,7 @@ + [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB + [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB + [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB +-[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so.1:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2" ++[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2" + if [ -z "$ENABLE_2_0_0_BACKEND" ] + then + ENABLE_2_0_0_BACKEND="1" |