Update to 3.2.1

Main changes from 3.0:
Add various translations
Check for invalid 8bit characters in email addresses
Updates for various browsers quirks
Do not allow the '\' character in full names (see RFC 2822 [3.2.5]).
Close several small XSS vulnerabilities
Show timeout warning if session is about to expire
Added images MIME_Viewer
Protect against modified login forms
Escape login data correctly
Various bug fixes and interface improvements.

For details see share/doc/imp/CHANGES

3 files changed, 290 insertions, 208 deletions

diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index abeb2dbff58..43bd086172d 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:33 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/03/17 18:05:27 bouyer Exp $
 
-DISTNAME=	imp-3.0
+DISTNAME=	imp-3.2.1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
 
@@ -8,7 +8,7 @@ MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://www.horde.org/imp/
 COMMENT=	Internet Messaging Program
 
-DEPENDS+=	horde-2.0:../../www/horde
+DEPENDS+=	horde-2.2.1:../../www/horde
 DEPENDS+=	php-imap>4.0.0:../../mail/php4-imap
 
 DOCDIR=		${PREFIX}/share/doc/imp
diff --git a/mail/imp/PLIST b/mail/imp/PLIST
index bcb5ef1929b..9df92cc54db 100644
--- a/mail/imp/PLIST
+++ b/mail/imp/PLIST
@@ -1,151 +1,26 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/01 22:44:28 bouyer Exp $
-share/doc/imp/COPYING
-share/doc/imp/README
+@comment $NetBSD: PLIST,v 1.4 2003/03/17 18:05:27 bouyer Exp $
 share/doc/imp/CHANGES
+share/doc/imp/COPYING
 share/doc/imp/CREDITS
 share/doc/imp/INSTALL
+share/doc/imp/README
 share/examples/imp/imp.conf
