Help! Broken SpamAssassin on 10.4 after attempted upgrade

Looking through [url]http://wiki.apache.org/spamassassin/SpamAssassin_on_Mac_OS_X_Server[/url] , I decided that it was a good idea to update the vanilla install of SpamAssassin (3.0.1) to the latest release (3.1.x), so I used the [CODE] sudo cpan -i Mail::SpamAssassin[/CODE] as instructed by the Apache Wiki and let it do a standard install... ...Unfortunately, it seems to have created a parallel installation of SpamAssassin, which draws from /Users/$username/.spamassassin/ rather than /var/amasvis/.spamassassin/ ; /var/clamav/.spamassassin is a sym link to /var/amasvis/.spamassassin/ [b]As a result, SA ignores it's training and only about 2% of spam is being flagged.[/b] (Down from ~70%.) Neither the /etc/mail/spamasssassin/local.cf nor the /etc/amasvid.conf file appear to have changed from my last modification -- nor do any changes to them have any effect. Since I can't even find where the bad settings are, I can't begin to fix this. [i]/usr/bin/spamassassin -V[/i] returns: [code]SpamAssassin version 3.0.1 running on Perl version 5.8.6[/code] running [i]sudo -u clamav sa-learn --showdots --spam /var/spool/imap/user/$spamfolder/*[/i] does nothing... running [i]sudo sa-learn --showdots --spam /var/spool/imap/user/$spamfolder/*[/i] seems to work, except there's a random error that shows up in the middle of the dots: [code]Use of uninitialized value in pattern match (m//) at /System/Library/Perl/Extras/5.8.6/Mail/SpamAssassin/Message.pm line 225.[/code] The /var/amavis/.spamassassin/ directory looks like: [code]-rw------- 1 clamav clamav 1318912 Jan 24 12:29 auto-whitelist -rw------- 1 clamav clamav 168 Jan 24 12:29 bayes_journal -rw------- 1 clamav clamav 643072 Jan 24 12:21 bayes_seen -rw------- 1 clamav clamav 5300224 Jan 24 12:21 bayes_toks -rw-r--r-- 1 root clamav 1175 Jan 5 15:20 user_prefs[/code] [b][#:/var/spool/imap] clamav% sa-learn --dump magic[/b] [code]0.000 0 3 0 non-token data: bayes db version 0.000 0 1445 0 non-token data: nspam 0.000 0 3380 0 non-token data: nham 0.000 0 156405 0 non-token data: ntokens 0.000 0 1161372752 0 non-token data: oldest atime 0.000 0 1169659243 0 non-token data: newest atime 0.000 0 1169659266 0 non-token data: last journal sync atime 0.000 0 1169644139 0 non-token data: last expiry atime 0.000 0 0 0 non-token data: last expire atime delta 0.000 0 0 0 non-token data: last expire reduction count[/code] Any help would be greatly appreciated...