Version 1.4.15 - 23 May 2008

----------------------------
  - Fix saving of Read Receipts to Sent folder.
  - Converted Romanian (ro_RO) to UTF-8.
  - Converted Slovak (sk_SK) to UTF-8.
  - Converted Swedish (sv_SE) to UTF-8.
  - Added support for Macedonian.
  - Don't allow invalid plugin names in conf.pl --install-plugin.
  - Fix warning in Printer Friendly due to missing include (#1849101).
  - Let configtest.php use optional PEAR dynamic extension loading,
    patch by Walter Huijbers (#1833123).
  - Fix for IMAP servers that were having problems saving sent messages.
  - Fix broken <style> tag parsing for some HTML messages, thanks
    Roalt Zijlstra.
  - Re-added support for Vietnamese.
  - Fixed broken MDN functionality (send read confirmation).
  - Converted Norwegian Bokm�l (nb_NO) to UTF-8.
  - Converted traditional Chinese (zh_TW) to UTF-8.
  - Avoid deprecation notices on get_magic_quotes_* functions.
  - Improved Message-ID generation code.
  - Added edit list, checkbox, radio group, multiple-select folder
    list and multiple-select string list option widget types,
    as well as support for the "trailing_text" widget attribute.
  - Boolean option widgets are henceforth presented as checkboxes.
  - Tidied up fortune plugin to be inline with specifications for plugins.
  - Enhanced address book page: added 'Compose to' button, put labels
    around address entries tied to checkboxes, improved column spacing,
    added hook for plugins that can filter address book listings.
    Complements RisuMail team (risumail.jp).

7 files changed, 26 insertions, 22 deletions

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index a1ac37b90ed..f0cb6922bd4 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2007/12/15 13:58:11 taca Exp $
+# $NetBSD: Makefile,v 1.98 2008/05/27 12:40:37 martti Exp $
 
-DISTNAME=	squirrelmail-1.4.13
-PKGREVISION=	1
+DISTNAME=	squirrelmail-1.4.15
+#PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index 14750851148..a0929b75bfb 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2007/12/14 20:44:35 martti Exp $
+@comment $NetBSD: PLIST,v 1.26 2008/05/27 12:40:37 martti Exp $
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
@@ -206,6 +206,7 @@ share/squirrelmail/plugins/administrator/options.php
 share/squirrelmail/plugins/administrator/setup.php
 share/squirrelmail/plugins/bug_report/README
 share/squirrelmail/plugins/bug_report/bug_report.php
+share/squirrelmail/plugins/bug_report/functions.php
 share/squirrelmail/plugins/bug_report/index.php
 share/squirrelmail/plugins/bug_report/setup.php
 share/squirrelmail/plugins/calendar/README
@@ -244,6 +245,7 @@ share/squirrelmail/plugins/filters/options.php
 share/squirrelmail/plugins/filters/setup.php
 share/squirrelmail/plugins/filters/spamoptions.php
 share/squirrelmail/plugins/fortune/README
+share/squirrelmail/plugins/fortune/fortune_functions.php
 share/squirrelmail/plugins/fortune/index.php
 share/squirrelmail/plugins/fortune/setup.php
 share/squirrelmail/plugins/index.php
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index 038e9e6d3fb..703df19da12 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/12/05 07:11:28 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2008/05/27 12:40:37 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SQUIRRELMAIL_BUILDLINK3_MK:=	${SQUIRRELMAIL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	squirrelmail
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}squirrelmail
 
 .if ${SQUIRRELMAIL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.12
+BUILDLINK_API_DEPENDS.squirrelmail+=	squirrelmail>=1.4.15
 BUILDLINK_PKGSRCDIR.squirrelmail?=	../../mail/squirrelmail
 .endif	# SQUIRRELMAIL_BUILDLINK3_MK
 
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index e932235f231..2a5602f49a6 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.46 2007/12/15 13:58:11 taca Exp $
+$NetBSD: distinfo,v 1.47 2008/05/27 12:40:37 martti Exp $
 
 SHA1 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 8823810ca00ab5510a48db78826112a9482d1895
 RMD160 (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 98649a1639567bb6669e9cfc0ca8b0743ebfb46e
 Size (squirrelmail-1.4.11-lite-20071003-patch.bz2) = 1800 bytes
-SHA1 (squirrelmail-1.4.13-ja-20071215-patch.gz) = d25052da58254b6d7132028588fbd4ba5208bf5f
-RMD160 (squirrelmail-1.4.13-ja-20071215-patch.gz) = 2ef11134e65a2673027c5b00aef373269c92f6ab
-Size (squirrelmail-1.4.13-ja-20071215-patch.gz) = 11925 bytes
-SHA1 (squirrelmail-1.4.13.tar.bz2) = cbc101076dfde6f78e871133fc6a17b5d3aa0edb
-RMD160 (squirrelmail-1.4.13.tar.bz2) = d2d27c9e2fe6225833da15981b9d6881ce55fc6d
-Size (squirrelmail-1.4.13.tar.bz2) = 497103 bytes
-SHA1 (patch-aa) = 6f48193a3b4ee86e85afcc66e2299ecbfe375796
+SHA1 (squirrelmail-1.4.15-ja-20080527-patch.gz) = c610ea923598086d6ba78121ce07620355126b53
+RMD160 (squirrelmail-1.4.15-ja-20080527-patch.gz) = a5dead7379935b195cfdd8ec8e87478a56a2f68f
+Size (squirrelmail-1.4.15-ja-20080527-patch.gz) = 7974 bytes
+SHA1 (squirrelmail-1.4.15.tar.bz2) = 5387e8647ada27d9850c5d2f6a5fdf7dbb6b5862
+RMD160 (squirrelmail-1.4.15.tar.bz2) = ef2878abae89ec8a5cb2464809f89d409c499732
+Size (squirrelmail-1.4.15.tar.bz2) = 506346 bytes
+SHA1 (patch-aa) = 04b104e7a9ae11a8e2c2b96953e9e5857049be3d
diff --git a/mail/squirrelmail/options.mk b/mail/squirrelmail/options.mk
index 6f160ece624..7e477a7f473 100644
--- a/mail/squirrelmail/options.mk
+++ b/mail/squirrelmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2007/12/15 13:58:11 taca Exp $
+# $NetBSD: options.mk,v 1.8 2008/05/27 12:40:37 martti Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squirrelmail
 PKG_SUPPORTED_OPTIONS=	squirrelmail-japanese squirrelmail-lite
@@ -6,10 +6,10 @@ PKG_SUPPORTED_OPTIONS=	squirrelmail-japanese squirrelmail-lite
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msquirrelmail-japanese)
-PATCHFILES+=		squirrelmail-1.4.13-ja-20071215-patch.gz
-SITES.squirrelmail-1.4.13-ja-20071215-patch.gz= \
+PATCHFILES+=		squirrelmail-1.4.15-ja-20080527-patch.gz
+SITES.squirrelmail-1.4.15-ja-20080527-patch.gz= \
 			http://www.yamaai-tech.com/~masato/Download/
-PATCH_DIST_STRIP.squirrelmail-1.4.13-ja-20071215-patch.gz=	-p1
+PATCH_DIST_STRIP.squirrelmail-1.4.15-ja-20080527-patch.gz=	-p1
 
 .endif
 
diff --git a/mail/squirrelmail/patches/patch-aa b/mail/squirrelmail/patches/patch-aa
index 657e61c48f3..7c8d9a24a81 100644
--- a/mail/squirrelmail/patches/patch-aa
+++ b/mail/squirrelmail/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.14 2007/12/05 07:11:28 martti Exp $
+$NetBSD: patch-aa,v 1.15 2008/05/27 12:40:37 martti Exp $
+
+Make this pkgsrc friendly.
 
 --- config/config_default.php.orig	2007-07-10 17:52:53.000000000 +0300
 +++ config/config_default.php	2007-12-05 08:50:31.000000000 +0200
diff --git a/mail/squirrelmail/plugin.mk b/mail/squirrelmail/plugin.mk
index 79e6466429d..8290a88c9d2 100644
--- a/mail/squirrelmail/plugin.mk
+++ b/mail/squirrelmail/plugin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugin.mk,v 1.6 2008/05/25 21:42:21 joerg Exp $
+# $NetBSD: plugin.mk,v 1.7 2008/05/27 12:40:37 martti Exp $
 
 DISTNAME?=		${PLUGIN_NAME}-${PLUGIN_VERSION}
 PKGNAME=		sm-${PLUGIN_NAME}-${PLUGIN_VERSION}
@@ -15,12 +15,12 @@ FULL_PLUGIN_DIR=	${PREFIX}/${PLUGIN_DIR}
 
 INSTALLATION_DIRS+=	${PLUGIN_DIR}
 
-PLIST_SUBST+=		PLUGIN_DIR=${PLUGIN_DIR:Q}
+PLIST_SUBST+=		PLUGIN_DIR=${PLUGIN_DIR}
 
 USE_TOOLS+=		pax
 
 do-install:
-	cd ${WRKSRC:Q} && \
+	cd ${WRKSRC} && \
 		find . -type f ! -name '*.orig' 2>/dev/null | \
 		pax -rw ${DESTDIR}${FULL_PLUGIN_DIR}