-share/horde/imp/templates/index/css.inc
-share/horde/imp/templates/index/notconfigured.inc
-share/horde/imp/templates/search/javascript.inc
-share/horde/imp/templates/search/main.inc
-share/horde/imp/templates/prefs/folderselect.inc
-share/horde/imp/templates/prefs/identityselect.inc
-share/horde/imp/templates/prefs/sourceselect.inc
-share/horde/imp/templates/prefs/trashselect.inc
-share/horde/imp/templates/filters/javascript.inc
-share/horde/imp/templates/filters/list.inc
-share/horde/imp/templates/filters/manage.inc
-share/horde/imp/templates/folders/foot.inc
-share/horde/imp/templates/folders/alert.inc
-share/horde/imp/templates/folders/confirm.inc
-share/horde/imp/templates/folders/actions.inc
-share/horde/imp/templates/folders/head.inc
-share/horde/imp/templates/folders/javascript.inc
-share/horde/imp/templates/folders/row.inc
-share/horde/imp/templates/identities/javascript.inc
-share/horde/imp/templates/identities/manage.inc
-share/horde/imp/templates/message/headers.inc
-share/horde/imp/templates/message/javascript.inc
-share/horde/imp/templates/message/message.inc
-share/horde/imp/templates/message/navbar.inc
-share/horde/imp/templates/message/navbar_aux_bottom.inc
-share/horde/imp/templates/message/navbar_aux_top.inc
-share/horde/imp/templates/compose/bounce.inc
-share/horde/imp/templates/compose/compose.inc
-share/horde/imp/templates/compose/javascript.inc
-share/horde/imp/templates/compose/spelling.inc
-share/horde/imp/templates/javascript/open_compose_win.js
-share/horde/imp/templates/javascript/open_print_win.js
-share/horde/imp/templates/login/login.inc
-share/horde/imp/templates/mailbox/searchfolder.inc
-share/horde/imp/templates/mailbox/alert.inc
-share/horde/imp/templates/mailbox/empty_mailbox.inc
-share/horde/imp/templates/mailbox/footer.inc
-share/horde/imp/templates/mailbox/header.inc
-share/horde/imp/templates/mailbox/javascript.inc
-share/horde/imp/templates/mailbox/legend.inc
-share/horde/imp/templates/mailbox/message_footers.inc
-share/horde/imp/templates/mailbox/message_headers.inc
-share/horde/imp/templates/mailbox/message_summaries.inc
-share/horde/imp/templates/mailbox/navbar.inc
-share/horde/imp/templates/mailbox/actions.inc
-share/horde/imp/templates/menu/menu.inc
-share/horde/imp/templates/menu
-share/horde/imp/templates/intro/main.inc
-share/horde/imp/templates/intro
-share/horde/imp/templates/common-header.inc
-share/horde/imp/templates/common-footer.inc
-share/horde/imp/scripts/Imp.reg
-share/horde/imp/scripts/custom_login.php
-share/horde/imp/scripts/imp-cleanup.cron
-share/horde/imp/scripts/imp2horde.pl
-share/horde/imp/scripts/imp2turba.pl
-share/horde/imp/po/zh_TW.po
-share/horde/imp/po/README
-share/horde/imp/po/cs_CZ.po
-share/horde/imp/po/de_DE.po
-share/horde/imp/po/el_GR.po
-share/horde/imp/po/es_ES.po
-share/horde/imp/po/extract.pl
-share/horde/imp/po/fi_FI.po
-share/horde/imp/po/fr_FR.po
-share/horde/imp/po/it_IT.po
-share/horde/imp/po/ko_KR.po
-share/horde/imp/po/nl_NL.po
-share/horde/imp/po/no_BOK.po
-share/horde/imp/po/pl_PL.po
-share/horde/imp/po/pt_BR.po
-share/horde/imp/po/ru_win.po
-share/horde/imp/po/shtool
-share/horde/imp/po/sv_SE.po
-share/horde/imp/po/uk.po
-share/horde/imp/po/xgettext.sh
-share/horde/imp/po/zh_CN.po
-share/horde/imp/po/Makefile
-share/horde/imp/locale/nl_NL/LC_MESSAGES/imp.mo
-share/horde/imp/locale/nl_NL/help.xml
-share/horde/imp/locale/de_DE/LC_MESSAGES/imp.mo
-share/horde/imp/locale/de_DE/help.xml
-share/horde/imp/locale/el_GR/LC_MESSAGES/imp.mo
-share/horde/imp/locale/el_GR/help.xml
-share/horde/imp/locale/en_US/help.xml
-share/horde/imp/locale/es_ES/LC_MESSAGES/imp.mo
-share/horde/imp/locale/es_ES/help.xml
-share/horde/imp/locale/fi_FI/LC_MESSAGES/imp.mo
-share/horde/imp/locale/fi_FI/help.xml
-share/horde/imp/locale/fr_FR/LC_MESSAGES/imp.mo
-share/horde/imp/locale/fr_FR/help.xml
-share/horde/imp/locale/it_IT/LC_MESSAGES/imp.mo
-share/horde/imp/locale/it_IT/help.xml
-share/horde/imp/locale/ko_KR/LC_MESSAGES/imp.mo
-share/horde/imp/locale/ko_KR/help.xml
-share/horde/imp/locale/cs_CZ/LC_MESSAGES/imp.mo
-share/horde/imp/locale/cs_CZ/help.xml
-share/horde/imp/locale/no_BOK/LC_MESSAGES/imp.mo
-share/horde/imp/locale/no_BOK/help.xml
-share/horde/imp/locale/pl_PL/LC_MESSAGES/imp.mo
-share/horde/imp/locale/pl_PL/help.xml
-share/horde/imp/locale/pt_BR/LC_MESSAGES/imp.mo
-share/horde/imp/locale/pt_BR/help.xml
-share/horde/imp/locale/ru_win/LC_MESSAGES/imp.mo
-share/horde/imp/locale/ru_win/help.xml
-share/horde/imp/locale/sv_SE/LC_MESSAGES/imp.mo
-share/horde/imp/locale/sv_SE/help.xml
-share/horde/imp/locale/uk/LC_MESSAGES/imp.mo
-share/horde/imp/locale/uk/help.xml
-share/horde/imp/locale/zh_CN/LC_MESSAGES/imp.mo
-share/horde/imp/locale/zh_CN/help.xml
-share/horde/imp/locale/zh_TW/LC_MESSAGES/imp.mo
-share/horde/imp/locale/zh_TW/help.xml
-share/horde/imp/lib/MIME/Viewer/html.php
-share/horde/imp/lib/MIME/Viewer/text.php
-share/horde/imp/lib/Identity/IMP.php
-share/horde/imp/lib/Maintenance/Task/delete_sentmail_monthly.php
-share/horde/imp/lib/Maintenance/Task/purge_trash.php
-share/horde/imp/lib/Maintenance/Task/rename_sentmail_monthly.php
-share/horde/imp/lib/Maintenance/Task
-share/horde/imp/lib/Maintenance/imp.php
-share/horde/imp/lib/base.php
-share/horde/imp/lib/Tree.php
-share/horde/imp/lib/api.php
-share/horde/imp/lib/Message.php
-share/horde/imp/lib/version.php
-share/horde/imp/lib/IMP.php
-share/horde/imp/lib/Folder.php
-share/horde/imp/graphics/folders/spacer.gif
-share/horde/imp/graphics/folders/empty.gif
-share/horde/imp/graphics/folders/expanded.gif
-share/horde/imp/graphics/folders/folder.gif
-share/horde/imp/graphics/folders/folder_open.gif
-share/horde/imp/graphics/folders/inbox.gif
-share/horde/imp/graphics/folders/mbox.gif
-share/horde/imp/graphics/folders/mbox_marked.gif
-share/horde/imp/graphics/folders/mbox_noselect.gif
-share/horde/imp/graphics/folders/mbox_unmarked.gif
-share/horde/imp/graphics/folders/collapsed.gif
-share/horde/imp/graphics/mime/html.gif
-share/horde/imp/graphics/mime/text.gif
+share/horde/imp/compose.php
+share/horde/imp/config/conf.php.dist
+share/horde/imp/config/filter.txt.dist
+share/horde/imp/config/header.txt.dist
+share/horde/imp/config/html.php.dist
+share/horde/imp/config/menu.php.dist
+share/horde/imp/config/mime_drivers.php.dist
+share/horde/imp/config/motd.php.dist
+share/horde/imp/config/prefs.php.dist
+share/horde/imp/config/servers.php.dist
+share/horde/imp/config/trailer.txt.dist
+share/horde/imp/contacts.php
+share/horde/imp/filters.php
+share/horde/imp/folders.php
+share/horde/imp/graphics/addressbook-blue.gif
+share/horde/imp/graphics/addressbook-red.gif
 share/horde/imp/graphics/addressbook-yellow.gif
 share/horde/imp/graphics/alternative.gif
 share/horde/imp/graphics/answered.gif
