[pkgsrc/trunk]: pkgsrc/mail/spamassassin After changing the SUBST-stage to 'p...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4181e54e016
branches:  trunk
changeset: 488975:c4181e54e016
user:      heinz <heinz%pkgsrc.org@localhost>
date:      Sun Feb 13 21:20:25 2005 +0000

description:
After changing the SUBST-stage to 'pre-configure' for 3.0.2, Makefile.PL was
changed after perl5-configure had been run and the Makefile created.
For some people, this resulted in a message
  Makefile out-of-date with respect to Makefile.PL
at the build stage.
Omitting the first substitution (sa1) and the corresponding part of
patch-ab solved this. This patch had been unnecessary for some time
anyway.

This should resolve pkg/29255.

diffstat:

 mail/spamassassin/Makefile         |   9 +++------
 mail/spamassassin/distinfo         |   4 ++--
 mail/spamassassin/patches/patch-ab |  11 ++++-------
 3 files changed, 9 insertions(+), 15 deletions(-)

diffs (66 lines):

diff -r 5296f8831c82 -r c4181e54e016 mail/spamassassin/Makefile
--- a/mail/spamassassin/Makefile        Sun Feb 13 21:03:41 2005 +0000
+++ b/mail/spamassassin/Makefile        Sun Feb 13 21:20:25 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2005/01/15 21:44:55 schmonz Exp $
+# $NetBSD: Makefile,v 1.53 2005/02/13 21:20:25 heinz Exp $
 
 DISTNAME=      Mail-SpamAssassin-${SPAMASSASSIN_VERSION}
 PKGNAME=       spamassassin-${SPAMASSASSIN_VERSION}
+PKGREVISION=   1
 SVR4_PKGNAME=  sa
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:=spamassassin/} \
@@ -80,11 +81,7 @@
 INSTALLATION_DIRS+=    ${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/spamc  \
                        ${DOC_SUBDIR}/spamd
 
-SUBST_CLASSES+=                sa1 sa2 sa3
-
-SUBST_STAGE.sa1=       pre-configure
-SUBST_FILES.sa1=       Makefile.PL
-SUBST_SED.sa1=         -e s!@SA_CONTACT_ADDRESS@!${SPAMASSASSIN_CONTACT_ADDRESS}!
+SUBST_CLASSES+=                sa2 sa3
 
 SUBST_STAGE.sa2=       pre-configure
 SUBST_FILES.sa2=       README spamd/spamd.raw
diff -r 5296f8831c82 -r c4181e54e016 mail/spamassassin/distinfo
--- a/mail/spamassassin/distinfo        Sun Feb 13 21:03:41 2005 +0000
+++ b/mail/spamassassin/distinfo        Sun Feb 13 21:20:25 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2005/01/15 21:44:55 schmonz Exp $
+$NetBSD: distinfo,v 1.27 2005/02/13 21:20:25 heinz Exp $
 
 SHA1 (Mail-SpamAssassin-3.0.2.tar.gz) = be69e72c7351df46de3eeed811219adf35b2964d
 Size (Mail-SpamAssassin-3.0.2.tar.gz) = 996164 bytes
-SHA1 (patch-ab) = 0922036370c492b980a731f8b802ff0b26e0a604
+SHA1 (patch-ab) = 36280764366900829205be94466a77662c422524
 SHA1 (patch-ae) = 7d57eb154af72ea82cb8fdafd7277823e33b7dd5
 SHA1 (patch-aq) = c918a738e0c7048183f5efbb0b7265d355ded7b3
diff -r 5296f8831c82 -r c4181e54e016 mail/spamassassin/patches/patch-ab
--- a/mail/spamassassin/patches/patch-ab        Sun Feb 13 21:03:41 2005 +0000
+++ b/mail/spamassassin/patches/patch-ab        Sun Feb 13 21:20:25 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.9 2005/01/15 21:44:55 schmonz Exp $
+$NetBSD: patch-ab,v 1.10 2005/02/13 21:20:25 heinz Exp $
 
---- Makefile.PL.orig   2004-10-22 11:21:08.000000000 -0400
+--- Makefile.PL.orig   Fri Oct 22 17:21:08 2004
 +++ Makefile.PL
 @@ -64,6 +64,8 @@ my @ATT_KEYS = (
    'ENABLE_SSL',       # Set to 'yes' to build spamc with SSL support.
@@ -11,12 +11,9 @@
  );
  
  
-@@ -98,8 +100,10 @@ sub yesno {
- my %opt = (
-   'build_spamc'        => undef,
+@@ -100,6 +102,8 @@ my %opt = (
    'enable_ssl'      => undef,
--  'contact_address' => undef,
-+  'contact_address' => '@SA_CONTACT_ADDRESS@',
+   'contact_address' => undef,
    'run_net_tests'   => undef,
 +  'run_awl_sql_tests'   => undef,
 +  'run_bayes_sql_tests' => undef,