aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/horde-turba/Makefile11
-rw-r--r--mail/horde-turba/distinfo2
-rw-r--r--mail/horde-turba/files/patch-ab28
-rw-r--r--mail/horde-turba/pkg-plist15
-rw-r--r--mail/horde4-turba/Makefile11
-rw-r--r--mail/horde4-turba/distinfo2
-rw-r--r--mail/horde4-turba/files/patch-ab28
-rw-r--r--mail/horde4-turba/pkg-plist15
-rw-r--r--mail/imp-devel/Makefile27
-rw-r--r--mail/imp-devel/distinfo2
-rw-r--r--mail/imp-devel/files/patch-ab10
-rw-r--r--mail/imp-devel/files/patch-ac11
-rw-r--r--mail/imp-devel/pkg-descr10
-rw-r--r--mail/imp-devel/pkg-message8
-rw-r--r--mail/imp-devel/pkg-plist40
-rw-r--r--mail/imp3/Makefile27
-rw-r--r--mail/imp3/distinfo2
-rw-r--r--mail/imp3/files/patch-ab10
-rw-r--r--mail/imp3/files/patch-ac11
-rw-r--r--mail/imp3/pkg-descr10
-rw-r--r--mail/imp3/pkg-message8
-rw-r--r--mail/imp3/pkg-plist40
-rw-r--r--mail/turba/Makefile11
-rw-r--r--mail/turba/distinfo2
-rw-r--r--mail/turba/files/patch-ab28
-rw-r--r--mail/turba/pkg-plist15
26 files changed, 268 insertions, 116 deletions
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 9817644a2a1c..71c28da81532 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -7,9 +7,9 @@
PORTNAME= turba
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/tarballs/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -96,8 +96,8 @@ pre-install:
do-install:
@${MKDIR} ${TURBADIR}
@${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/po ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/templates ${WRKSRC}/po ${TURBADIR}
@${CP} -p ${WRKSRC}/*.php ${TURBADIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
@@ -107,7 +107,10 @@ do-install:
@${CHOWN} -R www:www ${TURBADIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
- @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \
+ ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \
+ ${HORDEDIR}/config/registry.php
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo
index 95ed0497fa57..b160954d3a12 100644
--- a/mail/horde-turba/distinfo
+++ b/mail/horde-turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.0-RC3.tar.gz) = 9fc7d02714f25221e54352c1c4a360fa
+MD5 (turba-1.0.tar.gz) = 8d70570cd66f9921a7466c699e58f5be
diff --git a/mail/horde-turba/files/patch-ab b/mail/horde-turba/files/patch-ab
index f76a7c518225..5cc76966a8a9 100644
--- a/mail/horde-turba/files/patch-ab
+++ b/mail/horde-turba/files/patch-ab
@@ -1,14 +1,14 @@
---- config/sources.php.dist.orig Sun Nov 4 01:42:12 2001
-+++ config/sources.php.dist Sun Nov 18 17:25:08 2001
-@@ -83,21 +83,25 @@
- 'title' => 'Local SQL',
+--- config/sources.php.dist.orig Tue Jan 1 13:58:34 2002
++++ config/sources.php.dist Thu Jan 3 18:04:12 2002
+@@ -92,21 +92,25 @@
+ 'title' => 'My Addressbook',
'type' => 'sql',
'params' => array(
- 'phptype' => 'pgsql',
- 'hostspec' => '',
- 'username' => '',
- 'password' => '',
-+// 'phptype' => 'pgsql',
++// 'phptype' => 'pgsql',
+ 'phptype' => 'mysql',
+ 'hostspec' => 'localhost',
+ 'username' => 'hordemgr',
@@ -18,18 +18,18 @@
- 'tty' => '',
- 'port' => '5432',
- 'protocol' => 'unix',
-+// 'tty' => '',
++// 'tty' => '',
+// Default port: 5432 for pgsql (PostGres), 3306 for mysql
-+// 'port' => '5432',
-+// 'port' => '3306',
-+// 'protocol' => 'unix',
++// 'port' => '5432',
++// 'port' => '3306',
++// 'protocol' => 'unix',
'table' => 'turba_objects'
),
'map' => array(
'__key' => 'object_id',
'__owner' => 'owner_id',
- 'name' => 'object_name',
-+ 'alias' => 'object_alias',
- 'email' => 'object_email',
- 'homeAddress' => 'object_homeAddress',
- 'workAddress' => 'object_workAddress',
+ 'name' => 'object_name',
++ 'alias' => 'object_alias',
+ 'email' => 'object_email',
+ 'homeAddress' => 'object_homeAddress',
+ 'workAddress' => 'object_workAddress',
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
index ca31e90a6f06..5bc52ab2ec51 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde-turba/pkg-plist
@@ -8,6 +8,7 @@
%%TURBADIR%%/addobject.php
%%TURBADIR%%/addobjectaction.php
%%TURBADIR%%/advanced.php
+%%TURBADIR%%/config/.htaccess
%%TURBADIR%%/config/attributes.php
%%TURBADIR%%/config/attributes.php.dist
%%TURBADIR%%/config/conf.php
@@ -23,7 +24,6 @@
%%TURBADIR%%/config/sources.php
%%TURBADIR%%/config/sources.php.dist
%%TURBADIR%%/config/sources.php.dist.orig
-%%TURBADIR%%/config/turba.dt
%%TURBADIR%%/data.php
%%TURBADIR%%/deleteobject.php
%%TURBADIR%%/displayobject.php
@@ -34,6 +34,7 @@
%%TURBADIR%%/graphics/search.gif
%%TURBADIR%%/graphics/turba.gif
%%TURBADIR%%/index.php
+%%TURBADIR%%/lib/.htaccess
%%TURBADIR%%/lib/AbstractObject.php
%%TURBADIR%%/lib/Driver.php
%%TURBADIR%%/lib/Driver/ldap.php
@@ -54,14 +55,17 @@
%%TURBADIR%%/lib/api.php
%%TURBADIR%%/lib/base.php
%%TURBADIR%%/lib/version.php
+%%TURBADIR%%/locale/.htaccess
%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/no_BOK/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ru_koi/LC_MESSAGES/turba.mo
@@ -70,6 +74,7 @@
%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
%%TURBADIR%%/menu.php
+%%TURBADIR%%/po/.htaccess
%%TURBADIR%%/po/Makefile
%%TURBADIR%%/po/README
%%TURBADIR%%/po/cs_CZ.po
@@ -77,10 +82,12 @@
%%TURBADIR%%/po/el_GR.po
%%TURBADIR%%/po/es_ES.po
%%TURBADIR%%/po/extract.pl
+%%TURBADIR%%/po/fi_FI.po
%%TURBADIR%%/po/fr_FR.po
%%TURBADIR%%/po/it_IT.po
%%TURBADIR%%/po/ko_KR.po
%%TURBADIR%%/po/nl_NL.po
+%%TURBADIR%%/po/no_BOK.po
%%TURBADIR%%/po/pl_PL.po
%%TURBADIR%%/po/pt_BR.po
%%TURBADIR%%/po/ru_koi.po
@@ -90,9 +97,11 @@
%%TURBADIR%%/po/xgettext.sh
%%TURBADIR%%/po/zh_CN.po
%%TURBADIR%%/po/zh_TW.po
+%%TURBADIR%%/scripts/.htaccess
%%TURBADIR%%/scripts/drivers/turba.sql
%%TURBADIR%%/search.php
%%TURBADIR%%/status.php
+%%TURBADIR%%/templates/.htaccess
%%TURBADIR%%/templates/add/add.inc
%%TURBADIR%%/templates/add/noadd.inc
%%TURBADIR%%/templates/add/select.inc
@@ -136,6 +145,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/el_GR
@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/es_ES
+@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/it_IT/LC_MESSAGES
@@ -144,6 +155,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/ko_KR
@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/nl_NL
+@dirrm %%TURBADIR%%/locale/no_BOK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/no_BOK
@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/pl_PL
@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 9817644a2a1c..71c28da81532 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -7,9 +7,9 @@
PORTNAME= turba
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/tarballs/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -96,8 +96,8 @@ pre-install:
do-install:
@${MKDIR} ${TURBADIR}
@${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/po ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/templates ${WRKSRC}/po ${TURBADIR}
@${CP} -p ${WRKSRC}/*.php ${TURBADIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
@@ -107,7 +107,10 @@ do-install:
@${CHOWN} -R www:www ${TURBADIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
- @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \
+ ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \
+ ${HORDEDIR}/config/registry.php
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
diff --git a/mail/horde4-turba/distinfo b/mail/horde4-turba/distinfo
index 95ed0497fa57..b160954d3a12 100644
--- a/mail/horde4-turba/distinfo
+++ b/mail/horde4-turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.0-RC3.tar.gz) = 9fc7d02714f25221e54352c1c4a360fa
+MD5 (turba-1.0.tar.gz) = 8d70570cd66f9921a7466c699e58f5be
diff --git a/mail/horde4-turba/files/patch-ab b/mail/horde4-turba/files/patch-ab
index f76a7c518225..5cc76966a8a9 100644
--- a/mail/horde4-turba/files/patch-ab
+++ b/mail/horde4-turba/files/patch-ab
@@ -1,14 +1,14 @@
---- config/sources.php.dist.orig Sun Nov 4 01:42:12 2001
-+++ config/sources.php.dist Sun Nov 18 17:25:08 2001
-@@ -83,21 +83,25 @@
- 'title' => 'Local SQL',
+--- config/sources.php.dist.orig Tue Jan 1 13:58:34 2002
++++ config/sources.php.dist Thu Jan 3 18:04:12 2002
+@@ -92,21 +92,25 @@
+ 'title' => 'My Addressbook',
'type' => 'sql',
'params' => array(
- 'phptype' => 'pgsql',
- 'hostspec' => '',
- 'username' => '',
- 'password' => '',
-+// 'phptype' => 'pgsql',
++// 'phptype' => 'pgsql',
+ 'phptype' => 'mysql',
+ 'hostspec' => 'localhost',
+ 'username' => 'hordemgr',
@@ -18,18 +18,18 @@
- 'tty' => '',
- 'port' => '5432',
- 'protocol' => 'unix',
-+// 'tty' => '',
++// 'tty' => '',
+// Default port: 5432 for pgsql (PostGres), 3306 for mysql
-+// 'port' => '5432',
-+// 'port' => '3306',
-+// 'protocol' => 'unix',
++// 'port' => '5432',
++// 'port' => '3306',
++// 'protocol' => 'unix',
'table' => 'turba_objects'
),
'map' => array(
'__key' => 'object_id',
'__owner' => 'owner_id',
- 'name' => 'object_name',
-+ 'alias' => 'object_alias',
- 'email' => 'object_email',
- 'homeAddress' => 'object_homeAddress',
- 'workAddress' => 'object_workAddress',
+ 'name' => 'object_name',
++ 'alias' => 'object_alias',
+ 'email' => 'object_email',
+ 'homeAddress' => 'object_homeAddress',
+ 'workAddress' => 'object_workAddress',
diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist
index ca31e90a6f06..5bc52ab2ec51 100644
--- a/mail/horde4-turba/pkg-plist
+++ b/mail/horde4-turba/pkg-plist
@@ -8,6 +8,7 @@
%%TURBADIR%%/addobject.php
%%TURBADIR%%/addobjectaction.php
%%TURBADIR%%/advanced.php
+%%TURBADIR%%/config/.htaccess
%%TURBADIR%%/config/attributes.php
%%TURBADIR%%/config/attributes.php.dist
%%TURBADIR%%/config/conf.php
@@ -23,7 +24,6 @@
%%TURBADIR%%/config/sources.php
%%TURBADIR%%/config/sources.php.dist
%%TURBADIR%%/config/sources.php.dist.orig
-%%TURBADIR%%/config/turba.dt
%%TURBADIR%%/data.php
%%TURBADIR%%/deleteobject.php
%%TURBADIR%%/displayobject.php
@@ -34,6 +34,7 @@
%%TURBADIR%%/graphics/search.gif
%%TURBADIR%%/graphics/turba.gif
%%TURBADIR%%/index.php
+%%TURBADIR%%/lib/.htaccess
%%TURBADIR%%/lib/AbstractObject.php
%%TURBADIR%%/lib/Driver.php
%%TURBADIR%%/lib/Driver/ldap.php
@@ -54,14 +55,17 @@
%%TURBADIR%%/lib/api.php
%%TURBADIR%%/lib/base.php
%%TURBADIR%%/lib/version.php
+%%TURBADIR%%/locale/.htaccess
%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/no_BOK/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ru_koi/LC_MESSAGES/turba.mo
@@ -70,6 +74,7 @@
%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
%%TURBADIR%%/menu.php
+%%TURBADIR%%/po/.htaccess
%%TURBADIR%%/po/Makefile
%%TURBADIR%%/po/README
%%TURBADIR%%/po/cs_CZ.po
@@ -77,10 +82,12 @@
%%TURBADIR%%/po/el_GR.po
%%TURBADIR%%/po/es_ES.po
%%TURBADIR%%/po/extract.pl
+%%TURBADIR%%/po/fi_FI.po
%%TURBADIR%%/po/fr_FR.po
%%TURBADIR%%/po/it_IT.po
%%TURBADIR%%/po/ko_KR.po
%%TURBADIR%%/po/nl_NL.po
+%%TURBADIR%%/po/no_BOK.po
%%TURBADIR%%/po/pl_PL.po
%%TURBADIR%%/po/pt_BR.po
%%TURBADIR%%/po/ru_koi.po
@@ -90,9 +97,11 @@
%%TURBADIR%%/po/xgettext.sh
%%TURBADIR%%/po/zh_CN.po
%%TURBADIR%%/po/zh_TW.po
+%%TURBADIR%%/scripts/.htaccess
%%TURBADIR%%/scripts/drivers/turba.sql
%%TURBADIR%%/search.php
%%TURBADIR%%/status.php
+%%TURBADIR%%/templates/.htaccess
%%TURBADIR%%/templates/add/add.inc
%%TURBADIR%%/templates/add/noadd.inc
%%TURBADIR%%/templates/add/select.inc
@@ -136,6 +145,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/el_GR
@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/es_ES
+@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/it_IT/LC_MESSAGES
@@ -144,6 +155,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/ko_KR
@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/nl_NL
+@dirrm %%TURBADIR%%/locale/no_BOK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/no_BOK
@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/pl_PL
@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
diff --git a/mail/imp-devel/Makefile b/mail/imp-devel/Makefile
index 67c72f2f61b2..a772447c5fb7 100644
--- a/mail/imp-devel/Makefile
+++ b/mail/imp-devel/Makefile
@@ -7,10 +7,10 @@
PORTNAME= imp
PORTVERSION= 3.0
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/imp/tarballs/
PKGNAMESUFFIX= -devel
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -37,6 +37,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
#
# - WITHOUT_SSL : if you have not installed c-client WITH_SSL;
#
+# - WITH_VALID_CERT : if you own a valid SSL certificate;
+#
# - WITHOUT_TURBA : if you do not want adressbooks;
#
# - WITHOUT_IMAPSERVER : if your IMAP server runs on another machine;
@@ -113,9 +115,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
.endif
NO_BUILD= yes
-DOCS= COPYING README docs/CHANGES docs/CREDITS \
- docs/INSTALL docs/SECURITY docs/FEATURES \
- docs/PACKAGES
+DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
CONFFILE= conf.php filter.txt header.txt html.php menu.php \
mime_drivers.php motd.php prefs.php servers.php \
trailer.txt
@@ -164,6 +164,7 @@ pre-install:
${ECHO_MSG} "" ; \
${FALSE} ; \
fi
+.if !defined(BATCH)
.if !defined(WITHOUT_SSL)
@if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \
${ECHO_MSG} "" ; \
@@ -172,6 +173,7 @@ pre-install:
${FALSE} ; \
fi
.endif
+.endif
.if !defined(WITHOUT_LDAP)
.if defined(WITH_LDAP1)
@if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.1"; then \
@@ -238,7 +240,20 @@ do-install:
.endfor
@${PERL} -pi -e "s:example.com:${HOSTNAME}:g" ${CONFDIR}/servers.php
@${PERL} -pi -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${CONFDIR}/mime_drivers.php
- @${PERL} -pi -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" ${IMPDIR}/compose.php
+ @${PERL} -pi -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" \
+ ${IMPDIR}/compose.php
+.if defined(WITHOUT_SSL)
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap:;s:%%IMAPPORT%%:143:" \
+ ${CONFDIR}/servers.php
+.else
+ @${PERL} -pi -e "s:%%IMAPPORT%%:993:" ${CONFDIR}/servers.php
+.if defined(WITH_VALID_CERT)
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl:" ${CONFDIR}/servers.php
+.else
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:" \
+ ${CONFDIR}/servers.php
+.endif
+.endif
.if !defined(WITHOUT_ASPELL)
@${PERL} -pi -e "s:\/\* BEGBSDASPELL::;s:ENDBSDASPELL \*\/::" \
${CONFDIR}/mime_drivers.php
@@ -274,6 +289,8 @@ do-install:
# Provide a link to IMP from Turba
.if !defined(WITHOUT_TURBA)
@${PERL} -pi -e "s://UNCOMMENTWHENINSTIMP::" ${TURBADIR}/config/conf.php
+ @${PERL} -pi -e "s:apps'] = array\(\):apps'] = array('turba'):" \
+ ${CONFDIR}/conf.php
.endif
.if !defined(NOPORTDOCS)
@${PERL} -pi -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" ${WRKSRC}/docs/SECURITY
diff --git a/mail/imp-devel/distinfo b/mail/imp-devel/distinfo
index 793e07b66041..7745bb27ad36 100644
--- a/mail/imp-devel/distinfo
+++ b/mail/imp-devel/distinfo
@@ -1 +1 @@
-MD5 (imp-3.0-RC3.tar.gz) = f02ecd032f3a3c17f96ab575bf5b6f61
+MD5 (imp-3.0.tar.gz) = d941d7b11231c771fb801ae8010e7271
diff --git a/mail/imp-devel/files/patch-ab b/mail/imp-devel/files/patch-ab
index ee535e400968..7c274c3fb977 100644
--- a/mail/imp-devel/files/patch-ab
+++ b/mail/imp-devel/files/patch-ab
@@ -1,5 +1,5 @@
--- config/servers.php.dist.orig Fri Jun 22 20:08:14 2001
-+++ config/servers.php.dist Fri Nov 16 23:46:19 2001
++++ config/servers.php.dist Tue Dec 18 23:08:00 2001
@@ -31,7 +31,7 @@
* is on.
*
@@ -14,11 +14,13 @@
$servers['imap'] = array(
'name' => 'IMAP Server',
- 'server' => 'imap.example.com',
+- 'protocol' => 'imap',
+- 'port' => 143,
+- 'folders' => 'mail/',
+// 'server' => 'imap.example.com',
+ 'server' => 'localhost',
- 'protocol' => 'imap',
- 'port' => 143,
-- 'folders' => 'mail/',
++ 'protocol' => '%%PROTOCOL%%',
++ 'port' => %%IMAPPORT%%,
+ 'folders' => 'Mail/',
'namespace' => '',
'maildomain' => 'example.com',
diff --git a/mail/imp-devel/files/patch-ac b/mail/imp-devel/files/patch-ac
new file mode 100644
index 000000000000..a7a34acdf937
--- /dev/null
+++ b/mail/imp-devel/files/patch-ac
@@ -0,0 +1,11 @@
+--- config/prefs.php.dist.orig Sun Dec 23 18:24:39 2001
++++ config/prefs.php.dist Thu Jan 3 20:57:38 2002
+@@ -444,7 +444,7 @@
+
+ // addressbook(s) to use when expanding addresses
+ $_prefs['search_sources'] = array(
+- 'value' => '',
++ 'value' => 'localsql',
+ 'locked' => false,
+ 'shared' => false,
+ 'type' => 'implicit'
diff --git a/mail/imp-devel/pkg-descr b/mail/imp-devel/pkg-descr
index 52e93a82e191..7aa00a473a1b 100644
--- a/mail/imp-devel/pkg-descr
+++ b/mail/imp-devel/pkg-descr
@@ -1,13 +1,9 @@
-IMP 3 is currently in heavy development. Features that have been added
+IMP 3 is the new stable version of IMP. Features that have been added
include searching; a new, flexible preferences system; a hierarchical
folder tree; and more.
It requires PHP4. You should use it if you want to take advantage of
-PHP4s built-in session handling and improved speed; if you want access
-to features such as the interactive spell checker and folder searching;
-or if you want to contribute a major piece to the code.
-
-This code branch continues the trend of 2.2 by being slimmer, cleaner,
-and better designed code than the previous version.
+PHP4s built-in session handling and improved speed or if you want access
+to features such as the interactive spell checker and folder searching.
WWW: http://www.horde.org/imp/
diff --git a/mail/imp-devel/pkg-message b/mail/imp-devel/pkg-message
index a13b440f15f9..4ca4e8caccdf 100644
--- a/mail/imp-devel/pkg-message
+++ b/mail/imp-devel/pkg-message
@@ -15,8 +15,8 @@ IMP requires an IMAP server. If you want to install one on this
machine, you may install the ports mail/cyrus-imapd, or
mail/imap-uw, or mail/courier-imap.
-Please refer to the file %%DOCSDIR%%/SECURITY
-on how to secure the IMP installation.
-It is at least recommended that you change the default database
-password used by horde and imp.
+To secure your installation, it is at least recommended that you change
+the default database password used by horde and imp.
+Then, you might change the 'session.save_path' setting in php.ini to a
+directory only readable and writeable by your webserver.
************************************************************************
diff --git a/mail/imp-devel/pkg-plist b/mail/imp-devel/pkg-plist
index 7382ae313ddb..2a5334368c84 100644
--- a/mail/imp-devel/pkg-plist
+++ b/mail/imp-devel/pkg-plist
@@ -1,12 +1,10 @@
%%PORTDOCS%%share/doc/imp/CHANGES
%%PORTDOCS%%share/doc/imp/COPYING
%%PORTDOCS%%share/doc/imp/CREDITS
-%%PORTDOCS%%share/doc/imp/FEATURES
%%PORTDOCS%%share/doc/imp/INSTALL
-%%PORTDOCS%%share/doc/imp/PACKAGES
%%PORTDOCS%%share/doc/imp/README
-%%PORTDOCS%%share/doc/imp/SECURITY
%%IMPDIR%%/compose.php
+%%IMPDIR%%/config/.htaccess
%%IMPDIR%%/config/conf.php
%%IMPDIR%%/config/conf.php.dist
%%IMPDIR%%/config/filter.txt
@@ -15,7 +13,6 @@
%%IMPDIR%%/config/header.txt.dist
%%IMPDIR%%/config/html.php
%%IMPDIR%%/config/html.php.dist
-%%IMPDIR%%/config/imp.dt
%%IMPDIR%%/config/menu.php
%%IMPDIR%%/config/menu.php.dist
%%IMPDIR%%/config/mime_drivers.php
@@ -25,6 +22,7 @@
%%IMPDIR%%/config/motd.php.dist
%%IMPDIR%%/config/prefs.php
%%IMPDIR%%/config/prefs.php.dist
+%%IMPDIR%%/config/prefs.php.dist.orig
%%IMPDIR%%/config/servers.php
%%IMPDIR%%/config/servers.php.dist
%%IMPDIR%%/config/servers.php.dist.orig
@@ -86,6 +84,7 @@
%%IMPDIR%%/identities.php
%%IMPDIR%%/index.php
%%IMPDIR%%/intro.php
+%%IMPDIR%%/lib/.htaccess
%%IMPDIR%%/lib/Folder.php
%%IMPDIR%%/lib/IMP.php
%%IMPDIR%%/lib/Identity/IMP.php
@@ -100,30 +99,47 @@
%%IMPDIR%%/lib/api.php
%%IMPDIR%%/lib/base.php
%%IMPDIR%%/lib/version.php
+%%IMPDIR%%/locale/.htaccess
%%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/cs_CZ/help.xml
%%IMPDIR%%/locale/de_DE/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/de_DE/help.xml
%%IMPDIR%%/locale/el_GR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/en_EN/help.xml
+%%IMPDIR%%/locale/el_GR/help.xml
+%%IMPDIR%%/locale/en_US/help.xml
%%IMPDIR%%/locale/es_ES/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/es_ES/help.xml
+%%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/fi_FI/help.xml
%%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/fr_FR/help.xml
%%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/it_IT/help.xml
%%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/ko_KR/help.xml
%%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/nl_NL/help.xml
%%IMPDIR%%/locale/no_BOK/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/no_BOK/help.xml
%%IMPDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/pl_PL/help.xml
%%IMPDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/pt_BR/help.xml
%%IMPDIR%%/locale/ru_win/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/ru_win/help.xml
+%%IMPDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/sv_SE/help.xml
%%IMPDIR%%/locale/uk/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/uk/help.xml
%%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/zh_CN/help.xml
%%IMPDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/zh_TW/help.xml
%%IMPDIR%%/login.php
%%IMPDIR%%/mailbox.php
%%IMPDIR%%/menu.php
%%IMPDIR%%/message.php
+%%IMPDIR%%/po/.htaccess
%%IMPDIR%%/po/Makefile
%%IMPDIR%%/po/README
%%IMPDIR%%/po/cs_CZ.po
@@ -131,6 +147,7 @@
%%IMPDIR%%/po/el_GR.po
%%IMPDIR%%/po/es_ES.po
%%IMPDIR%%/po/extract.pl
+%%IMPDIR%%/po/fi_FI.po
%%IMPDIR%%/po/fr_FR.po
%%IMPDIR%%/po/it_IT.po
%%IMPDIR%%/po/ko_KR.po
@@ -140,17 +157,23 @@
%%IMPDIR%%/po/pt_BR.po
%%IMPDIR%%/po/ru_win.po
%%IMPDIR%%/po/shtool
+%%IMPDIR%%/po/sv_SE.po
%%IMPDIR%%/po/uk.po
%%IMPDIR%%/po/xgettext.sh
%%IMPDIR%%/po/zh_CN.po
%%IMPDIR%%/po/zh_TW.po
%%IMPDIR%%/prefs.php
%%IMPDIR%%/redirect.php
+%%IMPDIR%%/scripts/.htaccess
%%IMPDIR%%/scripts/Imp.reg
+%%IMPDIR%%/scripts/custom_login.php
%%IMPDIR%%/scripts/imp-cleanup.cron
+%%IMPDIR%%/scripts/imp2horde.pl
+%%IMPDIR%%/scripts/imp2turba.pl
%%IMPDIR%%/search.php
%%IMPDIR%%/spelling.php
%%IMPDIR%%/status.php
+%%IMPDIR%%/templates/.htaccess
%%IMPDIR%%/templates/common-footer.inc
%%IMPDIR%%/templates/common-header.inc
%%IMPDIR%%/templates/compose/bounce.inc
@@ -194,7 +217,6 @@
%%IMPDIR%%/templates/message/navbar.inc
%%IMPDIR%%/templates/message/navbar_aux_bottom.inc
%%IMPDIR%%/templates/message/navbar_aux_top.inc
-%%IMPDIR%%/templates/prefs/filters.inc
%%IMPDIR%%/templates/prefs/folderselect.inc
%%IMPDIR%%/templates/prefs/identityselect.inc
%%IMPDIR%%/templates/prefs/sourceselect.inc
@@ -220,9 +242,11 @@ etc/horde/httpd.conf.imp
@dirrm %%IMPDIR%%/locale/de_DE
@dirrm %%IMPDIR%%/locale/el_GR/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/el_GR
-@dirrm %%IMPDIR%%/locale/en_EN
+@dirrm %%IMPDIR%%/locale/en_US
@dirrm %%IMPDIR%%/locale/es_ES/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/es_ES
+@dirrm %%IMPDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/fi_FI
@dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/fr_FR
@dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES
@@ -239,6 +263,8 @@ etc/horde/httpd.conf.imp
@dirrm %%IMPDIR%%/locale/pt_BR
@dirrm %%IMPDIR%%/locale/ru_win/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/ru_win
+@dirrm %%IMPDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/sv_SE
@dirrm %%IMPDIR%%/locale/uk/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/uk
@dirrm %%IMPDIR%%/locale/zh_CN/LC_MESSAGES
diff --git a/mail/imp3/Makefile b/mail/imp3/Makefile
index 67c72f2f61b2..a772447c5fb7 100644
--- a/mail/imp3/Makefile
+++ b/mail/imp3/Makefile
@@ -7,10 +7,10 @@
PORTNAME= imp
PORTVERSION= 3.0
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/imp/tarballs/
PKGNAMESUFFIX= -devel
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -37,6 +37,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
#
# - WITHOUT_SSL : if you have not installed c-client WITH_SSL;
#
+# - WITH_VALID_CERT : if you own a valid SSL certificate;
+#
# - WITHOUT_TURBA : if you do not want adressbooks;
#
# - WITHOUT_IMAPSERVER : if your IMAP server runs on another machine;
@@ -113,9 +115,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
.endif
NO_BUILD= yes
-DOCS= COPYING README docs/CHANGES docs/CREDITS \
- docs/INSTALL docs/SECURITY docs/FEATURES \
- docs/PACKAGES
+DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
CONFFILE= conf.php filter.txt header.txt html.php menu.php \
mime_drivers.php motd.php prefs.php servers.php \
trailer.txt
@@ -164,6 +164,7 @@ pre-install:
${ECHO_MSG} "" ; \
${FALSE} ; \
fi
+.if !defined(BATCH)
.if !defined(WITHOUT_SSL)
@if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \
${ECHO_MSG} "" ; \
@@ -172,6 +173,7 @@ pre-install:
${FALSE} ; \
fi
.endif
+.endif
.if !defined(WITHOUT_LDAP)
.if defined(WITH_LDAP1)
@if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.1"; then \
@@ -238,7 +240,20 @@ do-install:
.endfor
@${PERL} -pi -e "s:example.com:${HOSTNAME}:g" ${CONFDIR}/servers.php
@${PERL} -pi -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${CONFDIR}/mime_drivers.php
- @${PERL} -pi -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" ${IMPDIR}/compose.php
+ @${PERL} -pi -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" \
+ ${IMPDIR}/compose.php
+.if defined(WITHOUT_SSL)
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap:;s:%%IMAPPORT%%:143:" \
+ ${CONFDIR}/servers.php
+.else
+ @${PERL} -pi -e "s:%%IMAPPORT%%:993:" ${CONFDIR}/servers.php
+.if defined(WITH_VALID_CERT)
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl:" ${CONFDIR}/servers.php
+.else
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:" \
+ ${CONFDIR}/servers.php
+.endif
+.endif
.if !defined(WITHOUT_ASPELL)
@${PERL} -pi -e "s:\/\* BEGBSDASPELL::;s:ENDBSDASPELL \*\/::" \
${CONFDIR}/mime_drivers.php
@@ -274,6 +289,8 @@ do-install:
# Provide a link to IMP from Turba
.if !defined(WITHOUT_TURBA)
@${PERL} -pi -e "s://UNCOMMENTWHENINSTIMP::" ${TURBADIR}/config/conf.php
+ @${PERL} -pi -e "s:apps'] = array\(\):apps'] = array('turba'):" \
+ ${CONFDIR}/conf.php
.endif
.if !defined(NOPORTDOCS)
@${PERL} -pi -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" ${WRKSRC}/docs/SECURITY
diff --git a/mail/imp3/distinfo b/mail/imp3/distinfo
index 793e07b66041..7745bb27ad36 100644
--- a/mail/imp3/distinfo
+++ b/mail/imp3/distinfo
@@ -1 +1 @@
-MD5 (imp-3.0-RC3.tar.gz) = f02ecd032f3a3c17f96ab575bf5b6f61
+MD5 (imp-3.0.tar.gz) = d941d7b11231c771fb801ae8010e7271
diff --git a/mail/imp3/files/patch-ab b/mail/imp3/files/patch-ab
index ee535e400968..7c274c3fb977 100644
--- a/mail/imp3/files/patch-ab
+++ b/mail/imp3/files/patch-ab
@@ -1,5 +1,5 @@
--- config/servers.php.dist.orig Fri Jun 22 20:08:14 2001
-+++ config/servers.php.dist Fri Nov 16 23:46:19 2001
++++ config/servers.php.dist Tue Dec 18 23:08:00 2001
@@ -31,7 +31,7 @@
* is on.
*
@@ -14,11 +14,13 @@
$servers['imap'] = array(
'name' => 'IMAP Server',
- 'server' => 'imap.example.com',
+- 'protocol' => 'imap',
+- 'port' => 143,
+- 'folders' => 'mail/',
+// 'server' => 'imap.example.com',
+ 'server' => 'localhost',
- 'protocol' => 'imap',
- 'port' => 143,
-- 'folders' => 'mail/',
++ 'protocol' => '%%PROTOCOL%%',
++ 'port' => %%IMAPPORT%%,
+ 'folders' => 'Mail/',
'namespace' => '',
'maildomain' => 'example.com',
diff --git a/mail/imp3/files/patch-ac b/mail/imp3/files/patch-ac
new file mode 100644
index 000000000000..a7a34acdf937
--- /dev/null
+++ b/mail/imp3/files/patch-ac
@@ -0,0 +1,11 @@
+--- config/prefs.php.dist.orig Sun Dec 23 18:24:39 2001
++++ config/prefs.php.dist Thu Jan 3 20:57:38 2002
+@@ -444,7 +444,7 @@
+
+ // addressbook(s) to use when expanding addresses
+ $_prefs['search_sources'] = array(
+- 'value' => '',
++ 'value' => 'localsql',
+ 'locked' => false,
+ 'shared' => false,
+ 'type' => 'implicit'
diff --git a/mail/imp3/pkg-descr b/mail/imp3/pkg-descr
index 52e93a82e191..7aa00a473a1b 100644
--- a/mail/imp3/pkg-descr
+++ b/mail/imp3/pkg-descr
@@ -1,13 +1,9 @@
-IMP 3 is currently in heavy development. Features that have been added
+IMP 3 is the new stable version of IMP. Features that have been added
include searching; a new, flexible preferences system; a hierarchical
folder tree; and more.
It requires PHP4. You should use it if you want to take advantage of
-PHP4s built-in session handling and improved speed; if you want access
-to features such as the interactive spell checker and folder searching;
-or if you want to contribute a major piece to the code.
-
-This code branch continues the trend of 2.2 by being slimmer, cleaner,
-and better designed code than the previous version.
+PHP4s built-in session handling and improved speed or if you want access
+to features such as the interactive spell checker and folder searching.
WWW: http://www.horde.org/imp/
diff --git a/mail/imp3/pkg-message b/mail/imp3/pkg-message
index a13b440f15f9..4ca4e8caccdf 100644
--- a/mail/imp3/pkg-message
+++ b/mail/imp3/pkg-message
@@ -15,8 +15,8 @@ IMP requires an IMAP server. If you want to install one on this
machine, you may install the ports mail/cyrus-imapd, or
mail/imap-uw, or mail/courier-imap.
-Please refer to the file %%DOCSDIR%%/SECURITY
-on how to secure the IMP installation.
-It is at least recommended that you change the default database
-password used by horde and imp.
+To secure your installation, it is at least recommended that you change
+the default database password used by horde and imp.
+Then, you might change the 'session.save_path' setting in php.ini to a
+directory only readable and writeable by your webserver.
************************************************************************
diff --git a/mail/imp3/pkg-plist b/mail/imp3/pkg-plist
index 7382ae313ddb..2a5334368c84 100644
--- a/mail/imp3/pkg-plist
+++ b/mail/imp3/pkg-plist
@@ -1,12 +1,10 @@
%%PORTDOCS%%share/doc/imp/CHANGES
%%PORTDOCS%%share/doc/imp/COPYING
%%PORTDOCS%%share/doc/imp/CREDITS
-%%PORTDOCS%%share/doc/imp/FEATURES
%%PORTDOCS%%share/doc/imp/INSTALL
-%%PORTDOCS%%share/doc/imp/PACKAGES
%%PORTDOCS%%share/doc/imp/README
-%%PORTDOCS%%share/doc/imp/SECURITY
%%IMPDIR%%/compose.php
+%%IMPDIR%%/config/.htaccess
%%IMPDIR%%/config/conf.php
%%IMPDIR%%/config/conf.php.dist
%%IMPDIR%%/config/filter.txt
@@ -15,7 +13,6 @@
%%IMPDIR%%/config/header.txt.dist
%%IMPDIR%%/config/html.php
%%IMPDIR%%/config/html.php.dist
-%%IMPDIR%%/config/imp.dt
%%IMPDIR%%/config/menu.php
%%IMPDIR%%/config/menu.php.dist
%%IMPDIR%%/config/mime_drivers.php
@@ -25,6 +22,7 @@
%%IMPDIR%%/config/motd.php.dist
%%IMPDIR%%/config/prefs.php
%%IMPDIR%%/config/prefs.php.dist
+%%IMPDIR%%/config/prefs.php.dist.orig
%%IMPDIR%%/config/servers.php
%%IMPDIR%%/config/servers.php.dist
%%IMPDIR%%/config/servers.php.dist.orig
@@ -86,6 +84,7 @@
%%IMPDIR%%/identities.php
%%IMPDIR%%/index.php
%%IMPDIR%%/intro.php
+%%IMPDIR%%/lib/.htaccess
%%IMPDIR%%/lib/Folder.php
%%IMPDIR%%/lib/IMP.php
%%IMPDIR%%/lib/Identity/IMP.php
@@ -100,30 +99,47 @@
%%IMPDIR%%/lib/api.php
%%IMPDIR%%/lib/base.php
%%IMPDIR%%/lib/version.php
+%%IMPDIR%%/locale/.htaccess
%%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/cs_CZ/help.xml
%%IMPDIR%%/locale/de_DE/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/de_DE/help.xml
%%IMPDIR%%/locale/el_GR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/en_EN/help.xml
+%%IMPDIR%%/locale/el_GR/help.xml
+%%IMPDIR%%/locale/en_US/help.xml
%%IMPDIR%%/locale/es_ES/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/es_ES/help.xml
+%%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/fi_FI/help.xml
%%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/fr_FR/help.xml
%%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/it_IT/help.xml
%%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/ko_KR/help.xml
%%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/nl_NL/help.xml
%%IMPDIR%%/locale/no_BOK/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/no_BOK/help.xml
%%IMPDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/pl_PL/help.xml
%%IMPDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/pt_BR/help.xml
%%IMPDIR%%/locale/ru_win/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/ru_win/help.xml
+%%IMPDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/sv_SE/help.xml
%%IMPDIR%%/locale/uk/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/uk/help.xml
%%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/zh_CN/help.xml
%%IMPDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/zh_TW/help.xml
%%IMPDIR%%/login.php
%%IMPDIR%%/mailbox.php
%%IMPDIR%%/menu.php
%%IMPDIR%%/message.php
+%%IMPDIR%%/po/.htaccess
%%IMPDIR%%/po/Makefile
%%IMPDIR%%/po/README
%%IMPDIR%%/po/cs_CZ.po
@@ -131,6 +147,7 @@
%%IMPDIR%%/po/el_GR.po
%%IMPDIR%%/po/es_ES.po
%%IMPDIR%%/po/extract.pl
+%%IMPDIR%%/po/fi_FI.po
%%IMPDIR%%/po/fr_FR.po
%%IMPDIR%%/po/it_IT.po
%%IMPDIR%%/po/ko_KR.po
@@ -140,17 +157,23 @@
%%IMPDIR%%/po/pt_BR.po
%%IMPDIR%%/po/ru_win.po
%%IMPDIR%%/po/shtool
+%%IMPDIR%%/po/sv_SE.po
%%IMPDIR%%/po/uk.po
%%IMPDIR%%/po/xgettext.sh
%%IMPDIR%%/po/zh_CN.po
%%IMPDIR%%/po/zh_TW.po
%%IMPDIR%%/prefs.php
%%IMPDIR%%/redirect.php
+%%IMPDIR%%/scripts/.htaccess
%%IMPDIR%%/scripts/Imp.reg
+%%IMPDIR%%/scripts/custom_login.php
%%IMPDIR%%/scripts/imp-cleanup.cron
+%%IMPDIR%%/scripts/imp2horde.pl
+%%IMPDIR%%/scripts/imp2turba.pl
%%IMPDIR%%/search.php
%%IMPDIR%%/spelling.php
%%IMPDIR%%/status.php
+%%IMPDIR%%/templates/.htaccess
%%IMPDIR%%/templates/common-footer.inc
%%IMPDIR%%/templates/common-header.inc
%%IMPDIR%%/templates/compose/bounce.inc
@@ -194,7 +217,6 @@
%%IMPDIR%%/templates/message/navbar.inc
%%IMPDIR%%/templates/message/navbar_aux_bottom.inc
%%IMPDIR%%/templates/message/navbar_aux_top.inc
-%%IMPDIR%%/templates/prefs/filters.inc
%%IMPDIR%%/templates/prefs/folderselect.inc
%%IMPDIR%%/templates/prefs/identityselect.inc
%%IMPDIR%%/templates/prefs/sourceselect.inc
@@ -220,9 +242,11 @@ etc/horde/httpd.conf.imp
@dirrm %%IMPDIR%%/locale/de_DE
@dirrm %%IMPDIR%%/locale/el_GR/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/el_GR
-@dirrm %%IMPDIR%%/locale/en_EN
+@dirrm %%IMPDIR%%/locale/en_US
@dirrm %%IMPDIR%%/locale/es_ES/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/es_ES
+@dirrm %%IMPDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/fi_FI
@dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/fr_FR
@dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES
@@ -239,6 +263,8 @@ etc/horde/httpd.conf.imp
@dirrm %%IMPDIR%%/locale/pt_BR
@dirrm %%IMPDIR%%/locale/ru_win/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/ru_win
+@dirrm %%IMPDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/sv_SE
@dirrm %%IMPDIR%%/locale/uk/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/uk
@dirrm %%IMPDIR%%/locale/zh_CN/LC_MESSAGES
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 9817644a2a1c..71c28da81532 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -7,9 +7,9 @@
PORTNAME= turba
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/tarballs/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -96,8 +96,8 @@ pre-install:
do-install:
@${MKDIR} ${TURBADIR}
@${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/po ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/templates ${WRKSRC}/po ${TURBADIR}
@${CP} -p ${WRKSRC}/*.php ${TURBADIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
@@ -107,7 +107,10 @@ do-install:
@${CHOWN} -R www:www ${TURBADIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
- @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \
+ ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \
+ ${HORDEDIR}/config/registry.php
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index 95ed0497fa57..b160954d3a12 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.0-RC3.tar.gz) = 9fc7d02714f25221e54352c1c4a360fa
+MD5 (turba-1.0.tar.gz) = 8d70570cd66f9921a7466c699e58f5be
diff --git a/mail/turba/files/patch-ab b/mail/turba/files/patch-ab
index f76a7c518225..5cc76966a8a9 100644
--- a/mail/turba/files/patch-ab
+++ b/mail/turba/files/patch-ab
@@ -1,14 +1,14 @@
---- config/sources.php.dist.orig Sun Nov 4 01:42:12 2001
-+++ config/sources.php.dist Sun Nov 18 17:25:08 2001
-@@ -83,21 +83,25 @@
- 'title' => 'Local SQL',
+--- config/sources.php.dist.orig Tue Jan 1 13:58:34 2002
++++ config/sources.php.dist Thu Jan 3 18:04:12 2002
+@@ -92,21 +92,25 @@
+ 'title' => 'My Addressbook',
'type' => 'sql',
'params' => array(
- 'phptype' => 'pgsql',
- 'hostspec' => '',
- 'username' => '',
- 'password' => '',
-+// 'phptype' => 'pgsql',
++// 'phptype' => 'pgsql',
+ 'phptype' => 'mysql',
+ 'hostspec' => 'localhost',
+ 'username' => 'hordemgr',
@@ -18,18 +18,18 @@
- 'tty' => '',
- 'port' => '5432',
- 'protocol' => 'unix',
-+// 'tty' => '',
++// 'tty' => '',
+// Default port: 5432 for pgsql (PostGres), 3306 for mysql
-+// 'port' => '5432',
-+// 'port' => '3306',
-+// 'protocol' => 'unix',
++// 'port' => '5432',
++// 'port' => '3306',
++// 'protocol' => 'unix',
'table' => 'turba_objects'
),
'map' => array(
'__key' => 'object_id',
'__owner' => 'owner_id',
- 'name' => 'object_name',
-+ 'alias' => 'object_alias',
- 'email' => 'object_email',
- 'homeAddress' => 'object_homeAddress',
- 'workAddress' => 'object_workAddress',
+ 'name' => 'object_name',
++ 'alias' => 'object_alias',
+ 'email' => 'object_email',
+ 'homeAddress' => 'object_homeAddress',
+ 'workAddress' => 'object_workAddress',
diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist
index ca31e90a6f06..5bc52ab2ec51 100644
--- a/mail/turba/pkg-plist
+++ b/mail/turba/pkg-plist
@@ -8,6 +8,7 @@
%%TURBADIR%%/addobject.php
%%TURBADIR%%/addobjectaction.php
%%TURBADIR%%/advanced.php
+%%TURBADIR%%/config/.htaccess
%%TURBADIR%%/config/attributes.php
%%TURBADIR%%/config/attributes.php.dist
%%TURBADIR%%/config/conf.php
@@ -23,7 +24,6 @@
%%TURBADIR%%/config/sources.php
%%TURBADIR%%/config/sources.php.dist
%%TURBADIR%%/config/sources.php.dist.orig
-%%TURBADIR%%/config/turba.dt
%%TURBADIR%%/data.php
%%TURBADIR%%/deleteobject.php
%%TURBADIR%%/displayobject.php
@@ -34,6 +34,7 @@
%%TURBADIR%%/graphics/search.gif
%%TURBADIR%%/graphics/turba.gif
%%TURBADIR%%/index.php
+%%TURBADIR%%/lib/.htaccess
%%TURBADIR%%/lib/AbstractObject.php
%%TURBADIR%%/lib/Driver.php
%%TURBADIR%%/lib/Driver/ldap.php
@@ -54,14 +55,17 @@
%%TURBADIR%%/lib/api.php
%%TURBADIR%%/lib/base.php
%%TURBADIR%%/lib/version.php
+%%TURBADIR%%/locale/.htaccess
%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/no_BOK/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ru_koi/LC_MESSAGES/turba.mo
@@ -70,6 +74,7 @@
%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
%%TURBADIR%%/menu.php
+%%TURBADIR%%/po/.htaccess
%%TURBADIR%%/po/Makefile
%%TURBADIR%%/po/README
%%TURBADIR%%/po/cs_CZ.po
@@ -77,10 +82,12 @@
%%TURBADIR%%/po/el_GR.po
%%TURBADIR%%/po/es_ES.po
%%TURBADIR%%/po/extract.pl
+%%TURBADIR%%/po/fi_FI.po
%%TURBADIR%%/po/fr_FR.po
%%TURBADIR%%/po/it_IT.po
%%TURBADIR%%/po/ko_KR.po
%%TURBADIR%%/po/nl_NL.po
+%%TURBADIR%%/po/no_BOK.po
%%TURBADIR%%/po/pl_PL.po
%%TURBADIR%%/po/pt_BR.po
%%TURBADIR%%/po/ru_koi.po
@@ -90,9 +97,11 @@
%%TURBADIR%%/po/xgettext.sh
%%TURBADIR%%/po/zh_CN.po
%%TURBADIR%%/po/zh_TW.po
+%%TURBADIR%%/scripts/.htaccess
%%TURBADIR%%/scripts/drivers/turba.sql
%%TURBADIR%%/search.php
%%TURBADIR%%/status.php
+%%TURBADIR%%/templates/.htaccess
%%TURBADIR%%/templates/add/add.inc
%%TURBADIR%%/templates/add/noadd.inc
%%TURBADIR%%/templates/add/select.inc
@@ -136,6 +145,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/el_GR
@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/es_ES
+@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/it_IT/LC_MESSAGES
@@ -144,6 +155,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/ko_KR
@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/nl_NL
+@dirrm %%TURBADIR%%/locale/no_BOK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/no_BOK
@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/pl_PL
@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
generated by cgit (git 2.34.1) at 2024-12-25 01:37:46 +0800