Pullup ticket 1789 - requested by tron

security update for squirrelmail

Revisions pulled up:
- pkgsrc/mail/squirrelmail/Makefile			1.75
- pkgsrc/mail/squirrelmail/PLIST			1.19
- pkgsrc/mail/squirrelmail/buildlink3.mk		1.13
- pkgsrc/mail/squirrelmail/distinfo			1.34
- pkgsrc/mail/squirrelmail-locales/Makefile		1.17
- pkgsrc/mail/squirrelmail-locales/PLIST		1.10
- pkgsrc/mail/squirrelmail-locales/distinfo		1.7

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Mon Aug 14 15:57:40 UTC 2006

   Modified Files:
	pkgsrc/mail/squirrelmail: Makefile PLIST buildlink3.mk distinfo
	pkgsrc/mail/squirrelmail-locales: Makefile PLIST distinfo

   Log Message:
   Update "squirrelmail" and "squirrelmail-locales" package to version 1.4.8.
   Changes since version 1.4.7:
   - A security fix for CVE-2006-4019
   - A collection of bugfixes

7 files changed, 139 insertions, 146 deletions

diff --git a/mail/squirrelmail-locales/Makefile b/mail/squirrelmail-locales/Makefile
index 3e0dca9d6c4..32e1eeec41f 100644
--- a/mail/squirrelmail-locales/Makefile
+++ b/mail/squirrelmail-locales/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15.2.1 2006/07/13 12:32:09 salo Exp $
-#
+# $NetBSD: Makefile,v 1.15.2.2 2006/08/14 17:14:12 ghen Exp $
 
-DISTNAME=	all_locales-${VER}-20060702
+DISTNAME=	all_locales-${VER}-20060811
 PKGNAME=	squirrelmail-locales-${VER}
 #PKGREVISION=	1
 CATEGORIES=	mail
@@ -12,7 +11,7 @@ MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.squirrelmail.org/
 COMMENT=	Locale package for SquirrelMail
 
-VER=		1.4.7
+VER=		1.4.8
 
 NO_CONFIGURE=		yes
 USE_TOOLS+=		tar
diff --git a/mail/squirrelmail-locales/PLIST b/mail/squirrelmail-locales/PLIST
index c366e40158f..17cbad3c028 100644
--- a/mail/squirrelmail-locales/PLIST
+++ b/mail/squirrelmail-locales/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8.2.1 2006/07/13 12:32:09 salo Exp $
+@comment $NetBSD: PLIST,v 1.8.2.2 2006/08/14 17:14:12 ghen Exp $
 share/squirrelmail/help/bg_BG/FAQ.hlp
 share/squirrelmail/help/bg_BG/addresses.hlp
 share/squirrelmail/help/bg_BG/basic.hlp
@@ -215,15 +215,6 @@ share/squirrelmail/help/sv_SE/main_folder.hlp
 share/squirrelmail/help/sv_SE/options.hlp
 share/squirrelmail/help/sv_SE/read_mail.hlp
 share/squirrelmail/help/sv_SE/search.hlp
-share/squirrelmail/help/th_TH/FAQ.hlp
-share/squirrelmail/help/th_TH/addresses.hlp
-share/squirrelmail/help/th_TH/basic.hlp
-share/squirrelmail/help/th_TH/compose.hlp
-share/squirrelmail/help/th_TH/folders.hlp
-share/squirrelmail/help/th_TH/main_folder.hlp
-share/squirrelmail/help/th_TH/options.hlp
-share/squirrelmail/help/th_TH/read_mail.hlp
-share/squirrelmail/help/th_TH/search.hlp
 share/squirrelmail/help/uk_UA/FAQ.hlp
 share/squirrelmail/help/uk_UA/addresses.hlp
 share/squirrelmail/help/uk_UA/basic.hlp
