--- trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxserver-magellan.patch	2012/05/03 13:12:06	1764
+++ trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxserver-magellan.patch	2012/05/07 20:52:03	1766
@@ -1,5 +1,5 @@
---- NX/scripts/setup/nxserver.orig	2012-05-03 11:44:18.486001418 +0200
-+++ NX/scripts/setup/nxserver	2012-05-03 11:59:12.624000346 +0200
+--- NX/scripts/setup/nxserver.orig	2012-05-07 22:48:36.539982523 +0200
++++ NX/scripts/setup/nxserver	2012-05-07 23:44:41.106982523 +0200
 @@ -85,6 +85,13 @@
  {
    ret_getLinuxName=0
@@ -27,7 +27,46 @@
    if [ -f /etc/debian_version ];
    then
      system=debian
-@@ -2061,6 +2074,7 @@
+@@ -179,6 +192,9 @@
+ if [ -x "/bin/unlink" ];
+ then
+   UNLINKCOMMAND="/bin/unlink"
++elif [ -x "/usr/bin/unlink" ];
++then
++  UNLINKCOMMAND="/usr/bin/unlink"
+ elif [ -x "/usr/sbin/unlink" ];
+ then
+   UNLINKCOMMAND="/usr/sbin/unlink"
+@@ -236,6 +252,9 @@
+   if [ -x "/usr/bin/awk" ];
+   then
+     AWKCOMMAND="/usr/bin/awk"
++  elif [ -x "/bin/awk" ];
++  then
++    AWKCOMMAND="/bin/awk"
+   else
+     AWKCOMMAND="awk"
+   fi
+@@ -293,7 +312,7 @@
+     SEDCOMMAND="sed"
+   fi
+ else
+-  if [ -x "/bin/grep" ];
++  if [ -x "/bin/sed" ];
+   then
+     SEDCOMMAND="/bin/sed"
+   else
+@@ -480,6 +499,9 @@
+ if [ -x "/sbin/pidof" ];
+ then
+   PIDOFCOMMAND="/sbin/pidof"
++elif [ -x "/bin/pidof" ];
++then
++  PIDOFCOMMAND="/bin/pidof"
+ else
+   PIDOFCOMMAND="pidof"
+ fi
+@@ -2061,6 +2083,7 @@
    ${ECHOCOMMAND} "                           11.04 Natty Narwhal/11.10 Oneiric Ocelot etc."
    ${ECHOCOMMAND} "       solaris      Sun Solaris 10.0 etc."
    ${ECHOCOMMAND} "       fedora       Fedora 10/11/12/13/14/15/16 etc."
@@ -35,7 +74,7 @@
  }
  
  updatePathsInFile ()
-@@ -3001,6 +3015,9 @@
+@@ -3001,6 +3024,9 @@
      elif [ "$system" = "fedora" ];
      then
        detectedSystem="Fedora"
@@ -45,7 +84,7 @@
      elif [ "$system" = "debian" ];
      then
        detectedSystem="Debian"
-@@ -3390,6 +3407,7 @@
+@@ -3390,6 +3416,7 @@
        "suse"               ) ;;
        "mandriva"           ) ;;
        "fedora"             ) ;;
@@ -53,7 +92,7 @@
        "debian"             ) ;;
        "solaris"            ) ;;
        "macosx"             ) ;;
-@@ -3530,6 +3548,7 @@
+@@ -3530,6 +3557,7 @@
  /etc/debian_version
  /etc/debian_release
  /etc/fedora-release
@@ -61,7 +100,7 @@
  /etc/gentoo-release
  /etc/immunix-release
  knoppix_version
-@@ -3559,6 +3578,7 @@
+@@ -3559,6 +3587,7 @@
  /etc/va-release
  /etc/yellowdog-release
  /etc/system-release
@@ -69,7 +108,7 @@
  )
  
  getVersionFromLSB()
-@@ -5007,6 +5027,12 @@
+@@ -5007,6 +5036,12 @@
  
  removeNXinit () {
  
@@ -82,7 +121,7 @@
    if [ "${system}" = "fedora" ] || [ "${system}" = "redhat" ] || [ "${system}" = "suse" ];
    then
      if [ -f "/sbin/chkconfig" ];
-@@ -5215,6 +5241,12 @@
+@@ -5215,6 +5250,12 @@
  
  addNXinit () {
  
@@ -95,7 +134,7 @@
    if [ "${system}" = "macosx" ];
    then
      return 0
-@@ -7656,6 +7688,7 @@
+@@ -7656,6 +7697,7 @@
  /etc/server-fedora.cfg.sample
  /etc/server-mandriva.cfg.sample
  /etc/server-redhat.cfg.sample
@@ -103,7 +142,7 @@
  /etc/server-suse.cfg.sample
  /etc/server-solaris.cfg.sample
  /etc/server-macosx.cfg.sample
-@@ -8707,6 +8740,12 @@
+@@ -8707,6 +8749,12 @@
  
  addNxhttpdUserLinux () {
  
@@ -116,3 +155,15 @@
    checkNxhttpdGroupExist
    if [ "x${ret_checkNxhttpdGroupExist}" = "x0" ];
    then
+--- NX/scripts/etc/nxserver.orig	2012-05-07 22:58:20.445982523 +0200
++++ NX/scripts/etc/nxserver	2012-05-07 22:58:34.831982523 +0200
+@@ -19,6 +19,9 @@
+ elif [ -x /usr/bin/awk ]
+ then
+   COMMAND_AWK="/usr/bin/awk"
++elif [ -x /bin/awk ]
++then
++  COMMAND_AWK="/bin/awk"
+ else
+   COMMAND_AWK="awk"
+ fi