[pkgsrc/trunk]: pkgsrc/mail/spamd Update spamd to 20060330.

[peter <peter%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/317d720558b8
branches:  trunk
changeset: 510622:317d720558b8
user:      peter <peter%pkgsrc.org@localhost>
date:      Sat Apr 01 12:14:27 2006 +0000

description:
Update spamd to 20060330.

This version allows changing of the paths for spamd chroot, spamd database,
pfctl binary and configuration file. This allows spamd to just work
for different configurations.

Based on patches and suggestions from Jeremy C. Reed and Johnny Lam.

diffstat:

 mail/spamd/Makefile |  25 ++++++++++++++++---------
 mail/spamd/distinfo |   8 ++++----
 2 files changed, 20 insertions(+), 13 deletions(-)

diffs (61 lines):

diff -r 4c739b3d296b -r 317d720558b8 mail/spamd/Makefile
--- a/mail/spamd/Makefile       Sat Apr 01 11:22:44 2006 +0000
+++ b/mail/spamd/Makefile       Sat Apr 01 12:14:27 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2006/03/07 22:32:23 peter Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/01 12:14:27 peter Exp $
 
-DISTNAME=              spamd-20060307
+DISTNAME=              spamd-20060330
 CATEGORIES=            mail
 MASTER_SITES=          http://nedbsd.nl/~ppostma/pf/
 
@@ -12,21 +12,28 @@
 
 NO_CONFIGURE=          yes
 
-PKG_USERS=             _spamd:_spamd::Spam\ Daemon:${VARBASE}/chroot/spamd:/sbin/nologin
+SPAMD_HOME=            ${VARBASE}/chroot/spamd
+OWN_DIRS=              ${SPAMD_HOME}
+
+CPPFLAGS+=             -DPATH_SPAMD_HOME=\"${SPAMD_HOME}\"
+CPPFLAGS+=             -DPATH_SPAMD_DB=\"${VARBASE}/db/spamd\"
+CPPFLAGS+=             -DPATH_PFCTL=\"${PFCTL}\"
+CPPFLAGS+=             -DPATH_SPAMD_CONF=\"${SPAMD_CONF}\"
+
+PKG_USERS=             _spamd:_spamd::Spam\ Daemon:${SPAMD_HOME}:/sbin/nologin
 PKG_GROUPS=            _spamd
 
-OWN_DIRS=              ${VARBASE}/chroot/spamd
 RCD_SCRIPTS=            pfspamd
 
-CONF_FILES=            ${PREFIX}/share/examples/spamd/spamd.conf \
-                           ${PKG_SYSCONFDIR}/spamd.conf
+SPAMD_CONF=            ${PKG_SYSCONFDIR}/spamd.conf
+CONF_FILES=            ${PREFIX}/share/examples/spamd/spamd.conf ${SPAMD_CONF}
 
 SUBST_CLASSES+=                fix
 SUBST_STAGE.fix=       post-patch
 SUBST_FILES.fix=       spamd/spamd.8
-SUBST_FILES.fix+=      spamd-setup/spamd-setup.c spamd-setup/spamd-setup.8
-SUBST_SED.fix=         -e 's,/etc/spamd.conf,${PKG_SYSCONFDIR}/spamd.conf,g'
-SUBST_MESSAGE.fix=     "Fixing configuration paths."
+SUBST_FILES.fix+=      spamd-setup/spamd-setup.8
+SUBST_SED.fix=         -e 's,/etc/spamd.conf,${SPAMD_CONF},g'
+SUBST_MESSAGE.fix=     Fixing configuration paths.
 
 INSTALLATION_DIRS+=    libexec sbin ${PKGMANDIR}/cat5 ${PKGMANDIR}/man5
 INSTALLATION_DIRS+=    ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 share/examples/spamd
diff -r 4c739b3d296b -r 317d720558b8 mail/spamd/distinfo
--- a/mail/spamd/distinfo       Sat Apr 01 11:22:44 2006 +0000
+++ b/mail/spamd/distinfo       Sat Apr 01 12:14:27 2006 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2006/03/07 22:32:23 peter Exp $
+$NetBSD: distinfo,v 1.4 2006/04/01 12:14:27 peter Exp $
 
-SHA1 (spamd-20060307.tar.gz) = 9541b352e604fef27d9eb78c4dd63bb9b35c5894
-RMD160 (spamd-20060307.tar.gz) = 558448cec7aa4d65805b59c3294bfd6c7908182c
-Size (spamd-20060307.tar.gz) = 34303 bytes
+SHA1 (spamd-20060330.tar.gz) = 152b8da2baac9eeedd9b69a9a7a2f8169ca55d9e
+RMD160 (spamd-20060330.tar.gz) = 94707f9714e7a67c778aad12032339eba452a490
+Size (spamd-20060330.tar.gz) = 34509 bytes