@@ -156,20 +31,35 @@ share/horde/imp/graphics/deleted.gif
 share/horde/imp/graphics/down.gif
 share/horde/imp/graphics/download.gif
 share/horde/imp/graphics/draft.gif
+share/horde/imp/graphics/empty_trash.gif
 share/horde/imp/graphics/expand.gif
+share/horde/imp/graphics/favicon.ico
 share/horde/imp/graphics/fetchmail.gif
 share/horde/imp/graphics/filters.gif
 share/horde/imp/graphics/first-grey.gif
 share/horde/imp/graphics/first.gif
 share/horde/imp/graphics/folders.gif
+share/horde/imp/graphics/folders/collapsed.gif
+share/horde/imp/graphics/folders/empty.gif
+share/horde/imp/graphics/folders/expanded.gif
+share/horde/imp/graphics/folders/folder.gif
+share/horde/imp/graphics/folders/folder_open.gif
+share/horde/imp/graphics/folders/inbox.gif
+share/horde/imp/graphics/folders/mbox.gif
+share/horde/imp/graphics/folders/mbox_marked.gif
+share/horde/imp/graphics/folders/mbox_noselect.gif
+share/horde/imp/graphics/folders/mbox_unmarked.gif
+share/horde/imp/graphics/folders/spacer.gif
 share/horde/imp/graphics/imp.gif
-share/horde/imp/graphics/up.gif
-share/horde/imp/graphics/addressbook-blue.gif
+share/horde/imp/graphics/important.gif
 share/horde/imp/graphics/last-grey.gif
 share/horde/imp/graphics/last.gif
 share/horde/imp/graphics/lhand.gif
 share/horde/imp/graphics/lock.gif
 share/horde/imp/graphics/manage_attachments.gif
+share/horde/imp/graphics/mime/html.gif
+share/horde/imp/graphics/mime/image.gif
+share/horde/imp/graphics/mime/text.gif
 share/horde/imp/graphics/next-grey.gif
 share/horde/imp/graphics/next.gif
 share/horde/imp/graphics/personal.gif
@@ -181,95 +71,287 @@ share/horde/imp/graphics/rhand.gif
 share/horde/imp/graphics/search.gif
 share/horde/imp/graphics/signed.gif
 share/horde/imp/graphics/spellcheck.gif
+share/horde/imp/graphics/thread.gif
 share/horde/imp/graphics/unseen.gif
-share/horde/imp/graphics/important.gif
-share/horde/imp/graphics/addressbook-red.gif
-share/horde/imp/config/conf.php.dist
-share/horde/imp/config/filter.txt.dist
-share/horde/imp/config/header.txt.dist
-share/horde/imp/config/html.php.dist
-share/horde/imp/config/menu.php.dist
-share/horde/imp/config/mime_drivers.php.dist
-share/horde/imp/config/motd.php.dist
-share/horde/imp/config/prefs.php.dist
-share/horde/imp/config/servers.php.dist
-share/horde/imp/config/trailer.txt.dist
-share/horde/imp/compose.php
-share/horde/imp/filters.php
-share/horde/imp/folders.php
+share/horde/imp/graphics/up.gif
 share/horde/imp/identities.php
 share/horde/imp/index.php
-share/horde/imp/intro.php
+share/horde/imp/lib/Browser.php
+share/horde/imp/lib/Folder.php
+share/horde/imp/lib/IMP.php
+share/horde/imp/lib/Identity/IMP.php
+share/horde/imp/lib/MIME/Viewer/enriched.php
+share/horde/imp/lib/MIME/Viewer/html.php
+share/horde/imp/lib/MIME/Viewer/images.php
+share/horde/imp/lib/MIME/Viewer/text.php
+share/horde/imp/lib/Maintenance/Task/delete_sentmail_monthly.php
+share/horde/imp/lib/Maintenance/Task/purge_trash.php
+share/horde/imp/lib/Maintenance/Task/rename_sentmail_monthly.php
+share/horde/imp/lib/Maintenance/imp.php
+share/horde/imp/lib/Message.php
+share/horde/imp/lib/Tree.php
+share/horde/imp/lib/api.php
+share/horde/imp/lib/base.php
+share/horde/imp/lib/constants.php
+share/horde/imp/lib/version.php
+share/horde/imp/locale/bg_BG/LC_MESSAGES/imp.mo
+share/horde/imp/locale/ca_ES/LC_MESSAGES/imp.mo
+share/horde/imp/locale/ca_ES/help.xml
+share/horde/imp/locale/cs_CZ/LC_MESSAGES/imp.mo
+share/horde/imp/locale/cs_CZ/help.xml
+share/horde/imp/locale/da_DK/LC_MESSAGES/imp.mo
+share/horde/imp/locale/da_DK/help.xml
+share/horde/imp/locale/de_DE/LC_MESSAGES/imp.mo
+share/horde/imp/locale/de_DE/help.xml
+share/horde/imp/locale/el_GR/LC_MESSAGES/imp.mo
+share/horde/imp/locale/el_GR/help.xml
+share/horde/imp/locale/en_GB/help.xml
+share/horde/imp/locale/en_US/help.xml
+share/horde/imp/locale/es_ES/LC_MESSAGES/imp.mo
+share/horde/imp/locale/es_ES/help.xml
+share/horde/imp/locale/et_EE/LC_MESSAGES/imp.mo
+share/horde/imp/locale/et_EE/help.xml
+share/horde/imp/locale/fi_FI/LC_MESSAGES/imp.mo
+share/horde/imp/locale/fi_FI/help.xml
+share/horde/imp/locale/fr_FR/LC_MESSAGES/imp.mo
+share/horde/imp/locale/fr_FR/help.xml
+share/horde/imp/locale/hu_HU/LC_MESSAGES/imp.mo
+share/horde/imp/locale/it_IT/LC_MESSAGES/imp.mo
+share/horde/imp/locale/it_IT/help.xml
+share/horde/imp/locale/ja_JP/LC_MESSAGES/imp.mo
+share/horde/imp/locale/ko_KR/LC_MESSAGES/imp.mo
+share/horde/imp/locale/ko_KR/help.xml
+share/horde/imp/locale/lt_LT/LC_MESSAGES/imp.mo
+share/horde/imp/locale/lv_LV/LC_MESSAGES/imp.mo
+share/horde/imp/locale/nb_NO/LC_MESSAGES/imp.mo
+share/horde/imp/locale/nb_NO/help.xml
+share/horde/imp/locale/nl_NL/LC_MESSAGES/imp.mo
+share/horde/imp/locale/nl_NL/help.xml
+share/horde/imp/locale/nn_NO/LC_MESSAGES/imp.mo
+share/horde/imp/locale/pl_PL/LC_MESSAGES/imp.mo
+share/horde/imp/locale/pl_PL/help.xml
+share/horde/imp/locale/pt_BR/LC_MESSAGES/imp.mo
+share/horde/imp/locale/pt_BR/help.xml
+share/horde/imp/locale/pt_PT/LC_MESSAGES/imp.mo
+share/horde/imp/locale/pt_PT/help.xml
+share/horde/imp/locale/ro_RO/LC_MESSAGES/imp.mo
+share/horde/imp/locale/ru_RU.KOI8-R/LC_MESSAGES/imp.mo
+share/horde/imp/locale/ru_RU.KOI8-R/help.xml
+share/horde/imp/locale/ru_RU/LC_MESSAGES/imp.mo
+share/horde/imp/locale/ru_RU/help.xml
+share/horde/imp/locale/sk_SK/LC_MESSAGES/imp.mo
+share/horde/imp/locale/sk_SK/help.xml
+share/horde/imp/locale/sl_SI/LC_MESSAGES/imp.mo
+share/horde/imp/locale/sr_YU/LC_MESSAGES/imp.mo
+share/horde/imp/locale/sv_SE/LC_MESSAGES/imp.mo
+share/horde/imp/locale/sv_SE/help.xml
+share/horde/imp/locale/uk_UA/LC_MESSAGES/imp.mo
+share/horde/imp/locale/uk_UA/help.xml
+share/horde/imp/locale/zh_CN/LC_MESSAGES/imp.mo
+share/horde/imp/locale/zh_CN/help.xml
+share/horde/imp/locale/zh_TW/LC_MESSAGES/imp.mo
+share/horde/imp/locale/zh_TW/help.xml
 share/horde/imp/login.php
 share/horde/imp/mailbox.php
 share/horde/imp/menu.php
 share/horde/imp/message.php
