Make this work with PHP 5.1.1

6 files changed, 34 insertions, 6 deletions

diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index aacb03fd3c6..452ae7417fc 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 09:28:44 martti Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:14:35 martti Exp $
 
 DISTNAME=	squirrelmail-1.4.5
 PKGNAME=	ja-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/ja-squirrelmail/distinfo b/mail/ja-squirrelmail/distinfo
index 568416cfd47..a4d1c67e869 100644
--- a/mail/ja-squirrelmail/distinfo
+++ b/mail/ja-squirrelmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/12/05 09:28:44 martti Exp $
+$NetBSD: distinfo,v 1.8 2005/12/05 20:14:35 martti Exp $
 
 SHA1 (squirrelmail-1.4.5.tar.bz2) = 48c93dd99b72b73a3ea48311152bcbc40af5cabb
 RMD160 (squirrelmail-1.4.5.tar.bz2) = 6f748e483ea1c3c94eeb849ce11a3afd90c499a0
@@ -13,3 +13,4 @@ SHA1 (patch-ad) = 1db2f3d91e059a26ba41e638b7fba134fb7fa1ca
 SHA1 (patch-ae) = 45578c696d9e0ff48928e81228982e5d40c86919
 SHA1 (patch-af) = 96bb58143a83b6bbeb5477fdcd470895ccae202b
 SHA1 (patch-ag) = a9cd5b779468ca7f1361c72207bbb550cd9748e3
+SHA1 (patch-ah) = 073dfa9544b8dd9ec91c4a8cba5e5b6c710e284f
diff --git a/mail/ja-squirrelmail/patches/patch-ah b/mail/ja-squirrelmail/patches/patch-ah
new file mode 100644
index 00000000000..c86f299404a
--- /dev/null
+++ b/mail/ja-squirrelmail/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/12/05 20:14:35 martti Exp $
+
+--- functions/imap_general.php.orig	2005-05-20 13:37:34.000000000 +0300
++++ functions/imap_general.php	2005-12-05 22:08:12.000000000 +0200
+@@ -888,7 +888,7 @@
+  * Saves a message to a given folder -- used for saving sent messages
+  */
+ function sqimap_append ($imap_stream, $sent_folder, $length) {
+-    fputs ($imap_stream, sqimap_session_id() . " APPEND \"$sent_folder\" (\\Seen) \{$length}\r\n");
++    fputs ($imap_stream, sqimap_session_id() . " APPEND \"$sent_folder\" (\\Seen) {".$length."}\r\n");
+     $tmp = fgets ($imap_stream, 1024);
+     sqimap_append_checkresponse($tmp, $sent_folder);
+ }
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 16c7823d946..7a6f8cf311c 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2005/12/05 09:18:44 martti Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/05 20:13:38 martti Exp $
 
 DISTNAME=	squirrelmail-1.4.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index 5f9c5664fcf..52a572fb7dc 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2005/12/05 09:18:44 martti Exp $
+$NetBSD: distinfo,v 1.29 2005/12/05 20:13:38 martti Exp $
 
 SHA1 (squirrelmail-1.4.5.tar.bz2) = 48c93dd99b72b73a3ea48311152bcbc40af5cabb
 RMD160 (squirrelmail-1.4.5.tar.bz2) = 6f748e483ea1c3c94eeb849ce11a3afd90c499a0
@@ -10,3 +10,4 @@ SHA1 (patch-ad) = 1db2f3d91e059a26ba41e638b7fba134fb7fa1ca
 SHA1 (patch-ae) = 45578c696d9e0ff48928e81228982e5d40c86919
 SHA1 (patch-af) = 96bb58143a83b6bbeb5477fdcd470895ccae202b
 SHA1 (patch-ag) = a9cd5b779468ca7f1361c72207bbb550cd9748e3
+SHA1 (patch-ah) = 073dfa9544b8dd9ec91c4a8cba5e5b6c710e284f
diff --git a/mail/squirrelmail/patches/patch-ah b/mail/squirrelmail/patches/patch-ah
new file mode 100644
index 00000000000..d3b3ff16e91
--- /dev/null
+++ b/mail/squirrelmail/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/12/05 20:13:38 martti Exp $
+
+--- functions/imap_general.php.orig	2005-05-20 13:37:34.000000000 +0300
++++ functions/imap_general.php	2005-12-05 22:08:12.000000000 +0200
+@@ -888,7 +888,7 @@
+  * Saves a message to a given folder -- used for saving sent messages
+  */
+ function sqimap_append ($imap_stream, $sent_folder, $length) {
+-    fputs ($imap_stream, sqimap_session_id() . " APPEND \"$sent_folder\" (\\Seen) \{$length}\r\n");
++    fputs ($imap_stream, sqimap_session_id() . " APPEND \"$sent_folder\" (\\Seen) {".$length."}\r\n");
+     $tmp = fgets ($imap_stream, 1024);
+     sqimap_append_checkresponse($tmp, $sent_folder);
+ }