diff options
author | martti <martti@pkgsrc.org> | 2003-09-01 11:51:26 +0000 |
---|---|---|
committer | martti <martti@pkgsrc.org> | 2003-09-01 11:51:26 +0000 |
commit | 0a236b468cb91bf1e07043c6c231c887c8b49d8c (patch) | |
tree | d5f49f95f492e09e8f199b9f1e17612a35a059da /mail/squirrelmail | |
parent | 57f2808ad7516e8b828339220eee44037bfc1359 (diff) | |
download | pkgsrc-0a236b468cb91bf1e07043c6c231c887c8b49d8c.tar.gz |
Updated squirrelmail to 1.4.1 (pkg/22652 by Adrian Portelli, so fixes by me)
- lots of bug fixes
I couldn't make this work without the latest PHP (4.3.3)...
Diffstat (limited to 'mail/squirrelmail')
-rw-r--r-- | mail/squirrelmail/Makefile | 12 | ||||
-rw-r--r-- | mail/squirrelmail/PLIST | 26 | ||||
-rw-r--r-- | mail/squirrelmail/distinfo | 8 | ||||
-rw-r--r-- | mail/squirrelmail/patches/patch-aa | 10 |
4 files changed, 36 insertions, 20 deletions
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index 62de7987b64..5316e3ee963 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.33 2003/07/17 21:47:04 grant Exp $ +# $NetBSD: Makefile,v 1.34 2003/09/01 11:51:26 martti Exp $ -DISTNAME= squirrelmail-1.4.0 +DISTNAME= squirrelmail-1.4.1 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/} EXTRACT_SUFX= .tar.bz2 @@ -12,10 +12,8 @@ COMMENT= PHP4 webmail package CONFLICTS= sq-attachment-handlers-[0-9]* CONFLICTS+= sq-squirrelspell-[0-9]* -DEPENDS+= php>=4.0.6:../../www/php4 -DEPENDS+= php-gettext>=4.0.6:../../devel/php4-gettext -DEPENDS+= php-session>=4.0.6:../../devel/php4-session -DEPENDS+= php-pcre>=4.0.6:../../devel/php4-pcre +DEPENDS+= php>=4.3.3:../../www/php4 +DEPENDS+= php-gettext>=4.3.3:../../devel/php4-gettext USE_BUILDLINK2= yes USE_PKGINSTALL= yes @@ -67,6 +65,8 @@ do-install: ${CP} -R ${WRKSRC}/* ${SMDIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR} ${CHMOD} -R a-w ${SMDIR} + ${CP} ${WRKSRC}/data/index.php ${USER_PREFS_DIR}/ + ${CP} ${WRKSRC}/data/.htaccess ${USER_PREFS_DIR}/ .include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST index 5478145f20f..d1eefa36741 100644 --- a/mail/squirrelmail/PLIST +++ b/mail/squirrelmail/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2003/04/15 09:25:08 martti Exp $ +@comment $NetBSD: PLIST,v 1.12 2003/09/01 11:51:26 martti Exp $ share/examples/squirrelmail/squirrelmail.conf share/squirrelmail/AUTHORS share/squirrelmail/COPYING @@ -48,6 +48,7 @@ share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.6.txt share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.0.txt share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.1.txt share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.2.txt +share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.0.txt share/squirrelmail/doc/addressbook.txt share/squirrelmail/doc/authentication.txt share/squirrelmail/doc/compose.txt @@ -81,7 +82,6 @@ share/squirrelmail/functions/imap.php share/squirrelmail/functions/imap_general.php share/squirrelmail/functions/imap_mailbox.php share/squirrelmail/functions/imap_messages.php -share/squirrelmail/functions/imap_parse.php share/squirrelmail/functions/imap_search.php share/squirrelmail/functions/imap_utf7_local.php share/squirrelmail/functions/index.php @@ -121,6 +121,15 @@ share/squirrelmail/help/cs_CZ/main_folder.hlp share/squirrelmail/help/cs_CZ/options.hlp share/squirrelmail/help/cs_CZ/read_mail.hlp share/squirrelmail/help/cs_CZ/search.hlp +share/squirrelmail/help/cy_GB/FAQ.hlp +share/squirrelmail/help/cy_GB/addresses.hlp +share/squirrelmail/help/cy_GB/basic.hlp +share/squirrelmail/help/cy_GB/compose.hlp +share/squirrelmail/help/cy_GB/folders.hlp +share/squirrelmail/help/cy_GB/main_folder.hlp +share/squirrelmail/help/cy_GB/options.hlp +share/squirrelmail/help/cy_GB/read_mail.hlp +share/squirrelmail/help/cy_GB/search.hlp share/squirrelmail/help/da_DK/FAQ.hlp share/squirrelmail/help/da_DK/addresses.hlp share/squirrelmail/help/da_DK/basic.hlp @@ -336,6 +345,8 @@ share/squirrelmail/locale/ca_ES/LC_MESSAGES/squirrelmail.mo share/squirrelmail/locale/ca_ES/LC_MESSAGES/squirrelmail.po share/squirrelmail/locale/cs_CZ/LC_MESSAGES/squirrelmail.mo share/squirrelmail/locale/cs_CZ/LC_MESSAGES/squirrelmail.po +share/squirrelmail/locale/cy_GB/LC_MESSAGES/squirrelmail.mo +share/squirrelmail/locale/cy_GB/LC_MESSAGES/squirrelmail.po share/squirrelmail/locale/da_DK/LC_MESSAGES/squirrelmail.mo share/squirrelmail/locale/da_DK/LC_MESSAGES/squirrelmail.po share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrelmail.mo @@ -348,9 +359,10 @@ share/squirrelmail/locale/et_EE/LC_MESSAGES/squirrelmail.mo share/squirrelmail/locale/et_EE/LC_MESSAGES/squirrelmail.po share/squirrelmail/locale/fi_FI/LC_MESSAGES/squirrelmail.mo share/squirrelmail/locale/fi_FI/LC_MESSAGES/squirrelmail.po +share/squirrelmail/locale/fo_FO/LC_MESSAGES/squirrelmail.mo +share/squirrelmail/locale/fo_FO/LC_MESSAGES/squirrelmail.po share/squirrelmail/locale/fr_FR/LC_MESSAGES/squirrelmail.mo share/squirrelmail/locale/fr_FR/LC_MESSAGES/squirrelmail.po -share/squirrelmail/locale/he_HE/LC_MESSAGES/squirrelmail.po share/squirrelmail/locale/he_IL/LC_MESSAGES/squirrelmail.mo share/squirrelmail/locale/he_IL/LC_MESSAGES/squirrelmail.po share/squirrelmail/locale/hr_HR/LC_MESSAGES/squirrelmail.mo @@ -692,10 +704,10 @@ share/squirrelmail/themes/spice_of_life_lite.php @dirrm share/squirrelmail/locale/hr_HR @dirrm share/squirrelmail/locale/he_IL/LC_MESSAGES @dirrm share/squirrelmail/locale/he_IL -@dirrm share/squirrelmail/locale/he_HE/LC_MESSAGES -@dirrm share/squirrelmail/locale/he_HE @dirrm share/squirrelmail/locale/fr_FR/LC_MESSAGES @dirrm share/squirrelmail/locale/fr_FR +@dirrm share/squirrelmail/locale/fo_FO/LC_MESSAGES +@dirrm share/squirrelmail/locale/fo_FO @dirrm share/squirrelmail/locale/fi_FI/LC_MESSAGES @dirrm share/squirrelmail/locale/fi_FI @dirrm share/squirrelmail/locale/et_EE/LC_MESSAGES @@ -708,6 +720,8 @@ share/squirrelmail/themes/spice_of_life_lite.php @dirrm share/squirrelmail/locale/de_DE @dirrm share/squirrelmail/locale/da_DK/LC_MESSAGES @dirrm share/squirrelmail/locale/da_DK +@dirrm share/squirrelmail/locale/cy_GB/LC_MESSAGES +@dirrm share/squirrelmail/locale/cy_GB @dirrm share/squirrelmail/locale/cs_CZ/LC_MESSAGES @dirrm share/squirrelmail/locale/cs_CZ @dirrm share/squirrelmail/locale/ca_ES/LC_MESSAGES @@ -740,11 +754,13 @@ share/squirrelmail/themes/spice_of_life_lite.php @dirrm share/squirrelmail/help/en_US @dirrm share/squirrelmail/help/de_DE @dirrm share/squirrelmail/help/da_DK +@dirrm share/squirrelmail/help/cy_GB @dirrm share/squirrelmail/help/cs_CZ @dirrm share/squirrelmail/help/ca_ES @dirrm share/squirrelmail/help/bg_BG @dirrm share/squirrelmail/help @dirrm share/squirrelmail/functions +@dirrm share/squirrelmail/doc/ReleaseNotes/1.4 @dirrm share/squirrelmail/doc/ReleaseNotes/1.3 @dirrm share/squirrelmail/doc/ReleaseNotes/1.2 @dirrm share/squirrelmail/doc/ReleaseNotes diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo index 74538b3a433..c862313f317 100644 --- a/mail/squirrelmail/distinfo +++ b/mail/squirrelmail/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.13 2003/04/15 09:25:08 martti Exp $ +$NetBSD: distinfo,v 1.14 2003/09/01 11:51:26 martti Exp $ -SHA1 (squirrelmail-1.4.0.tar.bz2) = 0e416e8fd530fab2762be7c2b6816e36b463309f -Size (squirrelmail-1.4.0.tar.bz2) = 1668728 bytes -SHA1 (patch-aa) = cd78d02216a142ffe3cb66c31d26104f062f724e +SHA1 (squirrelmail-1.4.1.tar.bz2) = eb44e8cfb10e04ec37bf7e265d27a55338430a28 +Size (squirrelmail-1.4.1.tar.bz2) = 1790721 bytes +SHA1 (patch-aa) = 2c1340abf3fd5f28b7a050316f07d07fb50f57f2 diff --git a/mail/squirrelmail/patches/patch-aa b/mail/squirrelmail/patches/patch-aa index 5753cd4368d..96b8f75ada7 100644 --- a/mail/squirrelmail/patches/patch-aa +++ b/mail/squirrelmail/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2003/04/15 09:25:08 martti Exp $ +$NetBSD: patch-aa,v 1.6 2003/09/01 11:51:27 martti Exp $ ---- config/config_default.php.orig Sat Jan 4 08:01:24 2003 -+++ config/config_default.php Tue Apr 15 11:31:46 2003 +--- config/config_default.php.orig Mon Jul 7 10:28:21 2003 ++++ config/config_default.php Mon Sep 1 09:41:14 2003 @@ -193,7 +193,7 @@ * false. (Cyrus works fine whether it's true OR false). */ @@ -12,10 +12,10 @@ $NetBSD: patch-aa,v 1.5 2003/04/15 09:25:08 martti Exp $ /** * This option controls what character set is used when sending mail @@ -220,7 +220,7 @@ - * $data_dir = '../data/'; + * $data_dir = SM_PATH . 'data/'; */ global $data_dir; --$data_dir = '../data/'; +-$data_dir = SM_PATH . 'data/'; +$data_dir = '@USER_PREFS_DIR@/'; /** |