+share/horde/imp/po/Makefile
+share/horde/imp/po/README
+share/horde/imp/po/bg_BG.po
+share/horde/imp/po/ca_ES.po
+share/horde/imp/po/cs_CZ.po
+share/horde/imp/po/da_DK.po
+share/horde/imp/po/de_DE.po
+share/horde/imp/po/el_GR.po
+share/horde/imp/po/es_ES.po
+share/horde/imp/po/et_EE.po
+share/horde/imp/po/extract.pl
+share/horde/imp/po/fi_FI.po
+share/horde/imp/po/fr_FR.po
+share/horde/imp/po/hu_HU.po
+share/horde/imp/po/imp.pot
+share/horde/imp/po/it_IT.po
+share/horde/imp/po/ja_JP.po
+share/horde/imp/po/ko_KR.po
+share/horde/imp/po/lt_LT.po
+share/horde/imp/po/lv_LV.po
+share/horde/imp/po/nb_NO.po
+share/horde/imp/po/nl_NL.po
+share/horde/imp/po/nn_NO.po
+share/horde/imp/po/pl_PL.po
+share/horde/imp/po/pt_BR.po
+share/horde/imp/po/pt_PT.po
+share/horde/imp/po/ro_RO.po
+share/horde/imp/po/ru_RU.KOI8-R.po
+share/horde/imp/po/ru_RU.po
+share/horde/imp/po/shtool
+share/horde/imp/po/sk_SK.po
+share/horde/imp/po/sl_SI.po
+share/horde/imp/po/sr_YU.po
+share/horde/imp/po/sv_SE.po
+share/horde/imp/po/uk_UA.po
+share/horde/imp/po/xgettext.sh
+share/horde/imp/po/zh_CN.po
+share/horde/imp/po/zh_TW.po
 share/horde/imp/prefs.php
 share/horde/imp/redirect.php
