Mailing List Archive

Author: hstern
Date: Sun Apr 10 03:58:04 2005
New Revision: 160766

URL: http://svn.apache.org/viewcvs?view=rev&rev=160766
Log:
* spamassassin.raw
* MANIFEST
* Makefile.PL
+ lib/Mail/spamassassin-run.pod
- spamassassin-run.pod

Fix for bug 4253: "spamassassin --help" no longer prints a usage message

Added -input and -pathlist flags to pod2usage to instruct it to use
Mail/spamassassin-run.pod instead of $0 and to search for spamassassin-run.pod
in @INC. In the SpamAssassin source tree, spamassassin-run.pod had to be moved
to lib/Mail so that spamassassin.raw --help works when run from the source
tree and does not use a system-installed version of spamassassin-run.pod.

Made all necessary changes to MANIFEST and Makefile.PL.


Added:
spamassassin/trunk/lib/Mail/spamassassin-run.pod
- copied unchanged from r160745, spamassassin/trunk/spamassassin-run.pod
Removed:
spamassassin/trunk/spamassassin-run.pod
Modified:
spamassassin/trunk/MANIFEST
spamassassin/trunk/Makefile.PL
spamassassin/trunk/spamassassin.raw

Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/MANIFEST?view=diff&r1=160765&r2=160766
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Sun Apr 10 03:58:04 2005
@@ -84,6 +84,7 @@
lib/Mail/SpamAssassin/Util/DependencyInfo.pm
lib/Mail/SpamAssassin/Util/Progress.pm
lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
+lib/Mail/spamassassin-run.pod
masses/CORPUS_POLICY
masses/CORPUS_SUBMIT
masses/CORPUS_SUBMIT_NIGHTLY
@@ -195,7 +196,6 @@
sa-update.raw
sample-nonspam.txt
sample-spam.txt
-spamassassin-run.pod
spamassassin.raw
spamassassin.spec
spamc/Makefile.in

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/Makefile.PL?view=diff&r1=160765&r2=160766
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Sun Apr 10 03:58:04 2005
@@ -164,7 +164,7 @@

'MAN1PODS' => {
'spamassassin' => '$(INST_MAN1DIR)/spamassassin.$(MAN1EXT)',
- 'spamassassin-run.pod' => '$(INST_MAN1DIR)/spamassassin-run.$(MAN1EXT)',
+ 'lib/Mail/spamassassin-run.pod' => '$(INST_MAN1DIR)/spamassassin-run.$(MAN1EXT)',
'sa-learn' => '$(INST_MAN1DIR)/sa-learn.$(MAN1EXT)',
'sa-update' => '$(INST_MAN1DIR)/sa-update.$(MAN1EXT)',
'spamc/spamc.pod' => '$(INST_MAN1DIR)/spamc.$(MAN1EXT)',

Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamassassin.raw?view=diff&r1=160765&r2=160766
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Sun Apr 10 03:58:04 2005
@@ -116,6 +116,8 @@
-verbose => 0,
-message => $message,
-exitval => $resphash{$respnam},
+ -input => "Mail/spamassassin-run.pod",
+ -pathlist => \@INC,
);
}

@@ -126,7 +128,7 @@
my $ver = Mail::SpamAssassin::Version();

print "SpamAssassin version $ver\n";
- pod2usage( -verbose => $verbose, -message => $message, -exitval => 64 );
+ pod2usage( -verbose => $verbose, -message => $message, -exitval => 64, -input = "Mail/spamassassin-run.pod", -pathlist => \@INC );

}