@@ -314,6 +305,8 @@ share/squirrelmail/locale/de_DE/LC_MESSAGES/calendar.mo
 share/squirrelmail/locale/de_DE/LC_MESSAGES/calendar.po
 share/squirrelmail/locale/de_DE/LC_MESSAGES/change_sqlpass.mo
 share/squirrelmail/locale/de_DE/LC_MESSAGES/change_sqlpass.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/compatibility.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/compatibility.po
 share/squirrelmail/locale/de_DE/LC_MESSAGES/empty_folders.mo
 share/squirrelmail/locale/de_DE/LC_MESSAGES/empty_folders.po
 share/squirrelmail/locale/de_DE/LC_MESSAGES/expire.mo
@@ -431,6 +424,8 @@ share/squirrelmail/locale/id_ID/LC_MESSAGES/askuserinfo.mo
 share/squirrelmail/locale/id_ID/LC_MESSAGES/askuserinfo.po
 share/squirrelmail/locale/id_ID/LC_MESSAGES/compatibility.mo
 share/squirrelmail/locale/id_ID/LC_MESSAGES/compatibility.po
+share/squirrelmail/locale/id_ID/LC_MESSAGES/cookie_warning.mo
+share/squirrelmail/locale/id_ID/LC_MESSAGES/cookie_warning.po
 share/squirrelmail/locale/id_ID/LC_MESSAGES/folder_sizes.mo
 share/squirrelmail/locale/id_ID/LC_MESSAGES/folder_sizes.po
 share/squirrelmail/locale/id_ID/LC_MESSAGES/squirrelmail.mo
@@ -595,6 +590,8 @@ share/squirrelmail/locale/nl_NL/LC_MESSAGES/vacation_local.po
 share/squirrelmail/locale/nl_NL/setup.php
 share/squirrelmail/locale/nn_NO/LC_MESSAGES/abook_import_export.mo
 share/squirrelmail/locale/nn_NO/LC_MESSAGES/abook_import_export.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/advanced_settings.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/advanced_settings.po
 share/squirrelmail/locale/nn_NO/LC_MESSAGES/archive_mail.mo
 share/squirrelmail/locale/nn_NO/LC_MESSAGES/archive_mail.po
 share/squirrelmail/locale/nn_NO/LC_MESSAGES/askuserinfo.mo
@@ -635,6 +632,8 @@ share/squirrelmail/locale/nn_NO/LC_MESSAGES/multilogin.mo
 share/squirrelmail/locale/nn_NO/LC_MESSAGES/multilogin.po
 share/squirrelmail/locale/nn_NO/LC_MESSAGES/naguser.mo
 share/squirrelmail/locale/nn_NO/LC_MESSAGES/naguser.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/newuser_wiz.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/newuser_wiz.po
 share/squirrelmail/locale/nn_NO/LC_MESSAGES/proon.mo
 share/squirrelmail/locale/nn_NO/LC_MESSAGES/proon.po
 share/squirrelmail/locale/nn_NO/LC_MESSAGES/qmailadmin_login.mo
@@ -836,120 +835,119 @@ share/squirrelmail/locale/zh_CN/setup.php
 share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.mo
 share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.po
 share/squirrelmail/locale/zh_TW/setup.php