+share/horde/imp/scripts/Imp.reg
+share/horde/imp/scripts/custom_login.php
+share/horde/imp/scripts/imp-cleanup.cron
+share/horde/imp/scripts/imp2horde.pl
+share/horde/imp/scripts/imp2turba.pl
+share/horde/imp/scripts/singlescript.php
 share/horde/imp/search.php
 share/horde/imp/spelling.php
 share/horde/imp/status.php
+share/horde/imp/templates/common-footer.inc
+share/horde/imp/templates/common-header.inc
+share/horde/imp/templates/compose/bounce.inc
+share/horde/imp/templates/compose/compose.inc
+share/horde/imp/templates/compose/javascript.inc
+share/horde/imp/templates/compose/spelling.inc
+share/horde/imp/templates/contacts/contacts.inc
+share/horde/imp/templates/contacts/javascript.inc
+share/horde/imp/templates/filters/javascript.inc
+share/horde/imp/templates/filters/list.inc
+share/horde/imp/templates/filters/manage.inc
+share/horde/imp/templates/folders/actions.inc
+share/horde/imp/templates/folders/alert.inc
+share/horde/imp/templates/folders/confirm.inc
+share/horde/imp/templates/folders/foot.inc
+share/horde/imp/templates/folders/head.inc
+share/horde/imp/templates/folders/javascript.inc
+share/horde/imp/templates/folders/row.inc
+share/horde/imp/templates/identities/javascript.inc
+share/horde/imp/templates/identities/manage.inc
+share/horde/imp/templates/index/css.inc
+share/horde/imp/templates/index/notconfigured.inc
+share/horde/imp/templates/javascript/open_compose_win.js
+share/horde/imp/templates/javascript/open_print_win.js
+share/horde/imp/templates/login/login.inc
+share/horde/imp/templates/mailbox/actions.inc
+share/horde/imp/templates/mailbox/alert.inc
+share/horde/imp/templates/mailbox/empty_mailbox.inc
+share/horde/imp/templates/mailbox/footer.inc
+share/horde/imp/templates/mailbox/header.inc
+share/horde/imp/templates/mailbox/javascript.inc
+share/horde/imp/templates/mailbox/legend.inc
+share/horde/imp/templates/mailbox/message_footers.inc
+share/horde/imp/templates/mailbox/message_headers.inc
+share/horde/imp/templates/mailbox/message_summaries.inc
+share/horde/imp/templates/mailbox/navbar.inc
+share/horde/imp/templates/mailbox/searchfolder.inc
+share/horde/imp/templates/menu/menu.inc
+share/horde/imp/templates/message/headers.inc
+share/horde/imp/templates/message/javascript.inc
+share/horde/imp/templates/message/message.inc
+share/horde/imp/templates/message/navbar.inc
+share/horde/imp/templates/message/navbar_aux_bottom.inc
+share/horde/imp/templates/message/navbar_aux_top.inc
+share/horde/imp/templates/message/print.inc
+share/horde/imp/templates/prefs/folderselect.inc
+share/horde/imp/templates/prefs/identityselect.inc
+share/horde/imp/templates/prefs/initialpageselect.inc
+share/horde/imp/templates/prefs/sourceselect.inc
+share/horde/imp/templates/prefs/trashselect.inc
+share/horde/imp/templates/search/javascript.inc
+share/horde/imp/templates/search/main.inc
+share/horde/imp/test.php
 share/horde/imp/view.php
 
-@dirrm share/doc/imp
-@dirrm share/examples/imp
-@dirrm share/horde/imp/templates/index
 @dirrm share/horde/imp/templates/search
 @dirrm share/horde/imp/templates/prefs
-@dirrm share/horde/imp/templates/filters
-@dirrm share/horde/imp/templates/folders
-@dirrm share/horde/imp/templates/identities
 @dirrm share/horde/imp/templates/message
-@dirrm share/horde/imp/templates/compose
-@dirrm share/horde/imp/templates/javascript
-@dirrm share/horde/imp/templates/login
+@dirrm share/horde/imp/templates/menu
 @dirrm share/horde/imp/templates/mailbox
