summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authortron <tron>2013-06-01 15:58:01 +0000
committertron <tron>2013-06-01 15:58:01 +0000
commit3a573912d746086fe9741f7dc73b9b66b7796436 (patch)
tree258cfc5cafc3d2391bac913c5971457047719130 /mail
parent593d18b4e4c7a0508f9aab4c290f04e3d1990036 (diff)
downloadpkgsrc-3a573912d746086fe9741f7dc73b9b66b7796436.tar.gz
Fix build with Perl 5.18.
Diffstat (limited to 'mail')
-rw-r--r--mail/demime/distinfo4
-rw-r--r--mail/demime/patches/patch-aa39
2 files changed, 38 insertions, 5 deletions
diff --git a/mail/demime/distinfo b/mail/demime/distinfo
index 0cceebe0eeb..7a02ef0106e 100644
--- a/mail/demime/distinfo
+++ b/mail/demime/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 09:59:21 agc Exp $
+$NetBSD: distinfo,v 1.7 2013/06/01 15:58:01 tron Exp $
SHA1 (demime-1.1d/demime.1.1d) = bb525a0060723853a7adfeea3c001570ccce7697
RMD160 (demime-1.1d/demime.1.1d) = 494fab7b21ae20175610c28b416321457bf83b05
@@ -6,4 +6,4 @@ Size (demime-1.1d/demime.1.1d) = 93746 bytes
SHA1 (demime-1.1d/demime_junkmail.cf) = 9bfcdf203111a7eb7135ac4d38d405d9b41448a9
RMD160 (demime-1.1d/demime_junkmail.cf) = 0fbc1f960f1835698906631058f937a743d75901
Size (demime-1.1d/demime_junkmail.cf) = 15234 bytes
-SHA1 (patch-aa) = fd399750d676983f6c843e92dfec654443cb33d3
+SHA1 (patch-aa) = 97217714da00b4a0d58eab4c73e0ea61efcd6927
diff --git a/mail/demime/patches/patch-aa b/mail/demime/patches/patch-aa
index 9ef1c8db102..ab46401ee37 100644
--- a/mail/demime/patches/patch-aa
+++ b/mail/demime/patches/patch-aa
@@ -1,7 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/07 12:21:09 tron Exp $
+$NetBSD: patch-aa,v 1.2 2013/06/01 15:58:01 tron Exp $
---- demime.stable.orig Wed Apr 17 17:08:40 2002
-+++ demime.stable
+Enable 8bit mode and fix build with Perl 5.18 and newer.
+
+--- demime.stable.orig 2013-06-01 16:48:54.000000000 +0100
++++ demime.stable 2013-06-01 16:55:48.000000000 +0100
@@ -21,7 +21,7 @@
# Following controls whether only 7 bit output
@@ -11,3 +13,34 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/06/07 12:21:09 tron Exp $
# Following configuration variable controls whether a message/rfc822
# in a multipart/mixed main segment is rendered or elided.
+@@ -2198,6 +2198,8 @@
+
+ =head2 Parameters
+
++=over
++
+ =item -p | --[no]preservefrom
+
+ Controls whether demime passes the Unix style "From" line through, if it
+@@ -2386,9 +2388,12 @@
+ If demime has not yet tried to produce any output, none of the other
+ possibilities will apply.
+
++=back
+
+ =head2 What demime will do when faced with different types of input:
+
++=over
++
+ =item B<text/plain or no content type in mail header>
+
+ The content will be passed through without reformatting. A scan will
+@@ -2490,6 +2495,8 @@
+ If the program does not recognize the top level mime type of the mail
+ then a message will be printed and the mail will be bounced.
+
++=back
++
+ =head1 FILES
+
+ If the installer has left $AD_REMOVE = 1 in the program header (the