Upgrade to 2.1.

Changelog at <http://cvs.horde.org/diff.php/turba/docs/CHANGES?r1=1.181.2.51.2.2&r2=1.181.2.68&ty=h>
author: thierry <thierry@FreeBSD.org> 2006-03-16 04:15:22 +0800
committer: thierry <thierry@FreeBSD.org> 2006-03-16 04:15:22 +0800
commit: dc61b9e1390400ef3d48e3e3c260f947a85b4c07 (patch)
tree: 775d7d0405271ae0c8ea1eee339744c332562dc2
parent: 4cf1f139338d69614b794ba384448c9bf7972d90 (diff)
download: freebsd-ports-gnome-dc61b9e1390400ef3d48e3e3c260f947a85b4c07.tar.gz
freebsd-ports-gnome-dc61b9e1390400ef3d48e3e3c260f947a85b4c07.tar.zst
freebsd-ports-gnome-dc61b9e1390400ef3d48e3e3c260f947a85b4c07.zip
15 files changed, 621 insertions, 420 deletions
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 81bfb5cbe144..3bd64ead08ab 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		ftp://ftp.planetmirror.com/pub/horde/turba/		\
@@ -39,12 +39,12 @@ USE_PHP=	ldap
 
 NO_BUILD=	yes
 USE_APACHE=	1.3+	# needed to test APACHE_VERSION
-USE_REINPLACE=	yes
+USE_GETTEXT=	yes
 
 REINPLACE_ARGS=	-i ""
 DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING
-CONFFILE=	attributes.php menu.php prefs.php sources.php
+CONFFILE=	attributes.php menu.php mime_drivers.php prefs.php sources.php
 SUB_DIRS=	config lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo
index eb17ec4654db..c2a29941365f 100644
--- a/mail/horde-turba/distinfo
+++ b/mail/horde-turba/distinfo
@@ -1,3 +1,3 @@
-MD5 (turba-h3-2.0.5.tar.gz) = 6e051d636308f0efcc70addb9a40e651
-SHA256 (turba-h3-2.0.5.tar.gz) = 28ad16ce36047bf821db5e7036a21a37ec96c1850e2ecec18213310253ab97da
-SIZE (turba-h3-2.0.5.tar.gz) = 1420141
+MD5 (turba-h3-2.1.tar.gz) = 2841adb1f8b7b17fd3e17cd14abdd36f
+SHA256 (turba-h3-2.1.tar.gz) = 1623f8e8b8b67965706a2e2cf039956a3957bc56531fbe0bfbad39cb83143125
+SIZE (turba-h3-2.1.tar.gz) = 1450847
diff --git a/mail/horde-turba/files/patch-config::sources.php.dist b/mail/horde-turba/files/patch-config::sources.php.dist
index 46b4a1ba4f5c..52bf06d5d79c 100644
--- a/mail/horde-turba/files/patch-config::sources.php.dist
+++ b/mail/horde-turba/files/patch-config::sources.php.dist
@@ -1,36 +1,48 @@
---- config/sources.php.dist.orig	Mon Oct 17 22:51:49 2005
-+++ config/sources.php.dist	Tue Oct 18 22:24:34 2005
-@@ -469,87 +469,87 @@
- // Check that IMSP is configured in Horde but fall through if there is no
- // configuration at all - in case we aren't using up to date Horde install.
- // (In that case, be sure to change the params array below to suit your needs.
+--- config/sources.php.dist.orig	Mon Nov  7 11:03:26 2005
++++ config/sources.php.dist	Wed Mar  8 23:18:05 2006
+@@ -490,109 +490,109 @@
+ // configuration at all - in case we don't have at least a 3.0.6 Horde
+ // install.  (In that case, be sure to change the params array below to suit
+ // your needs).
 -if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
 -    !isset($GLOBALS['conf']['imsp']['enabled'])) {
--
--    // First, get the user name
+-    // First, get the user name to login to IMSP server with.
 -    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
 -    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
 -    if (!strlen($uid)) {
--        $uid = Auth::getAuth();
--        if (preg_match('/(^.*)@/', $uid, $matches)) {
--            $uid = $matches[1];
--        }
+-        $uid = Auth::getBareAuth();
 -        $pass = Auth::getCredential('password');
 -    }
--
--    $cfgSources['imsp'] = array(
+-    // Note we always use the horde username to append to the key even if we
+-    // have an alternate username set in prefs.  This is to prevent the
+-    // (fringe) case where an IMSP username for one user might be a valid
+-    // horde username for another user.
+-    $cfgKey = 'IMSP_' . Auth::getAuth();
+-    $cfgSources[$cfgKey] = array(
 -        'title' => _("IMSP"),
 -        'type' => 'imsp',
 -        'params' => array(
--            'server'   => $GLOBALS['conf']['imsp']['server'],
--            'port'     => $GLOBASL['conf']['imsp']['port'],
+-            'server'  => $GLOBALS['conf']['imsp']['server'],
+-            'port'    => $GLOBALS['conf']['imsp']['port'],
 -            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
+-            // socket, command, and auth_mechanism are for imtest driver.
+-            'socket'  => isset($GLOBALS['conf']['imsp']['socket']) ?
+-                         $GLOBALS['conf']['imsp']['socket'] . $uid . '.sck' :
+-                         '',
+-            'command' => isset($GLOBALS['conf']['imsp']['command']) ?
+-                         $GLOBALS['conf']['imsp']['command'] : '' ,
+-            'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
+-                                $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
 -            'username' => $uid,
 -            'password' => $pass,
 -            'name' => $uid,
 -            'group_id_field' => 'group',
 -            'group_id_value' => 'group',
--            'contact_ownership' => false
+-            'contact_ownership' => false,
+-            // Dynamically generated acl rights for current user.
+-            'my_rights' => '',
+-            // Flags this as the user's 'root' IMSP address book.
+-            'is_root' => true
 -            ),
 -        'map' => array(
 -            '__key' => 'name',
@@ -57,28 +69,38 @@
 -            'homePhone'
 -            ),
 -        'strict' => array(),
--        'public' => false,
--        'readonly' => false,
--        'export' => true
+-        'export' => true,
+-        'browse' => true,
 -        );
 -
 -    /**
 -     * Get any other address books this user might be privy to.
+-     * The values for attributes such as 'export' and 'browse' for books
+-     * that are added below will be the same as the values set in the default
+-     * book above. Any entries defined explicitly in cfgSources[]
+-     * will override any entries gathered dynamically below.
 -     */
 -    require_once 'Net/IMSP/Utils.php';
--    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
+-    $result = Net_IMSP_Utils::getAllBooks($cfgSources[$cfgKey]);
+-    $count = 2;
 -    if (!is_a($result, 'PEAR_Error')) {
--        for ($i = 0; $i < count($result); $i++) {
--            // Make sure we didn't define this source explicitly.
+-        $resultCount = count($result);
+-        for ($i = 0; $i < $resultCount; $i++) {
+-            // Make sure we didn't define this source explicitly,
+-            // but set the acls from the server regardless.
 -            $dup = false;
--            foreach ($cfgSources as $thisSource) {
+-            foreach ($cfgSources as $key => $thisSource) {
 -                if (($thisSource['type'] == 'imsp') &&
 -                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
+-
 -                    $dup = true;
+-                    $acl = $result[$i]['params']['my_rights'];
+-                    $cfgSources[$key]['params']['my_rights'] = $acl;
+-                    break;
 -                }
 -            }
 -            if (!$dup) {
--                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
+-                $cfgSources[sprintf('IMSP_%d', $count++)] = $result[$i];
 -            }
 -        }
 -    } else {
@@ -87,31 +109,43 @@
 -}
 +//UNCOMMENTIFIMSPif (!empty($GLOBALS['conf']['imsp']['enabled']) ||
 +//UNCOMMENTIFIMSP    !isset($GLOBALS['conf']['imsp']['enabled'])) {
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    // First, get the user name
++//UNCOMMENTIFIMSP    // First, get the user name to login to IMSP server with.
 +//UNCOMMENTIFIMSP    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
 +//UNCOMMENTIFIMSP    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
 +//UNCOMMENTIFIMSP    if (!strlen($uid)) {
-+//UNCOMMENTIFIMSP        $uid = Auth::getAuth();
-+//UNCOMMENTIFIMSP        if (preg_match('/(^.*)@/', $uid, $matches)) {
-+//UNCOMMENTIFIMSP            $uid = $matches[1];
-+//UNCOMMENTIFIMSP        }
++//UNCOMMENTIFIMSP        $uid = Auth::getBareAuth();
 +//UNCOMMENTIFIMSP        $pass = Auth::getCredential('password');
 +//UNCOMMENTIFIMSP    }
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    $cfgSources['imsp'] = array(
++//UNCOMMENTIFIMSP    // Note we always use the horde username to append to the key even if we
++//UNCOMMENTIFIMSP    // have an alternate username set in prefs.  This is to prevent the
++//UNCOMMENTIFIMSP    // (fringe) case where an IMSP username for one user might be a valid
++//UNCOMMENTIFIMSP    // horde username for another user.
++//UNCOMMENTIFIMSP    $cfgKey = 'IMSP_' . Auth::getAuth();
++//UNCOMMENTIFIMSP    $cfgSources[$cfgKey] = array(
 +//UNCOMMENTIFIMSP        'title' => _("IMSP"),
 +//UNCOMMENTIFIMSP        'type' => 'imsp',
 +//UNCOMMENTIFIMSP        'params' => array(
-+//UNCOMMENTIFIMSP            'server'   => $GLOBALS['conf']['imsp']['server'],
-+//UNCOMMENTIFIMSP            'port'     => $GLOBASL['conf']['imsp']['port'],
++//UNCOMMENTIFIMSP            'server'  => $GLOBALS['conf']['imsp']['server'],
++//UNCOMMENTIFIMSP            'port'    => $GLOBALS['conf']['imsp']['port'],
 +//UNCOMMENTIFIMSP            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
++//UNCOMMENTIFIMSP            // socket, command, and auth_mechanism are for imtest driver.
++//UNCOMMENTIFIMSP            'socket'  => isset($GLOBALS['conf']['imsp']['socket']) ?
++//UNCOMMENTIFIMSP                         $GLOBALS['conf']['imsp']['socket'] . $uid . '.sck' :
++//UNCOMMENTIFIMSP                         '',
++//UNCOMMENTIFIMSP            'command' => isset($GLOBALS['conf']['imsp']['command']) ?
++//UNCOMMENTIFIMSP                         $GLOBALS['conf']['imsp']['command'] : '' ,
++//UNCOMMENTIFIMSP            'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
++//UNCOMMENTIFIMSP                                $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
 +//UNCOMMENTIFIMSP            'username' => $uid,
 +//UNCOMMENTIFIMSP            'password' => $pass,
 +//UNCOMMENTIFIMSP            'name' => $uid,
 +//UNCOMMENTIFIMSP            'group_id_field' => 'group',
 +//UNCOMMENTIFIMSP            'group_id_value' => 'group',
-+//UNCOMMENTIFIMSP            'contact_ownership' => false
++//UNCOMMENTIFIMSP            'contact_ownership' => false,
++//UNCOMMENTIFIMSP            // Dynamically generated acl rights for current user.
++//UNCOMMENTIFIMSP            'my_rights' => '',
++//UNCOMMENTIFIMSP            // Flags this as the user's 'root' IMSP address book.
++//UNCOMMENTIFIMSP            'is_root' => true
 +//UNCOMMENTIFIMSP            ),
 +//UNCOMMENTIFIMSP        'map' => array(
 +//UNCOMMENTIFIMSP            '__key' => 'name',
@@ -138,34 +172,44 @@
 +//UNCOMMENTIFIMSP            'homePhone'
 +//UNCOMMENTIFIMSP            ),
 +//UNCOMMENTIFIMSP        'strict' => array(),
-+//UNCOMMENTIFIMSP        'public' => false,
-+//UNCOMMENTIFIMSP        'readonly' => false,
-+//UNCOMMENTIFIMSP        'export' => true
++//UNCOMMENTIFIMSP        'export' => true,
++//UNCOMMENTIFIMSP        'browse' => true,
 +//UNCOMMENTIFIMSP        );
 +//UNCOMMENTIFIMSP
 +//UNCOMMENTIFIMSP    /**
 +//UNCOMMENTIFIMSP     * Get any other address books this user might be privy to.
++//UNCOMMENTIFIMSP     * The values for attributes such as 'export' and 'browse' for books
++//UNCOMMENTIFIMSP     * that are added below will be the same as the values set in the default
++//UNCOMMENTIFIMSP     * book above. Any entries defined explicitly in cfgSources[]
++//UNCOMMENTIFIMSP     * will override any entries gathered dynamically below.
 +//UNCOMMENTIFIMSP     */
 +//UNCOMMENTIFIMSP    require_once 'Net/IMSP/Utils.php';
-+//UNCOMMENTIFIMSP    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
++//UNCOMMENTIFIMSP    $result = Net_IMSP_Utils::getAllBooks($cfgSources[$cfgKey]);
++//UNCOMMENTIFIMSP    $count = 2;
 +//UNCOMMENTIFIMSP    if (!is_a($result, 'PEAR_Error')) {
-+//UNCOMMENTIFIMSP        for ($i = 0; $i < count($result); $i++) {
-+//UNCOMMENTIFIMSP            // Make sure we didn't define this source explicitly.
++//UNCOMMENTIFIMSP        $resultCount = count($result);
++//UNCOMMENTIFIMSP        for ($i = 0; $i < $resultCount; $i++) {
++//UNCOMMENTIFIMSP            // Make sure we didn't define this source explicitly,
++//UNCOMMENTIFIMSP            // but set the acls from the server regardless.
 +//UNCOMMENTIFIMSP            $dup = false;
-+//UNCOMMENTIFIMSP            foreach ($cfgSources as $thisSource) {
++//UNCOMMENTIFIMSP            foreach ($cfgSources as $key => $thisSource) {
 +//UNCOMMENTIFIMSP                if (($thisSource['type'] == 'imsp') &&
 +//UNCOMMENTIFIMSP                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
++//UNCOMMENTIFIMSP
 +//UNCOMMENTIFIMSP                    $dup = true;
++//UNCOMMENTIFIMSP                    $acl = $result[$i]['params']['my_rights'];
++//UNCOMMENTIFIMSP                    $cfgSources[$key]['params']['my_rights'] = $acl;
++//UNCOMMENTIFIMSP                    break;
 +//UNCOMMENTIFIMSP                }
 +//UNCOMMENTIFIMSP            }
 +//UNCOMMENTIFIMSP            if (!$dup) {
-+//UNCOMMENTIFIMSP                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
++//UNCOMMENTIFIMSP                $cfgSources[sprintf('IMSP_%d', $count++)] = $result[$i];
 +//UNCOMMENTIFIMSP            }
 +//UNCOMMENTIFIMSP        }
 +//UNCOMMENTIFIMSP    } else {
 +//UNCOMMENTIFIMSP        $notification->push($result);
 +//UNCOMMENTIFIMSP    }
 +//UNCOMMENTIFIMSP}
+ /* End IMSP sources. */
  
  /* Begin Kolab sources. */
- if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
diff --git a/mail/horde-turba/files/pkg-message.in b/mail/horde-turba/files/pkg-message.in
index f7347f3f3413..6243e33a282d 100644
--- a/mail/horde-turba/files/pkg-message.in
+++ b/mail/horde-turba/files/pkg-message.in
@@ -7,6 +7,10 @@ Horde must be configured; if not, see `pkg_info -D -x horde'.
 Then, you might have to tune the configuration files located in
 %%CONFDIR%%/, specially the file sources.php.
 
+Warning: if you don't use some source, deactivate it, or you could
+******** experience bad response times!
+         When upgrading from Turba 2.0.x, please read UPGRADING.
+
 Then, you must login to Horde as a Horde Administrator to finish the
 configuration.
 
@@ -14,8 +18,5 @@ You have to create a table in your database; please see
 %%TURBADIR%%/scripts/.
 You might create a LDAP schema: please see the doc LDAP.
 
-WARNING! if you are upgrading from Turba v. 1.2.x, you have to alter your
-******** schemas. Please read the doc UPGRADING.
-
 To protect your configuration files, you have to restart Apache.
 ************************************************************************
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
index 07ea12b087a2..f6fd94a1e219 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde-turba/pkg-plist
@@ -7,6 +7,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%TURBADIR%%/add.php
+%%TURBADIR%%/addressbooks.php
 %%TURBADIR%%/browse.php
 %%TURBADIR%%/config/.htaccess
 %%TURBADIR%%/config/attributes.php
@@ -14,6 +15,8 @@
 %%TURBADIR%%/config/conf.xml
 %%TURBADIR%%/config/menu.php
 %%TURBADIR%%/config/menu.php.dist
+%%TURBADIR%%/config/mime_drivers.php
+%%TURBADIR%%/config/mime_drivers.php.dist
 %%TURBADIR%%/config/prefs.php
 %%TURBADIR%%/config/prefs.php.dist
 %%TURBADIR%%/config/sources.php
@@ -26,16 +29,19 @@
 %%TURBADIR%%/lib/.htaccess
 %%TURBADIR%%/lib/AbstractObject.php
 %%TURBADIR%%/lib/Block/minisearch.php
+%%TURBADIR%%/lib/Block/tree_menu.php
 %%TURBADIR%%/lib/Driver.php
 %%TURBADIR%%/lib/Driver/imsp.php
 %%TURBADIR%%/lib/Driver/kolab.php
 %%TURBADIR%%/lib/Driver/ldap.php
+%%TURBADIR%%/lib/Driver/null.php
 %%TURBADIR%%/lib/Driver/prefs.php
 %%TURBADIR%%/lib/Driver/sql.php
 %%TURBADIR%%/lib/Group.php
 %%TURBADIR%%/lib/List.php
 %%TURBADIR%%/lib/ListView.php
 %%TURBADIR%%/lib/Object.php
+%%TURBADIR%%/lib/Object/Group.php
 %%TURBADIR%%/lib/ObjectView.php
 %%TURBADIR%%/lib/Renderer.php
 %%TURBADIR%%/lib/Turba.php
@@ -57,11 +63,13 @@
 %%TURBADIR%%/locale/es_ES/help.xml
 %%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fa_IR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fa_IR/help.xml
 %%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fi_FI/help.xml
 %%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/is_IS/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
@@ -83,6 +91,7 @@
 %%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/tr_TR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/tr_TR/help.xml
 %%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
@@ -103,6 +112,7 @@
 %%TURBADIR%%/po/fr_FR.po
 %%TURBADIR%%/po/gl_ES.po
 %%TURBADIR%%/po/hu_HU.po
+%%TURBADIR%%/po/is_IS.po
 %%TURBADIR%%/po/it_IT.po
 %%TURBADIR%%/po/ja_JP.po
 %%TURBADIR%%/po/ko_KR.po
@@ -127,10 +137,12 @@
 %%TURBADIR%%/po/zh_TW.po
 %%TURBADIR%%/scripts/.htaccess
 %%TURBADIR%%/scripts/Turba.reg
+%%TURBADIR%%/scripts/import_vcards.php
 %%TURBADIR%%/scripts/ldap/addou
 %%TURBADIR%%/scripts/ldap/addou.pl
 %%TURBADIR%%/scripts/ldap/core.schema.patch
 %%TURBADIR%%/scripts/ldap/rfc2739.schema
+%%TURBADIR%%/scripts/sql/turba_objects.mssql.sql
 %%TURBADIR%%/scripts/sql/turba_objects.mysql.sql
 %%TURBADIR%%/scripts/sql/turba_objects.oci8.sql
 %%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql
@@ -138,8 +150,10 @@
 %%TURBADIR%%/scripts/sql/turba_weddingguests.sql
 %%TURBADIR%%/scripts/upgrades/1.2_to_2.0.sql
 %%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php
+%%TURBADIR%%/scripts/upgrades/public_to_horde_share.php
 %%TURBADIR%%/search.php
 %%TURBADIR%%/templates/.htaccess
+%%TURBADIR%%/templates/addressbooks.inc
 %%TURBADIR%%/templates/block/minisearch.inc
 %%TURBADIR%%/templates/browse/actions.inc
 %%TURBADIR%%/templates/browse/column_footers.inc
@@ -149,14 +163,16 @@
 %%TURBADIR%%/templates/browse/footerAlpha.inc
 %%TURBADIR%%/templates/browse/header.inc
 %%TURBADIR%%/templates/browse/javascript.inc
+%%TURBADIR%%/templates/browse/row.inc
 %%TURBADIR%%/templates/browse/search.inc
 %%TURBADIR%%/templates/browse/search_criteria.inc
-%%TURBADIR%%/templates/browse/select.inc
 %%TURBADIR%%/templates/common-header.inc
 %%TURBADIR%%/templates/data/export.inc
 %%TURBADIR%%/templates/data/import.inc
 %%TURBADIR%%/templates/menu.inc
+%%TURBADIR%%/templates/prefs/addressbookselect.inc
 %%TURBADIR%%/templates/prefs/columnselect.inc
+%%TURBADIR%%/templates/prefs/imsp_opt.inc
 %%TURBADIR%%/test.php
 %%TURBADIR%%/themes/graphics/contact.png
 %%TURBADIR%%/themes/graphics/favicon.ico
@@ -165,97 +181,103 @@
 %%TURBADIR%%/themes/graphics/menu/new.png
 %%TURBADIR%%/themes/graphics/new.png
 %%TURBADIR%%/themes/graphics/turba.png
+%%TURBADIR%%/themes/ideas/screen.css
 %%TURBADIR%%/themes/screen.css
 %%TURBADIR%%/vcard.php
+%%TURBADIR%%/view.php
 %%HORDE_INC%%/httpd-turba.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%TURBADIR%%/lib/Block
-@dirrm %%TURBADIR%%/lib/Driver
-@dirrm %%TURBADIR%%/lib
-@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ar_SY
-@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/bg_BG
-@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ca_ES
-@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/cs_CZ
-@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/da_DK
-@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/de_DE
-@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/el_GR
-@dirrm %%TURBADIR%%/locale/en_US
-@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/es_ES
-@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/et_EE
-@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fa_IR
-@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fi_FI
-@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fr_FR
-@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/gl_ES
-@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/hu_HU
-@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/it_IT
-@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ja_JP
-@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ko_KR
-@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lt_LT
-@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lv_LV
-@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/mk_MK
-@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nb_NO
-@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nl_NL
-@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nn_NO
-@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pl_PL
-@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_BR
-@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_PT
-@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ro_RO
-@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ru_RU
-@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sk_SK
-@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sl_SI
-@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sv_SE
-@dirrm %%TURBADIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/tr_TR
-@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/uk_UA
-@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_CN
-@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_TW
-@dirrm %%TURBADIR%%/locale
-@dirrm %%TURBADIR%%/po
-@dirrm %%TURBADIR%%/scripts/ldap
-@dirrm %%TURBADIR%%/scripts/sql
-@dirrm %%TURBADIR%%/scripts/upgrades
-@dirrm %%TURBADIR%%/scripts
-@dirrm %%TURBADIR%%/templates/block
-@dirrm %%TURBADIR%%/templates/browse
-@dirrm %%TURBADIR%%/templates/data
-@dirrm %%TURBADIR%%/templates/prefs
-@dirrm %%TURBADIR%%/templates
+@dirrm %%TURBADIR%%/themes/ideas
 @dirrm %%TURBADIR%%/themes/graphics/menu
 @dirrm %%TURBADIR%%/themes/graphics
 @dirrm %%TURBADIR%%/themes
+@dirrm %%TURBADIR%%/templates/prefs
+@dirrm %%TURBADIR%%/templates/data
+@dirrm %%TURBADIR%%/templates/browse
+@dirrm %%TURBADIR%%/templates/block
+@dirrm %%TURBADIR%%/templates
+@dirrm %%TURBADIR%%/scripts/upgrades
+@dirrm %%TURBADIR%%/scripts/sql
+@dirrm %%TURBADIR%%/scripts/ldap
+@dirrm %%TURBADIR%%/scripts
+@dirrm %%TURBADIR%%/po
+@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/zh_TW
+@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/zh_CN
+@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/uk_UA
+@dirrm %%TURBADIR%%/locale/tr_TR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/tr_TR
+@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sv_SE
+@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sl_SI
+@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sk_SK
+@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ru_RU
+@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ro_RO
+@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pt_PT
+@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pt_BR
+@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pl_PL
+@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nn_NO
+@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nl_NL
+@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nb_NO
+@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/mk_MK
+@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/lv_LV
+@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/lt_LT
+@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ko_KR
+@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ja_JP
+@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/it_IT
+@dirrm %%TURBADIR%%/locale/is_IS/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/is_IS
+@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/hu_HU
+@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/gl_ES
+@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fr_FR
+@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fi_FI
+@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fa_IR
+@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/et_EE
+@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/es_ES
+@dirrm %%TURBADIR%%/locale/en_US
+@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/el_GR
+@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/de_DE
+@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/da_DK
+@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/cs_CZ
+@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ca_ES
+@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/bg_BG
+@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ar_SY
+@dirrm %%TURBADIR%%/locale
+@dirrm %%TURBADIR%%/lib/Object
+@dirrm %%TURBADIR%%/lib/Driver
+@dirrm %%TURBADIR%%/lib/Block
+@dirrm %%TURBADIR%%/lib
 @dirrmtry %%TURBADIR%%/config
 @dirrmtry %%TURBADIR%%
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 81bfb5cbe144..3bd64ead08ab 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		ftp://ftp.planetmirror.com/pub/horde/turba/		\
@@ -39,12 +39,12 @@ USE_PHP=	ldap
 
 NO_BUILD=	yes
 USE_APACHE=	1.3+	# needed to test APACHE_VERSION
-USE_REINPLACE=	yes
+USE_GETTEXT=	yes
 
 REINPLACE_ARGS=	-i ""
 DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING
-CONFFILE=	attributes.php menu.php prefs.php sources.php
+CONFFILE=	attributes.php menu.php mime_drivers.php prefs.php sources.php
 SUB_DIRS=	config lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
diff --git a/mail/horde4-turba/distinfo b/mail/horde4-turba/distinfo
index eb17ec4654db..c2a29941365f 100644
--- a/mail/horde4-turba/distinfo
+++ b/mail/horde4-turba/distinfo
@@ -1,3 +1,3 @@
-MD5 (turba-h3-2.0.5.tar.gz) = 6e051d636308f0efcc70addb9a40e651
-SHA256 (turba-h3-2.0.5.tar.gz) = 28ad16ce36047bf821db5e7036a21a37ec96c1850e2ecec18213310253ab97da
-SIZE (turba-h3-2.0.5.tar.gz) = 1420141
+MD5 (turba-h3-2.1.tar.gz) = 2841adb1f8b7b17fd3e17cd14abdd36f
+SHA256 (turba-h3-2.1.tar.gz) = 1623f8e8b8b67965706a2e2cf039956a3957bc56531fbe0bfbad39cb83143125
+SIZE (turba-h3-2.1.tar.gz) = 1450847
diff --git a/mail/horde4-turba/files/patch-config::sources.php.dist b/mail/horde4-turba/files/patch-config::sources.php.dist
index 46b4a1ba4f5c..52bf06d5d79c 100644
--- a/mail/horde4-turba/files/patch-config::sources.php.dist
+++ b/mail/horde4-turba/files/patch-config::sources.php.dist
@@ -1,36 +1,48 @@
---- config/sources.php.dist.orig	Mon Oct 17 22:51:49 2005
-+++ config/sources.php.dist	Tue Oct 18 22:24:34 2005
-@@ -469,87 +469,87 @@
- // Check that IMSP is configured in Horde but fall through if there is no
- // configuration at all - in case we aren't using up to date Horde install.
- // (In that case, be sure to change the params array below to suit your needs.
+--- config/sources.php.dist.orig	Mon Nov  7 11:03:26 2005
++++ config/sources.php.dist	Wed Mar  8 23:18:05 2006
+@@ -490,109 +490,109 @@
+ // configuration at all - in case we don't have at least a 3.0.6 Horde
+ // install.  (In that case, be sure to change the params array below to suit
+ // your needs).
 -if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
 -    !isset($GLOBALS['conf']['imsp']['enabled'])) {
--
--    // First, get the user name
+-    // First, get the user name to login to IMSP server with.
 -    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
 -    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
 -    if (!strlen($uid)) {
--        $uid = Auth::getAuth();
--        if (preg_match('/(^.*)@/', $uid, $matches)) {
--            $uid = $matches[1];
--        }
+-        $uid = Auth::getBareAuth();
 -        $pass = Auth::getCredential('password');
 -    }
--
--    $cfgSources['imsp'] = array(
+-    // Note we always use the horde username to append to the key even if we
+-    // have an alternate username set in prefs.  This is to prevent the
+-    // (fringe) case where an IMSP username for one user might be a valid
+-    // horde username for another user.
+-    $cfgKey = 'IMSP_' . Auth::getAuth();
+-    $cfgSources[$cfgKey] = array(
 -        'title' => _("IMSP"),
 -        'type' => 'imsp',
 -        'params' => array(
--            'server'   => $GLOBALS['conf']['imsp']['server'],
--            'port'     => $GLOBASL['conf']['imsp']['port'],
+-            'server'  => $GLOBALS['conf']['imsp']['server'],
+-            'port'    => $GLOBALS['conf']['imsp']['port'],
 -            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
+-            // socket, command, and auth_mechanism are for imtest driver.
+-            'socket'  => isset($GLOBALS['conf']['imsp']['socket']) ?
+-                         $GLOBALS['conf']['imsp']['socket'] . $uid . '.sck' :
+-                         '',
+-            'command' => isset($GLOBALS['conf']['imsp']['command']) ?
+-                         $GLOBALS['conf']['imsp']['command'] : '' ,
+-            'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
+-                                $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
 -            'username' => $uid,
 -            'password' => $pass,
 -            'name' => $uid,
 -            'group_id_field' => 'group',
 -            'group_id_value' => 'group',
--            'contact_ownership' => false
+-            'contact_ownership' => false,
+-            // Dynamically generated acl rights for current user.
+-            'my_rights' => '',
+-            // Flags this as the user's 'root' IMSP address book.
+-            'is_root' => true
 -            ),
 -        'map' => array(
 -            '__key' => 'name',
@@ -57,28 +69,38 @@
 -            'homePhone'
 -            ),
 -        'strict' => array(),
--        'public' => false,
--        'readonly' => false,
--        'export' => true
+-        'export' => true,
+-        'browse' => true,
 -        );
 -
 -    /**
 -     * Get any other address books this user might be privy to.
+-     * The values for attributes such as 'export' and 'browse' for books
+-     * that are added below will be the same as the values set in the default
+-     * book above. Any entries defined explicitly in cfgSources[]
+-     * will override any entries gathered dynamically below.
 -     */
 -    require_once 'Net/IMSP/Utils.php';
--    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
+-    $result = Net_IMSP_Utils::getAllBooks($cfgSources[$cfgKey]);
+-    $count = 2;
 -    if (!is_a($result, 'PEAR_Error')) {
--        for ($i = 0; $i < count($result); $i++) {
--            // Make sure we didn't define this source explicitly.
+-        $resultCount = count($result);
+-        for ($i = 0; $i < $resultCount; $i++) {
+-            // Make sure we didn't define this source explicitly,
+-            // but set the acls from the server regardless.
 -            $dup = false;
--            foreach ($cfgSources as $thisSource) {
+-            foreach ($cfgSources as $key => $thisSource) {
 -                if (($thisSource['type'] == 'imsp') &&
 -                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
+-
 -                    $dup = true;
+-                    $acl = $result[$i]['params']['my_rights'];
+-                    $cfgSources[$key]['params']['my_rights'] = $acl;
+-                    break;
 -                }
 -            }
 -            if (!$dup) {
--                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
+-                $cfgSources[sprintf('IMSP_%d', $count++)] = $result[$i];
 -            }
 -        }
 -    } else {
@@ -87,31 +109,43 @@
 -}
 +//UNCOMMENTIFIMSPif (!empty($GLOBALS['conf']['imsp']['enabled']) ||
 +//UNCOMMENTIFIMSP    !isset($GLOBALS['conf']['imsp']['enabled'])) {
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    // First, get the user name
++//UNCOMMENTIFIMSP    // First, get the user name to login to IMSP server with.
 +//UNCOMMENTIFIMSP    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
 +//UNCOMMENTIFIMSP    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
 +//UNCOMMENTIFIMSP    if (!strlen($uid)) {
-+//UNCOMMENTIFIMSP        $uid = Auth::getAuth();
-+//UNCOMMENTIFIMSP        if (preg_match('/(^.*)@/', $uid, $matches)) {
-+//UNCOMMENTIFIMSP            $uid = $matches[1];
-+//UNCOMMENTIFIMSP        }
++//UNCOMMENTIFIMSP        $uid = Auth::getBareAuth();
 +//UNCOMMENTIFIMSP        $pass = Auth::getCredential('password');
 +//UNCOMMENTIFIMSP    }
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    $cfgSources['imsp'] = array(
++//UNCOMMENTIFIMSP    // Note we always use the horde username to append to the key even if we
++//UNCOMMENTIFIMSP    // have an alternate username set in prefs.  This is to prevent the
++//UNCOMMENTIFIMSP    // (fringe) case where an IMSP username for one user might be a valid
++//UNCOMMENTIFIMSP    // horde username for another user.
++//UNCOMMENTIFIMSP    $cfgKey = 'IMSP_' . Auth::getAuth();
++//UNCOMMENTIFIMSP    $cfgSources[$cfgKey] = array(
 +//UNCOMMENTIFIMSP        'title' => _("IMSP"),
 +//UNCOMMENTIFIMSP        'type' => 'imsp',
 +//UNCOMMENTIFIMSP        'params' => array(
-+//UNCOMMENTIFIMSP            'server'   => $GLOBALS['conf']['imsp']['server'],
-+//UNCOMMENTIFIMSP            'port'     => $GLOBASL['conf']['imsp']['port'],
++//UNCOMMENTIFIMSP            'server'  => $GLOBALS['conf']['imsp']['server'],
++//UNCOMMENTIFIMSP            'port'    => $GLOBALS['conf']['imsp']['port'],
 +//UNCOMMENTIFIMSP            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
++//UNCOMMENTIFIMSP            // socket, command, and auth_mechanism are for imtest driver.
++//UNCOMMENTIFIMSP            'socket'  => isset($GLOBALS['conf']['imsp']['socket']) ?
++//UNCOMMENTIFIMSP                         $GLOBALS['conf']['imsp']['socket'] . $uid . '.sck' :
++//UNCOMMENTIFIMSP                         '',
++//UNCOMMENTIFIMSP            'command' => isset($GLOBALS['conf']['imsp']['command']) ?
++//UNCOMMENTIFIMSP                         $GLOBALS['conf']['imsp']['command'] : '' ,
++//UNCOMMENTIFIMSP            'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
++//UNCOMMENTIFIMSP                                $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
 +//UNCOMMENTIFIMSP            'username' => $uid,
 +//UNCOMMENTIFIMSP            'password' => $pass,
 +//UNCOMMENTIFIMSP            'name' => $uid,
 +//UNCOMMENTIFIMSP            'group_id_field' => 'group',
 +//UNCOMMENTIFIMSP            'group_id_value' => 'group',
-+//UNCOMMENTIFIMSP            'contact_ownership' => false
++//UNCOMMENTIFIMSP            'contact_ownership' => false,
++//UNCOMMENTIFIMSP            // Dynamically generated acl rights for current user.
++//UNCOMMENTIFIMSP            'my_rights' => '',
++//UNCOMMENTIFIMSP            // Flags this as the user's 'root' IMSP address book.
++//UNCOMMENTIFIMSP            'is_root' => true
 +//UNCOMMENTIFIMSP            ),
 +//UNCOMMENTIFIMSP        'map' => array(
 +//UNCOMMENTIFIMSP            '__key' => 'name',
@@ -138,34 +172,44 @@
 +//UNCOMMENTIFIMSP            'homePhone'
 +//UNCOMMENTIFIMSP            ),
 +//UNCOMMENTIFIMSP        'strict' => array(),
-+//UNCOMMENTIFIMSP        'public' => false,
-+//UNCOMMENTIFIMSP        'readonly' => false,
-+//UNCOMMENTIFIMSP        'export' => true
++//UNCOMMENTIFIMSP        'export' => true,
++//UNCOMMENTIFIMSP        'browse' => true,
 +//UNCOMMENTIFIMSP        );
 +//UNCOMMENTIFIMSP
 +//UNCOMMENTIFIMSP    /**
 +//UNCOMMENTIFIMSP     * Get any other address books this user might be privy to.
++//UNCOMMENTIFIMSP     * The values for attributes such as 'export' and 'browse' for books
++//UNCOMMENTIFIMSP     * that are added below will be the same as the values set in the default
++//UNCOMMENTIFIMSP     * book above. Any entries defined explicitly in cfgSources[]
++//UNCOMMENTIFIMSP     * will override any entries gathered dynamically below.
 +//UNCOMMENTIFIMSP     */
 +//UNCOMMENTIFIMSP    require_once 'Net/IMSP/Utils.php';
-+//UNCOMMENTIFIMSP    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
++//UNCOMMENTIFIMSP    $result = Net_IMSP_Utils::getAllBooks($cfgSources[$cfgKey]);
++//UNCOMMENTIFIMSP    $count = 2;
 +//UNCOMMENTIFIMSP    if (!is_a($result, 'PEAR_Error')) {
-+//UNCOMMENTIFIMSP        for ($i = 0; $i < count($result); $i++) {
-+//UNCOMMENTIFIMSP            // Make sure we didn't define this source explicitly.
++//UNCOMMENTIFIMSP        $resultCount = count($result);
++//UNCOMMENTIFIMSP        for ($i = 0; $i < $resultCount; $i++) {
++//UNCOMMENTIFIMSP            // Make sure we didn't define this source explicitly,
++//UNCOMMENTIFIMSP            // but set the acls from the server regardless.
 +//UNCOMMENTIFIMSP            $dup = false;
-+//UNCOMMENTIFIMSP            foreach ($cfgSources as $thisSource) {
++//UNCOMMENTIFIMSP            foreach ($cfgSources as $key => $thisSource) {
 +//UNCOMMENTIFIMSP                if (($thisSource['type'] == 'imsp') &&
 +//UNCOMMENTIFIMSP                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
++//UNCOMMENTIFIMSP
 +//UNCOMMENTIFIMSP                    $dup = true;
++//UNCOMMENTIFIMSP                    $acl = $result[$i]['params']['my_rights'];
++//UNCOMMENTIFIMSP                    $cfgSources[$key]['params']['my_rights'] = $acl;
++//UNCOMMENTIFIMSP                    break;
 +//UNCOMMENTIFIMSP                }
 +//UNCOMMENTIFIMSP            }
 +//UNCOMMENTIFIMSP            if (!$dup) {
-+//UNCOMMENTIFIMSP                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
++//UNCOMMENTIFIMSP                $cfgSources[sprintf('IMSP_%d', $count++)] = $result[$i];
 +//UNCOMMENTIFIMSP            }
 +//UNCOMMENTIFIMSP        }
 +//UNCOMMENTIFIMSP    } else {
 +//UNCOMMENTIFIMSP        $notification->push($result);
 +//UNCOMMENTIFIMSP    }
 +//UNCOMMENTIFIMSP}
+ /* End IMSP sources. */
  
  /* Begin Kolab sources. */
- if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
diff --git a/mail/horde4-turba/files/pkg-message.in b/mail/horde4-turba/files/pkg-message.in
index f7347f3f3413..6243e33a282d 100644
--- a/mail/horde4-turba/files/pkg-message.in
+++ b/mail/horde4-turba/files/pkg-message.in
@@ -7,6 +7,10 @@ Horde must be configured; if not, see `pkg_info -D -x horde'.
 Then, you might have to tune the configuration files located in
 %%CONFDIR%%/, specially the file sources.php.
 
+Warning: if you don't use some source, deactivate it, or you could
+******** experience bad response times!
+         When upgrading from Turba 2.0.x, please read UPGRADING.
+
 Then, you must login to Horde as a Horde Administrator to finish the
 configuration.
 
@@ -14,8 +18,5 @@ You have to create a table in your database; please see
 %%TURBADIR%%/scripts/.
 You might create a LDAP schema: please see the doc LDAP.
 
-WARNING! if you are upgrading from Turba v. 1.2.x, you have to alter your
-******** schemas. Please read the doc UPGRADING.
-
 To protect your configuration files, you have to restart Apache.
 ************************************************************************
diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist
index 07ea12b087a2..f6fd94a1e219 100644
--- a/mail/horde4-turba/pkg-plist
+++ b/mail/horde4-turba/pkg-plist
@@ -7,6 +7,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%TURBADIR%%/add.php
+%%TURBADIR%%/addressbooks.php
 %%TURBADIR%%/browse.php
 %%TURBADIR%%/config/.htaccess
 %%TURBADIR%%/config/attributes.php
@@ -14,6 +15,8 @@
 %%TURBADIR%%/config/conf.xml
 %%TURBADIR%%/config/menu.php
 %%TURBADIR%%/config/menu.php.dist
+%%TURBADIR%%/config/mime_drivers.php
+%%TURBADIR%%/config/mime_drivers.php.dist
 %%TURBADIR%%/config/prefs.php
 %%TURBADIR%%/config/prefs.php.dist
 %%TURBADIR%%/config/sources.php
@@ -26,16 +29,19 @@
 %%TURBADIR%%/lib/.htaccess
 %%TURBADIR%%/lib/AbstractObject.php
 %%TURBADIR%%/lib/Block/minisearch.php
+%%TURBADIR%%/lib/Block/tree_menu.php
 %%TURBADIR%%/lib/Driver.php
 %%TURBADIR%%/lib/Driver/imsp.php
 %%TURBADIR%%/lib/Driver/kolab.php
 %%TURBADIR%%/lib/Driver/ldap.php
+%%TURBADIR%%/lib/Driver/null.php
 %%TURBADIR%%/lib/Driver/prefs.php
 %%TURBADIR%%/lib/Driver/sql.php
 %%TURBADIR%%/lib/Group.php
 %%TURBADIR%%/lib/List.php
 %%TURBADIR%%/lib/ListView.php
 %%TURBADIR%%/lib/Object.php
+%%TURBADIR%%/lib/Object/Group.php
 %%TURBADIR%%/lib/ObjectView.php
 %%TURBADIR%%/lib/Renderer.php
 %%TURBADIR%%/lib/Turba.php
@@ -57,11 +63,13 @@
 %%TURBADIR%%/locale/es_ES/help.xml
 %%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fa_IR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fa_IR/help.xml
 %%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fi_FI/help.xml
 %%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/is_IS/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
@@ -83,6 +91,7 @@
 %%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/tr_TR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/tr_TR/help.xml
 %%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
@@ -103,6 +112,7 @@
 %%TURBADIR%%/po/fr_FR.po
 %%TURBADIR%%/po/gl_ES.po
 %%TURBADIR%%/po/hu_HU.po
+%%TURBADIR%%/po/is_IS.po
 %%TURBADIR%%/po/it_IT.po
 %%TURBADIR%%/po/ja_JP.po
 %%TURBADIR%%/po/ko_KR.po
@@ -127,10 +137,12 @@
 %%TURBADIR%%/po/zh_TW.po
 %%TURBADIR%%/scripts/.htaccess
 %%TURBADIR%%/scripts/Turba.reg
+%%TURBADIR%%/scripts/import_vcards.php
 %%TURBADIR%%/scripts/ldap/addou
 %%TURBADIR%%/scripts/ldap/addou.pl
 %%TURBADIR%%/scripts/ldap/core.schema.patch
 %%TURBADIR%%/scripts/ldap/rfc2739.schema
+%%TURBADIR%%/scripts/sql/turba_objects.mssql.sql
 %%TURBADIR%%/scripts/sql/turba_objects.mysql.sql
 %%TURBADIR%%/scripts/sql/turba_objects.oci8.sql
 %%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql
@@ -138,8 +150,10 @@
 %%TURBADIR%%/scripts/sql/turba_weddingguests.sql
 %%TURBADIR%%/scripts/upgrades/1.2_to_2.0.sql
 %%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php
+%%TURBADIR%%/scripts/upgrades/public_to_horde_share.php
 %%TURBADIR%%/search.php
 %%TURBADIR%%/templates/.htaccess
+%%TURBADIR%%/templates/addressbooks.inc
 %%TURBADIR%%/templates/block/minisearch.inc
 %%TURBADIR%%/templates/browse/actions.inc
 %%TURBADIR%%/templates/browse/column_footers.inc
@@ -149,14 +163,16 @@
 %%TURBADIR%%/templates/browse/footerAlpha.inc
 %%TURBADIR%%/templates/browse/header.inc
 %%TURBADIR%%/templates/browse/javascript.inc
+%%TURBADIR%%/templates/browse/row.inc
 %%TURBADIR%%/templates/browse/search.inc
 %%TURBADIR%%/templates/browse/search_criteria.inc
-%%TURBADIR%%/templates/browse/select.inc
 %%TURBADIR%%/templates/common-header.inc
 %%TURBADIR%%/templates/data/export.inc
 %%TURBADIR%%/templates/data/import.inc
 %%TURBADIR%%/templates/menu.inc
+%%TURBADIR%%/templates/prefs/addressbookselect.inc
 %%TURBADIR%%/templates/prefs/columnselect.inc
+%%TURBADIR%%/templates/prefs/imsp_opt.inc
 %%TURBADIR%%/test.php
 %%TURBADIR%%/themes/graphics/contact.png
 %%TURBADIR%%/themes/graphics/favicon.ico
@@ -165,97 +181,103 @@
 %%TURBADIR%%/themes/graphics/menu/new.png
 %%TURBADIR%%/themes/graphics/new.png
 %%TURBADIR%%/themes/graphics/turba.png
+%%TURBADIR%%/themes/ideas/screen.css
 %%TURBADIR%%/themes/screen.css
 %%TURBADIR%%/vcard.php
+%%TURBADIR%%/view.php
 %%HORDE_INC%%/httpd-turba.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%TURBADIR%%/lib/Block
-@dirrm %%TURBADIR%%/lib/Driver
-@dirrm %%TURBADIR%%/lib
-@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ar_SY
-@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/bg_BG
-@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ca_ES
-@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/cs_CZ
-@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/da_DK
-@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/de_DE
-@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/el_GR
-@dirrm %%TURBADIR%%/locale/en_US
-@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/es_ES
-@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/et_EE
-@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fa_IR
-@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fi_FI
-@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fr_FR
-@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/gl_ES
-@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/hu_HU
-@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/it_IT
-@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ja_JP
-@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ko_KR
-@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lt_LT
-@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lv_LV
-@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/mk_MK
-@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nb_NO
-@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nl_NL
-@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nn_NO
-@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pl_PL
-@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_BR
-@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_PT
-@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ro_RO
-@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ru_RU
-@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sk_SK
-@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sl_SI
-@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sv_SE
-@dirrm %%TURBADIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/tr_TR
-@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/uk_UA
-@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_CN
-@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_TW
-@dirrm %%TURBADIR%%/locale
-@dirrm %%TURBADIR%%/po
-@dirrm %%TURBADIR%%/scripts/ldap
-@dirrm %%TURBADIR%%/scripts/sql
-@dirrm %%TURBADIR%%/scripts/upgrades
-@dirrm %%TURBADIR%%/scripts
-@dirrm %%TURBADIR%%/templates/block
-@dirrm %%TURBADIR%%/templates/browse
-@dirrm %%TURBADIR%%/templates/data
-@dirrm %%TURBADIR%%/templates/prefs
-@dirrm %%TURBADIR%%/templates
+@dirrm %%TURBADIR%%/themes/ideas
 @dirrm %%TURBADIR%%/themes/graphics/menu
 @dirrm %%TURBADIR%%/themes/graphics
 @dirrm %%TURBADIR%%/themes
+@dirrm %%TURBADIR%%/templates/prefs
+@dirrm %%TURBADIR%%/templates/data
+@dirrm %%TURBADIR%%/templates/browse
+@dirrm %%TURBADIR%%/templates/block
+@dirrm %%TURBADIR%%/templates
+@dirrm %%TURBADIR%%/scripts/upgrades
+@dirrm %%TURBADIR%%/scripts/sql
+@dirrm %%TURBADIR%%/scripts/ldap
+@dirrm %%TURBADIR%%/scripts
+@dirrm %%TURBADIR%%/po
+@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/zh_TW
+@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/zh_CN
+@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/uk_UA
+@dirrm %%TURBADIR%%/locale/tr_TR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/tr_TR
+@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sv_SE
+@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sl_SI
+@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sk_SK
+@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ru_RU
+@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ro_RO
+@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pt_PT
+@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pt_BR
+@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pl_PL
+@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nn_NO
+@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nl_NL
+@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nb_NO
+@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/mk_MK
+@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/lv_LV
+@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/lt_LT
+@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ko_KR
+@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ja_JP
+@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/it_IT
+@dirrm %%TURBADIR%%/locale/is_IS/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/is_IS
+@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/hu_HU
+@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/gl_ES
+@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fr_FR
+@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fi_FI
+@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fa_IR
+@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/et_EE
+@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/es_ES
+@dirrm %%TURBADIR%%/locale/en_US
+@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/el_GR
+@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/de_DE
+@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/da_DK
+@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/cs_CZ
+@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ca_ES
+@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/bg_BG
+@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ar_SY
+@dirrm %%TURBADIR%%/locale
+@dirrm %%TURBADIR%%/lib/Object
+@dirrm %%TURBADIR%%/lib/Driver
+@dirrm %%TURBADIR%%/lib/Block
+@dirrm %%TURBADIR%%/lib
 @dirrmtry %%TURBADIR%%/config
 @dirrmtry %%TURBADIR%%
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 81bfb5cbe144..3bd64ead08ab 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		ftp://ftp.planetmirror.com/pub/horde/turba/		\
@@ -39,12 +39,12 @@ USE_PHP=	ldap
 
 NO_BUILD=	yes
 USE_APACHE=	1.3+	# needed to test APACHE_VERSION
-USE_REINPLACE=	yes
+USE_GETTEXT=	yes
 
 REINPLACE_ARGS=	-i ""
 DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING
-CONFFILE=	attributes.php menu.php prefs.php sources.php
+CONFFILE=	attributes.php menu.php mime_drivers.php prefs.php sources.php
 SUB_DIRS=	config lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index eb17ec4654db..c2a29941365f 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1,3 +1,3 @@
-MD5 (turba-h3-2.0.5.tar.gz) = 6e051d636308f0efcc70addb9a40e651
-SHA256 (turba-h3-2.0.5.tar.gz) = 28ad16ce36047bf821db5e7036a21a37ec96c1850e2ecec18213310253ab97da
-SIZE (turba-h3-2.0.5.tar.gz) = 1420141
+MD5 (turba-h3-2.1.tar.gz) = 2841adb1f8b7b17fd3e17cd14abdd36f
+SHA256 (turba-h3-2.1.tar.gz) = 1623f8e8b8b67965706a2e2cf039956a3957bc56531fbe0bfbad39cb83143125
+SIZE (turba-h3-2.1.tar.gz) = 1450847
diff --git a/mail/turba/files/patch-config::sources.php.dist b/mail/turba/files/patch-config::sources.php.dist
index 46b4a1ba4f5c..52bf06d5d79c 100644
--- a/mail/turba/files/patch-config::sources.php.dist
+++ b/mail/turba/files/patch-config::sources.php.dist
@@ -1,36 +1,48 @@
---- config/sources.php.dist.orig	Mon Oct 17 22:51:49 2005
-+++ config/sources.php.dist	Tue Oct 18 22:24:34 2005
-@@ -469,87 +469,87 @@
- // Check that IMSP is configured in Horde but fall through if there is no
- // configuration at all - in case we aren't using up to date Horde install.
- // (In that case, be sure to change the params array below to suit your needs.
+--- config/sources.php.dist.orig	Mon Nov  7 11:03:26 2005
++++ config/sources.php.dist	Wed Mar  8 23:18:05 2006
+@@ -490,109 +490,109 @@
+ // configuration at all - in case we don't have at least a 3.0.6 Horde
+ // install.  (In that case, be sure to change the params array below to suit
+ // your needs).
 -if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
 -    !isset($GLOBALS['conf']['imsp']['enabled'])) {
--
--    // First, get the user name
+-    // First, get the user name to login to IMSP server with.
 -    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
 -    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
 -    if (!strlen($uid)) {
--        $uid = Auth::getAuth();
--        if (preg_match('/(^.*)@/', $uid, $matches)) {
--            $uid = $matches[1];
--        }
+-        $uid = Auth::getBareAuth();
 -        $pass = Auth::getCredential('password');
 -    }
--
--    $cfgSources['imsp'] = array(
+-    // Note we always use the horde username to append to the key even if we
+-    // have an alternate username set in prefs.  This is to prevent the
+-    // (fringe) case where an IMSP username for one user might be a valid
+-    // horde username for another user.
+-    $cfgKey = 'IMSP_' . Auth::getAuth();
+-    $cfgSources[$cfgKey] = array(
 -        'title' => _("IMSP"),
 -        'type' => 'imsp',
 -        'params' => array(
--            'server'   => $GLOBALS['conf']['imsp']['server'],
--            'port'     => $GLOBASL['conf']['imsp']['port'],
+-            'server'  => $GLOBALS['conf']['imsp']['server'],
+-            'port'    => $GLOBALS['conf']['imsp']['port'],
 -            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
+-            // socket, command, and auth_mechanism are for imtest driver.
+-            'socket'  => isset($GLOBALS['conf']['imsp']['socket']) ?
+-                         $GLOBALS['conf']['imsp']['socket'] . $uid . '.sck' :
+-                         '',
+-            'command' => isset($GLOBALS['conf']['imsp']['command']) ?
+-                         $GLOBALS['conf']['imsp']['command'] : '' ,
+-            'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
+-                                $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
 -            'username' => $uid,
 -            'password' => $pass,
 -            'name' => $uid,
 -            'group_id_field' => 'group',
 -            'group_id_value' => 'group',
--            'contact_ownership' => false
+-            'contact_ownership' => false,
+-            // Dynamically generated acl rights for current user.
+-            'my_rights' => '',
+-            // Flags this as the user's 'root' IMSP address book.
+-            'is_root' => true
 -            ),
 -        'map' => array(
 -            '__key' => 'name',
@@ -57,28 +69,38 @@
 -            'homePhone'
 -            ),
 -        'strict' => array(),
--        'public' => false,
--        'readonly' => false,
--        'export' => true
+-        'export' => true,
+-        'browse' => true,
 -        );
 -
 -    /**
 -     * Get any other address books this user might be privy to.
+-     * The values for attributes such as 'export' and 'browse' for books
+-     * that are added below will be the same as the values set in the default
+-     * book above. Any entries defined explicitly in cfgSources[]
+-     * will override any entries gathered dynamically below.
 -     */
 -    require_once 'Net/IMSP/Utils.php';
--    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
+-    $result = Net_IMSP_Utils::getAllBooks($cfgSources[$cfgKey]);
+-    $count = 2;
 -    if (!is_a($result, 'PEAR_Error')) {
--        for ($i = 0; $i < count($result); $i++) {
--            // Make sure we didn't define this source explicitly.
+-        $resultCount = count($result);
+-        for ($i = 0; $i < $resultCount; $i++) {
+-            // Make sure we didn't define this source explicitly,
+-            // but set the acls from the server regardless.
 -            $dup = false;
--            foreach ($cfgSources as $thisSource) {
+-            foreach ($cfgSources as $key => $thisSource) {
 -                if (($thisSource['type'] == 'imsp') &&
 -                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
+-
 -                    $dup = true;
+-                    $acl = $result[$i]['params']['my_rights'];
+-                    $cfgSources[$key]['params']['my_rights'] = $acl;
+-                    break;
 -                }
 -            }
 -            if (!$dup) {
--                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
+-                $cfgSources[sprintf('IMSP_%d', $count++)] = $result[$i];
 -            }
 -        }
 -    } else {
@@ -87,31 +109,43 @@
 -}
 +//UNCOMMENTIFIMSPif (!empty($GLOBALS['conf']['imsp']['enabled']) ||
 +//UNCOMMENTIFIMSP    !isset($GLOBALS['conf']['imsp']['enabled'])) {
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    // First, get the user name
++//UNCOMMENTIFIMSP    // First, get the user name to login to IMSP server with.
 +//UNCOMMENTIFIMSP    $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
 +//UNCOMMENTIFIMSP    $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
 +//UNCOMMENTIFIMSP    if (!strlen($uid)) {
-+//UNCOMMENTIFIMSP        $uid = Auth::getAuth();
-+//UNCOMMENTIFIMSP        if (preg_match('/(^.*)@/', $uid, $matches)) {
-+//UNCOMMENTIFIMSP            $uid = $matches[1];
-+//UNCOMMENTIFIMSP        }
++//UNCOMMENTIFIMSP        $uid = Auth::getBareAuth();
 +//UNCOMMENTIFIMSP        $pass = Auth::getCredential('password');
 +//UNCOMMENTIFIMSP    }
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP    $cfgSources['imsp'] = array(
++//UNCOMMENTIFIMSP    // Note we always use the horde username to append to the key even if we
++//UNCOMMENTIFIMSP    // have an alternate username set in prefs.  This is to prevent the
++//UNCOMMENTIFIMSP    // (fringe) case where an IMSP username for one user might be a valid
++//UNCOMMENTIFIMSP    // horde username for another user.
++//UNCOMMENTIFIMSP    $cfgKey = 'IMSP_' . Auth::getAuth();
++//UNCOMMENTIFIMSP    $cfgSources[$cfgKey] = array(
 +//UNCOMMENTIFIMSP        'title' => _("IMSP"),
 +//UNCOMMENTIFIMSP        'type' => 'imsp',
 +//UNCOMMENTIFIMSP        'params' => array(
-+//UNCOMMENTIFIMSP            'server'   => $GLOBALS['conf']['imsp']['server'],
-+//UNCOMMENTIFIMSP            'port'     => $GLOBASL['conf']['imsp']['port'],
++//UNCOMMENTIFIMSP            'server'  => $GLOBALS['conf']['imsp']['server'],
++//UNCOMMENTIFIMSP            'port'    => $GLOBALS['conf']['imsp']['port'],
 +//UNCOMMENTIFIMSP            'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
++//UNCOMMENTIFIMSP            // socket, command, and auth_mechanism are for imtest driver.
++//UNCOMMENTIFIMSP            'socket'  => isset($GLOBALS['conf']['imsp']['socket']) ?
++//UNCOMMENTIFIMSP                         $GLOBALS['conf']['imsp']['socket'] . $uid . '.sck' :
++//UNCOMMENTIFIMSP                         '',
++//UNCOMMENTIFIMSP            'command' => isset($GLOBALS['conf']['imsp']['command']) ?
++//UNCOMMENTIFIMSP                         $GLOBALS['conf']['imsp']['command'] : '' ,
++//UNCOMMENTIFIMSP            'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
++//UNCOMMENTIFIMSP                                $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
 +//UNCOMMENTIFIMSP            'username' => $uid,
 +//UNCOMMENTIFIMSP            'password' => $pass,
 +//UNCOMMENTIFIMSP            'name' => $uid,
 +//UNCOMMENTIFIMSP            'group_id_field' => 'group',
 +//UNCOMMENTIFIMSP            'group_id_value' => 'group',
-+//UNCOMMENTIFIMSP            'contact_ownership' => false
++//UNCOMMENTIFIMSP            'contact_ownership' => false,
++//UNCOMMENTIFIMSP            // Dynamically generated acl rights for current user.
++//UNCOMMENTIFIMSP            'my_rights' => '',
++//UNCOMMENTIFIMSP            // Flags this as the user's 'root' IMSP address book.
++//UNCOMMENTIFIMSP            'is_root' => true
 +//UNCOMMENTIFIMSP            ),
 +//UNCOMMENTIFIMSP        'map' => array(
 +//UNCOMMENTIFIMSP            '__key' => 'name',
@@ -138,34 +172,44 @@
 +//UNCOMMENTIFIMSP            'homePhone'
 +//UNCOMMENTIFIMSP            ),
 +//UNCOMMENTIFIMSP        'strict' => array(),
-+//UNCOMMENTIFIMSP        'public' => false,
-+//UNCOMMENTIFIMSP        'readonly' => false,
-+//UNCOMMENTIFIMSP        'export' => true
++//UNCOMMENTIFIMSP        'export' => true,
++//UNCOMMENTIFIMSP        'browse' => true,
 +//UNCOMMENTIFIMSP        );
 +//UNCOMMENTIFIMSP
 +//UNCOMMENTIFIMSP    /**
 +//UNCOMMENTIFIMSP     * Get any other address books this user might be privy to.
++//UNCOMMENTIFIMSP     * The values for attributes such as 'export' and 'browse' for books
++//UNCOMMENTIFIMSP     * that are added below will be the same as the values set in the default
++//UNCOMMENTIFIMSP     * book above. Any entries defined explicitly in cfgSources[]
++//UNCOMMENTIFIMSP     * will override any entries gathered dynamically below.
 +//UNCOMMENTIFIMSP     */
 +//UNCOMMENTIFIMSP    require_once 'Net/IMSP/Utils.php';
-+//UNCOMMENTIFIMSP    $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
++//UNCOMMENTIFIMSP    $result = Net_IMSP_Utils::getAllBooks($cfgSources[$cfgKey]);
++//UNCOMMENTIFIMSP    $count = 2;
 +//UNCOMMENTIFIMSP    if (!is_a($result, 'PEAR_Error')) {
-+//UNCOMMENTIFIMSP        for ($i = 0; $i < count($result); $i++) {
-+//UNCOMMENTIFIMSP            // Make sure we didn't define this source explicitly.
++//UNCOMMENTIFIMSP        $resultCount = count($result);
++//UNCOMMENTIFIMSP        for ($i = 0; $i < $resultCount; $i++) {
++//UNCOMMENTIFIMSP            // Make sure we didn't define this source explicitly,
++//UNCOMMENTIFIMSP            // but set the acls from the server regardless.
 +//UNCOMMENTIFIMSP            $dup = false;
-+//UNCOMMENTIFIMSP            foreach ($cfgSources as $thisSource) {
++//UNCOMMENTIFIMSP            foreach ($cfgSources as $key => $thisSource) {
 +//UNCOMMENTIFIMSP                if (($thisSource['type'] == 'imsp') &&
 +//UNCOMMENTIFIMSP                    ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
++//UNCOMMENTIFIMSP
 +//UNCOMMENTIFIMSP                    $dup = true;
++//UNCOMMENTIFIMSP                    $acl = $result[$i]['params']['my_rights'];
++//UNCOMMENTIFIMSP                    $cfgSources[$key]['params']['my_rights'] = $acl;
++//UNCOMMENTIFIMSP                    break;
 +//UNCOMMENTIFIMSP                }
 +//UNCOMMENTIFIMSP            }
 +//UNCOMMENTIFIMSP            if (!$dup) {
-+//UNCOMMENTIFIMSP                $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
++//UNCOMMENTIFIMSP                $cfgSources[sprintf('IMSP_%d', $count++)] = $result[$i];
 +//UNCOMMENTIFIMSP            }
 +//UNCOMMENTIFIMSP        }
 +//UNCOMMENTIFIMSP    } else {
 +//UNCOMMENTIFIMSP        $notification->push($result);
 +//UNCOMMENTIFIMSP    }
 +//UNCOMMENTIFIMSP}
+ /* End IMSP sources. */
  
  /* Begin Kolab sources. */
- if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
diff --git a/mail/turba/files/pkg-message.in b/mail/turba/files/pkg-message.in
index f7347f3f3413..6243e33a282d 100644
--- a/mail/turba/files/pkg-message.in
+++ b/mail/turba/files/pkg-message.in
@@ -7,6 +7,10 @@ Horde must be configured; if not, see `pkg_info -D -x horde'.
 Then, you might have to tune the configuration files located in
 %%CONFDIR%%/, specially the file sources.php.
 
+Warning: if you don't use some source, deactivate it, or you could
+******** experience bad response times!
+         When upgrading from Turba 2.0.x, please read UPGRADING.
+
 Then, you must login to Horde as a Horde Administrator to finish the
 configuration.
 
@@ -14,8 +18,5 @@ You have to create a table in your database; please see
 %%TURBADIR%%/scripts/.
 You might create a LDAP schema: please see the doc LDAP.
 
-WARNING! if you are upgrading from Turba v. 1.2.x, you have to alter your
-******** schemas. Please read the doc UPGRADING.
-
 To protect your configuration files, you have to restart Apache.
 ************************************************************************
diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist
index 07ea12b087a2..f6fd94a1e219 100644
--- a/mail/turba/pkg-plist
+++ b/mail/turba/pkg-plist
@@ -7,6 +7,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%TURBADIR%%/add.php
+%%TURBADIR%%/addressbooks.php
 %%TURBADIR%%/browse.php
 %%TURBADIR%%/config/.htaccess
 %%TURBADIR%%/config/attributes.php
@@ -14,6 +15,8 @@
 %%TURBADIR%%/config/conf.xml
 %%TURBADIR%%/config/menu.php
 %%TURBADIR%%/config/menu.php.dist
+%%TURBADIR%%/config/mime_drivers.php
+%%TURBADIR%%/config/mime_drivers.php.dist
 %%TURBADIR%%/config/prefs.php
 %%TURBADIR%%/config/prefs.php.dist
 %%TURBADIR%%/config/sources.php
@@ -26,16 +29,19 @@
 %%TURBADIR%%/lib/.htaccess
 %%TURBADIR%%/lib/AbstractObject.php
 %%TURBADIR%%/lib/Block/minisearch.php
+%%TURBADIR%%/lib/Block/tree_menu.php
 %%TURBADIR%%/lib/Driver.php
 %%TURBADIR%%/lib/Driver/imsp.php
 %%TURBADIR%%/lib/Driver/kolab.php
 %%TURBADIR%%/lib/Driver/ldap.php
+%%TURBADIR%%/lib/Driver/null.php
 %%TURBADIR%%/lib/Driver/prefs.php
 %%TURBADIR%%/lib/Driver/sql.php
 %%TURBADIR%%/lib/Group.php
 %%TURBADIR%%/lib/List.php
 %%TURBADIR%%/lib/ListView.php
 %%TURBADIR%%/lib/Object.php
+%%TURBADIR%%/lib/Object/Group.php
 %%TURBADIR%%/lib/ObjectView.php
 %%TURBADIR%%/lib/Renderer.php
 %%TURBADIR%%/lib/Turba.php
@@ -57,11 +63,13 @@
 %%TURBADIR%%/locale/es_ES/help.xml
 %%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fa_IR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fa_IR/help.xml
 %%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fi_FI/help.xml
 %%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/is_IS/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
@@ -83,6 +91,7 @@
 %%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/tr_TR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/tr_TR/help.xml
 %%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
@@ -103,6 +112,7 @@
 %%TURBADIR%%/po/fr_FR.po
 %%TURBADIR%%/po/gl_ES.po
 %%TURBADIR%%/po/hu_HU.po
+%%TURBADIR%%/po/is_IS.po
 %%TURBADIR%%/po/it_IT.po
 %%TURBADIR%%/po/ja_JP.po
 %%TURBADIR%%/po/ko_KR.po
@@ -127,10 +137,12 @@
 %%TURBADIR%%/po/zh_TW.po
 %%TURBADIR%%/scripts/.htaccess
 %%TURBADIR%%/scripts/Turba.reg
+%%TURBADIR%%/scripts/import_vcards.php
 %%TURBADIR%%/scripts/ldap/addou
 %%TURBADIR%%/scripts/ldap/addou.pl
 %%TURBADIR%%/scripts/ldap/core.schema.patch
 %%TURBADIR%%/scripts/ldap/rfc2739.schema
+%%TURBADIR%%/scripts/sql/turba_objects.mssql.sql
 %%TURBADIR%%/scripts/sql/turba_objects.mysql.sql
 %%TURBADIR%%/scripts/sql/turba_objects.oci8.sql
 %%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql
@@ -138,8 +150,10 @@
 %%TURBADIR%%/scripts/sql/turba_weddingguests.sql
 %%TURBADIR%%/scripts/upgrades/1.2_to_2.0.sql
 %%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php
+%%TURBADIR%%/scripts/upgrades/public_to_horde_share.php
 %%TURBADIR%%/search.php
 %%TURBADIR%%/templates/.htaccess
+%%TURBADIR%%/templates/addressbooks.inc
 %%TURBADIR%%/templates/block/minisearch.inc
 %%TURBADIR%%/templates/browse/actions.inc
 %%TURBADIR%%/templates/browse/column_footers.inc
@@ -149,14 +163,16 @@
 %%TURBADIR%%/templates/browse/footerAlpha.inc
 %%TURBADIR%%/templates/browse/header.inc
 %%TURBADIR%%/templates/browse/javascript.inc
+%%TURBADIR%%/templates/browse/row.inc
 %%TURBADIR%%/templates/browse/search.inc
 %%TURBADIR%%/templates/browse/search_criteria.inc
-%%TURBADIR%%/templates/browse/select.inc
 %%TURBADIR%%/templates/common-header.inc
 %%TURBADIR%%/templates/data/export.inc
 %%TURBADIR%%/templates/data/import.inc
 %%TURBADIR%%/templates/menu.inc
+%%TURBADIR%%/templates/prefs/addressbookselect.inc
 %%TURBADIR%%/templates/prefs/columnselect.inc
+%%TURBADIR%%/templates/prefs/imsp_opt.inc
 %%TURBADIR%%/test.php
 %%TURBADIR%%/themes/graphics/contact.png
 %%TURBADIR%%/themes/graphics/favicon.ico
@@ -165,97 +181,103 @@
 %%TURBADIR%%/themes/graphics/menu/new.png
 %%TURBADIR%%/themes/graphics/new.png
 %%TURBADIR%%/themes/graphics/turba.png
+%%TURBADIR%%/themes/ideas/screen.css
 %%TURBADIR%%/themes/screen.css
 %%TURBADIR%%/vcard.php
+%%TURBADIR%%/view.php
 %%HORDE_INC%%/httpd-turba.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%TURBADIR%%/lib/Block
-@dirrm %%TURBADIR%%/lib/Driver
-@dirrm %%TURBADIR%%/lib
-@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ar_SY
-@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/bg_BG
-@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ca_ES
-@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/cs_CZ
-@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/da_DK
-@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/de_DE
-@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/el_GR
-@dirrm %%TURBADIR%%/locale/en_US
-@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/es_ES
-@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/et_EE
-@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fa_IR
-@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fi_FI
-@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fr_FR
-@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/gl_ES
-@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/hu_HU
-@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/it_IT
-@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ja_JP
-@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ko_KR
-@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lt_LT
-@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lv_LV
-@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/mk_MK
-@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nb_NO
-@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nl_NL
-@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nn_NO
-@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pl_PL
-@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_BR
-@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_PT
-@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ro_RO
-@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ru_RU
-@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sk_SK
-@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sl_SI
-@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sv_SE
-@dirrm %%TURBADIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/tr_TR
-@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/uk_UA
-@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_CN
-@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_TW
-@dirrm %%TURBADIR%%/locale
-@dirrm %%TURBADIR%%/po
-@dirrm %%TURBADIR%%/scripts/ldap
-@dirrm %%TURBADIR%%/scripts/sql
-@dirrm %%TURBADIR%%/scripts/upgrades
-@dirrm %%TURBADIR%%/scripts
-@dirrm %%TURBADIR%%/templates/block
-@dirrm %%TURBADIR%%/templates/browse
-@dirrm %%TURBADIR%%/templates/data
-@dirrm %%TURBADIR%%/templates/prefs
-@dirrm %%TURBADIR%%/templates
+@dirrm %%TURBADIR%%/themes/ideas
 @dirrm %%TURBADIR%%/themes/graphics/menu
 @dirrm %%TURBADIR%%/themes/graphics
 @dirrm %%TURBADIR%%/themes
+@dirrm %%TURBADIR%%/templates/prefs
+@dirrm %%TURBADIR%%/templates/data
+@dirrm %%TURBADIR%%/templates/browse
+@dirrm %%TURBADIR%%/templates/block
+@dirrm %%TURBADIR%%/templates
+@dirrm %%TURBADIR%%/scripts/upgrades
+@dirrm %%TURBADIR%%/scripts/sql
+@dirrm %%TURBADIR%%/scripts/ldap
+@dirrm %%TURBADIR%%/scripts
+@dirrm %%TURBADIR%%/po
+@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/zh_TW
+@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/zh_CN
+@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/uk_UA
+@dirrm %%TURBADIR%%/locale/tr_TR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/tr_TR
+@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sv_SE
+@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sl_SI
+@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/sk_SK
+@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ru_RU
+@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ro_RO
+@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pt_PT
+@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pt_BR
+@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/pl_PL
+@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nn_NO
+@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nl_NL
+@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nb_NO
+@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/mk_MK
+@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/lv_LV
+@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/lt_LT
+@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ko_KR
+@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ja_JP
+@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/it_IT
+@dirrm %%TURBADIR%%/locale/is_IS/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/is_IS
+@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/hu_HU
+@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/gl_ES
+@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fr_FR
+@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fi_FI
+@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fa_IR
+@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/et_EE
+@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/es_ES
+@dirrm %%TURBADIR%%/locale/en_US
+@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/el_GR
+@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/de_DE
+@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/da_DK
+@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/cs_CZ
+@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ca_ES
+@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/bg_BG
+@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ar_SY
+@dirrm %%TURBADIR%%/locale
+@dirrm %%TURBADIR%%/lib/Object
+@dirrm %%TURBADIR%%/lib/Driver
+@dirrm %%TURBADIR%%/lib/Block
+@dirrm %%TURBADIR%%/lib
 @dirrmtry %%TURBADIR%%/config
 @dirrmtry %%TURBADIR%%
author	thierry <thierry@FreeBSD.org>	2006-03-16 04:15:22 +0800
committer	thierry <thierry@FreeBSD.org>	2006-03-16 04:15:22 +0800
commit	dc61b9e1390400ef3d48e3e3c260f947a85b4c07 (patch)
tree	775d7d0405271ae0c8ea1eee339744c332562dc2
parent	4cf1f139338d69614b794ba384448c9bf7972d90 (diff)
download	freebsd-ports-gnome-dc61b9e1390400ef3d48e3e3c260f947a85b4c07.tar.gz freebsd-ports-gnome-dc61b9e1390400ef3d48e3e3c260f947a85b4c07.tar.zst freebsd-ports-gnome-dc61b9e1390400ef3d48e3e3c260f947a85b4c07.zip