Upgrade to 3.1 RC2.

PR:	ports/36906
Submitted by:	maintainer

4 files changed, 62 insertions, 58 deletions

diff --git a/mail/imp3/Makefile b/mail/imp3/Makefile
index d4df326559fa..8c3f93ccdf35 100644
--- a/mail/imp3/Makefile
+++ b/mail/imp3/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	3.0
-PORTREVISION=	2
+PORTVERSION=	3.1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-RC2
 
 MAINTAINER=	thierry@pompo.net
 
@@ -118,12 +118,13 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
 .endif
 .endif
 
-IS_INTERACTIVE=	'need to build mod_php4 with mcrypt option set.'
+IS_INTERACTIVE=	'need to build mod_php4 with mcrypt, cclient with SSL.'
 NO_BUILD=	yes
 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
+SUB_DIRS=	config graphics lib locale scripts templates po
 
 LHORDEDIR?=	www/horde
 LIMPDIR?=	${LHORDEDIR}/imp
@@ -227,9 +228,9 @@ pre-install:
 
 do-install:
 	@${MKDIR}  ${IMPDIR}
-	@${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${IMPDIR}
-	@${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${IMPDIR}
-	@${CP} -Rp ${WRKSRC}/po ${IMPDIR}
+.for REP in ${SUB_DIRS}
+	@${CP} -Rp ${WRKSRC}/${REP} ${IMPDIR}
+.endfor
 	@${CP} -p  ${WRKSRC}/*.php ${IMPDIR}
 .for FILE in ${CONFFILE}
 	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
diff --git a/mail/imp3/distinfo b/mail/imp3/distinfo
index 7745bb27ad36..fe3946b9b821 100644
--- a/mail/imp3/distinfo
+++ b/mail/imp3/distinfo
@@ -1 +1 @@
-MD5 (imp-3.0.tar.gz) = d941d7b11231c771fb801ae8010e7271
+MD5 (imp-3.1-RC2.tar.gz) = 9ed5ba6a0cf7e8959201bc2cb0e0c2d1
diff --git a/mail/imp3/files/patch-aa b/mail/imp3/files/patch-aa
deleted file mode 100644
index 132794233fcc..000000000000
--- a/mail/imp3/files/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
---- config/mime_drivers.php.dist.orig	Mon Dec 24 04:51:49 2001
-+++ config/mime_drivers.php.dist	Sun Feb 17 11:47:19 2002
-@@ -61,4 +61,28 @@
- $mime_drivers['imp']['html']['handles'] = array(
-         'text/html', 'text/richtext' );
- 
-+/**
-+ * Misc utilities
-+ */
-+
-+/**
-+ ** PGP/GnuPG Configuration
-+ **/
-+
-+// Should we attempt to verify pgp/gpg signatures?
-+//$conf['pgp']['enabled'] = false;
-+
-+// If we are using gpg support, where is the gpg binary?
-+//$conf['utils']['gpg'] = '%%LOCALBASE%%/bin/gpg';
-+
-+// What kind of binary are we using? Valid values are 'gpg', 'pgp2',
-+// and 'pgp5'.
-+//$conf['pgp']['type'] = 'gpg';
-+
-+// Where should we look for keyrings?
-+//$conf['pgp']['conf_dir'] = '%%GNUPG_CNFDIR%%';
-+
-+// What keyserver should we use?
-+//$conf['pgp']['keyserver'] = 'wwwkeys.pgp.net';
-+
- ?>
diff --git a/mail/imp3/pkg-plist b/mail/imp3/pkg-plist
index 2a5334368c84..af6c88456640 100644
--- a/mail/imp3/pkg-plist
+++ b/mail/imp3/pkg-plist
@@ -1,6 +1,6 @@
 %%PORTDOCS%%share/doc/imp/CHANGES
 %%PORTDOCS%%share/doc/imp/COPYING
-%%PORTDOCS%%share/doc/imp/CREDITS 
+%%PORTDOCS%%share/doc/imp/CREDITS
 %%PORTDOCS%%share/doc/imp/INSTALL
 %%PORTDOCS%%share/doc/imp/README
 %%IMPDIR%%/compose.php
@@ -17,7 +17,6 @@
 %%IMPDIR%%/config/menu.php.dist
 %%IMPDIR%%/config/mime_drivers.php
 %%IMPDIR%%/config/mime_drivers.php.dist
-%%IMPDIR%%/config/mime_drivers.php.dist.orig
 %%IMPDIR%%/config/motd.php
 %%IMPDIR%%/config/motd.php.dist
 %%IMPDIR%%/config/prefs.php
@@ -28,6 +27,7 @@
 %%IMPDIR%%/config/servers.php.dist.orig
 %%IMPDIR%%/config/trailer.txt
 %%IMPDIR%%/config/trailer.txt.dist
+%%IMPDIR%%/contacts.php
 %%IMPDIR%%/filters.php
 %%IMPDIR%%/folders.php
 %%IMPDIR%%/graphics/addressbook-blue.gif
@@ -79,11 +79,11 @@
 %%IMPDIR%%/graphics/search.gif
 %%IMPDIR%%/graphics/signed.gif
 %%IMPDIR%%/graphics/spellcheck.gif
+%%IMPDIR%%/graphics/thread.gif
 %%IMPDIR%%/graphics/unseen.gif
 %%IMPDIR%%/graphics/up.gif
 %%IMPDIR%%/identities.php
 %%IMPDIR%%/index.php
-%%IMPDIR%%/intro.php
 %%IMPDIR%%/lib/.htaccess
 %%IMPDIR%%/lib/Folder.php
 %%IMPDIR%%/lib/IMP.php
@@ -98,14 +98,19 @@
 %%IMPDIR%%/lib/Tree.php
 %%IMPDIR%%/lib/api.php
 %%IMPDIR%%/lib/base.php
+%%IMPDIR%%/lib/constants.php
 %%IMPDIR%%/lib/version.php
 %%IMPDIR%%/locale/.htaccess
 %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/cs_CZ/help.xml
+%%IMPDIR%%/locale/da_DK/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/da_DK/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/el_GR/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
@@ -115,22 +120,29 @@
 %%IMPDIR%%/locale/fr_FR/help.xml
 %%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/it_IT/help.xml
+%%IMPDIR%%/locale/ja_JP/LC_MESSAGES/imp.mo
 %%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/nb_NO/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/nb_NO/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/pt_PT/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/pt_PT/help.xml
+%%IMPDIR%%/locale/ru_RU/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/ru_RU/help.xml
+%%IMPDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/ru_RU.KOI8-R/help.xml
+%%IMPDIR%%/locale/sk_SK/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/sk_SK/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/uk_UA/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/uk_UA/help.xml
 %%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/zh_CN/help.xml
 %%IMPDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo
@@ -143,22 +155,28 @@
 %%IMPDIR%%/po/Makefile
 %%IMPDIR%%/po/README
 %%IMPDIR%%/po/cs_CZ.po
+%%IMPDIR%%/po/da_DK.po
 %%IMPDIR%%/po/de_DE.po
 %%IMPDIR%%/po/el_GR.po
 %%IMPDIR%%/po/es_ES.po
+%%IMPDIR%%/po/et_EE.po
 %%IMPDIR%%/po/extract.pl
 %%IMPDIR%%/po/fi_FI.po
 %%IMPDIR%%/po/fr_FR.po
 %%IMPDIR%%/po/it_IT.po
+%%IMPDIR%%/po/ja_JP.po
 %%IMPDIR%%/po/ko_KR.po
 %%IMPDIR%%/po/nl_NL.po
-%%IMPDIR%%/po/no_BOK.po
+%%IMPDIR%%/po/nb_NO.po
 %%IMPDIR%%/po/pl_PL.po
 %%IMPDIR%%/po/pt_BR.po
-%%IMPDIR%%/po/ru_win.po
+%%IMPDIR%%/po/pt_PT.po
+%%IMPDIR%%/po/ru_RU.po
+%%IMPDIR%%/po/ru_RU.KOI8-R.po
 %%IMPDIR%%/po/shtool
+%%IMPDIR%%/po/sk_SK.po
 %%IMPDIR%%/po/sv_SE.po
-%%IMPDIR%%/po/uk.po
+%%IMPDIR%%/po/uk_UA.po
 %%IMPDIR%%/po/xgettext.sh
 %%IMPDIR%%/po/zh_CN.po
 %%IMPDIR%%/po/zh_TW.po
@@ -174,6 +192,8 @@
 %%IMPDIR%%/spelling.php
 %%IMPDIR%%/status.php
 %%IMPDIR%%/templates/.htaccess
+%%IMPDIR%%/templates/contacts/contacts.inc
+%%IMPDIR%%/templates/contacts/javascript.inc
 %%IMPDIR%%/templates/common-footer.inc
 %%IMPDIR%%/templates/common-header.inc
 %%IMPDIR%%/templates/compose/bounce.inc
@@ -194,7 +214,6 @@
 %%IMPDIR%%/templates/identities/manage.inc
 %%IMPDIR%%/templates/index/css.inc
 %%IMPDIR%%/templates/index/notconfigured.inc
-%%IMPDIR%%/templates/intro/main.inc
 %%IMPDIR%%/templates/javascript/open_compose_win.js
 %%IMPDIR%%/templates/javascript/open_print_win.js
 %%IMPDIR%%/templates/login/login.inc
@@ -217,12 +236,15 @@
 %%IMPDIR%%/templates/message/navbar.inc
 %%IMPDIR%%/templates/message/navbar_aux_bottom.inc
 %%IMPDIR%%/templates/message/navbar_aux_top.inc
+%%IMPDIR%%/templates/message/print.inc
 %%IMPDIR%%/templates/prefs/folderselect.inc
 %%IMPDIR%%/templates/prefs/identityselect.inc
+%%IMPDIR%%/templates/prefs/initialpageselect.inc
 %%IMPDIR%%/templates/prefs/sourceselect.inc
 %%IMPDIR%%/templates/prefs/trashselect.inc
 %%IMPDIR%%/templates/search/javascript.inc
 %%IMPDIR%%/templates/search/main.inc
+%%IMPDIR%%/test.php
 %%IMPDIR%%/view.php
 %%PORTDOCS%%@dirrm share/doc/imp
 etc/horde/httpd.conf.imp
@@ -238,6 +260,8 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/lib
 @dirrm %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/cs_CZ
+@dirrm %%IMPDIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/da_DK
 @dirrm %%IMPDIR%%/locale/de_DE/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/de_DE
 @dirrm %%IMPDIR%%/locale/el_GR/LC_MESSAGES
@@ -245,28 +269,38 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/locale/en_US
 @dirrm %%IMPDIR%%/locale/es_ES/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/es_ES
+@dirrm %%IMPDIR%%/locale/et_EE/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/et_EE
 @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
 @dirrm %%IMPDIR%%/locale/it_IT
+@dirrm %%IMPDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/ja_JP
 @dirrm %%IMPDIR%%/locale/ko_KR/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/ko_KR
 @dirrm %%IMPDIR%%/locale/nl_NL/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/nl_NL
-@dirrm %%IMPDIR%%/locale/no_BOK/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/no_BOK
+@dirrm %%IMPDIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/nb_NO
 @dirrm %%IMPDIR%%/locale/pl_PL/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/pl_PL
 @dirrm %%IMPDIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/pt_BR
-@dirrm %%IMPDIR%%/locale/ru_win/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ru_win
+@dirrm %%IMPDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/pt_PT
+@dirrm %%IMPDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/ru_RU
+@dirrm %%IMPDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/ru_RU.KOI8-R
+@dirrm %%IMPDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/sk_SK
 @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/uk_UA/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/uk_UA
 @dirrm %%IMPDIR%%/locale/zh_CN/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/zh_CN
 @dirrm %%IMPDIR%%/locale/zh_TW/LC_MESSAGES
@@ -274,12 +308,12 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/locale
 @dirrm %%IMPDIR%%/po
 @dirrm %%IMPDIR%%/scripts
+@dirrm %%IMPDIR%%/templates/contacts
 @dirrm %%IMPDIR%%/templates/compose
 @dirrm %%IMPDIR%%/templates/filters
 @dirrm %%IMPDIR%%/templates/folders
 @dirrm %%IMPDIR%%/templates/identities
 @dirrm %%IMPDIR%%/templates/index
-@dirrm %%IMPDIR%%/templates/intro
 @dirrm %%IMPDIR%%/templates/javascript
 @dirrm %%IMPDIR%%/templates/login
 @dirrm %%IMPDIR%%/templates/mailbox