Apply upstream patch (SVN rev 1791010) to fix "Unescaped left brace in

regex is deprecated here (and will be fatal in Perl 5.30)". While here,
remove references to LOCALBASE. Bump PKGREVISION.

4 files changed, 36 insertions, 7 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index a04fa30980c..4e95db95cff 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.128 2016/12/16 15:52:52 hans Exp $
+# $NetBSD: Makefile,v 1.129 2017/07/09 22:12:12 schmonz Exp $
 
 DISTNAME=	Mail-SpamAssassin-3.4.1
 PKGNAME=	spamassassin-3.4.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/source/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index a98f1e73dff..bdfc26db5cb 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2016/11/10 20:25:50 roy Exp $
+$NetBSD: distinfo,v 1.70 2017/07/09 22:12:12 schmonz Exp $
 
 SHA1 (Mail-SpamAssassin-3.4.1.tar.gz) = e7b342d30f4983f70f4234480b489ccc7d2aa615
 RMD160 (Mail-SpamAssassin-3.4.1.tar.gz) = 4b7d6a6def068eb015e8d4699db410ade76b28f3
@@ -12,6 +12,7 @@ SHA1 (patch-Makefile.PL) = d322d7fb7286d5cf87ca775f9c381db32626e060
 SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0
 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
 SHA1 (patch-lib_Mail_SpamAssassin_DnsResolver.pm) = 129386c70010f6005ff93d4c237c219fe5b8a4a9
+SHA1 (patch-lib_Mail_SpamAssassin_PerMsgStatus.pm) = 414255bf5ffb2083029950bb38309716616803ce
 SHA1 (patch-sa-compile) = e8a92060eefbc1c95b7b2c674fc69686a66f230b
 SHA1 (patch-sa-update) = 59cba1287051042fc7f510f5e5ef462e2ee8d034
 SHA1 (patch-spamd_netbsd-rc-script.sh) = 192fc1876ee30a4475c0efd9be6340e87d9fa2f4
diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk
index 34c46037666..f028818bfbf 100644
--- a/mail/spamassassin/options.mk
+++ b/mail/spamassassin/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2016/12/16 15:47:35 hans Exp $
+# $NetBSD: options.mk,v 1.13 2017/07/09 22:12:12 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.spamassassin
 PKG_SUPPORTED_OPTIONS=	inet6 ssl gnupg2 gnupg21
@@ -55,13 +55,13 @@ DEPENDS+=		p5-IO-Socket-INET6-[0-9]*:../../net/p5-IO-Socket-INET6
 #
 .if !empty(PKG_OPTIONS:Mgnupg21)
 DEPENDS+=	gnupg21-[0-9]*:../../security/gnupg21
-GPGPATH=	${LOCALBASE}/bin/gpg2
+GPGPATH=	${PREFIX}/bin/gpg2
 .elif !empty(PKG_OPTIONS:Mgnupg2)
 DEPENDS+=       gnupg2-[0-9]*:../../security/gnupg2
-GPGPATH=        ${LOCALBASE}/bin/gpg2
+GPGPATH=        ${PREFIX}/bin/gpg2
 .else
 DEPENDS+=       gnupg>=1.0.0:../../security/gnupg
-GPGPATH=        ${LOCALBASE}/bin/gpg
+GPGPATH=        ${PREFIX}/bin/gpg
 .endif
 SUBST_CLASSES+=		gpgpath
 SUBST_STAGE.gpgpath=	pre-configure
diff --git a/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_PerMsgStatus.pm b/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_PerMsgStatus.pm
new file mode 100644
index 00000000000..673c89bf62a
--- /dev/null
+++ b/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_PerMsgStatus.pm
@@ -0,0 +1,28 @@
+$NetBSD: patch-lib_Mail_SpamAssassin_PerMsgStatus.pm,v 1.3 2017/07/09 22:12:12 schmonz Exp $
+
+Apply upstream patch (SVN rev 1791010) to fix "Unescaped left brace in
+regex is deprecated here (and will be fatal in Perl 5.30)".
+
+--- lib/Mail/SpamAssassin/PerMsgStatus.pm.orig	2015-04-28 19:56:49.000000000 +0000
++++ lib/Mail/SpamAssassin/PerMsgStatus.pm
+@@ -914,16 +914,16 @@ sub get_content_preview {
+     $str .= shift @{$ary};
+   }
+   undef $ary;
+-  chomp ($str); $str .= " [...]\n";
+ 
+   # in case the last line was huge, trim it back to around 200 chars
+   local $1;
+-  $str =~ s/^(.{,200}).*$/$1/gs;
++  $str =~ s/^(.{200}).+$/$1 [...]/gm;
++  chomp ($str); $str .= "\n";
+ 
+   # now, some tidy-ups that make things look a bit prettier
+-  $str =~ s/-----Original Message-----.*$//gs;
++  $str =~ s/-----Original Message-----.*$//gm;
+   $str =~ s/This is a multi-part message in MIME format\.//gs;
+-  $str =~ s/[-_\*\.]{10,}//gs;
++  $str =~ s/[-_*.]{10,}//gs;
+   $str =~ s/\s+/ /gs;
+ 
+   # add "Content preview:" ourselves, so that the text aligns