Update to RC3.

PR:		38263
Submitted by:	maintainer

4 files changed, 17 insertions, 8 deletions

diff --git a/mail/imp3/Makefile b/mail/imp3/Makefile
index 8c3f93ccdf35..797dbaa8c932 100644
--- a/mail/imp3/Makefile
+++ b/mail/imp3/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	imp
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-RC2
+DISTNAME=	${PORTNAME}-${PORTVERSION}-RC3
 
 MAINTAINER=	thierry@pompo.net
 
@@ -242,7 +243,7 @@ do-install:
 	@${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:" \
+	@${PERL} -pi -e "s:%%PROTOCOL%%:imap/notls:;s:%%IMAPPORT%%:143:" \
 		${CONFDIR}/servers.php
 .else
 	@${PERL} -pi -e "s:%%IMAPPORT%%:993:" ${CONFDIR}/servers.php
diff --git a/mail/imp3/distinfo b/mail/imp3/distinfo
index fe3946b9b821..f7fd2d6c9c46 100644
--- a/mail/imp3/distinfo
+++ b/mail/imp3/distinfo
@@ -1 +1 @@
-MD5 (imp-3.1-RC2.tar.gz) = 9ed5ba6a0cf7e8959201bc2cb0e0c2d1
+MD5 (imp-3.1-RC3.tar.gz) = cc068223e37dfd4b49f5f17b21639a5e
diff --git a/mail/imp3/files/patch-ab b/mail/imp3/files/patch-ab
index 7c274c3fb977..d59dda213dca 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	Tue Dec 18 23:08:00 2001
+--- config/servers.php.dist.orig	Sun Apr 14 14:34:20 2002
++++ config/servers.php.dist	Sat May 18 23:18:53 2002
 @@ -31,7 +31,7 @@
   * is on.
   *
@@ -9,12 +9,12 @@
   * under "INBOX." (not the trailing dot. IMPORTANT: Use this only if
   * you want to restrict users to this subfolder. If you set this to
   * 'INBOX.' with Cyrus or Courier-IMAPd, then users will not be able
-@@ -84,14 +84,17 @@
+@@ -83,14 +83,17 @@
  
  $servers['imap'] = array(
      'name' => 'IMAP Server',
 -    'server' => 'imap.example.com',
--    'protocol' => 'imap',
+-    'protocol' => 'imap/notls',
 -    'port' => 143,
 -    'folders' => 'mail/',
 +//  'server' => 'imap.example.com',
diff --git a/mail/imp3/pkg-plist b/mail/imp3/pkg-plist
index af6c88456640..d30b6ac06997 100644
--- a/mail/imp3/pkg-plist
+++ b/mail/imp3/pkg-plist
@@ -42,6 +42,7 @@
 %%IMPDIR%%/graphics/down.gif
 %%IMPDIR%%/graphics/download.gif
 %%IMPDIR%%/graphics/draft.gif
+%%IMPDIR%%/graphics/empty_trash.gif
 %%IMPDIR%%/graphics/expand.gif
 %%IMPDIR%%/graphics/fetchmail.gif
 %%IMPDIR%%/graphics/filters.gif
@@ -93,6 +94,7 @@
 %%IMPDIR%%/lib/Maintenance/Task/rename_sentmail_monthly.php
 %%IMPDIR%%/lib/Maintenance/imp.php
 %%IMPDIR%%/lib/MIME/Viewer/html.php
+%%IMPDIR%%/lib/MIME/Viewer/enriched.php
 %%IMPDIR%%/lib/MIME/Viewer/text.php
 %%IMPDIR%%/lib/Message.php
 %%IMPDIR%%/lib/Tree.php
@@ -109,9 +111,10 @@
 %%IMPDIR%%/locale/de_DE/help.xml
 %%IMPDIR%%/locale/el_GR/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/el_GR/help.xml
+%%IMPDIR%%/locale/en_GB/help.xml
+%%IMPDIR%%/locale/en_US/help.xml
 %%IMPDIR%%/locale/et_EE/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/et_EE/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
@@ -139,6 +142,7 @@
 %%IMPDIR%%/locale/ru_RU.KOI8-R/help.xml
 %%IMPDIR%%/locale/sk_SK/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/sk_SK/help.xml
+%%IMPDIR%%/locale/sl_SI/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/sv_SE/help.xml
 %%IMPDIR%%/locale/uk_UA/LC_MESSAGES/imp.mo
@@ -175,6 +179,7 @@
 %%IMPDIR%%/po/ru_RU.KOI8-R.po
 %%IMPDIR%%/po/shtool
 %%IMPDIR%%/po/sk_SK.po
+%%IMPDIR%%/po/sl_SI.po
 %%IMPDIR%%/po/sv_SE.po
 %%IMPDIR%%/po/uk_UA.po
 %%IMPDIR%%/po/xgettext.sh
@@ -266,6 +271,7 @@ 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_GB
 @dirrm %%IMPDIR%%/locale/en_US
 @dirrm %%IMPDIR%%/locale/es_ES/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/es_ES
@@ -297,6 +303,8 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/locale/ru_RU.KOI8-R
 @dirrm %%IMPDIR%%/locale/sk_SK/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/sk_SK
+@dirrm %%IMPDIR%%/locale/sl_SI/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/sl_SI
 @dirrm %%IMPDIR%%/locale/sv_SE/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/sv_SE
 @dirrm %%IMPDIR%%/locale/uk_UA/LC_MESSAGES