+@dirrm share/horde/imp/templates/login
+@dirrm share/horde/imp/templates/javascript
+@dirrm share/horde/imp/templates/index
+@dirrm share/horde/imp/templates/identities
+@dirrm share/horde/imp/templates/folders
+@dirrm share/horde/imp/templates/filters
+@dirrm share/horde/imp/templates/contacts
+@dirrm share/horde/imp/templates/compose
 @dirrm share/horde/imp/templates
 @dirrm share/horde/imp/scripts
 @dirrm share/horde/imp/po
+@dirrm share/horde/imp/locale/zh_TW/LC_MESSAGES
+@dirrm share/horde/imp/locale/zh_TW
+@dirrm share/horde/imp/locale/zh_CN/LC_MESSAGES
+@dirrm share/horde/imp/locale/zh_CN
+@dirrm share/horde/imp/locale/uk_UA/LC_MESSAGES
+@dirrm share/horde/imp/locale/uk_UA
+@dirrm share/horde/imp/locale/sv_SE/LC_MESSAGES
+@dirrm share/horde/imp/locale/sv_SE
+@dirrm share/horde/imp/locale/sr_YU/LC_MESSAGES
+@dirrm share/horde/imp/locale/sr_YU
+@dirrm share/horde/imp/locale/sl_SI/LC_MESSAGES
+@dirrm share/horde/imp/locale/sl_SI
+@dirrm share/horde/imp/locale/sk_SK/LC_MESSAGES
+@dirrm share/horde/imp/locale/sk_SK
+@dirrm share/horde/imp/locale/ru_RU/LC_MESSAGES
+@dirrm share/horde/imp/locale/ru_RU.KOI8-R/LC_MESSAGES
+@dirrm share/horde/imp/locale/ru_RU.KOI8-R
+@dirrm share/horde/imp/locale/ru_RU
+@dirrm share/horde/imp/locale/ro_RO/LC_MESSAGES
+@dirrm share/horde/imp/locale/ro_RO
+@dirrm share/horde/imp/locale/pt_PT/LC_MESSAGES
+@dirrm share/horde/imp/locale/pt_PT
+@dirrm share/horde/imp/locale/pt_BR/LC_MESSAGES
+@dirrm share/horde/imp/locale/pt_BR
+@dirrm share/horde/imp/locale/pl_PL/LC_MESSAGES
+@dirrm share/horde/imp/locale/pl_PL
+@dirrm share/horde/imp/locale/nn_NO/LC_MESSAGES
+@dirrm share/horde/imp/locale/nn_NO
 @dirrm share/horde/imp/locale/nl_NL/LC_MESSAGES
 @dirrm share/horde/imp/locale/nl_NL
-@dirrm share/horde/imp/locale/de_DE/LC_MESSAGES
-@dirrm share/horde/imp/locale/de_DE
-@dirrm share/horde/imp/locale/el_GR/LC_MESSAGES
-@dirrm share/horde/imp/locale/el_GR
-@dirrm share/horde/imp/locale/en_US
-@dirrm share/horde/imp/locale/es_ES/LC_MESSAGES
-@dirrm share/horde/imp/locale/es_ES
-@dirrm share/horde/imp/locale/fi_FI/LC_MESSAGES
-@dirrm share/horde/imp/locale/fi_FI
-@dirrm share/horde/imp/locale/fr_FR/LC_MESSAGES
-@dirrm share/horde/imp/locale/fr_FR
-@dirrm share/horde/imp/locale/it_IT/LC_MESSAGES
-@dirrm share/horde/imp/locale/it_IT
+@dirrm share/horde/imp/locale/nb_NO/LC_MESSAGES
+@dirrm share/horde/imp/locale/nb_NO
+@dirrm share/horde/imp/locale/lv_LV/LC_MESSAGES
+@dirrm share/horde/imp/locale/lv_LV
+@dirrm share/horde/imp/locale/lt_LT/LC_MESSAGES
+@dirrm share/horde/imp/locale/lt_LT
 @dirrm share/horde/imp/locale/ko_KR/LC_MESSAGES
 @dirrm share/horde/imp/locale/ko_KR
