diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/spamassassin/INSTALL | 8 | ||||
| -rw-r--r-- | mail/spamassassin/MESSAGE | 19 | ||||
| -rw-r--r-- | mail/spamassassin/Makefile | 73 | ||||
| -rw-r--r-- | mail/spamassassin/PLIST | 5 | ||||
| -rw-r--r-- | mail/spamassassin/distinfo | 22 | ||||
| -rw-r--r-- | mail/spamassassin/options.mk | 88 | ||||
| -rw-r--r-- | mail/spamassassin/patches/patch-ab | 29 | ||||
| -rw-r--r-- | mail/spamassassin/patches/patch-ba | 26 | ||||
| -rw-r--r-- | mail/spamassassin/patches/patch-bc | 32 | ||||
| -rw-r--r-- | mail/spamassassin/patches/patch-be | 13 |
10 files changed, 107 insertions, 208 deletions
diff --git a/mail/spamassassin/INSTALL b/mail/spamassassin/INSTALL new file mode 100644 index 00000000000..a445277a66c --- /dev/null +++ b/mail/spamassassin/INSTALL @@ -0,0 +1,8 @@ +# $NetBSD: INSTALL,v 1.1 2010/03/24 21:41:10 heinz Exp $ + +case ${STAGE} in +POST-INSTALL) + sa-update --verbose --install @RULESARCHIVE@ + ;; +esac + diff --git a/mail/spamassassin/MESSAGE b/mail/spamassassin/MESSAGE index a2ac941a42d..8d304338bfc 100644 --- a/mail/spamassassin/MESSAGE +++ b/mail/spamassassin/MESSAGE @@ -1,16 +1,21 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.11 2007/05/02 15:20:45 heinz Exp $ +$NetBSD: MESSAGE,v 1.12 2010/03/24 21:41:10 heinz Exp $ -If you upgrade from an earlier version *PLEASE* take a look at the file -UPGRADE in +IMPORTANT: The spamassassin package provided by pkgsrc contains the rules +IMPORTANT: available at the time of the official SpamAssassin release. +IMPORTANT: You have to decide when/how to update them, see the documentation +IMPORTANT: for 'sa-update'. - ${PREFIX}/share/doc/spamassassin/ +If you upgrade from an earlier version please take a look at the documents +in -Some configuration options were changed and some features are now provided -by plugins (they may not be enabled after installation). + ${PREFIX}/share/doc/spamassassin/ For more information see 'perldoc Mail::SpamAssassin::Conf' and the man -pages for 'spamassassin', 'spamd'/'spamc', 'sa-learn', 'sa-update' and +pages for 'spamassassin', 'spamd', 'spamc', 'sa-learn', 'sa-update' and 'sa-compile'. +If you want to compile the rules, you may have to increase the data +segment size for the 'sa-compile' process. + Please check that your existing mail configuration still works. =========================================================================== diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index f2338cb2ae2..ca750cc7809 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,11 +1,15 @@ -# $NetBSD: Makefile,v 1.96 2010/01/02 03:48:40 heinz Exp $ +# $NetBSD: Makefile,v 1.97 2010/03/24 21:41:10 heinz Exp $ -DISTNAME= Mail-SpamAssassin-3.2.5 -PKGNAME= spamassassin-3.2.5 -PKGREVISION= 4 +DISTNAME= Mail-SpamAssassin-3.3.1 +PKGNAME= spamassassin-3.3.1 SVR4_PKGNAME= sa CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES+= ${RULESARCHIVE} +DISTFILES+= ${RULESARCHIVEASC} +DISTFILES+= ${RULESARCHIVESHA} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= heinz@NetBSD.org HOMEPAGE= http://spamassassin.apache.org/ @@ -17,20 +21,29 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../mk/bsd.prefs.mk" -DEPENDS+= p5-Net-DNS>=0.34:../../net/p5-Net-DNS -DEPENDS+= p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser -DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 -DEPENDS+= {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64 -DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww +RULESARCHIVE= Mail-SpamAssassin-rules-3.3.1.r923114.tgz +RULESARCHIVEASC=${RULESARCHIVE}.asc +RULESARCHIVESHA=${RULESARCHIVE}.sha1 +FILES_SUBST+= RULESARCHIVE=${RULESDIR}/${RULESARCHIVE} +PLIST_SUBST+= RULESARCHIVE=${RULESARCHIVE:Q} +PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q} +PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q} + +DEPENDS+= gnupg-[0-9]*:../../security/gnupg DEPENDS+= p5-Archive-Tar>=1.23:../../archivers/p5-Archive-Tar +DEPENDS+= p5-DB_File-[0-9]*:../../databases/p5-DB_File +DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 +DEPENDS+= p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser DEPENDS+= p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress DEPENDS+= p5-IO-Zlib>=1.04:../../devel/p5-IO-Zlib -DEPENDS+= gnupg-[0-9]*:../../security/gnupg -DEPENDS+= p5-DB_File-[0-9]*:../../databases/p5-DB_File +DEPENDS+= p5-NetAddr-IP>=4.007:../../net/p5-NetAddr-IP +DEPENDS+= p5-Net-DNS>=0.58:../../net/p5-Net-DNS +DEPENDS+= {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64 +DEPENDS+= p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes +DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww USE_TOOLS+= perl - CONFLICTS= p5-Mail-SpamAssassin-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME} @@ -46,14 +59,14 @@ SPAMASSASSIN_CONTACT_ADDRESS?= postmaster BUILD_DEFS+= SPAMASSASSIN_CONTACT_ADDRESS BUILD_DEFS+= VARBASE -PLIST_ADD= ${WRKSRC}/.PLIST_ADD -PLIST_SRC= ${PKGDIR}/PLIST ${PLIST_ADD} +DYNAMIC_PLIST= ${WRKSRC}/.PLIST_ADD +PLIST_SRC= ${PKGDIR}/PLIST ${DYNAMIC_PLIST} PERL5_PACKLIST= auto/Mail/SpamAssassin/.packlist GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_DIRS= spamc -BUILD_DIRS= . +BUILD_DIRS= . # build at the top-level directory, not in "spamc" PERL5_CONFIGURE= NO # we need the default "do-configure" target PERL5_CONFIGURE_DIRS= ${WRKSRC} @@ -65,8 +78,12 @@ MAKE_PARAMS+= DEFRULESDIR="${RULESDIR}" MAKE_PARAMS+= LOCALRULESDIR="${PKG_SYSCONFDIR}" MAKE_PARAMS+= LOCALSTATEDIR="${VARBASE}/spamassassin" MAKE_PARAMS+= PERL_BIN="${PERL5}" +MAKE_PARAMS+= PERL_WARN=yes +MAKE_PARAMS+= PERL_TAINT=yes MAKE_PARAMS+= SYSCONFDIR="${PKG_SYSCONFDIR}" +TEST_MAKE_FLAGS= HOME=${HOME} # for test t/razor2.t + RCD_SCRIPTS= spamd RCD_SCRIPT_SRC.spamd= ${WRKSRC}/spamd/netbsd-rc-script.sh @@ -77,12 +94,12 @@ DOCDIR= ${PREFIX}/${DOC_SUBDIR} RULE_SUBDIR= share/spamassassin RULESDIR= ${PREFIX}/${RULE_SUBDIR} -PRE_FILES= init.pre v310.pre v312.pre v320.pre +PRE_FILES= init.pre v310.pre v312.pre v320.pre v330.pre .for p in ${PRE_FILES} CONF_FILES+= ${EGDIR}/${p} ${PKG_SYSCONFDIR}/${p} .endfor CONF_FILES+= ${EGDIR}/local.cf ${PKG_SYSCONFDIR}/local.cf \ - ${RULESDIR}/user_prefs.template \ + ${RULESDIR}/user_prefs.template \ ${PKG_SYSCONFDIR}/user_prefs.template SA_INSTALLDIRS= ${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/ldap @@ -94,6 +111,7 @@ SA_DOCFILES+= CREDITS PACKAGING Changes SA_DOCFILES+= ldap/README ldap/README.testing ldap/sa_test.ldif SA_DOCFILES+= rules/STATISTICS-set0.txt rules/STATISTICS-set1.txt SA_DOCFILES+= rules/STATISTICS-set2.txt rules/STATISTICS-set3.txt +SA_DOCFILES+= rules/sa-update-pubkey.txt SA_DOCFILES+= spamc/README.qmail SA_DOCFILES+= sample-nonspam.txt sample-spam.txt SA_DOCFILES+= spamd/README spamd/README.vpopmail @@ -106,6 +124,7 @@ OWN_DIRS+= ${VARBASE}/spamassassin OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/sa-update-keys ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 SUBST_CLASSES+= sa2 +SUBST_MESSAGE.sa2= Setting correct paths for pkgsrc (part 1) SUBST_STAGE.sa2= pre-configure SUBST_FILES.sa2= README spamd/spamd.raw SUBST_SED.sa2= -e s!@@PREFIX@@!${PREFIX}!g @@ -113,6 +132,7 @@ SUBST_SED.sa2+= -e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g SUBST_SED.sa2+= -e s!@VARBASE@!${VARBASE}!g SUBST_CLASSES+= sa3 +SUBST_MESSAGE.sa3= Setting correct paths for pkgsrc (part 2) SUBST_STAGE.sa3= pre-configure SUBST_FILES.sa3= INSTALL UPGRADE USAGE ldap/README SUBST_FILES.sa3+= spamc/README.qmail spamc/spamc.pod @@ -136,7 +156,7 @@ INTERPRETER_SUPPORT= YES .endif # These variables are substituted in netbsd-rc-script.sh. -FILES_SUBST+= INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT:Q} +FILES_SUBST+= INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT} FILES_SUBST+= OPSYS=${OPSYS} INSTALLATION_DIRS+= ${SA_INSTALLDIRS} @@ -144,28 +164,31 @@ INSTALLATION_DIRS+= ${SA_INSTALLDIRS} pre-configure: perl5-configure # GNU configure needs version.h -> create it cd ${WRKSRC}/spamc && ${PERL5} ./version.h.pl - # values will be set via the SUBST framework in options.mk + # values in 'config' will be set via the SUBST framework in options.mk ${CP} ${WRKSRC}/t/config.dist ${WRKSRC}/t/config post-install: - ${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; : + ${TEST} -r ${DYNAMIC_PLIST} && ${RM} ${DYNAMIC_PLIST} ; : .for f in ${SA_DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f} - ${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD} + ${ECHO} "${DOC_SUBDIR}/${f}" >> ${DYNAMIC_PLIST} .endfor set -e ; cd ${WRKSRC}/rules; \ - for f in [0-9]*.cf; do \ - ${ECHO} "${RULE_SUBDIR}/$$f" >> ${PLIST_ADD}; \ - done; \ for f in ${PRE_FILES}; do \ ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR} && \ - ${ECHO} "${EG_SUBDIR}/$$f" >> ${PLIST_ADD}; \ + ${ECHO} "${EG_SUBDIR}/$$f" >> ${DYNAMIC_PLIST}; \ done # examples are in the static PLIST ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVE} \ + ${DESTDIR}${RULESDIR} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVEASC} \ + ${DESTDIR}${RULESDIR} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVESHA} \ + ${DESTDIR}${RULESDIR} # make sure we install the patched version of init.pre but can run the # tests with the original file diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST index 09bfdf31a99..78ecbfc69b5 100644 --- a/mail/spamassassin/PLIST +++ b/mail/spamassassin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2007/05/02 15:20:45 heinz Exp $ +@comment $NetBSD: PLIST,v 1.21 2010/03/24 21:41:10 heinz Exp $ @comment Most of this PLIST is auto-generated; see Makefile. share/examples/rc.d/spamd share/examples/spamassassin/local.cf @@ -7,3 +7,6 @@ share/examples/spamassassin/procmailrc.example share/spamassassin/languages share/spamassassin/sa-update-pubkey.txt share/spamassassin/user_prefs.template +share/spamassassin/${RULESARCHIVE} +share/spamassassin/${RULESARCHIVEASC} +share/spamassassin/${RULESARCHIVESHA} diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index 037ab030a09..623950699b7 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -1,12 +1,18 @@ -$NetBSD: distinfo,v 1.51 2010/01/02 03:48:40 heinz Exp $ +$NetBSD: distinfo,v 1.52 2010/03/24 21:41:10 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) = debb4851d063404e0a59557603cc08b259050b26 +SHA1 (Mail-SpamAssassin-3.3.1.tar.gz) = 8b32a857cc89c8d057442400bc00f33fd703ce06 +RMD160 (Mail-SpamAssassin-3.3.1.tar.gz) = 154fb16de88b3cc9fac41f721af21b181a2368f3 +Size (Mail-SpamAssassin-3.3.1.tar.gz) = 1196842 bytes +SHA1 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = 7aeeb7abb2d727bb35d3a0927a1390ad3cddad59 +RMD160 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = 9b6e17e05b3a323ba820ec2dc432d8b7dfc4d0ac +Size (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = 255548 bytes +SHA1 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.asc) = 3e11775118e0e4be5720fdc3b99661e187943fd8 +RMD160 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.asc) = bc9c1755977c0b8677a3a8e700068f0e7288f434 +Size (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.asc) = 823 bytes +SHA1 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 949b64216a6bb6833bd4f2ccab18b53719dda311 +RMD160 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 8b6c82596c158e5e010643a4d16a987dcc65244c +Size (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 84 bytes +SHA1 (patch-ab) = 84ebc0f611365c00205a85cb84970772a0931ef8 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353 SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8 SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424 -SHA1 (patch-ba) = ea6b8eac3d9475641725dc4aa1e7a4d31912a044 -SHA1 (patch-bc) = 71fcf6297eacbd69a5c5d5b1911f648e4011ce3e -SHA1 (patch-be) = 42b9975742834e836159b754f4a50a0d68d8ea75 diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk index 87f57f5c33e..d9fb7316f84 100644 --- a/mail/spamassassin/options.mk +++ b/mail/spamassassin/options.mk @@ -1,101 +1,37 @@ -# $NetBSD: options.mk,v 1.8 2009/03/07 13:25:19 seb Exp $ +# $NetBSD: options.mk,v 1.9 2010/03/24 21:41:10 heinz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.spamassassin PKG_SUPPORTED_OPTIONS= inet6 -PKG_SUPPORTED_OPTIONS+= online-tests -PKG_SUPPORTED_OPTIONS+= spamassassin-perl-warnings -PKG_SUPPORTED_OPTIONS+= spamassassin-taint-checks -PKG_SUPPORTED_OPTIONS+= spamassassin-test-awl-sql -PKG_SUPPORTED_OPTIONS+= spamassassin-test-bayes-sql -PKG_SUPPORTED_OPTIONS+= spamassassin-test-prefork PKG_SUPPORTED_OPTIONS+= ssl -PKG_OPTIONS_LEGACY_OPTS+= awl-sql-tests:spamassassin-test-awl-sql -PKG_OPTIONS_LEGACY_OPTS+= bayes-sql-tests:spamassassin-test-bayes-sql -PKG_OPTIONS_LEGACY_OPTS+= net-tests:online-tests -PKG_OPTIONS_LEGACY_OPTS+= perl-taint-checks:spamassassin-taint-checks -PKG_OPTIONS_LEGACY_OPTS+= perl-warnings:spamassassin-perl-warnings -PKG_OPTIONS_LEGACY_OPTS+= spamassassin-test-net:online-tests - # # Default options # -PKG_SUGGESTED_OPTIONS= inet6 spamassassin-taint-checks -PKG_SUGGESTED_OPTIONS+= spamassassin-perl-warnings ssl +PKG_SUGGESTED_OPTIONS= inet6 ssl .include "../../mk/bsd.options.mk" # -# change t/config according to all the options +# change t/config according to enable/disable software options # +AWL_SQL_TEST?= n # to enable tests, set to 'y' on make command line +BAYES_SQL_TEST?= n # to enable tests, set to 'y' on make command line +LONG_TEST?= y # to disable tests, set to 'n' on make command line +NET_TEST?= y # to disable tests, set to 'n' on make command line +PREFORK_TEST?= n # to enable tests, set to 'y' on make command line +ROOT_TEST?= n # to enable tests, set to 'y' on make command line + SUBST_CLASSES+= satests SUBST_STAGE.satests= post-configure SUBST_FILES.satests= t/config SUBST_SED.satests= -e s!awl_sql_tests=n!awl_sql_tests=${AWL_SQL_TEST}! SUBST_SED.satests+= -e s!bayes_sql_tests=n!bayes_sql_tests=${BAYES_SQL_TEST}! +SUBST_SED.satests+= -e s!run_long_tests=n!run_long_tests=${LONG_TEST}! SUBST_SED.satests+= -e s!run_net_tests=n!run_net_tests=${NET_TEST}! +SUBST_SED.satests+= -e s!run_root_tests=n!run_root_tests=${ROOT_TEST}! SUBST_SED.satests+= -e s!prefork_stress_test=n!prefork_stress_test=${PREFORK_TEST}! # -# Enable tests of the SQL storage module for the automatic whitelist -# (AWL). This option enables interactive questions about the database -# configuration during 'configure' phase. -# -.if !empty(PKG_OPTIONS:Mspamassassin-test-awl-sql) -AWL_SQL_TEST=y -.else -AWL_SQL_TEST=n -.endif - -# -# Enable tests of the SQL storage module for Bayes information. -# This option enables interactive questions about the database -# configuration during 'configure' phase. -# -.if !empty(PKG_OPTIONS:Mspamassassin-test-bayes-sql) -BAYES_SQL_TEST=y -.else -BAYES_SQL_TEST=n -.endif - -# -# Enable Internet based tests during 'make test' (Razor, Pyzor, etc.) -# -.if !empty(PKG_OPTIONS:Monline-tests) -NET_TEST=y -.else -NET_TEST=n -.endif - -# -# Enable Perl warnings in spamd and spamassassin -# -.if !empty(PKG_OPTIONS:Mspamassassin-perl-warnings) -MAKE_PARAMS+= PERL_WARN=yes -.else -MAKE_PARAMS+= PERL_WARN=no -.endif - -# -# Enable Perl taint checks in spamd and spamassassin to improve security -# -.if !empty(PKG_OPTIONS:Mspamassassin-taint-checks) -MAKE_PARAMS+= PERL_TAINT=yes -.else -MAKE_PARAMS+= PERL_TAINT=no -.endif - -# -# Enable spamd prefork stress test (will kill any processes containing the -# string 'spam child' in their process title). -# -.if !empty(PKG_OPTIONS:Mspamassassin-test-prefork) -PREFORK_TEST=y -.else -PREFORK_TEST=n -.endif - -# # Build spamc and spamd with support for connections over SSL # .if !empty(PKG_OPTIONS:Mssl) diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab index e7b871cc23b..ca6de755b43 100644 --- a/mail/spamassassin/patches/patch-ab +++ b/mail/spamassassin/patches/patch-ab @@ -1,34 +1,21 @@ -$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. +$NetBSD: patch-ab,v 1.16 2010/03/24 21:41:11 heinz Exp $ - 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 2008-06-10 09:21:07.000000000 +0000 +--- Makefile.PL.orig 2009-08-09 23:01:31.000000000 +0200 +++ Makefile.PL -@@ -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 = ( +@@ -138,6 +138,7 @@ my %makefile = ( 'spamassassin.raw' => 'spamassassin', 'sa-learn.raw' => 'sa-learn', 'sa-update.raw' => 'sa-update', + 'spamc/qmail-spamc.c' => 'spamc/qmail-spamc$(EXE_EXT)', - 'sa-compile.raw' => 'sa-compile', - 'spamc/spamc.c' => 'spamc/spamc$(EXE_EXT)', - 'spamd/spamd.raw' => 'spamd/spamd', -@@ -1201,17 +1202,19 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail + 'sa-compile.raw' => 'sa-compile', + 'sa-awl.raw' => 'sa-awl', + 'sa-check_spamd.raw' => 'sa-check_spamd', +@@ -1095,18 +1096,20 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail conf__install: -$(MKPATH) $(B_CONFDIR) @@ -37,12 +24,14 @@ $NetBSD: patch-ab,v 1.15 2010/01/01 13:55:32 heinz Exp $ - $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}" - $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}" - $(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}" +- $(PERL) -MFile::Copy -e "copy(q{rules/v330.pre}, q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}" + @ # manage local.cf and *.pre through pkgsrc .mk files + @ # $(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}" + @ # $(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}" + @ # $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}" + @ # $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}" + @ # $(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}" ++ @ # $(PERL) -MFile::Copy -e "copy(q{rules/v330.pre}, q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}" data__install: -$(MKPATH) $(B_DATADIR) diff --git a/mail/spamassassin/patches/patch-ba b/mail/spamassassin/patches/patch-ba deleted file mode 100644 index 2636b502c5a..00000000000 --- a/mail/spamassassin/patches/patch-ba +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ba,v 1.2 2008/01/09 15:55:52 heinz Exp $ - - Both submitted upstream (bug id 5628/5630): - - no need for a hard-coded path, the appropriate variables already exist - - the documentation conflicts with the code - ---- sa-update.raw.orig 2007-08-08 15:19:47.000000000 +0200 -+++ sa-update.raw -@@ -1322,7 +1322,7 @@ Options: - keyring. Use multiple times for multiple files - --updatedir path Directory to place updates, defaults to the - SpamAssassin site rules directory -- (default: /var/lib/spamassassin/<version>) -+ (default: @@LOCAL_STATE_DIR@@/@@VERSION@@) - -D, --debug [area=n,...] Print debugging messages - -V, --version Print version - -h, --help Print usage message -@@ -1441,7 +1441,7 @@ Note: use of this option automatically e - - By default, C<sa-update> will use the system-wide rules update directory: - -- @@LOCAL_STATE_DIR@@/spamassassin/@@VERSION@@ -+ @@LOCAL_STATE_DIR@@/@@VERSION@@ - - If the updates should be stored in another location, specify it here. - diff --git a/mail/spamassassin/patches/patch-bc b/mail/spamassassin/patches/patch-bc deleted file mode 100644 index ccb313aeaf1..00000000000 --- a/mail/spamassassin/patches/patch-bc +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-bc,v 1.3 2008/06/22 22:41:01 heinz Exp $ - - Both submitted upstream (bug id 5628/5630): - - no need for a hard-coded path, the appropriate variables already exist - - the documentation conflicts with the code - ---- sa-compile.raw.orig 2008-06-10 11:21:07.000000000 +0200 -+++ sa-compile.raw -@@ -684,7 +684,7 @@ Options: - --siteconfigpath=path Path for site configs - (default: /etc/mail/spamassassin) - --updatedir=path Directory to place updates -- (default: /var/lib/spamassassin/compiled/<perlversion>/<version>) -+ (default: @@LOCAL_STATE_DIR@@/compiled/@@PERL_MAJOR_VER@@/@@VERSION@@) - --cf='config line' Additional line of configuration - -D, --debug [area=n,...] Print debugging messages - -V, --version Print version -@@ -746,12 +746,12 @@ the default directories (usually C</etc/ - - By default, C<sa-compile> will use the system-wide rules update directory: - -- @@LOCAL_STATE_DIR@@/spamassassin/compiled/@@PERL_MAJOR_VER@@/@@VERSION@@ -+ @@LOCAL_STATE_DIR@@/compiled/@@PERL_MAJOR_VER@@/@@VERSION@@ - - If the updates should be stored in another location, specify it here. - - Note that use of this option is not recommended; if sa-compile is placing the --compiled rules the wrong directory, you probably need to rebuild SpamAssassin -+compiled rules in the wrong directory, you probably need to rebuild SpamAssassin - with different C<Makefile.PL> arguments, instead of overriding sa-compile's - runtime behaviour. - diff --git a/mail/spamassassin/patches/patch-be b/mail/spamassassin/patches/patch-be deleted file mode 100644 index 08de57fa893..00000000000 --- a/mail/spamassassin/patches/patch-be +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-be,v 1.1 2010/01/02 03:48:40 heinz Exp $ - ---- rules/72_active.cf.orig 2008-06-10 09:21:33.000000000 +0000 -+++ rules/72_active.cf -@@ -540,7 +540,7 @@ describe FH_DATE_IS_19XX The date is not - ##} FH_DATE_IS_19XX - - ##{ FH_DATE_PAST_20XX --header FH_DATE_PAST_20XX Date =~ /20[1-9][0-9]/ [if-unset: 2006]
-+header FH_DATE_PAST_20XX Date =~ /20[2-9][0-9]/ [if-unset: 2006]
- describe FH_DATE_PAST_20XX The date is grossly in the future.
- ##} FH_DATE_PAST_20XX - |