$NetBSD: patch-aa,v 1.7 2010/09/23 23:54:40 pettai Exp $

--- config/main.inc.php.dist.orig	2010-06-23 09:55:08.000000000 +0000
+++ config/main.inc.php.dist
@@ -135,10 +135,10 @@ $rcmail_config['enable_installer'] = fal
 
 // use this folder to store log files (must be writeable for apache user)
 // This is used by the 'file' log driver.
-$rcmail_config['log_dir'] = 'logs/';
+$rcmail_config['log_dir'] = '@VARBASE@/log/roundcube/';
 
 // use this folder to store temp files (must be writeable for apache user)
-$rcmail_config['temp_dir'] = 'temp/';
+$rcmail_config['temp_dir'] = '@VARBASE@/tmp/roundcube/';
 
 // enable caching of messages and mailbox data in the local database.
 // this is recommended if the IMAP server does not run on the same machine
@@ -560,3 +560,6 @@ $rcmail_config['delete_always'] = false;
 
 // end of config file
 
+include_once('main-local.inc.php');
+
+?>
