diff options
Diffstat (limited to 'www-apps/davical/files')
| -rw-r--r-- | www-apps/davical/files/awl_location.patch | 2 | ||||
| -rw-r--r-- | www-apps/davical/files/inc_path.patch | 28 | ||||
| -rw-r--r-- | www-apps/davical/files/postinstall-en.txt | 5 | ||||
| -rw-r--r-- | www-apps/davical/files/vhost-example | 1 |
4 files changed, 30 insertions, 6 deletions
diff --git a/www-apps/davical/files/awl_location.patch b/www-apps/davical/files/awl_location.patch index 376aae6a3..2f4366855 100644 --- a/www-apps/davical/files/awl_location.patch +++ b/www-apps/davical/files/awl_location.patch @@ -5,7 +5,7 @@ LOCALEDIR="locale" APPLICATION="davical" -AWL_LOCATION="../awl" -+AWL_LOCATION="/usr/share/php5/awl" ++AWL_LOCATION="/usr/share/php5/awl/inc" if [ ! -d "${AWL_LOCATION}" ]; then AWL_LOCATION="`find .. -type d -name 'awl-*.*'`" diff --git a/www-apps/davical/files/inc_path.patch b/www-apps/davical/files/inc_path.patch new file mode 100644 index 000000000..2230249df --- /dev/null +++ b/www-apps/davical/files/inc_path.patch @@ -0,0 +1,28 @@ +--- htdocs/always.php.orig 2012-01-05 21:28:16.382878446 +0100 ++++ htdocs/always.php 2012-01-05 21:30:06.828431957 +0100 +@@ -48,7 +48,7 @@ + // $c->default_locale = array('es_MX', 'es_AR', 'es', 'pt'); // An array of locales to try, or just a single locale + // $c->local_tzid = 'Pacific/Auckland'; // Perhaps we should read from /etc/timezone - I wonder how standard that is? + $c->default_locale = 'en'; +-$c->locale_path = '../locale'; ++$c->locale_path = '../../davical/locale'; + $c->base_url = preg_replace('#/[^/]+\.php.*$#', '', $_SERVER['SCRIPT_NAME']); + $c->base_directory = preg_replace('#/[^/]*$#', '', $_SERVER['DOCUMENT_ROOT']); + $c->default_privileges = array('read-free-busy', 'schedule-deliver'); +@@ -80,6 +80,7 @@ + '../../awl/inc' + , '/usr/share/awl/inc' // Where it ends up on Debian + , '/usr/share/php/awl/inc' // Fedora's standard for PHP libraries ++ , '/usr/share/php5/awl/inc' // Gentoo's standard for PHP5 libraries + , '/usr/local/share/awl/inc' + ); + foreach( $try_paths AS $awl_include_path ) { +@@ -95,7 +96,7 @@ + } + + // Ensure that ../inc is in our included paths as early as possible +-set_include_path( '../inc'. PATH_SEPARATOR. get_include_path()); ++set_include_path( '../../davical/inc'. PATH_SEPARATOR. get_include_path()); + + + /** We actually discovered this and worked around it earlier, but we can't log it until the utilties are loaded */ diff --git a/www-apps/davical/files/postinstall-en.txt b/www-apps/davical/files/postinstall-en.txt index 7565fbffd..5a88a2bdf 100644 --- a/www-apps/davical/files/postinstall-en.txt +++ b/www-apps/davical/files/postinstall-en.txt @@ -15,7 +15,4 @@ You can safely ignore any message about missing time_zone table. If you are upgrading from a version <= 0.9.8.4 please note inc/ and locale/ have been moved away from the htdocs directory and placed into hostroot for -safety reasons. Update you include_path accordingly. - -You may have to configure the locale path in the davical configuration file. -(add a $c->locale_path = '/path/to/the/locales';) +safety reasons. diff --git a/www-apps/davical/files/vhost-example b/www-apps/davical/files/vhost-example index 5ac5c35f5..d6f0da208 100644 --- a/www-apps/davical/files/vhost-example +++ b/www-apps/davical/files/vhost-example @@ -9,7 +9,6 @@ Allow from all </Directory> - php_value include_path "/usr/share/php5/awl:/var/www/myvhost/inc" php_value magic_quotes_gpc 0 php_value register_globals 0 php_value error_reporting "E_ALL & ~E_NOTICE" |