-@dirrm share/squirrelmail/locale/ar/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ar
-@dirrm share/squirrelmail/locale/bg_BG/LC_MESSAGES
-@dirrm share/squirrelmail/locale/bg_BG
-@dirrm share/squirrelmail/locale/bn_IN/LC_MESSAGES
-@dirrm share/squirrelmail/locale/bn_IN
-@dirrm share/squirrelmail/locale/ca_ES/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ca_ES
-@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/da_DK/LC_MESSAGES
-@dirrm share/squirrelmail/locale/da_DK
-@dirrm share/squirrelmail/locale/de_DE/LC_MESSAGES
-@dirrm share/squirrelmail/locale/de_DE
-@dirrm share/squirrelmail/locale/el_GR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/el_GR
-@dirrm share/squirrelmail/locale/en_GB/LC_MESSAGES
-@dirrm share/squirrelmail/locale/en_GB
-@dirrm share/squirrelmail/locale/es_ES/LC_MESSAGES
-@dirrm share/squirrelmail/locale/es_ES
-@dirrm share/squirrelmail/locale/et_EE/LC_MESSAGES
-@dirrm share/squirrelmail/locale/et_EE
-@dirrm share/squirrelmail/locale/eu_ES/LC_MESSAGES
-@dirrm share/squirrelmail/locale/eu_ES
-@dirrm share/squirrelmail/locale/fa_IR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fa_IR
-@dirrm share/squirrelmail/locale/fi_FI/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fi_FI
-@dirrm share/squirrelmail/locale/fo_FO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fo_FO
-@dirrm share/squirrelmail/locale/fr_FR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/fr_FR
-@dirrm share/squirrelmail/locale/he_IL/LC_MESSAGES
-@dirrm share/squirrelmail/locale/he_IL
-@dirrm share/squirrelmail/locale/hr_HR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/hr_HR
-@dirrm share/squirrelmail/locale/hu_HU/LC_MESSAGES
-@dirrm share/squirrelmail/locale/hu_HU
-@dirrm share/squirrelmail/locale/id_ID/LC_MESSAGES
-@dirrm share/squirrelmail/locale/id_ID
-@dirrm share/squirrelmail/locale/is_IS/LC_MESSAGES
-@dirrm share/squirrelmail/locale/is_IS
-@dirrm share/squirrelmail/locale/it_IT/LC_MESSAGES
-@dirrm share/squirrelmail/locale/it_IT
-@dirrm share/squirrelmail/locale/ja_JP/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ja_JP
-@dirrm share/squirrelmail/locale/ka/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ka
-@dirrm share/squirrelmail/locale/ko_KR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ko_KR
-@dirrm share/squirrelmail/locale/lt_LT/LC_MESSAGES
-@dirrm share/squirrelmail/locale/lt_LT
-@dirrm share/squirrelmail/locale/ms_MY/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ms_MY
-@dirrm share/squirrelmail/locale/nb_NO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/nb_NO
-@dirrm share/squirrelmail/locale/nl_NL/LC_MESSAGES
-@dirrm share/squirrelmail/locale/nl_NL
-@dirrm share/squirrelmail/locale/nn_NO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/nn_NO
+@dirrm share/squirrelmail/locale/zh_TW/LC_MESSAGES
+@dirrm share/squirrelmail/locale/zh_TW
+@dirrm share/squirrelmail/locale/zh_CN/LC_MESSAGES
+@dirrm share/squirrelmail/locale/zh_CN
+@dirrm share/squirrelmail/locale/uk_UA/LC_MESSAGES
+@dirrm share/squirrelmail/locale/uk_UA
 @dirrm share/squirrelmail/locale/ug/LC_MESSAGES
 @dirrm share/squirrelmail/locale/ug
-@dirrm share/squirrelmail/locale/pl_PL/LC_MESSAGES
-@dirrm share/squirrelmail/locale/pl_PL
-@dirrm share/squirrelmail/locale/pt_BR/LC_MESSAGES
-@dirrm share/squirrelmail/locale/pt_BR
-@dirrm share/squirrelmail/locale/pt_PT/LC_MESSAGES
-@dirrm share/squirrelmail/locale/pt_PT
-@dirrm share/squirrelmail/locale/ro_RO/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ro_RO
-@dirrm share/squirrelmail/locale/ru_RU/LC_MESSAGES
-@dirrm share/squirrelmail/locale/ru_RU
-@dirrm share/squirrelmail/locale/sk_SK/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sk_SK
-@dirrm share/squirrelmail/locale/sl_SI/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sl_SI
-@dirrm share/squirrelmail/locale/sr_YU/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sr_YU
-@dirrm share/squirrelmail/locale/sv_SE/LC_MESSAGES
-@dirrm share/squirrelmail/locale/sv_SE
 @dirrm share/squirrelmail/locale/tr_TR/LC_MESSAGES
 @dirrm share/squirrelmail/locale/tr_TR
