[pkgsrc/trunk]: pkgsrc/mail/spamassassin Starting with ExtUtils::MakeMaker 6....

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9962ff8d5d15
branches:  trunk
changeset: 568988:9962ff8d5d15
user:      heinz <heinz%pkgsrc.org@localhost>
date:      Fri Jan 01 13:55:32 2010 +0000

description:
Starting with ExtUtils::MakeMaker 6.43 some public variables (esp.
Recognized_Att_Keys) were made private, which broke SpamAssassin's
(ab)use of those variables. For details see
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6131.

Perl 5.10.1 includes ExtUtils::MakeMaker 6.55_2 and consequently building
SpamAssassin 3.2.5 with DESTDIR support in pkgsrc does not work anymore.

The fix changes the decision whether the used EU::MM module has good
enough DESTDIR support to depend only on the version number
(ie. mm_has_good_destdir is true) instead of the availability of the
key 'DESTDIR' in the (now non-public) Recognized_Att_Keys hash.

Ok to commit during freeze by wiz@

diffstat:

 mail/spamassassin/distinfo         |   4 ++--
 mail/spamassassin/patches/patch-ab |  21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r 900094ef72b3 -r 9962ff8d5d15 mail/spamassassin/distinfo
--- a/mail/spamassassin/distinfo        Fri Jan 01 13:52:03 2010 +0000
+++ b/mail/spamassassin/distinfo        Fri Jan 01 13:55:32 2010 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.49 2008/06/22 22:41:01 heinz Exp $
+$NetBSD: distinfo,v 1.50 2010/01/01 13:55:32 heinz Exp $
 
 SHA1 (Mail-SpamAssassin-3.2.5.tar.gz) = 14b1f6eae0221a152176f7f597f55581445e800a
 RMD160 (Mail-SpamAssassin-3.2.5.tar.gz) = 5a72a97d124e72ff4da1627982748377f1e34128
 Size (Mail-SpamAssassin-3.2.5.tar.gz) = 1223706 bytes
-SHA1 (patch-ab) = 9872b4c3e6d34cb58f84081554eff49efcfc6a6a
+SHA1 (patch-ab) = debb4851d063404e0a59557603cc08b259050b26
 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
 SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
 SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424
diff -r 900094ef72b3 -r 9962ff8d5d15 mail/spamassassin/patches/patch-ab
--- a/mail/spamassassin/patches/patch-ab        Fri Jan 01 13:52:03 2010 +0000
+++ b/mail/spamassassin/patches/patch-ab        Fri Jan 01 13:55:32 2010 +0000
@@ -1,13 +1,26 @@
-$NetBSD: patch-ab,v 1.14 2007/06/12 21:43:30 heinz Exp $
+$NetBSD: patch-ab,v 1.15 2010/01/01 13:55:32 heinz Exp $
+
+  - deal with internal changes of ExtUtils::MakeMaker and how SpamAssassin
+    (ab)used those internals regarding DESTDIR support. Will not be necessary
+    starting with SA 3.3.0.
 
   - enable build of qmail-spamc
   - some files (local.cf, *.pre) are managed by pkgsrc, disable
     their installation.
   - pkgsrc creates B_DATADIR, so there is no need to re-set permissions
 
---- Makefile.PL.orig   2007-04-23 14:15:49.000000000 +0200
+--- Makefile.PL.orig   2008-06-10 09:21:07.000000000 +0000
 +++ Makefile.PL
-@@ -167,6 +167,7 @@ my %makefile = (
+@@ -143,7 +143,7 @@ $mm_knows_destdir    = $ExtUtils::MakeMa
+ $mm_has_good_destdir = $mm_version >= 6.11;
+ # Add DESTDIR hack only if it's requested (and necessary)
+ $mm_needs_destdir    = $opt{'destdir'} && !$mm_has_good_destdir;
+-$mm_has_destdir      = $mm_knows_destdir || $mm_needs_destdir;
++$mm_has_destdir      = $mm_has_good_destdir || $mm_needs_destdir;
+ push(@ATT_KEYS, 'DESTDIR') if $mm_needs_destdir;
+ 
+ # Now make EU::MM understand our extended vars
+@@ -174,6 +174,7 @@ my %makefile = (
        'spamassassin.raw' => 'spamassassin',
        'sa-learn.raw'     => 'sa-learn',
        'sa-update.raw'    => 'sa-update',
@@ -15,7 +28,7 @@
        'sa-compile.raw'    => 'sa-compile',
        'spamc/spamc.c'    => 'spamc/spamc$(EXE_EXT)',
        'spamd/spamd.raw'  => 'spamd/spamd',
-@@ -1194,17 +1195,19 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
+@@ -1201,17 +1202,19 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
  
  conf__install:
        -$(MKPATH) $(B_CONFDIR)