6 files changed, 61 insertions, 124 deletions

diff --git a/mail/horde-mimp/Makefile b/mail/horde-mimp/Makefile
index 2782e4475fff..dcae6dc7d467 100644
--- a/mail/horde-mimp/Makefile
+++ b/mail/horde-mimp/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mimp
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.1
+PORTEPOCH=	1
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@FreeBSD.org
@@ -24,12 +24,11 @@ COMMENT=	Mobile webmail system
 #
 # - NOCRYPT	if crypto is restricted in your country;
 #
-# - WITHOUT_SSL	if you have not installed c-client WITH_SSL;
-#
 # - WITH_VALID_CERT	if you own a valid SSL certificate;
 #-----------------------------------------------------------------------
 
-RUN_DEPENDS+=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
+RUN_DEPENDS+=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL \
+		${LOCALBASE}/${LHORDEDIR}/imp/index.php:${PORTSDIR}/mail/horde-imp
 
 USE_PHP=	imap
 . if !defined(WITHOUT_LDAP)
@@ -39,7 +38,7 @@ USE_PHP+=	ldap
 USE_PHP+=	openssl
 .endif
 .if !defined(NOCRYPT)
-RUN_DEPENDS+=	${LOCALBASE}/bin/gpgv:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
 .endif
 
 USE_HORDE=	base
@@ -53,26 +52,9 @@ pre-configure:
 .else
 	@${REINPLACE_CMD} -e "s:%%GPG%%::" ${WRKSRC}/config/conf.xml
 .endif
