Thu Aug 1 10:29:00 2013 UTC ()
Add a patch from the svn repository (via
https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6872).
Fix sa-update with new p5-Net-DNS.
Bump PKGREVISION


(bouyer)
diff -r1.108 -r1.109 pkgsrc/mail/spamassassin/Makefile
diff -r1.59 -r1.60 pkgsrc/mail/spamassassin/distinfo
diff -r0 -r1.1 pkgsrc/mail/spamassassin/patches/patch-sa-update
cvs diff -r1.108 -r1.109 pkgsrc/mail/spamassassin/Makefile (switch to unified diff)

--- pkgsrc/mail/spamassassin/Makefile 2013/07/24 16:17:02 1.108
+++ pkgsrc/mail/spamassassin/Makefile 2013/08/01 10:29:00 1.109
@@ -1,208 +1,208 @@ @@ -1,208 +1,208 @@
1# $NetBSD: Makefile,v 1.108 2013/07/24 16:17:02 drochner Exp $ 1# $NetBSD: Makefile,v 1.109 2013/08/01 10:29:00 bouyer Exp $
2 2
3DISTNAME= Mail-SpamAssassin-3.3.2 3DISTNAME= Mail-SpamAssassin-3.3.2
4PKGNAME= spamassassin-3.3.2 4PKGNAME= spamassassin-3.3.2
5PKGREVISION= 4 5PKGREVISION= 5
6SVR4_PKGNAME= sa 6SVR4_PKGNAME= sa
7CATEGORIES= mail perl5 7CATEGORIES= mail perl5
8MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} 8MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10DISTFILES+= ${RULESARCHIVE} 10DISTFILES+= ${RULESARCHIVE}
11DISTFILES+= ${RULESARCHIVEASC} 11DISTFILES+= ${RULESARCHIVEASC}
12DISTFILES+= ${RULESARCHIVESHA} 12DISTFILES+= ${RULESARCHIVESHA}
13EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 13EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://spamassassin.apache.org/ 16HOMEPAGE= http://spamassassin.apache.org/
17COMMENT= Mail filter to identify spam 17COMMENT= Mail filter to identify spam
18LICENSE= apache-2.0 18LICENSE= apache-2.0
19 19
20PKG_INSTALLATION_TYPES= overwrite pkgviews 20PKG_INSTALLATION_TYPES= overwrite pkgviews
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24RULESARCHIVE= Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz 24RULESARCHIVE= Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz
25RULESARCHIVEASC=${RULESARCHIVE}.asc 25RULESARCHIVEASC=${RULESARCHIVE}.asc
26RULESARCHIVESHA=${RULESARCHIVE}.sha1 26RULESARCHIVESHA=${RULESARCHIVE}.sha1
27FILES_SUBST+= RULESARCHIVE=${RULESDIR}/${RULESARCHIVE} 27FILES_SUBST+= RULESARCHIVE=${RULESDIR}/${RULESARCHIVE}
28PLIST_SUBST+= RULESARCHIVE=${RULESARCHIVE:Q} 28PLIST_SUBST+= RULESARCHIVE=${RULESARCHIVE:Q}
29PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q} 29PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q}
30PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q} 30PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q}
31 31
32DEPENDS+= p5-Archive-Tar>=1.23:../../archivers/p5-Archive-Tar 32DEPENDS+= p5-Archive-Tar>=1.23:../../archivers/p5-Archive-Tar
33DEPENDS+= p5-DB_File-[0-9]*:../../databases/p5-DB_File 33DEPENDS+= p5-DB_File-[0-9]*:../../databases/p5-DB_File
34DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 34DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
35DEPENDS+= p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser 35DEPENDS+= p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser
36DEPENDS+= p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress 36DEPENDS+= p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress
37DEPENDS+= p5-IO-Zlib>=1.04:../../devel/p5-IO-Zlib 37DEPENDS+= p5-IO-Zlib>=1.04:../../devel/p5-IO-Zlib
38DEPENDS+= p5-NetAddr-IP>=4.007:../../net/p5-NetAddr-IP 38DEPENDS+= p5-NetAddr-IP>=4.007:../../net/p5-NetAddr-IP
39DEPENDS+= p5-Net-DNS>=0.58:../../net/p5-Net-DNS 39DEPENDS+= p5-Net-DNS>=0.58:../../net/p5-Net-DNS
40DEPENDS+= {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64 40DEPENDS+= {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64
41DEPENDS+= p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes 41DEPENDS+= p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes
42DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww 42DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
43 43
44USE_TOOLS+= perl 44USE_TOOLS+= perl
45 45
46CONFLICTS= p5-Mail-SpamAssassin-[0-9]* 46CONFLICTS= p5-Mail-SpamAssassin-[0-9]*
47 47
48WRKSRC= ${WRKDIR}/${DISTNAME} 48WRKSRC= ${WRKDIR}/${DISTNAME}
49 49
50PKG_SYSCONFSUBDIR= spamassassin 50PKG_SYSCONFSUBDIR= spamassassin
51 51
52# Set contact address (e-mail, URL, ...) for use in spam report messages 52# Set contact address (e-mail, URL, ...) for use in spam report messages
53# See "perldoc Mail::SpamAssassin::Conf" for option "report_contact" 53# See "perldoc Mail::SpamAssassin::Conf" for option "report_contact"
54SPAMASSASSIN_CONTACT_ADDRESS?= postmaster 54SPAMASSASSIN_CONTACT_ADDRESS?= postmaster
55 55
56.include "options.mk" 56.include "options.mk"
57 57
58BUILD_DEFS+= SPAMASSASSIN_CONTACT_ADDRESS 58BUILD_DEFS+= SPAMASSASSIN_CONTACT_ADDRESS
59BUILD_DEFS+= VARBASE 59BUILD_DEFS+= VARBASE
60 60
61DYNAMIC_PLIST= ${WRKSRC}/.PLIST_ADD 61DYNAMIC_PLIST= ${WRKSRC}/.PLIST_ADD
62PLIST_SRC= ${PKGDIR}/PLIST ${DYNAMIC_PLIST} 62PLIST_SRC= ${PKGDIR}/PLIST ${DYNAMIC_PLIST}
63PERL5_PACKLIST= auto/Mail/SpamAssassin/.packlist 63PERL5_PACKLIST= auto/Mail/SpamAssassin/.packlist
64 64
65GNU_CONFIGURE= YES 65GNU_CONFIGURE= YES
66CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 66CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
67CONFIGURE_DIRS= spamc 67CONFIGURE_DIRS= spamc
68BUILD_DIRS= . # build at the top-level directory, not in "spamc" 68BUILD_DIRS= . # build at the top-level directory, not in "spamc"
69PERL5_CONFIGURE= NO # we need the default "do-configure" target 69PERL5_CONFIGURE= NO # we need the default "do-configure" target
70PERL5_CONFIGURE_DIRS= ${WRKSRC} 70PERL5_CONFIGURE_DIRS= ${WRKSRC}
71 71
72# test t/meta needs this 72# test t/meta needs this
73REPLACE_PERL+= build/parse-rules-for-masses 73REPLACE_PERL+= build/parse-rules-for-masses
74 74
75MAKE_PARAMS+= CONTACT_ADDRESS=${SPAMASSASSIN_CONTACT_ADDRESS:Q} 75MAKE_PARAMS+= CONTACT_ADDRESS=${SPAMASSASSIN_CONTACT_ADDRESS:Q}
76MAKE_PARAMS+= DEFRULESDIR="${RULESDIR}" 76MAKE_PARAMS+= DEFRULESDIR="${RULESDIR}"
77MAKE_PARAMS+= LOCALRULESDIR="${PKG_SYSCONFDIR}" 77MAKE_PARAMS+= LOCALRULESDIR="${PKG_SYSCONFDIR}"
78MAKE_PARAMS+= LOCALSTATEDIR="${VARBASE}/spamassassin" 78MAKE_PARAMS+= LOCALSTATEDIR="${VARBASE}/spamassassin"
79MAKE_PARAMS+= PERL_BIN="${PERL5}" 79MAKE_PARAMS+= PERL_BIN="${PERL5}"
80MAKE_PARAMS+= PERL_WARN=yes 80MAKE_PARAMS+= PERL_WARN=yes
81MAKE_PARAMS+= PERL_TAINT=yes 81MAKE_PARAMS+= PERL_TAINT=yes
82MAKE_PARAMS+= SYSCONFDIR="${PKG_SYSCONFDIR}" 82MAKE_PARAMS+= SYSCONFDIR="${PKG_SYSCONFDIR}"
83 83
84TEST_MAKE_FLAGS= HOME=${HOME} # for test t/razor2.t 84TEST_MAKE_FLAGS= HOME=${HOME} # for test t/razor2.t
85 85
86RCD_SCRIPTS= spamd 86RCD_SCRIPTS= spamd
87RCD_SCRIPT_SRC.spamd= ${WRKSRC}/spamd/netbsd-rc-script.sh 87RCD_SCRIPT_SRC.spamd= ${WRKSRC}/spamd/netbsd-rc-script.sh
88 88
89EG_SUBDIR= share/examples/spamassassin 89EG_SUBDIR= share/examples/spamassassin
90EGDIR= ${PREFIX}/${EG_SUBDIR} 90EGDIR= ${PREFIX}/${EG_SUBDIR}
91DOC_SUBDIR= share/doc/spamassassin 91DOC_SUBDIR= share/doc/spamassassin
92DOCDIR= ${PREFIX}/${DOC_SUBDIR} 92DOCDIR= ${PREFIX}/${DOC_SUBDIR}
93RULE_SUBDIR= share/spamassassin 93RULE_SUBDIR= share/spamassassin
94RULESDIR= ${PREFIX}/${RULE_SUBDIR} 94RULESDIR= ${PREFIX}/${RULE_SUBDIR}
95 95
96PRE_FILES= init.pre v310.pre v312.pre v320.pre v330.pre 96PRE_FILES= init.pre v310.pre v312.pre v320.pre v330.pre
97.for p in ${PRE_FILES} 97.for p in ${PRE_FILES}
98CONF_FILES+= ${EGDIR}/${p} ${PKG_SYSCONFDIR}/${p} 98CONF_FILES+= ${EGDIR}/${p} ${PKG_SYSCONFDIR}/${p}
99.endfor 99.endfor
100CONF_FILES+= ${EGDIR}/local.cf ${PKG_SYSCONFDIR}/local.cf \ 100CONF_FILES+= ${EGDIR}/local.cf ${PKG_SYSCONFDIR}/local.cf \
101 ${RULESDIR}/user_prefs.template \ 101 ${RULESDIR}/user_prefs.template \
102 ${PKG_SYSCONFDIR}/user_prefs.template 102 ${PKG_SYSCONFDIR}/user_prefs.template
103 103
104SA_INSTALLDIRS= ${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/ldap 104SA_INSTALLDIRS= ${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/ldap
105SA_INSTALLDIRS+= ${DOC_SUBDIR}/rules ${DOC_SUBDIR}/spamc 105SA_INSTALLDIRS+= ${DOC_SUBDIR}/rules ${DOC_SUBDIR}/spamc
106SA_INSTALLDIRS+= ${DOC_SUBDIR}/spamd ${DOC_SUBDIR}/sql ${RULE_SUBDIR} 106SA_INSTALLDIRS+= ${DOC_SUBDIR}/spamd ${DOC_SUBDIR}/sql ${RULE_SUBDIR}
107 107
108SA_DOCFILES= INSTALL LICENSE README TRADEMARK UPGRADE USAGE NOTICE 108SA_DOCFILES= INSTALL LICENSE README TRADEMARK UPGRADE USAGE NOTICE
109SA_DOCFILES+= CREDITS PACKAGING Changes 109SA_DOCFILES+= CREDITS PACKAGING Changes
110SA_DOCFILES+= ldap/README ldap/README.testing ldap/sa_test.ldif 110SA_DOCFILES+= ldap/README ldap/README.testing ldap/sa_test.ldif
111SA_DOCFILES+= rules/STATISTICS-set0.txt rules/STATISTICS-set1.txt 111SA_DOCFILES+= rules/STATISTICS-set0.txt rules/STATISTICS-set1.txt
112SA_DOCFILES+= rules/STATISTICS-set2.txt rules/STATISTICS-set3.txt 112SA_DOCFILES+= rules/STATISTICS-set2.txt rules/STATISTICS-set3.txt
113SA_DOCFILES+= rules/sa-update-pubkey.txt 113SA_DOCFILES+= rules/sa-update-pubkey.txt
114SA_DOCFILES+= spamc/README.qmail 114SA_DOCFILES+= spamc/README.qmail
115SA_DOCFILES+= sample-nonspam.txt sample-spam.txt 115SA_DOCFILES+= sample-nonspam.txt sample-spam.txt
116SA_DOCFILES+= spamd/README spamd/README.vpopmail 116SA_DOCFILES+= spamd/README spamd/README.vpopmail
117SA_DOCFILES+= sql/README sql/README.awl sql/README.bayes 117SA_DOCFILES+= sql/README sql/README.awl sql/README.bayes
118SA_DOCFILES+= sql/awl_mysql.sql sql/awl_pg.sql sql/bayes_mysql.sql 118SA_DOCFILES+= sql/awl_mysql.sql sql/awl_pg.sql sql/bayes_mysql.sql
119SA_DOCFILES+= sql/bayes_pg.sql sql/userpref_mysql.sql 119SA_DOCFILES+= sql/bayes_pg.sql sql/userpref_mysql.sql
120SA_DOCFILES+= sql/userpref_pg.sql 120SA_DOCFILES+= sql/userpref_pg.sql
121 121
122OWN_DIRS+= ${VARBASE}/spamassassin 122OWN_DIRS+= ${VARBASE}/spamassassin
123OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/sa-update-keys ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 123OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/sa-update-keys ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
124 124
125SUBST_CLASSES+= sa2 125SUBST_CLASSES+= sa2
126SUBST_MESSAGE.sa2= Setting correct paths for pkgsrc (part 1) 126SUBST_MESSAGE.sa2= Setting correct paths for pkgsrc (part 1)
127SUBST_STAGE.sa2= pre-configure 127SUBST_STAGE.sa2= pre-configure
128SUBST_FILES.sa2= README spamd/spamd.raw 128SUBST_FILES.sa2= README spamd/spamd.raw
129SUBST_SED.sa2= -e s!@@PREFIX@@!${PREFIX}!g 129SUBST_SED.sa2= -e s!@@PREFIX@@!${PREFIX}!g
130SUBST_SED.sa2+= -e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g 130SUBST_SED.sa2+= -e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g
131SUBST_SED.sa2+= -e s!@VARBASE@!${VARBASE}!g 131SUBST_SED.sa2+= -e s!@VARBASE@!${VARBASE}!g
132 132
133SUBST_CLASSES+= sa3 133SUBST_CLASSES+= sa3
134SUBST_MESSAGE.sa3= Setting correct paths for pkgsrc (part 2) 134SUBST_MESSAGE.sa3= Setting correct paths for pkgsrc (part 2)
135SUBST_STAGE.sa3= pre-configure 135SUBST_STAGE.sa3= pre-configure
136SUBST_FILES.sa3= INSTALL UPGRADE USAGE ldap/README 136SUBST_FILES.sa3= INSTALL UPGRADE USAGE ldap/README
137SUBST_FILES.sa3+= spamc/README.qmail spamc/spamc.pod 137SUBST_FILES.sa3+= spamc/README.qmail spamc/spamc.pod
138SUBST_FILES.sa3+= lib/Mail/SpamAssassin/Conf.pm 138SUBST_FILES.sa3+= lib/Mail/SpamAssassin/Conf.pm
139SUBST_FILES.sa3+= lib/Mail/SpamAssassin/Plugin/Test.pm 139SUBST_FILES.sa3+= lib/Mail/SpamAssassin/Plugin/Test.pm
140SUBST_FILES.sa3+= spamd/README spamd/README.vpopmail sql/README 140SUBST_FILES.sa3+= spamd/README spamd/README.vpopmail sql/README
141SUBST_FILES.sa3+= sql/README.awl sa-learn.raw sa-compile.raw sa-update.raw 141SUBST_FILES.sa3+= sql/README.awl sa-learn.raw sa-compile.raw sa-update.raw
142SUBST_SED.sa3= -e s!/usr/share!${PREFIX}/share!g 142SUBST_SED.sa3= -e s!/usr/share!${PREFIX}/share!g
143SUBST_SED.sa3+= -e s!/usr/bin!${PREFIX}/bin!g 143SUBST_SED.sa3+= -e s!/usr/bin!${PREFIX}/bin!g
144SUBST_SED.sa3+= -e s!/usr/local/bin!${PREFIX}/bin!g 144SUBST_SED.sa3+= -e s!/usr/local/bin!${PREFIX}/bin!g
145SUBST_SED.sa3+= -e s!/usr/lib!${PREFIX}/lib!g 145SUBST_SED.sa3+= -e s!/usr/lib!${PREFIX}/lib!g
146SUBST_SED.sa3+= -e s!/etc/mail/spamassassin!${PKG_SYSCONFDIR}!g 146SUBST_SED.sa3+= -e s!/etc/mail/spamassassin!${PKG_SYSCONFDIR}!g
147 147
148.if (${OPSYS} == "NetBSD") || (${OPSYS} == "DragonFly") 148.if (${OPSYS} == "NetBSD") || (${OPSYS} == "DragonFly")
149# the 'spamd' RCD_SCRIPT behaves differently if we run NetBSD 1.6 or later 149# the 'spamd' RCD_SCRIPT behaves differently if we run NetBSD 1.6 or later
150. if (${OPSYS} == "NetBSD") && !empty(OS_VERSION:M1.[0-5]*) 150. if (${OPSYS} == "NetBSD") && !empty(OS_VERSION:M1.[0-5]*)
151INTERPRETER_SUPPORT= NO 151INTERPRETER_SUPPORT= NO
152. else 152. else
153INTERPRETER_SUPPORT= YES 153INTERPRETER_SUPPORT= YES
154. endif 154. endif
155.endif 155.endif
156 156
157# These variables are substituted in netbsd-rc-script.sh. 157# These variables are substituted in netbsd-rc-script.sh.
158FILES_SUBST+= INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT} 158FILES_SUBST+= INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT}
159FILES_SUBST+= OPSYS=${OPSYS} 159FILES_SUBST+= OPSYS=${OPSYS}
160 160
161INSTALLATION_DIRS+= ${SA_INSTALLDIRS} 161INSTALLATION_DIRS+= ${SA_INSTALLDIRS}
162 162
163pre-configure: perl5-configure 163pre-configure: perl5-configure
164 # GNU configure needs version.h -> create it 164 # GNU configure needs version.h -> create it
165 cd ${WRKSRC}/spamc && ${PERL5} ./version.h.pl 165 cd ${WRKSRC}/spamc && ${PERL5} ./version.h.pl
166 # values in 'config' will be set via the SUBST framework in options.mk 166 # values in 'config' will be set via the SUBST framework in options.mk
167 ${CP} ${WRKSRC}/t/config.dist ${WRKSRC}/t/config 167 ${CP} ${WRKSRC}/t/config.dist ${WRKSRC}/t/config
168 168
169post-install: 169post-install:
170 ${TEST} -r ${DYNAMIC_PLIST} && ${RM} ${DYNAMIC_PLIST} ; : 170 ${TEST} -r ${DYNAMIC_PLIST} && ${RM} ${DYNAMIC_PLIST} ; :
171.for f in ${SA_DOCFILES} 171.for f in ${SA_DOCFILES}
172 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f} 172 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
173 ${ECHO} "${DOC_SUBDIR}/${f}" >> ${DYNAMIC_PLIST} 173 ${ECHO} "${DOC_SUBDIR}/${f}" >> ${DYNAMIC_PLIST}
174.endfor 174.endfor
175 175
176 set -e ; cd ${WRKSRC}/rules; \ 176 set -e ; cd ${WRKSRC}/rules; \
177 for f in ${PRE_FILES}; do \ 177 for f in ${PRE_FILES}; do \
178 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR} && \ 178 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR} && \
179 ${ECHO} "${EG_SUBDIR}/$$f" >> ${DYNAMIC_PLIST}; \ 179 ${ECHO} "${EG_SUBDIR}/$$f" >> ${DYNAMIC_PLIST}; \
180 done 180 done
181 # examples are in the static PLIST 181 # examples are in the static PLIST
182 ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR} 182 ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR}
183 ${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR} 183 ${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR}
184 ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR} 184 ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR}
185 ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVE} \ 185 ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVE} \
186 ${DESTDIR}${RULESDIR} 186 ${DESTDIR}${RULESDIR}
187 ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVEASC} \ 187 ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVEASC} \
188 ${DESTDIR}${RULESDIR} 188 ${DESTDIR}${RULESDIR}
189 ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVESHA} \ 189 ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVESHA} \
190 ${DESTDIR}${RULESDIR} 190 ${DESTDIR}${RULESDIR}
191 191
192# make sure we install the patched version of init.pre but can run the 192# make sure we install the patched version of init.pre but can run the
193# tests with the original file 193# tests with the original file
194pre-patch: 194pre-patch:
195 ${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.notpatched 195 ${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.notpatched
196 196
197post-patch: 197post-patch:
198 ${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.patched 198 ${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.patched
199 199
200pre-test: 200pre-test:
201 ${CP} ${WRKDIR}/init.pre.notpatched ${WRKSRC}/rules/init.pre 201 ${CP} ${WRKDIR}/init.pre.notpatched ${WRKSRC}/rules/init.pre
202 202
203post-test: 203post-test:
204 ${CP} ${WRKDIR}/init.pre.patched ${WRKSRC}/rules/init.pre 204 ${CP} ${WRKDIR}/init.pre.patched ${WRKSRC}/rules/init.pre
205 205
206.include "../../devel/zlib/buildlink3.mk" 206.include "../../devel/zlib/buildlink3.mk"
207.include "../../lang/perl5/module.mk" 207.include "../../lang/perl5/module.mk"
208.include "../../mk/bsd.pkg.mk" 208.include "../../mk/bsd.pkg.mk"
cvs diff -r1.59 -r1.60 pkgsrc/mail/spamassassin/distinfo (switch to unified diff)

--- pkgsrc/mail/spamassassin/distinfo 2013/07/24 16:17:02 1.59
+++ pkgsrc/mail/spamassassin/distinfo 2013/08/01 10:29:00 1.60
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.59 2013/07/24 16:17:02 drochner Exp $ 1$NetBSD: distinfo,v 1.60 2013/08/01 10:29:00 bouyer Exp $
2 2
3SHA1 (Mail-SpamAssassin-3.3.2.tar.gz) = de954f69e190496eff4a796a9bab61747f03072b 3SHA1 (Mail-SpamAssassin-3.3.2.tar.gz) = de954f69e190496eff4a796a9bab61747f03072b
4RMD160 (Mail-SpamAssassin-3.3.2.tar.gz) = 78e22ba6ba62a48fb7d24c40170124881b975fd9 4RMD160 (Mail-SpamAssassin-3.3.2.tar.gz) = 78e22ba6ba62a48fb7d24c40170124881b975fd9
5Size (Mail-SpamAssassin-3.3.2.tar.gz) = 1208182 bytes 5Size (Mail-SpamAssassin-3.3.2.tar.gz) = 1208182 bytes
6SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = a199d5f0f8c2381e3dfe421e7a774356b3ffda4b 6SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = a199d5f0f8c2381e3dfe421e7a774356b3ffda4b
7RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 22843725705aca9a7c773d9cca50d6eb30ca295c 7RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 22843725705aca9a7c773d9cca50d6eb30ca295c
8Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 258995 bytes 8Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 258995 bytes
9SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 102cbd61d3d37243d17a48748fc468a1a4e91d05 9SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 102cbd61d3d37243d17a48748fc468a1a4e91d05
10RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 764ea0f583c370c3c11f7245005327afa6c19988 10RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 764ea0f583c370c3c11f7245005327afa6c19988
11Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 823 bytes 11Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 823 bytes
12SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = 13003cfad508bd45863e02711aaee041ab9bc30e 12SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = 13003cfad508bd45863e02711aaee041ab9bc30e
13RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = aa218d53eb3dda0737171f75d63b7a64f97c2930 13RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = aa218d53eb3dda0737171f75d63b7a64f97c2930
14Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = 88 bytes 14Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = 88 bytes
15SHA1 (patch-aa) = 0fff97dee1153332471aeadc2b96c357d1925f5c 15SHA1 (patch-aa) = 0fff97dee1153332471aeadc2b96c357d1925f5c
16SHA1 (patch-ab) = 84ebc0f611365c00205a85cb84970772a0931ef8 16SHA1 (patch-ab) = 84ebc0f611365c00205a85cb84970772a0931ef8
17SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353 17SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
18SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8 18SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
19SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424 19SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424
20SHA1 (patch-ba) = 1842e3fc17b3d23309336e542635eeacb67461e8 20SHA1 (patch-ba) = 1842e3fc17b3d23309336e542635eeacb67461e8
 21SHA1 (patch-sa-update) = 893d8c2ebe68524b620a438f30e2b9ba764aaa6e
File Added: pkgsrc/mail/spamassassin/patches/patch-sa-update
$NetBSD: patch-sa-update,v 1.1 2013/08/01 10:29:00 bouyer Exp $

from https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6872,
fix for new Net::DNS

Index: sa-update.raw
===================================================================
--- sa-update.raw	(revision 1421187)
+++ sa-update	(working copy)
@@ -1136,9 +1136,11 @@
   if ($RR) {
     foreach my $rr ($RR->answer) {
       my $text = $rr->rdatastr;
-      local($1);
-      $text =~ /^"(.*)"$/;
-      push @result, $1;
+      if (defined $text && $text ne '') {
+        local($1);
+        $text =~ s/^"(.*)"\z/$1/s;
+        push(@result,$text);
+      }
     }
   }
   else {