-@dirrm share/squirrelmail/locale/uk_UA/LC_MESSAGES
-@dirrm share/squirrelmail/locale/uk_UA
-@dirrm share/squirrelmail/locale/zh_CN/LC_MESSAGES
-@dirrm share/squirrelmail/locale/zh_CN
-@dirrm share/squirrelmail/locale/zh_TW/LC_MESSAGES
-@dirrm share/squirrelmail/locale/zh_TW
-@dirrm share/squirrelmail/help/bg_BG
-@dirrm share/squirrelmail/help/ca_ES
+@dirrm share/squirrelmail/locale/sv_SE/LC_MESSAGES
+@dirrm share/squirrelmail/locale/sv_SE
+@dirrm share/squirrelmail/locale/sr_YU/LC_MESSAGES
+@dirrm share/squirrelmail/locale/sr_YU
+@dirrm share/squirrelmail/locale/sl_SI/LC_MESSAGES
+@dirrm share/squirrelmail/locale/sl_SI
+@dirrm share/squirrelmail/locale/sk_SK/LC_MESSAGES
+@dirrm share/squirrelmail/locale/sk_SK
+@dirrm share/squirrelmail/locale/ru_RU/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ru_RU
+@dirrm share/squirrelmail/locale/ro_RO/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ro_RO
+@dirrm share/squirrelmail/locale/pt_PT/LC_MESSAGES
+@dirrm share/squirrelmail/locale/pt_PT
+@dirrm share/squirrelmail/locale/pt_BR/LC_MESSAGES
+@dirrm share/squirrelmail/locale/pt_BR
+@dirrm share/squirrelmail/locale/pl_PL/LC_MESSAGES
+@dirrm share/squirrelmail/locale/pl_PL
+@dirrm share/squirrelmail/locale/nn_NO/LC_MESSAGES
+@dirrm share/squirrelmail/locale/nn_NO
+@dirrm share/squirrelmail/locale/nl_NL/LC_MESSAGES
+@dirrm share/squirrelmail/locale/nl_NL
+@dirrm share/squirrelmail/locale/nb_NO/LC_MESSAGES
+@dirrm share/squirrelmail/locale/nb_NO
+@dirrm share/squirrelmail/locale/ms_MY/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ms_MY
+@dirrm share/squirrelmail/locale/lt_LT/LC_MESSAGES
+@dirrm share/squirrelmail/locale/lt_LT
+@dirrm share/squirrelmail/locale/ko_KR/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ko_KR
+@dirrm share/squirrelmail/locale/ka/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ka
+@dirrm share/squirrelmail/locale/ja_JP/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ja_JP
+@dirrm share/squirrelmail/locale/it_IT/LC_MESSAGES
+@dirrm share/squirrelmail/locale/it_IT
+@dirrm share/squirrelmail/locale/is_IS/LC_MESSAGES
+@dirrm share/squirrelmail/locale/is_IS
+@dirrm share/squirrelmail/locale/id_ID/LC_MESSAGES
+@dirrm share/squirrelmail/locale/id_ID
+@dirrm share/squirrelmail/locale/hu_HU/LC_MESSAGES
+@dirrm share/squirrelmail/locale/hu_HU
+@dirrm share/squirrelmail/locale/hr_HR/LC_MESSAGES
+@dirrm share/squirrelmail/locale/hr_HR
+@dirrm share/squirrelmail/locale/he_IL/LC_MESSAGES
+@dirrm share/squirrelmail/locale/he_IL
+@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/fa_IR/LC_MESSAGES
+@dirrm share/squirrelmail/locale/fa_IR
+@dirrm share/squirrelmail/locale/eu_ES/LC_MESSAGES
+@dirrm share/squirrelmail/locale/eu_ES
+@dirrm share/squirrelmail/locale/et_EE/LC_MESSAGES
+@dirrm share/squirrelmail/locale/et_EE
+@dirrm share/squirrelmail/locale/es_ES/LC_MESSAGES
+@dirrm share/squirrelmail/locale/es_ES
+@dirrm share/squirrelmail/locale/en_GB/LC_MESSAGES
+@dirrm share/squirrelmail/locale/en_GB
+@dirrm share/squirrelmail/locale/el_GR/LC_MESSAGES
+@dirrm share/squirrelmail/locale/el_GR
+@dirrm share/squirrelmail/locale/de_DE/LC_MESSAGES
+@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
+@dirrm share/squirrelmail/locale/ca_ES
+@dirrm share/squirrelmail/locale/bn_IN/LC_MESSAGES
+@dirrm share/squirrelmail/locale/bn_IN
+@dirrm share/squirrelmail/locale/bg_BG/LC_MESSAGES
+@dirrm share/squirrelmail/locale/bg_BG
+@dirrm share/squirrelmail/locale/ar/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ar
+@dirrm share/squirrelmail/help/zh_CN
+@dirrm share/squirrelmail/help/uk_UA
+@dirrm share/squirrelmail/help/sv_SE
+@dirrm share/squirrelmail/help/sr_YU
+@dirrm share/squirrelmail/help/sl_SI
+@dirrm share/squirrelmail/help/sk_SK
+@dirrm share/squirrelmail/help/ru_RU
+@dirrm share/squirrelmail/help/pt_PT
+@dirrm share/squirrelmail/help/pt_BR
+@dirrm share/squirrelmail/help/pl_PL
+@dirrm share/squirrelmail/help/nl_NL
+@dirrm share/squirrelmail/help/lt_LT
+@dirrm share/squirrelmail/help/ko_KR
+@dirrm share/squirrelmail/help/ja_JP
+@dirrm share/squirrelmail/help/it_IT
+@dirrm share/squirrelmail/help/id_ID
+@dirrm share/squirrelmail/help/fr_FR
+@dirrm share/squirrelmail/help/fi_FI
+@dirrm share/squirrelmail/help/es_ES
+@dirrm share/squirrelmail/help/en_GB
+@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/da_DK
-@dirrm share/squirrelmail/help/de_DE
-@dirrm share/squirrelmail/help/en_GB
-@dirrm share/squirrelmail/help/es_ES
-@dirrm share/squirrelmail/help/fi_FI
-@dirrm share/squirrelmail/help/fr_FR
-@dirrm share/squirrelmail/help/id_ID
-@dirrm share/squirrelmail/help/it_IT
-@dirrm share/squirrelmail/help/ja_JP
-@dirrm share/squirrelmail/help/ko_KR
-@dirrm share/squirrelmail/help/lt_LT
-@dirrm share/squirrelmail/help/nl_NL
-@dirrm share/squirrelmail/help/pl_PL
-@dirrm share/squirrelmail/help/pt_BR
-@dirrm share/squirrelmail/help/pt_PT
-@dirrm share/squirrelmail/help/ru_RU
-@dirrm share/squirrelmail/help/sk_SK
-@dirrm share/squirrelmail/help/sl_SI
-@dirrm share/squirrelmail/help/sr_YU
-@dirrm share/squirrelmail/help/sv_SE
-@dirrm share/squirrelmail/help/th_TH
-@dirrm share/squirrelmail/help/uk_UA
-@dirrm share/squirrelmail/help/zh_CN
+@dirrm share/squirrelmail/help/ca_ES
+@dirrm share/squirrelmail/help/bg_BG
diff --git a/mail/squirrelmail-locales/distinfo b/mail/squirrelmail-locales/distinfo
index 438294ea31f..e35badd2445 100644
--- a/mail/squirrelmail-locales/distinfo
+++ b/mail/squirrelmail-locales/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5.2.1 2006/07/13 12:32:09 salo Exp $
+$NetBSD: distinfo,v 1.5.2.2 2006/08/14 17:14:12 ghen Exp $
 
