diff options
| author | heinz <heinz@pkgsrc.org> | 2005-02-13 21:20:25 +0000 |
|---|---|---|
| committer | heinz <heinz@pkgsrc.org> | 2005-02-13 21:20:25 +0000 |
| commit | 448ecee5d5032bf7f66a9720e26a651a9cf7c1ba (patch) | |
| tree | a596d4ff90fd7c7b6f88db62312e3ab83f7617da /mail/spamassassin | |
| parent | 4f72a99beb1d55a0419b80ec58898ad249257931 (diff) | |
| download | pkgsrc-448ecee5d5032bf7f66a9720e26a651a9cf7c1ba.tar.gz | |
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 (limited to 'mail/spamassassin')
| -rw-r--r-- | mail/spamassassin/Makefile | 9 | ||||
| -rw-r--r-- | mail/spamassassin/distinfo | 4 | ||||
| -rw-r--r-- | mail/spamassassin/patches/patch-ab | 11 |
3 files changed, 9 insertions, 15 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 30fc863ea0f..f7ccc912775 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -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 @@ SUPPORT_FILES_PERMS+= ${EGDIR}/netbsd_lists.cf \ 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 --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index 3d0c2eceda3..13e7ce78bfc 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -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 --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab index b085b4a68e2..3890b5f857c 100644 --- a/mail/spamassassin/patches/patch-ab +++ b/mail/spamassassin/patches/patch-ab @@ -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 @@ $NetBSD: patch-ab,v 1.9 2005/01/15 21:44:55 schmonz Exp $ ); -@@ -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, |