[pkgsrc/trunk]: pkgsrc/mail/spamassassin Correct bad substitution of @PREFIX@...

[heinz <heinz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d785d54c608a
branches:  trunk
changeset: 475979:d785d54c608a
user:      heinz <heinz%pkgsrc.org@localhost>
date:      Mon May 31 12:43:06 2004 +0000

description:
Correct bad substitution of @PREFIX@ in spamd.raw

diffstat:

 mail/spamassassin/Makefile         |  6 +++---
 mail/spamassassin/distinfo         |  4 ++--
 mail/spamassassin/patches/patch-aq |  8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (67 lines):

diff -r 8662f56caad1 -r d785d54c608a mail/spamassassin/Makefile
--- a/mail/spamassassin/Makefile        Mon May 31 12:42:43 2004 +0000
+++ b/mail/spamassassin/Makefile        Mon May 31 12:43:06 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2004/03/26 16:42:42 seb Exp $
+# $NetBSD: Makefile,v 1.45 2004/05/31 12:43:06 heinz Exp $
 
 DISTNAME=      Mail-SpamAssassin-${SPAMASSASSIN_VERSION}
 PKGNAME=       spamassassin-${SPAMASSASSIN_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 SVR4_PKGNAME=  sa
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Mail/}                 \
@@ -110,7 +110,7 @@
 
 SUBST_STAGE.sa2=       post-patch
 SUBST_FILES.sa2=       README spamd/spamd.raw
-SUBST_SED.sa2=         -e s!@PREFIX@!${PREFIX}!g                       \
+SUBST_SED.sa2=         -e s!@@PREFIX@@!${PREFIX}!g                     \
                        -e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g       \
                        -e s!@SA_SSLCERTS@!${SA_SSLCERTS}!g
 
diff -r 8662f56caad1 -r d785d54c608a mail/spamassassin/distinfo
--- a/mail/spamassassin/distinfo        Mon May 31 12:42:43 2004 +0000
+++ b/mail/spamassassin/distinfo        Mon May 31 12:43:06 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2004/01/21 22:19:30 heinz Exp $
+$NetBSD: distinfo,v 1.22 2004/05/31 12:43:06 heinz Exp $
 
 SHA1 (Mail-SpamAssassin-2.63.tar.gz) = 6bab68dfd6a5238fc84360ce08249657bed4bab3
 Size (Mail-SpamAssassin-2.63.tar.gz) = 828596 bytes
@@ -6,4 +6,4 @@
 SHA1 (patch-ae) = 681f777fb9967d61b9886e10046258657f4f492a
 SHA1 (patch-ak) = 815602ef71c8e01e4cfc2b51a7ac3f2676bc0ecc
 SHA1 (patch-al) = 75c22289726d3c7e39834cd164ca9f2220969e9e
-SHA1 (patch-aq) = fc6d8c0040d0cb5eb4ddcfd8232ae69acadecdbe
+SHA1 (patch-aq) = 4ecd178997dc7060099ddde6b606cc9e2c0addeb
diff -r 8662f56caad1 -r d785d54c608a mail/spamassassin/patches/patch-aq
--- a/mail/spamassassin/patches/patch-aq        Mon May 31 12:42:43 2004 +0000
+++ b/mail/spamassassin/patches/patch-aq        Mon May 31 12:43:06 2004 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.2 2003/12/27 19:16:04 heinz Exp $
+$NetBSD: patch-aq,v 1.3 2004/05/31 12:43:06 heinz Exp $
 
---- README.orig        Sun Sep 28 18:21:54 2003
+--- README.orig        Sun Jan 18 00:56:14 2004
 +++ README
 @@ -116,30 +116,30 @@ Mail::SpamAssassin::Conf class (run the 
  the standard defaults that people use.  There is an explanation of all the
  default locations that SpamAssassin will look at the end.
  
 -  - /usr/share/spamassassin/*.cf:
-+  - @PREFIX@/share/spamassassin/*.cf:
++  - @@PREFIX@@/share/spamassassin/*.cf:
  
        Distributed configuration files, with all defaults.  Do not modify
        these, as they are overwritten when you upgrade.
@@ -20,7 +20,7 @@
        appended to the config loaded from the above directory.
  
 -  - /usr/share/spamassassin/user_prefs.template:
-+  - @PREFIX@/share/spamassassin/user_prefs.template:
++  - @@PREFIX@@/share/spamassassin/user_prefs.template:
  
        Distributed default user preferences. Do not modify this, as it is
        overwritten when you upgrade.