+@dirrm share/horde/imp/locale/ja_JP/LC_MESSAGES
+@dirrm share/horde/imp/locale/ja_JP
+@dirrm share/horde/imp/locale/it_IT/LC_MESSAGES
+@dirrm share/horde/imp/locale/it_IT
+@dirrm share/horde/imp/locale/hu_HU/LC_MESSAGES
+@dirrm share/horde/imp/locale/hu_HU
+@dirrm share/horde/imp/locale/fr_FR/LC_MESSAGES
+@dirrm share/horde/imp/locale/fr_FR
+@dirrm share/horde/imp/locale/fi_FI/LC_MESSAGES
+@dirrm share/horde/imp/locale/fi_FI
+@dirrm share/horde/imp/locale/et_EE/LC_MESSAGES
+@dirrm share/horde/imp/locale/et_EE
+@dirrm share/horde/imp/locale/es_ES/LC_MESSAGES
+@dirrm share/horde/imp/locale/es_ES
+@dirrm share/horde/imp/locale/en_US
+@dirrm share/horde/imp/locale/en_GB
+@dirrm share/horde/imp/locale/el_GR/LC_MESSAGES
+@dirrm share/horde/imp/locale/el_GR
+@dirrm share/horde/imp/locale/de_DE/LC_MESSAGES
+@dirrm share/horde/imp/locale/de_DE
+@dirrm share/horde/imp/locale/da_DK/LC_MESSAGES
+@dirrm share/horde/imp/locale/da_DK
 @dirrm share/horde/imp/locale/cs_CZ/LC_MESSAGES
 @dirrm share/horde/imp/locale/cs_CZ
-@dirrm share/horde/imp/locale/no_BOK/LC_MESSAGES
-@dirrm share/horde/imp/locale/no_BOK
-@dirrm share/horde/imp/locale/pl_PL/LC_MESSAGES
-@dirrm share/horde/imp/locale/pl_PL
-@dirrm share/horde/imp/locale/pt_BR/LC_MESSAGES
-@dirrm share/horde/imp/locale/pt_BR
-@dirrm share/horde/imp/locale/ru_win/LC_MESSAGES
-@dirrm share/horde/imp/locale/ru_win
-@dirrm share/horde/imp/locale/sv_SE/LC_MESSAGES
-@dirrm share/horde/imp/locale/sv_SE
-@dirrm share/horde/imp/locale/uk/LC_MESSAGES
-@dirrm share/horde/imp/locale/uk
-@dirrm share/horde/imp/locale/zh_CN/LC_MESSAGES
-@dirrm share/horde/imp/locale/zh_CN
-@dirrm share/horde/imp/locale/zh_TW/LC_MESSAGES
-@dirrm share/horde/imp/locale/zh_TW
+@dirrm share/horde/imp/locale/ca_ES/LC_MESSAGES
+@dirrm share/horde/imp/locale/ca_ES
+@dirrm share/horde/imp/locale/bg_BG/LC_MESSAGES
+@dirrm share/horde/imp/locale/bg_BG
 @dirrm share/horde/imp/locale
+@dirrm share/horde/imp/lib/Maintenance/Task
+@dirrm share/horde/imp/lib/Maintenance
 @dirrm share/horde/imp/lib/MIME/Viewer
 @dirrm share/horde/imp/lib/MIME
 @dirrm share/horde/imp/lib/Identity
-@dirrm share/horde/imp/lib/Maintenance
 @dirrm share/horde/imp/lib
-@dirrm share/horde/imp/graphics/folders
 @dirrm share/horde/imp/graphics/mime
+@dirrm share/horde/imp/graphics/folders
 @dirrm share/horde/imp/graphics
 @dirrm share/horde/imp/config
 @dirrm share/horde/imp
+@dirrm share/examples/imp
+@dirrm share/doc/imp
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
index 59258835df4..88505b4f8d2 100644
--- a/mail/imp/distinfo
+++ b/mail/imp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/02/01 22:44:28 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2003/03/17 18:05:28 bouyer Exp $
 
-SHA1 (imp-3.0.tar.gz) = b0b7619c4753fb7e09ffb4c4b04e9eb4e7c81e0c
-Size (imp-3.0.tar.gz) = 708355 bytes
+SHA1 (imp-3.2.1.tar.gz) = 269ac3a7414e6122bcc5cade1f519f4df7c6b5a9
+Size (imp-3.2.1.tar.gz) = 1312731 bytes