Mon Feb 25 18:41:46 2013 UTC ()
Adjust comment in rc.d script for moved file.

>From Jan Danielsson.


(gdt)
diff -r1.104 -r1.105 pkgsrc/mail/spamassassin/Makefile
diff -r1.57 -r1.58 pkgsrc/mail/spamassassin/distinfo
diff -r1.8 -r1.9 pkgsrc/mail/spamassassin/patches/patch-aa
cvs diff -r1.104 -r1.105 pkgsrc/mail/spamassassin/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/Makefile 2013/02/06 23:22:49 1.104
+++ pkgsrc/mail/spamassassin/Makefile 2013/02/25 18:41:45 1.105
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.104 2013/02/06 23:22:49 jperkin Exp $ 1# $NetBSD: Makefile,v 1.105 2013/02/25 18:41:45 gdt 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= 2 5PKGREVISION= 3
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= heinz@NetBSD.org 15MAINTAINER= heinz@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
cvs diff -r1.57 -r1.58 pkgsrc/mail/spamassassin/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/distinfo 2011/08/07 07:47:20 1.57
+++ pkgsrc/mail/spamassassin/distinfo 2013/02/25 18:41:45 1.58
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.57 2011/08/07 07:47:20 tron Exp $ 1$NetBSD: distinfo,v 1.58 2013/02/25 18:41:45 gdt 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) = 2715638de88d0a299a65919cbf0d573699307100 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
cvs diff -r1.8 -r1.9 pkgsrc/mail/spamassassin/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/patches/Attic/patch-aa 2011/02/11 19:10:54 1.8
+++ pkgsrc/mail/spamassassin/patches/Attic/patch-aa 2013/02/25 18:41:46 1.9
@@ -1,20 +1,30 @@ @@ -1,20 +1,30 @@
1$NetBSD: patch-aa,v 1.8 2011/02/11 19:10:54 tnn Exp $ 1$NetBSD: patch-aa,v 1.9 2013/02/25 18:41:46 gdt Exp $
2 2
3Make an effort to pick up spamd_flags from the rc configuration when 3Make an effort to pick up spamd_flags from the rc configuration when
4not running on NetBSD/DragonFlyBSD. 4not running on NetBSD/DragonFlyBSD.
 5Adjust comment for renamed file.
5 6
6--- spamd/netbsd-rc-script.sh.orig 2010-03-16 14:49:25.000000000 +0000 7--- spamd/netbsd-rc-script.sh.orig 2011-06-07 01:59:19.000000000 +0200
7+++ spamd/netbsd-rc-script.sh 8+++ spamd/netbsd-rc-script.sh 2013-02-25 17:56:03.000000000 +0100
8@@ -118,6 +118,12 @@ if [ "${OPSYS}" = "NetBSD" -o "${OPSYS}" 9@@ -10,7 +10,7 @@
 10 # of spam
 11 #
 12 # PLEASE read the file
 13-# @PREFIX@/share/doc/spamassassin/spamd/README.spamd
 14+# @PREFIX@/share/doc/spamassassin/spamd/README
 15 # especially the section about security.
 16
 17 ## only for DragonFlyBSD/NetBSD
 18@@ -118,6 +118,12 @@
9  19
10 else # not NetBSD or DragonFlyBSD 20 else # not NetBSD or DragonFlyBSD
11  21
12+ if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then 22+ if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
13+ load_rc_config $name 23+ load_rc_config $name
14+ elif [ -f /etc/rc.conf ]; then 24+ elif [ -f /etc/rc.conf ]; then
15+ . /etc/rc.conf 25+ . /etc/rc.conf
16+ fi 26+ fi
17+ 27+
18 if [ -f ${pidfile} ]; then 28 if [ -f ${pidfile} ]; then
19 the_spamd_pid=`head -1 ${pidfile}` 29 the_spamd_pid=`head -1 ${pidfile}`
20 else 30 else