aboutsummaryrefslogtreecommitdiff
path: root/mail/turba
diff options
context:
space:
mode:
Diffstat (limited to 'mail/turba')
-rw-r--r--mail/turba/Makefile8
-rw-r--r--mail/turba/distinfo4
-rw-r--r--mail/turba/files/patch-config::sources.php.dist154
-rw-r--r--mail/turba/pkg-plist17
4 files changed, 99 insertions, 84 deletions
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 2621ef05451f..1d273b68690b 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= turba
-PORTVERSION= 2.0.2
+PORTVERSION= 2.0.3
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \
ftp://ftp.planetmirror.com/pub/horde/turba/ \
@@ -41,7 +41,7 @@ NO_BUILD= yes
USE_REINPLACE= yes
REINPLACE_ARGS= -i ""
-DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \
+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
SUB_DIRS= config lib locale po scripts templates themes
@@ -51,6 +51,8 @@ LTURBADIR?= ${LHORDEDIR}/turba
PLIST_SUB= TURBADIR=${LTURBADIR}
PKGMESSAGE= ${WRKDIR}/pkg-message
+SUB_FILES= pkg-message
+SUB_LIST= TURBADIR=${TURBADIR} CONFDIR=${CONFDIR}
TURBADIR= ${PREFIX}/${LTURBADIR}
CONFDIR= ${TURBADIR}/config
@@ -97,8 +99,6 @@ do-install:
.endif
post-install:
- @${SED} -e "s:%%TURBADIR%%:${TURBADIR}:;s:%%CONFDIR%%:${CONFDIR}:" \
- < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index 9bc78221e313..b909f0960374 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1,2 +1,2 @@
-MD5 (turba-h3-2.0.2.tar.gz) = e3b04476d9d18f4c9774f5da76a03f22
-SIZE (turba-h3-2.0.2.tar.gz) = 1227556
+MD5 (turba-h3-2.0.3.tar.gz) = 315c5e1b3e635afed59c84ed4435eb95
+SIZE (turba-h3-2.0.3.tar.gz) = 1335946
diff --git a/mail/turba/files/patch-config::sources.php.dist b/mail/turba/files/patch-config::sources.php.dist
index b3d2dca409fe..5f11eab5cc62 100644
--- a/mail/turba/files/patch-config::sources.php.dist
+++ b/mail/turba/files/patch-config::sources.php.dist
@@ -1,7 +1,7 @@
---- config/sources.php.dist.orig Tue Feb 8 21:43:47 2005
-+++ config/sources.php.dist Sun Feb 13 15:54:12 2005
-@@ -454,72 +454,72 @@
- * automatically populated with the current username.
+--- config/sources.php.dist.orig Wed Jun 22 20:21:52 2005
++++ config/sources.php.dist Tue Jul 19 14:25:35 2005
+@@ -468,82 +468,82 @@
+ * populated with the current username.
*/
// First, get the user name
-$uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
@@ -57,59 +57,59 @@
- 'readonly' => false,
- 'export' => true
- );
-+//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 $pass = Auth::getCredential('password');
-+//UNCOMMENTIFIMSP }
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP $cfgSources['imsp'] = array(
-+//UNCOMMENTIFIMSP 'title' => _("IMSP"),
-+//UNCOMMENTIFIMSP 'type' => 'imsp',
-+//UNCOMMENTIFIMSP 'params' => array(
-+//UNCOMMENTIFIMSP 'server' => 'localhost',
-+//UNCOMMENTIFIMSP 'port' => '406',
-+//UNCOMMENTIFIMSP 'username' => $uid,
-+//UNCOMMENTIFIMSP 'password' => $pass,
-+//UNCOMMENTIFIMSP 'name' => $uid,
-+//UNCOMMENTIFIMSP 'auth_method' => 'cram_md5',
-+//UNCOMMENTIFIMSP 'group_id_field' => 'group',
-+//UNCOMMENTIFIMSP 'group_id_value' => 'group',
-+//UNCOMMENTIFIMSP 'contact_ownership' => false
-+//UNCOMMENTIFIMSP ),
-+//UNCOMMENTIFIMSP 'map' => array(
-+//UNCOMMENTIFIMSP '__key' => 'name',
-+//UNCOMMENTIFIMSP '__type' => '__type',
-+//UNCOMMENTIFIMSP '__members' => '__members',
-+//UNCOMMENTIFIMSP '__owner' => '__owner',
-+//UNCOMMENTIFIMSP '__uid' => '__uid',
-+//UNCOMMENTIFIMSP 'name' => 'fullname',
-+//UNCOMMENTIFIMSP 'email' => 'email',
-+//UNCOMMENTIFIMSP 'alias' => 'alias',
-+//UNCOMMENTIFIMSP 'company' => 'company',
-+//UNCOMMENTIFIMSP 'notes' => 'notes',
-+//UNCOMMENTIFIMSP 'workPhone' => 'phone-work',
-+//UNCOMMENTIFIMSP 'fax' => 'fax',
-+//UNCOMMENTIFIMSP 'homePhone' => 'phone-home',
-+//UNCOMMENTIFIMSP 'cellPhone' => 'cellphone',
-+//UNCOMMENTIFIMSP 'freebusyUrl' => 'freebusyUrl'
-+//UNCOMMENTIFIMSP ),
-+//UNCOMMENTIFIMSP 'search' => array(
-+//UNCOMMENTIFIMSP 'name',
-+//UNCOMMENTIFIMSP 'email',
-+//UNCOMMENTIFIMSP 'alias',
-+//UNCOMMENTIFIMSP 'company',
-+//UNCOMMENTIFIMSP 'homePhone'
-+//UNCOMMENTIFIMSP ),
-+//UNCOMMENTIFIMSP 'strict' => array(),
-+//UNCOMMENTIFIMSP 'public' => false,
-+//UNCOMMENTIFIMSP 'readonly' => false,
-+//UNCOMMENTIFIMSP 'export' => true
-+//UNCOMMENTIFIMSP );
++//UNCOMMENTIFIMSP$uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
++//UNCOMMENTIFIMSP$pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
++//UNCOMMENTIFIMSPif (!strlen($uid)) {
++//UNCOMMENTIFIMSP $uid = Auth::getAuth();
++//UNCOMMENTIFIMSP if (preg_match('/(^.*)@/', $uid, $matches)) {
++//UNCOMMENTIFIMSP $uid = $matches[1];
++//UNCOMMENTIFIMSP }
++//UNCOMMENTIFIMSP $pass = Auth::getCredential('password');
++//UNCOMMENTIFIMSP}
++//UNCOMMENTIFIMSP
++//UNCOMMENTIFIMSP$cfgSources['imsp'] = array(
++//UNCOMMENTIFIMSP 'title' => _("IMSP"),
++//UNCOMMENTIFIMSP 'type' => 'imsp',
++//UNCOMMENTIFIMSP 'params' => array(
++//UNCOMMENTIFIMSP 'server' => 'localhost',
++//UNCOMMENTIFIMSP 'port' => '406',
++//UNCOMMENTIFIMSP 'username' => $uid,
++//UNCOMMENTIFIMSP 'password' => $pass,
++//UNCOMMENTIFIMSP 'name' => $uid,
++//UNCOMMENTIFIMSP 'auth_method' => 'cram_md5',
++//UNCOMMENTIFIMSP 'group_id_field' => 'group',
++//UNCOMMENTIFIMSP 'group_id_value' => 'group',
++//UNCOMMENTIFIMSP 'contact_ownership' => false
++//UNCOMMENTIFIMSP ),
++//UNCOMMENTIFIMSP 'map' => array(
++//UNCOMMENTIFIMSP '__key' => 'name',
++//UNCOMMENTIFIMSP '__type' => '__type',
++//UNCOMMENTIFIMSP '__members' => '__members',
++//UNCOMMENTIFIMSP '__owner' => '__owner',
++//UNCOMMENTIFIMSP '__uid' => '__uid',
++//UNCOMMENTIFIMSP 'name' => 'fullname',
++//UNCOMMENTIFIMSP 'email' => 'email',
++//UNCOMMENTIFIMSP 'alias' => 'alias',
++//UNCOMMENTIFIMSP 'company' => 'company',
++//UNCOMMENTIFIMSP 'notes' => 'notes',
++//UNCOMMENTIFIMSP 'workPhone' => 'phone-work',
++//UNCOMMENTIFIMSP 'fax' => 'fax',
++//UNCOMMENTIFIMSP 'homePhone' => 'phone-home',
++//UNCOMMENTIFIMSP 'cellPhone' => 'cellphone',
++//UNCOMMENTIFIMSP 'freebusyUrl' => 'freebusyUrl'
++//UNCOMMENTIFIMSP ),
++//UNCOMMENTIFIMSP 'search' => array(
++//UNCOMMENTIFIMSP 'name',
++//UNCOMMENTIFIMSP 'email',
++//UNCOMMENTIFIMSP 'alias',
++//UNCOMMENTIFIMSP 'company',
++//UNCOMMENTIFIMSP 'homePhone'
++//UNCOMMENTIFIMSP ),
++//UNCOMMENTIFIMSP 'strict' => array(),
++//UNCOMMENTIFIMSP 'public' => false,
++//UNCOMMENTIFIMSP 'readonly' => false,
++//UNCOMMENTIFIMSP 'export' => true
++//UNCOMMENTIFIMSP );
/**
* Get any other addressbooks this user might be privy to.
@@ -118,20 +118,40 @@
-$result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
-if (!is_a($result, 'PEAR_Error')) {
- for ($i = 0; $i < count($result); $i++) {
-- $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
+- // Make sure we didn't define this source explicitly.
+- $dup = false;
+- foreach ($cfgSources as $thisSource) {
+- if (($thisSource['type'] == 'imsp') &&
+- ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
+- $dup = true;
+- }
+- }
+- if (!$dup) {
+- $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
+- }
- }
-} else {
- $notification->push($result);
-}
-+//UNCOMMENTIFIMSP require_once 'Net/IMSP/Utils.php';
-+//UNCOMMENTIFIMSP $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
-+//UNCOMMENTIFIMSP if (!is_a($result, 'PEAR_Error')) {
-+//UNCOMMENTIFIMSP for ($i = 0; $i < count($result); $i++) {
-+//UNCOMMENTIFIMSP $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
-+//UNCOMMENTIFIMSP }
-+//UNCOMMENTIFIMSP } else {
-+//UNCOMMENTIFIMSP $notification->push($result);
-+//UNCOMMENTIFIMSP }
++//UNCOMMENTIFIMSPrequire_once 'Net/IMSP/Utils.php';
++//UNCOMMENTIFIMSP$result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
++//UNCOMMENTIFIMSPif (!is_a($result, 'PEAR_Error')) {
++//UNCOMMENTIFIMSP for ($i = 0; $i < count($result); $i++) {
++//UNCOMMENTIFIMSP // Make sure we didn't define this source explicitly.
++//UNCOMMENTIFIMSP $dup = false;
++//UNCOMMENTIFIMSP foreach ($cfgSources as $thisSource) {
++//UNCOMMENTIFIMSP if (($thisSource['type'] == 'imsp') &&
++//UNCOMMENTIFIMSP ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
++//UNCOMMENTIFIMSP $dup = true;
++//UNCOMMENTIFIMSP }
++//UNCOMMENTIFIMSP }
++//UNCOMMENTIFIMSP if (!$dup) {
++//UNCOMMENTIFIMSP $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i];
++//UNCOMMENTIFIMSP }
++//UNCOMMENTIFIMSP }
++//UNCOMMENTIFIMSP} else {
++//UNCOMMENTIFIMSP $notification->push($result);
++//UNCOMMENTIFIMSP}
/* Begin Kolab sources. */
if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist
index cbcd497949cb..48455454ad34 100644
--- a/mail/turba/pkg-plist
+++ b/mail/turba/pkg-plist
@@ -1,5 +1,4 @@
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/LDAP
@@ -35,15 +34,9 @@
%%TURBADIR%%/lib/Driver/sql.php
%%TURBADIR%%/lib/Group.php
%%TURBADIR%%/lib/List.php
-%%TURBADIR%%/lib/List/Plain.php
-%%TURBADIR%%/lib/List/Tree.php
%%TURBADIR%%/lib/ListView.php
-%%TURBADIR%%/lib/ListView/Rolodex.php
-%%TURBADIR%%/lib/ListView/Tree.php
%%TURBADIR%%/lib/Object.php
%%TURBADIR%%/lib/ObjectView.php
-%%TURBADIR%%/lib/ObjectView/List.php
-%%TURBADIR%%/lib/ObjectView/PhotoID.php
%%TURBADIR%%/lib/Renderer.php
%%TURBADIR%%/lib/Turba.php
%%TURBADIR%%/lib/api.php
@@ -89,6 +82,7 @@
%%TURBADIR%%/locale/sk_SK/help.xml
%%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/uk_UA/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
@@ -126,6 +120,7 @@
%%TURBADIR%%/po/sk_SK.po
%%TURBADIR%%/po/sl_SI.po
%%TURBADIR%%/po/sv_SE.po
+%%TURBADIR%%/po/tr_TR.po
%%TURBADIR%%/po/turba.pot
%%TURBADIR%%/po/uk_UA.po
%%TURBADIR%%/po/zh_CN.po
@@ -141,7 +136,7 @@
%%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql
%%TURBADIR%%/scripts/sql/turba_objects.sql
%%TURBADIR%%/scripts/sql/turba_weddingguests.sql
-%%TURBADIR%%/scripts/upgrades/1.2_to_2.0.mysql.sql
+%%TURBADIR%%/scripts/upgrades/1.2_to_2.0.sql
%%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php
%%TURBADIR%%/search.php
%%TURBADIR%%/templates/.htaccess
@@ -164,6 +159,7 @@
%%TURBADIR%%/templates/prefs/columnselect.inc
%%TURBADIR%%/test.php
%%TURBADIR%%/themes/graphics/contact.png
+%%TURBADIR%%/themes/graphics/favicon.ico
%%TURBADIR%%/themes/graphics/group.png
%%TURBADIR%%/themes/graphics/menu/browse.png
%%TURBADIR%%/themes/graphics/menu/new.png
@@ -175,9 +171,6 @@ etc/horde/httpd.conf.turba
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%TURBADIR%%/lib/Block
@dirrm %%TURBADIR%%/lib/Driver
-@dirrm %%TURBADIR%%/lib/List
-@dirrm %%TURBADIR%%/lib/ListView
-@dirrm %%TURBADIR%%/lib/ObjectView
@dirrm %%TURBADIR%%/lib
@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/ar_SY
@@ -242,6 +235,8 @@ etc/horde/httpd.conf.turba
@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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 15:26:26 +0000