summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/squirrelmail/Makefile3
-rw-r--r--mail/squirrelmail/distinfo3
-rw-r--r--mail/squirrelmail/patches/patch-ab23
3 files changed, 27 insertions, 2 deletions
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 58a06414a25..5dc18a0a0e6 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2004/05/31 20:14:39 bouyer Exp $
+# $NetBSD: Makefile,v 1.40 2004/06/02 18:50:26 bouyer Exp $
DISTNAME= squirrelmail-1.4.3
+PKGREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index c7ddf860583..524e7961242 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.16 2004/05/31 20:14:39 bouyer Exp $
+$NetBSD: distinfo,v 1.17 2004/06/02 18:50:26 bouyer Exp $
SHA1 (squirrelmail-1.4.3.tar.bz2) = 8eb0c45e322b18994732baba70a81168e5a8a0ff
Size (squirrelmail-1.4.3.tar.bz2) = 2254146 bytes
SHA1 (patch-aa) = cad816ce6e36def3f1b99ba831aa297c074d5aca
+SHA1 (patch-ab) = d53432baf29324123c53c9f5fbe123b3dbeb7f7f
diff --git a/mail/squirrelmail/patches/patch-ab b/mail/squirrelmail/patches/patch-ab
new file mode 100644
index 00000000000..1e8e3c168f2
--- /dev/null
+++ b/mail/squirrelmail/patches/patch-ab
@@ -0,0 +1,23 @@
+--- src/compose.php.orig Wed Jun 2 20:38:45 2004
++++ src/compose.php Wed Jun 2 20:38:19 2004
+@@ -14,7 +14,7 @@
+ * - Send mail
+ * - Save As Draft
+ *
+- * $Id: patch-ab,v 1.3 2004/06/02 18:50:27 bouyer Exp $
++ * $Id: patch-ab,v 1.3 2004/06/02 18:50:27 bouyer Exp $
+ */
+
+ /* Path for SquirrelMail required files. */
+@@ -757,9 +757,9 @@
+ sqWordWrap($rewrap_body[$i], ($editor_size));
+ if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
+ $gt = $matches[1];
+- $body .= $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
++ $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
+ } else {
+- $body .= $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
++ $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
+ }
+ unset($rewrap_body[$i]);
+ }