wip/cacti/patches/patch-aa

   1 --- install/index.php.orig      2009-07-17 09:42:38.000000000 +0200
   2 +++ install/index.php   2009-07-17 09:43:16.000000000 +0200
   3 @@ -93,7 +93,7 @@
   4         if ($config["cacti_server_os"] == "win32") {
   5                 $search_paths = array("c:/usr/bin", "c:/cacti", "c:/rrdtool", "c:/spine", "c:/php", "c:/progra~1/php", "c:/net-snmp/bin", "c:/progra~1/net-snmp/bin", "d:/usr/bin", "d:/net-snmp/bin", "d:/progra~1/net-snmp/bin", "d:/cacti", "d:/rrdtool", "d:/spine", "d:/php", "d:/progra~1/php");
   6         }else{
   7 -               $search_paths = array("/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/local/bin", "/usr/local/sbin");
   8 +               $search_paths = array("/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/pkg/bin", "/usr/pkg/sbin");
   9         }
  10
  11         for ($i=0; $i<count($search_paths); $i++) {
  12 @@ -119,7 +119,7 @@
  13         }else if (!empty($which_rrdtool)) {
  14                 $input["path_rrdtool"]["default"] = $which_rrdtool;
  15         }else{
  16 -               $input["path_rrdtool"]["default"] = "/usr/local/bin/rrdtool";
  17 +               $input["path_rrdtool"]["default"] = "/usr/pkg/bin/rrdtool";
  18         }
  19  }elseif ($config["cacti_server_os"] == "win32") {
  20         $which_rrdtool = find_best_path("rrdtool.exe");
  21 @@ -169,7 +169,7 @@
  22         }else if (!empty($which_snmpwalk)) {
  23                 $input["path_snmpwalk"]["default"] = $which_snmpwalk;
  24         }else{
  25 -               $input["path_snmpwalk"]["default"] = "/usr/local/bin/snmpwalk";
  26 +               $input["path_snmpwalk"]["default"] = "/usr/pkg/bin/snmpwalk";
  27         }
  28  }elseif ($config["cacti_server_os"] == "win32") {
  29         $which_snmpwalk = find_best_path("snmpwalk.exe");
  30 @@ -194,7 +194,7 @@
  31         }else if (!empty($which_snmpget)) {
  32                 $input["path_snmpget"]["default"] = $which_snmpget;
  33         }else{
  34 -               $input["path_snmpget"]["default"] = "/usr/local/bin/snmpget";
  35 +               $input["path_snmpget"]["default"] = "/usr/pkg/bin/snmpget";
  36         }
  37  }elseif ($config["cacti_server_os"] == "win32") {
  38         $which_snmpget = find_best_path("snmpget.exe");
  39 @@ -219,7 +219,7 @@
  40         }else if (!empty($which_snmpbulkwalk)) {
  41                 $input["path_snmpbulkwalk"]["default"] = $which_snmpbulkwalk;
  42         }else{
  43 -               $input["path_snmpbulkwalk"]["default"] = "/usr/local/bin/snmpbulkwalk";
  44 +               $input["path_snmpbulkwalk"]["default"] = "/usr/pkg/bin/snmpbulkwalk";
  45         }
  46  }elseif ($config["cacti_server_os"] == "win32") {
  47         $which_snmpbulkwalk = find_best_path("snmpbulkwalk.exe");
  48 @@ -244,7 +244,7 @@
  49         }else if (!empty($which_snmpgetnext)) {
  50                 $input["path_snmpgetnext"]["default"] = $which_snmpgetnext;
  51         }else{
  52 -               $input["path_snmpgetnext"]["default"] = "/usr/local/bin/snmpgetnext";
  53 +               $input["path_snmpgetnext"]["default"] = "/usr/pkg/bin/snmpgetnext";
  54         }
  55  }elseif ($config["cacti_server_os"] == "win32") {
  56         $which_snmpgetnext = find_best_path("snmpgetnext.exe");