diff options
author | thierry <thierry@FreeBSD.org> | 2006-03-16 04:16:34 +0800 |
---|---|---|
committer | thierry <thierry@FreeBSD.org> | 2006-03-16 04:16:34 +0800 |
commit | 9673271aa764e5a3430616f295e7bbb58c774fce (patch) | |
tree | 0a06fc9e05ad1bdb34d05bf78efd56d295d35c46 /mail/horde4-imp | |
parent | 04b089f8e5d3011766e4ff34b709300628f2cd85 (diff) | |
download | freebsd-ports-gnome-9673271aa764e5a3430616f295e7bbb58c774fce.tar.gz freebsd-ports-gnome-9673271aa764e5a3430616f295e7bbb58c774fce.tar.zst freebsd-ports-gnome-9673271aa764e5a3430616f295e7bbb58c774fce.zip |
Upgrade to 4.1.
Changelog at
<http://cvs.horde.org/diff.php/imp/docs/CHANGES?r1=1.699.2.115&r2=1.699.2.163&ty=h>
Diffstat (limited to 'mail/horde4-imp')
-rw-r--r-- | mail/horde4-imp/Makefile | 5 | ||||
-rw-r--r-- | mail/horde4-imp/distinfo | 6 | ||||
-rw-r--r-- | mail/horde4-imp/files/patch-ab | 25 | ||||
-rw-r--r-- | mail/horde4-imp/files/patch-config::conf.xml | 18 | ||||
-rw-r--r-- | mail/horde4-imp/files/pkg-message.in | 6 | ||||
-rw-r--r-- | mail/horde4-imp/pkg-plist | 51 |
6 files changed, 59 insertions, 52 deletions
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile index 2420d84e6d10..d35b46ee5c66 100644 --- a/mail/horde4-imp/Makefile +++ b/mail/horde4-imp/Makefile @@ -6,8 +6,7 @@ # PORTNAME= imp -PORTVERSION= 4.0.4 -PORTREVISION= 1 +PORTVERSION= 4.1 CATEGORIES= mail www MASTER_SITES= ftp://ftp.horde.org/pub/imp/ \ ftp://ftp.planetmirror.com/pub/horde/imp/ \ @@ -110,7 +109,7 @@ REINPLACE_ARGS= -i.beforeIMP DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \ docs/RELEASE_NOTES docs/TODO docs/UPGRADING -CONFFILE= filter.txt header.txt menu.php mime_drivers.php motd.php \ +CONFFILE= filter.txt header.php menu.php mime_drivers.php motd.php \ prefs.php servers.php trailer.txt SUB_DIRS= config js lib locale po scripts templates themes diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo index 22d57099697c..08ddfec3164e 100644 --- a/mail/horde4-imp/distinfo +++ b/mail/horde4-imp/distinfo @@ -1,3 +1,3 @@ -MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1 -SHA256 (imp-h3-4.0.4.tar.gz) = aa814f8f2bee0912a50df6220c77a60b43d83a52b0bc49dffbd30b63845c08d1 -SIZE (imp-h3-4.0.4.tar.gz) = 3349908 +MD5 (imp-h3-4.1.tar.gz) = dc5f86c4c6e4d61047444ff9b59dff67 +SHA256 (imp-h3-4.1.tar.gz) = 3ab27ea1b4f61dba7c25fff32ae25a8a19ff0a8de290a9d5ea035d8290cdb41e +SIZE (imp-h3-4.1.tar.gz) = 3756910 diff --git a/mail/horde4-imp/files/patch-ab b/mail/horde4-imp/files/patch-ab index 0ef811fa652d..70f53f65a58c 100644 --- a/mail/horde4-imp/files/patch-ab +++ b/mail/horde4-imp/files/patch-ab @@ -1,16 +1,14 @@ ---- config/servers.php.dist.orig Sun Dec 12 07:36:51 2004 -+++ config/servers.php.dist Fri Dec 24 00:27:59 2004 -@@ -47,7 +47,7 @@ - * - * folders: The folder path for the IMAP server. - * Common values: -- * UW-IMAP 'mail/' (note the trailing slash) -+ * UW-IMAP 'Mail/' (note the trailing slash) - * Cyrus, Courier-IMAP 'INBOX.' (note the trailing dot) - * dovecot '' - * -@@ -174,14 +174,16 @@ +--- config/servers.php.dist.orig Tue Feb 7 08:50:24 2006 ++++ config/servers.php.dist Wed Mar 8 22:01:53 2006 +@@ -204,14 +204,21 @@ + /* Example configurations: */ + ++/* FreeBSD port note: see also ++<http://wiki.horde.org/ImpUWIMAPNamespaces> ++<http://wiki.horde.org/ImpImapConfig> ++*/ ++ $servers['imap'] = array( 'name' => 'IMAP Server', - 'server' => 'imap.example.com', @@ -19,11 +17,8 @@ 'hordeauth' => false, - 'protocol' => 'imap/notls', - 'port' => 143, -- 'folders' => 'mail/', + 'protocol' => '%%PROTOCOL%%', + 'port' => %%IMAPPORT%%, -+ 'folders' => 'Mail/', - 'namespace' => '', 'maildomain' => 'example.com', - 'smtphost' => 'smtp.example.com', +// 'smtphost' => 'smtp.example.com', diff --git a/mail/horde4-imp/files/patch-config::conf.xml b/mail/horde4-imp/files/patch-config::conf.xml index 225acb1a99c1..314c47ed5500 100644 --- a/mail/horde4-imp/files/patch-config::conf.xml +++ b/mail/horde4-imp/files/patch-config::conf.xml @@ -1,5 +1,5 @@ ---- config/conf.xml.orig Mon Nov 22 09:40:29 2004 -+++ config/conf.xml Mon Nov 29 11:51:54 2004 +--- config/conf.xml.orig Sat Jan 14 17:52:34 2006 ++++ config/conf.xml Sun Mar 12 18:24:46 2006 @@ -6,11 +6,11 @@ <configheader>External Utilities</configheader> <configstring name="spellchecker" required="false" desc="Enter the location @@ -14,12 +14,12 @@ <configmultienum name="gnupg_keyserver" required="false" desc="The address of the public PGP keyserver(s) to use.">wwwkeys.pgp.net <values> -@@ -23,7 +23,7 @@ - connecting to the PGP keyserver. Timeouts are not supported on all - systems.">10</configstring> +@@ -25,7 +25,7 @@ <configstring name="openssl_cafile" required="false" desc="The location of -- the root certificates bundle.">/somewhere/ca-bundle.crt</configstring> -+ the root certificates bundle.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring> + the root certificates bundle, e.g. /etc/ssl/certs. See + http://www.php.net/manual/en/ref.openssl.php#openssl.cert.verification for +- details."/> ++ details.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring> <configstring name="openssl_binary" required="false" desc="The location of - the OpenSSL binary on your system. This program is REQUIRED to import - personal S/MIME certificate information, as there is no native PHP function + the OpenSSL binary on your system, e.g. /usr/bin/openssl. This program is + REQUIRED to import personal S/MIME certificate information, as there is no diff --git a/mail/horde4-imp/files/pkg-message.in b/mail/horde4-imp/files/pkg-message.in index 78a666232a4a..1e77290035f9 100644 --- a/mail/horde4-imp/files/pkg-message.in +++ b/mail/horde4-imp/files/pkg-message.in @@ -11,10 +11,8 @@ Then, you might have to tune the configuration files located in Then, you must login to Horde as a Horde Administrator to finish the configuration. Please read %%DOCSDIR%%/INSTALL. -Warning: the filter system of IMP 3.x has been replaced by a separate -******** application => check the port mail/ingo. Ingo provides a script - to migrate the existing filter rules from IMP 3.x, see Ingo's - documentation. +Warning: if you are upgrading from IMP 4.0.x, please read +%%DOCSDIR%%/UPGRADING. To protect your configuration files, you have to restart Apache. diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist index 5d37825d02a8..a5a551a09a26 100644 --- a/mail/horde4-imp/pkg-plist +++ b/mail/horde4-imp/pkg-plist @@ -13,8 +13,8 @@ %%IMPDIR%%/config/conf.xml %%IMPDIR%%/config/filter.txt %%IMPDIR%%/config/filter.txt.dist -%%IMPDIR%%/config/header.txt -%%IMPDIR%%/config/header.txt.dist +%%IMPDIR%%/config/header.php +%%IMPDIR%%/config/header.php.dist %%IMPDIR%%/config/menu.php %%IMPDIR%%/config/menu.php.dist %%IMPDIR%%/config/mime_drivers.php @@ -47,6 +47,10 @@ %%IMPDIR%%/lib/Filter.php %%IMPDIR%%/lib/Folder.php %%IMPDIR%%/lib/IMAP.php +%%IMPDIR%%/lib/IMAP/Client.php +%%IMPDIR%%/lib/IMAP/Search.php +%%IMPDIR%%/lib/IMAP/Sort.php +%%IMPDIR%%/lib/IMAP/Thread.php %%IMPDIR%%/lib/IMAP/Tree.php %%IMPDIR%%/lib/IMP.php %%IMPDIR%%/lib/Identity/imp.php @@ -90,7 +94,6 @@ %%IMPDIR%%/lib/Search.php %%IMPDIR%%/lib/Session.php %%IMPDIR%%/lib/Spam.php -%%IMPDIR%%/lib/VFolder.php %%IMPDIR%%/lib/api.php %%IMPDIR%%/lib/base.php %%IMPDIR%%/lib/prefs.php @@ -122,6 +125,7 @@ %%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo %%IMPDIR%%/locale/fr_FR/help.xml %%IMPDIR%%/locale/gl_ES/LC_MESSAGES/imp.mo +%%IMPDIR%%/locale/he_IL/LC_MESSAGES/imp.mo %%IMPDIR%%/locale/hu_HU/LC_MESSAGES/imp.mo %%IMPDIR%%/locale/hu_HU/help.xml %%IMPDIR%%/locale/id_ID/LC_MESSAGES/imp.mo @@ -129,6 +133,7 @@ %%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo %%IMPDIR%%/locale/it_IT/help.xml %%IMPDIR%%/locale/ja_JP/LC_MESSAGES/imp.mo +%%IMPDIR%%/locale/km_KH/LC_MESSAGES/imp.mo %%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo %%IMPDIR%%/locale/ko_KR/help.xml %%IMPDIR%%/locale/lt_LT/LC_MESSAGES/imp.mo @@ -155,6 +160,7 @@ %%IMPDIR%%/locale/sv_SE/help.xml %%IMPDIR%%/locale/th_TH/LC_MESSAGES/imp.mo %%IMPDIR%%/locale/tr_TR/LC_MESSAGES/imp.mo +%%IMPDIR%%/locale/tr_TR/help.xml %%IMPDIR%%/locale/uk_UA/LC_MESSAGES/imp.mo %%IMPDIR%%/locale/uk_UA/help.xml %%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo @@ -182,12 +188,14 @@ %%IMPDIR%%/po/fi_FI.po %%IMPDIR%%/po/fr_FR.po %%IMPDIR%%/po/gl_ES.po +%%IMPDIR%%/po/he_IL.po %%IMPDIR%%/po/hu_HU.po %%IMPDIR%%/po/id_ID.po %%IMPDIR%%/po/imp.pot %%IMPDIR%%/po/is_IS.po %%IMPDIR%%/po/it_IT.po %%IMPDIR%%/po/ja_JP.po +%%IMPDIR%%/po/km_KH.po %%IMPDIR%%/po/ko_KR.po %%IMPDIR%%/po/lt_LT.po %%IMPDIR%%/po/lv_LV.po @@ -210,13 +218,14 @@ %%IMPDIR%%/po/zh_TW.po %%IMPDIR%%/recompose.php %%IMPDIR%%/redirect.php +%%IMPDIR%%/saveimage.php %%IMPDIR%%/scripts/.htaccess %%IMPDIR%%/scripts/Imp.reg %%IMPDIR%%/scripts/custom_login.php -%%IMPDIR%%/scripts/singlescript.php %%IMPDIR%%/search.php %%IMPDIR%%/smime.php %%IMPDIR%%/spelling.php +%%IMPDIR%%/stationery.php %%IMPDIR%%/templates/.htaccess %%IMPDIR%%/templates/acl/acl.inc %%IMPDIR%%/templates/common-header.inc @@ -246,9 +255,9 @@ %%IMPDIR%%/templates/folders/foot.inc %%IMPDIR%%/templates/folders/head.inc %%IMPDIR%%/templates/folders/import.inc -%%IMPDIR%%/templates/folders/javascript.inc -%%IMPDIR%%/templates/javascript/open_compose_win.js -%%IMPDIR%%/templates/javascript/open_print_win.js +%%IMPDIR%%/templates/javascript/addressesBlocks.js +%%IMPDIR%%/templates/javascript/folders.js +%%IMPDIR%%/templates/javascript/popup.js %%IMPDIR%%/templates/login/login.inc %%IMPDIR%%/templates/mailbox/actions.inc %%IMPDIR%%/templates/mailbox/actions_deleted.inc @@ -272,10 +281,9 @@ %%IMPDIR%%/templates/message/navbar_top.inc %%IMPDIR%%/templates/pgp/import_key.inc %%IMPDIR%%/templates/pgp/notactive.inc -%%IMPDIR%%/templates/pgp/open_pgp_import.js -%%IMPDIR%%/templates/pgp/open_pgp_win.js %%IMPDIR%%/templates/pgp/passphrase.inc %%IMPDIR%%/templates/pgp/pgp.inc +%%IMPDIR%%/templates/prefs/defaultsearchselect.inc %%IMPDIR%%/templates/prefs/encryptselect.inc %%IMPDIR%%/templates/prefs/folderselect.inc %%IMPDIR%%/templates/prefs/initialpageselect.inc @@ -284,19 +292,17 @@ %%IMPDIR%%/templates/prefs/spamselect.inc %%IMPDIR%%/templates/prefs/trashselect.inc %%IMPDIR%%/templates/quota/quota.inc +%%IMPDIR%%/templates/saveimage/saveimage.inc %%IMPDIR%%/templates/search/fields.inc %%IMPDIR%%/templates/search/header.inc %%IMPDIR%%/templates/search/javascript.inc %%IMPDIR%%/templates/search/main.inc %%IMPDIR%%/templates/smime/import_key.inc %%IMPDIR%%/templates/smime/notactive.inc -%%IMPDIR%%/templates/smime/open_smime_import.js -%%IMPDIR%%/templates/smime/open_smime_win.js %%IMPDIR%%/templates/smime/passphrase.inc %%IMPDIR%%/templates/smime/smime.inc -%%IMPDIR%%/templates/thread/bottom.inc +%%IMPDIR%%/templates/stationery/prefs.inc %%IMPDIR%%/templates/thread/thread.html -%%IMPDIR%%/templates/thread/top.inc %%IMPDIR%%/test.php %%IMPDIR%%/themes/azur/screen.css %%IMPDIR%%/themes/bluemoon/screen.css @@ -306,11 +312,13 @@ %%IMPDIR%%/themes/cherry/screen.css %%IMPDIR%%/themes/cornflower/screen.css %%IMPDIR%%/themes/gennevilliers/screen.css -%%IMPDIR%%/themes/graphics/addressbook-blue.png -%%IMPDIR%%/themes/graphics/addressbook-red.png +%%IMPDIR%%/themes/graphics/addressbook_add.png +%%IMPDIR%%/themes/graphics/addressbook_browse.png %%IMPDIR%%/themes/graphics/apple.png %%IMPDIR%%/themes/graphics/attachment.png +%%IMPDIR%%/themes/graphics/audio/theetone.wav %%IMPDIR%%/themes/graphics/compose.png +%%IMPDIR%%/themes/graphics/empty_spam.png %%IMPDIR%%/themes/graphics/empty_trash.png %%IMPDIR%%/themes/graphics/encrypted.png %%IMPDIR%%/themes/graphics/expand.png @@ -322,14 +330,13 @@ %%IMPDIR%%/themes/graphics/folders/folder_open.png %%IMPDIR%%/themes/graphics/folders/inbox.png %%IMPDIR%%/themes/graphics/folders/sent.png -%%IMPDIR%%/themes/graphics/folders/templates.png %%IMPDIR%%/themes/graphics/folders/trash.png -%%IMPDIR%%/themes/graphics/forward.png %%IMPDIR%%/themes/graphics/imp.png %%IMPDIR%%/themes/graphics/mail_answered.png %%IMPDIR%%/themes/graphics/mail_deleted.png %%IMPDIR%%/themes/graphics/mail_draft.png %%IMPDIR%%/themes/graphics/mail_flagged.png +%%IMPDIR%%/themes/graphics/mail_forwarded.png %%IMPDIR%%/themes/graphics/mail_personal.png %%IMPDIR%%/themes/graphics/mail_priority_high.png %%IMPDIR%%/themes/graphics/mail_priority_low.png @@ -344,7 +351,6 @@ %%IMPDIR%%/themes/graphics/mime/mail.png %%IMPDIR%%/themes/graphics/mime/text.png %%IMPDIR%%/themes/graphics/newmail.png -%%IMPDIR%%/themes/graphics/reply.png %%IMPDIR%%/themes/graphics/shared.png %%IMPDIR%%/themes/graphics/signed.png %%IMPDIR%%/themes/graphics/spacer_red.png @@ -355,6 +361,7 @@ %%IMPDIR%%/themes/luc/screen.css %%IMPDIR%%/themes/lucblue/screen.css %%IMPDIR%%/themes/postnuke/screen.css +%%IMPDIR%%/themes/rtl/screen.css %%IMPDIR%%/themes/screen.css %%IMPDIR%%/themes/simplex/screen.css %%IMPDIR%%/themes/sun/screen.css @@ -364,12 +371,14 @@ %%HORDE_INC%%httpd-imp.conf @dirrm %%IMPDIR%%/themes/sun @dirrm %%IMPDIR%%/themes/simplex +@dirrm %%IMPDIR%%/themes/rtl @dirrm %%IMPDIR%%/themes/postnuke @dirrm %%IMPDIR%%/themes/lucblue @dirrm %%IMPDIR%%/themes/luc @dirrm %%IMPDIR%%/themes/lavander @dirrm %%IMPDIR%%/themes/graphics/mime @dirrm %%IMPDIR%%/themes/graphics/folders +@dirrm %%IMPDIR%%/themes/graphics/audio @dirrm %%IMPDIR%%/themes/graphics @dirrm %%IMPDIR%%/themes/grey @dirrm %%IMPDIR%%/themes/green @@ -383,8 +392,10 @@ @dirrm %%IMPDIR%%/themes/azur @dirrm %%IMPDIR%%/themes @dirrm %%IMPDIR%%/templates/thread +@dirrm %%IMPDIR%%/templates/stationery @dirrm %%IMPDIR%%/templates/smime @dirrm %%IMPDIR%%/templates/search +@dirrm %%IMPDIR%%/templates/saveimage @dirrm %%IMPDIR%%/templates/quota @dirrm %%IMPDIR%%/templates/prefs @dirrm %%IMPDIR%%/templates/pgp @@ -441,6 +452,8 @@ @dirrm %%IMPDIR%%/locale/lt_LT @dirrm %%IMPDIR%%/locale/ko_KR/LC_MESSAGES @dirrm %%IMPDIR%%/locale/ko_KR +@dirrm %%IMPDIR%%/locale/km_KH/LC_MESSAGES +@dirrm %%IMPDIR%%/locale/km_KH @dirrm %%IMPDIR%%/locale/ja_JP/LC_MESSAGES @dirrm %%IMPDIR%%/locale/ja_JP @dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES @@ -451,6 +464,8 @@ @dirrm %%IMPDIR%%/locale/id_ID @dirrm %%IMPDIR%%/locale/hu_HU/LC_MESSAGES @dirrm %%IMPDIR%%/locale/hu_HU +@dirrm %%IMPDIR%%/locale/he_IL/LC_MESSAGES +@dirrm %%IMPDIR%%/locale/he_IL @dirrm %%IMPDIR%%/locale/gl_ES/LC_MESSAGES @dirrm %%IMPDIR%%/locale/gl_ES @dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES |