summaryrefslogtreecommitdiff
path: root/mail/spamassassin
diff options
context:
space:
mode:
authorprlw1 <prlw1@pkgsrc.org>2016-02-05 16:06:08 +0000
committerprlw1 <prlw1@pkgsrc.org>2016-02-05 16:06:08 +0000
commit5f81bcc1e54db5aedb123ce0adc6b5665f574af8 (patch)
tree5c8ad83df23654ff9c1d1cf355998d370503bbf6 /mail/spamassassin
parent463feed0732c70b34b545a095cbe05d3c38937b8 (diff)
downloadpkgsrc-5f81bcc1e54db5aedb123ce0adc6b5665f574af8.tar.gz
Use REPLACE_PERL rather than manual patch
Diffstat (limited to 'mail/spamassassin')
-rw-r--r--mail/spamassassin/INSTALL3
-rw-r--r--mail/spamassassin/Makefile3
-rw-r--r--mail/spamassassin/distinfo4
-rw-r--r--mail/spamassassin/patches/patch-sa-update8
4 files changed, 6 insertions, 12 deletions
diff --git a/mail/spamassassin/INSTALL b/mail/spamassassin/INSTALL
index a445277a66c..59c487665e7 100644
--- a/mail/spamassassin/INSTALL
+++ b/mail/spamassassin/INSTALL
@@ -1,8 +1,7 @@
-# $NetBSD: INSTALL,v 1.1 2010/03/24 21:41:10 heinz Exp $
+# $NetBSD: INSTALL,v 1.2 2016/02/05 16:06:08 prlw1 Exp $
case ${STAGE} in
POST-INSTALL)
sa-update --verbose --install @RULESARCHIVE@
;;
esac
-
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index e99d9afdbef..1750b688691 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2015/09/09 19:13:48 christos Exp $
+# $NetBSD: Makefile,v 1.122 2016/02/05 16:06:08 prlw1 Exp $
DISTNAME= Mail-SpamAssassin-3.4.1
PKGNAME= spamassassin-3.4.1
@@ -70,6 +70,7 @@ PERL5_CONFIGURE_DIRS= ${WRKSRC}
# test t/meta needs this
REPLACE_PERL+= build/parse-rules-for-masses
+REPLACE_PERL+= sa-update.raw
MAKE_PARAMS+= CONTACT_ADDRESS=${SPAMASSASSIN_CONTACT_ADDRESS:Q}
MAKE_PARAMS+= DEFRULESDIR="${RULESDIR}"
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 3bf1639aa83..f095e7bcf40 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2015/11/03 23:27:21 agc Exp $
+$NetBSD: distinfo,v 1.67 2016/02/05 16:06:08 prlw1 Exp $
SHA1 (Mail-SpamAssassin-3.4.1.tar.gz) = e7b342d30f4983f70f4234480b489ccc7d2aa615
RMD160 (Mail-SpamAssassin-3.4.1.tar.gz) = 4b7d6a6def068eb015e8d4699db410ade76b28f3
@@ -13,5 +13,5 @@ SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0
SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
SHA1 (patch-lib_Mail_SpamAssassin_Message.pm) = 402b9769df65ae87c3beebcc9441e29619eed367
SHA1 (patch-sa-compile) = e8a92060eefbc1c95b7b2c674fc69686a66f230b
-SHA1 (patch-sa-update) = 6ea354aa6b11740df1d25a807f5610115218294a
+SHA1 (patch-sa-update) = 59cba1287051042fc7f510f5e5ef462e2ee8d034
SHA1 (patch-spamd_netbsd-rc-script.sh) = 192fc1876ee30a4475c0efd9be6340e87d9fa2f4
diff --git a/mail/spamassassin/patches/patch-sa-update b/mail/spamassassin/patches/patch-sa-update
index c8cdc7f7395..88c4f000a10 100644
--- a/mail/spamassassin/patches/patch-sa-update
+++ b/mail/spamassassin/patches/patch-sa-update
@@ -1,15 +1,9 @@
-$NetBSD: patch-sa-update,v 1.2 2014/04/26 13:55:10 tron Exp $
+$NetBSD: patch-sa-update,v 1.3 2016/02/05 16:06:09 prlw1 Exp $
Prepare for substitution.
--- sa-update.raw.orig 2014-02-07 08:36:38.000000000 +0000
+++ sa-update.raw 2014-04-26 13:56:38.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w -T
-+#!/usr/pkg/bin/perl -w -T
-
- # <@LICENSE>
- # Licensed to the Apache Software Foundation (ASF) under one or more
@@ -340,10 +340,10 @@
if ($GPG_ENABLED || $opt{'import'}) {
# find GPG in the PATH