-SHA1 (all_locales-1.4.7-20060702.tar.bz2) = c2fae886d889eb6b0456a8533e64f89889e9fa08
-RMD160 (all_locales-1.4.7-20060702.tar.bz2) = 376317fa9975f1898469c27155c04775ad6c615c
-Size (all_locales-1.4.7-20060702.tar.bz2) = 2614000 bytes
+SHA1 (all_locales-1.4.8-20060811.tar.bz2) = 59ef035793d9e7e8249f1e2dc30c5b33f35f41b9
+RMD160 (all_locales-1.4.8-20060811.tar.bz2) = 790dd2135da37404f7c803c53e27734c72423592
+Size (all_locales-1.4.8-20060811.tar.bz2) = 2683471 bytes
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 77942e74ec8..a2623c87ed8 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.73.2.1 2006/07/13 12:30:41 salo Exp $
+# $NetBSD: Makefile,v 1.73.2.2 2006/08/14 17:14:12 ghen Exp $
 
-DISTNAME=	squirrelmail-1.4.7
+DISTNAME=	squirrelmail-1.4.8
 #PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
@@ -76,6 +76,8 @@ do-install:
 	${CHMOD} a+x ${SMDIR:Q}/config/conf.pl
 	${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
 	${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
+	${MV} ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \
+	  ${PREFIX}/man/man8/squirrelmail-conf.pl.8
 
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index 17d448cc78e..6625f9b2c8f 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.17.4.1 2006/07/13 12:30:41 salo Exp $
+@comment $NetBSD: PLIST,v 1.17.4.2 2006/08/14 17:14:12 ghen Exp $
+man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
@@ -42,12 +43,6 @@ share/squirrelmail/contrib/squirrelmail.mailto.reg
 share/squirrelmail/data/.htaccess
 share/squirrelmail/data/default_pref
 share/squirrelmail/data/index.php
-share/squirrelmail/doc/Development/addressbook.txt
-share/squirrelmail/doc/Development/index.html
-share/squirrelmail/doc/Development/mime.txt
-share/squirrelmail/doc/Development/plugin.txt
-share/squirrelmail/doc/Development/rfc_documents.txt
-share/squirrelmail/doc/Development/tree.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.0.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.1.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.2.txt
@@ -66,6 +61,7 @@ share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.4.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.5.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.6.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.7.txt
 share/squirrelmail/doc/authentication.txt
 share/squirrelmail/doc/db-backend.txt
 share/squirrelmail/doc/ie_ssl.txt
@@ -318,7 +314,6 @@ share/squirrelmail/plugins/translate/README
 share/squirrelmail/plugins/translate/index.php
 share/squirrelmail/plugins/translate/options.php
 share/squirrelmail/plugins/translate/setup.php
-share/squirrelmail/po/charsetconvert.pl
 share/squirrelmail/po/compilepo
 share/squirrelmail/po/independent_strings.txt
 share/squirrelmail/po/index.php
@@ -471,7 +466,6 @@ share/squirrelmail/themes/wood_theme.php
 @dirrm share/squirrelmail/doc/ReleaseNotes/1.3
 @dirrm share/squirrelmail/doc/ReleaseNotes/1.2
 @dirrm share/squirrelmail/doc/ReleaseNotes
-@dirrm share/squirrelmail/doc/Development
 @dirrm share/squirrelmail/doc
 @dirrm share/squirrelmail/data
 @dirrm share/squirrelmail/contrib/RPM
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index 70ca6db89f1..0a06eec52ff 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9.2.1 2006/07/13 12:30:41 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.9.2.2 2006/08/14 17:14:12 ghen Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SQUIRRELMAIL_BUILDLINK3_MK:=	${SQUIRRELMAIL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsquirrelmail}
 BUILDLINK_PACKAGES+=	squirrelmail
 
 .if !empty(SQUIRRELMAIL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.7
+BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.8
 BUILDLINK_PKGSRCDIR.squirrelmail?=	../../mail/squirrelmail
 .endif	# SQUIRRELMAIL_BUILDLINK3_MK
 
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index b7213499eee..9194128280d 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.32.2.1 2006/07/13 12:30:41 salo Exp $
+$NetBSD: distinfo,v 1.32.2.2 2006/08/14 17:14:12 ghen Exp $
 
-SHA1 (squirrelmail-1.4.7.tar.bz2) = 746080b2c536487ea7cfc5031668cd8092413b51
-RMD160 (squirrelmail-1.4.7.tar.bz2) = 65bc9492429006dd9fb75291990e8692f6f05ba0
-Size (squirrelmail-1.4.7.tar.bz2) = 496925 bytes
+SHA1 (squirrelmail-1.4.8.tar.bz2) = 45bab996b68b60647e668070466c15a20e991d52
+RMD160 (squirrelmail-1.4.8.tar.bz2) = 7ef716a1b34d477a77157b56a71feb7e0a1c41cb
+Size (squirrelmail-1.4.8.tar.bz2) = 474528 bytes
 SHA1 (patch-aa) = bc81f7c216fb7e372422991511eb6b89cd6b5e5f