packages: davical/davical-php_data_dir.patch - don't try to guess this path...

[pawelz]

Author: pawelz                       Date: Wed Sep 22 13:43:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't try to guess this path. It is set in .conf file.

---- Files affected:
packages/davical:
   davical-php_data_dir.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/davical/davical-php_data_dir.patch
diff -u packages/davical/davical-php_data_dir.patch:1.1 packages/davical/davical-php_data_dir.patch:1.2
--- packages/davical/davical-php_data_dir.patch:1.1	Wed Sep 22 14:59:43 2010
+++ packages/davical/davical-php_data_dir.patch	Wed Sep 22 15:43:33 2010
@@ -1,13 +1,26 @@
---- davical-0.9.9.2/inc/always.php.in~	2010-09-21 04:28:04.000000000 +0200
-+++ davical-0.9.9.2/inc/always.php.in	2010-09-22 13:46:31.000000000 +0200
-@@ -71,9 +71,7 @@
+--- davical-0.9.9.2/inc/always.php.in.orig	2010-09-22 15:19:34.000000000 +0200
++++ davical-0.9.9.2/inc/always.php.in	2010-09-22 15:19:48.000000000 +0200
+@@ -70,21 +70,8 @@
+ 
  // Utilities
  if ( ! @include_once('AWLUtilities.php') ) {
-   $try_paths = array(
+-  $try_paths = array(
 -        '../../awl/inc'
 -      , '/usr/share/awl/inc'
 -      , '/usr/local/share/awl/inc'
-+        '@PHP_DATA_DIR@/awl/inc'
-   );
-   foreach( $try_paths AS $awl_include_path ) {
-     if ( @file_exists($awl_include_path.'/AWLUtilities.php') ) {
+-  );
+-  foreach( $try_paths AS $awl_include_path ) {
+-    if ( @file_exists($awl_include_path.'/AWLUtilities.php') ) {
+-      set_include_path( $awl_include_path. PATH_SEPARATOR. get_include_path());
+-      break;
+-    }
+-  }
+-  if ( ! @include_once('AWLUtilities.php') ) {
+-    echo "Could not find the AWL libraries. Are they installed? Check your include_path in php.ini!\n";
+-    exit;
+-  }
++  echo "Could not find the AWL libraries. Are they installed? Check your include_path in php.ini!\n";
++  exit;
+ }
+ 
+ // Ensure that ../inc is in our included paths as early as possible
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/davical/davical-php_data_dir.patch?r1=1.1&r2=1.2&f=u