-	@${REINPLACE_CMD} -e "s:MIMP_VERSION:MIMP_VERSION . ' / ${SERVOS}':" \
-		${WRKSRC}/lib/MIME/Headers.php
-	@${REINPLACE_CMD} -e "s:example.com:${HOSTNAME}:g"	\
-		${WRKSRC}/config/servers.php.dist
-.if defined(WITHOUT_SSL)
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/notls:;s:%%IMAPPORT%%:143:"
-\
-		${WRKSRC}/config/servers.php.dist
-.else
-	@${REINPLACE_CMD} -e "s:%%IMAPPORT%%:993:" ${WRKSRC}/config/servers.php.dist
-. if defined(WITH_VALID_CERT)
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl:" ${WRKSRC}/config/servers.php.dist
-. else
-	@${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:"	\
-		${WRKSRC}/config/servers.php.dist
-. endif
-.endif
 
 pre-install:
-.if !defined(BATCH) && !defined(WITHOUT_SSL)
+.if !defined(BATCH)
 	@if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure c-client with SSL support." ; \
diff --git a/mail/horde-mimp/distinfo b/mail/horde-mimp/distinfo
index e449aa52700c..c5095e73a637 100644
--- a/mail/horde-mimp/distinfo
+++ b/mail/horde-mimp/distinfo
@@ -1,3 +1,3 @@
-MD5 (mimp-h3-1.0.2.tar.gz) = a3d3bafdd1efceb698493b22d79b7867
-SHA256 (mimp-h3-1.0.2.tar.gz) = 4ae20bc562fa0dc8c98812d322e86f4b8a7ef51ae922878bfafbeab815f20b03
-SIZE (mimp-h3-1.0.2.tar.gz) = 766401
+MD5 (mimp-h3-1.1.tar.gz) = 65fb6a3d5292e504f4bd174807934395
+SHA256 (mimp-h3-1.1.tar.gz) = 148f75e94d81f7ffd521dbed1b66c6ac12d33e0c8ef92abf94e2f78d5c1900b4
+SIZE (mimp-h3-1.1.tar.gz) = 863968
diff --git a/mail/horde-mimp/files/patch-config-prefs.php.dist b/mail/horde-mimp/files/patch-config-prefs.php.dist
deleted file mode 100644
index 68730ef6fde4..000000000000
--- a/mail/horde-mimp/files/patch-config-prefs.php.dist
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/prefs.php.dist.orig	Fri Oct 29 19:04:12 2004
-+++ config/prefs.php.dist	Thu Nov 11 21:49:05 2004
-@@ -1071,7 +1071,7 @@
- // 'value' => "source_one\tsource_two"
- // refer to turba/config/sources.php for possible source values
- $_prefs['search_sources'] = array(
--    'value' => "",
-+    'value' => 'localsql',
-     'locked' => false,
-     'shared' => false,
-     'type' => 'implicit');
diff --git a/mail/horde-mimp/files/patch-config-servers.php.dist b/mail/horde-mimp/files/patch-config-servers.php.dist
deleted file mode 100644
index a3d81c362a7c..000000000000
--- a/mail/horde-mimp/files/patch-config-servers.php.dist
+++ /dev/null
@@ -1,19 +0,0 @@
---- config/servers.php.dist.orig	Wed Feb 22 08:16:36 2006
-+++ config/servers.php.dist	Mon Feb  5 13:14:52 2007
-@@ -159,11 +159,12 @@
- 
- $servers['imap'] = array(
-     'name' => 'IMAP Server',
--    'server' => 'imap.example.com',
--    'protocol' => 'imap/notls',
--    'port' => 143,
-+    'server' => 'localhost',
-+    'hordeauth' => false,
-+    'protocol' => '%%PROTOCOL%%',
-+    'port' => %%IMAPPORT%%,
-     'maildomain' => 'example.com',
--    'smtphost' => 'smtp.example.com',
-+    'smtphost' => 'localhost',
-     'smtpport' => 25,
-     'realm' => '',
-     'preferred' => '',
diff --git a/mail/horde-mimp/files/pkg-message.in b/mail/horde-mimp/files/pkg-message.in
index 20c7c869de8d..87315b3e7e70 100644
--- a/mail/horde-mimp/files/pkg-message.in
+++ b/mail/horde-mimp/files/pkg-message.in
@@ -5,16 +5,13 @@ configuration files.
 Horde must be configured and the tables created; if not, see
 `pkg_info -Dx horde-base'.
 
-Then, you might have to tune the configuration files located in
-%%HORCFG%%/, specially the file servers.php.
-
 Then, you must login to Horde as a Horde Administrator to finish the
 configuration. Please read %%DOCSDIR%%/INSTALL.
 
 To protect your configuration files, you have to restart your webserver.
 
 To secure your installation, it is at least recommended that you change
-the default database password used by horde and imp.
+the default database password used by horde and mimp.
 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/horde-mimp/pkg-plist b/mail/horde-mimp/pkg-plist
index 889c821f6849..d44a6e25a6ff 100644
--- a/mail/horde-mimp/pkg-plist
+++ b/mail/horde-mimp/pkg-plist
@@ -1,38 +1,21 @@
 %%HORDIR%%/compose.php
 %%HORDIR%%/config/.htaccess
 %%HORDIR%%/config/conf.xml
-%%HORDIR%%/config/filter.txt.dist
-%%HORDIR%%/config/header.php.dist
 %%HORDIR%%/config/menu.php.dist
 %%HORDIR%%/config/mime_drivers.php.dist
-%%HORDIR%%/config/motd.php.dist
 %%HORDIR%%/config/prefs.php.dist
-%%HORDIR%%/config/servers.php.dist
-%%HORDIR%%/config/trailer.txt.dist
 %%HORDIR%%/folders.php
 %%HORDIR%%/index.php
-%%HORDIR%%/lib/Auth/mimp.php
-%%HORDIR%%/lib/Compose.php
-%%HORDIR%%/lib/Folder.php
-%%HORDIR%%/lib/IMAP/Client.php
-%%HORDIR%%/lib/IMAP/Sort.php
-%%HORDIR%%/lib/IMAP/Tree.php
-%%HORDIR%%/lib/IMAP.php
-%%HORDIR%%/lib/Identity/mimp.php
+%%HORDIR%%/lib/.htaccess
 %%HORDIR%%/lib/MIME/Contents.php
-%%HORDIR%%/lib/MIME/Headers.php
 %%HORDIR%%/lib/MIME/Viewer/alternative.php
 %%HORDIR%%/lib/MIME/Viewer/html.php
 %%HORDIR%%/lib/MIME/Viewer/multipart.php
 %%HORDIR%%/lib/MIME/Viewer/plain.php
 %%HORDIR%%/lib/MIME/Viewer/related.php
 %%HORDIR%%/lib/MIMP.php
-%%HORDIR%%/lib/Mailbox.php
-%%HORDIR%%/lib/Message.php
-%%HORDIR%%/lib/Session.php
 %%HORDIR%%/lib/api.php
 %%HORDIR%%/lib/base.php
-%%HORDIR%%/lib/prefs.php
 %%HORDIR%%/lib/version.php
 %%HORDIR%%/locale/ca_ES/LC_MESSAGES/mimp.mo
 %%HORDIR%%/locale/de_DE/LC_MESSAGES/mimp.mo
@@ -41,13 +24,15 @@
 %%HORDIR%%/locale/fr_FR/LC_MESSAGES/mimp.mo
 %%HORDIR%%/locale/hu_HU/LC_MESSAGES/mimp.mo
 %%HORDIR%%/locale/it_IT/LC_MESSAGES/mimp.mo
+%%HORDIR%%/locale/ja_JP/LC_MESSAGES/mimp.mo
 %%HORDIR%%/locale/lt_LT/LC_MESSAGES/mimp.mo
 %%HORDIR%%/locale/nl_NL/LC_MESSAGES/mimp.mo
 %%HORDIR%%/locale/pl_PL/LC_MESSAGES/mimp.mo
 %%HORDIR%%/locale/pt_PT/LC_MESSAGES/mimp.mo
 %%HORDIR%%/locale/ro_RO/LC_MESSAGES/mimp.mo
+%%HORDIR%%/locale/ru_RU/LC_MESSAGES/mimp.mo
+%%HORDIR%%/locale/sk_SK/LC_MESSAGES/mimp.mo
 %%HORDIR%%/locale/zh_CN/LC_MESSAGES/mimp.mo
-%%HORDIR%%/login.php
 %%HORDIR%%/mailbox.php
 %%HORDIR%%/message.php
 %%HORDIR%%/po/README
@@ -58,68 +43,71 @@
 %%HORDIR%%/po/fr_FR.po
 %%HORDIR%%/po/hu_HU.po
 %%HORDIR%%/po/it_IT.po
+%%HORDIR%%/po/ja_JP.po
 %%HORDIR%%/po/lt_LT.po
 %%HORDIR%%/po/mimp.pot
 %%HORDIR%%/po/nl_NL.po
 %%HORDIR%%/po/pl_PL.po
 %%HORDIR%%/po/pt_PT.po
 %%HORDIR%%/po/ro_RO.po
+%%HORDIR%%/po/ru_RU.po
+%%HORDIR%%/po/sk_SK.po
 %%HORDIR%%/po/zh_CN.po
-%%HORDIR%%/redirect.php
+%%HORDIR%%/templates/.htaccess
 %%HORDIR%%/templates/common-header.inc
 %%HORDIR%%/templates/compose/compose.inc
 %%HORDIR%%/templates/compose/redirect.inc
+%%HORDIR%%/templates/folders/folders.inc
 %%HORDIR%%/templates/index/notconfigured.inc
-%%HORDIR%%/templates/login/login.inc
 %%HORDIR%%/templates/mailbox/mailbox.inc
-%%HORDIR%%/templates/prefs/sentmailselect.inc
-%%HORDIR%%/test.php
 %%HORDIR%%/themes/graphics/favicon.ico
 %%HORDIR%%/themes/graphics/horde-power2.png
 %%HORDIR%%/themes/graphics/horde-power2.wbmp
 %%HORDIR%%/themes/graphics/mimp.png
-@dirrmtry %%HORDIR%%/config
-@dirrm %%HORDIR%%/lib/Auth
-@dirrm %%HORDIR%%/lib/IMAP
-@dirrm %%HORDIR%%/lib/Identity
-@dirrm %%HORDIR%%/lib/MIME/Viewer
-@dirrm %%HORDIR%%/lib/MIME
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ca_ES
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hu_HU
-@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/it_IT
-@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lt_LT
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_PT
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
+@dirrm %%HORDIR%%/themes/graphics
+@dirrm %%HORDIR%%/themes
+@dirrm %%HORDIR%%/templates/mailbox
+@dirrm %%HORDIR%%/templates/index
+@dirrm %%HORDIR%%/templates/folders
+@dirrm %%HORDIR%%/templates/compose
+@dirrm %%HORDIR%%/templates
+@dirrm %%HORDIR%%/po
 @dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
 @dirrm %%HORDIR%%/locale/zh_CN
+@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sk_SK
+@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ru_RU
+@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ro_RO
+@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_PT
+@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pl_PL
+@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nl_NL
+@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lt_LT
+@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ja_JP
+@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/it_IT
+@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hu_HU
+@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fr_FR
+@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fi_FI
+@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/es_ES
+@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/de_DE
+@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ca_ES
 @dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/templates/compose
-@dirrm %%HORDIR%%/templates/index
-@dirrm %%HORDIR%%/templates/login
-@dirrm %%HORDIR%%/templates/mailbox
-@dirrm %%HORDIR%%/templates/prefs
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes
+@dirrm %%HORDIR%%/lib/MIME/Viewer
+@dirrm %%HORDIR%%/lib/MIME
+@dirrm %%HORDIR%%/lib
+@dirrmtry %%HORDIR%%/config
 @dirrmtry %%HORDIR%%
 @dirrmtry %%HORBAS%%