Update to 3.4.1.

Changes:

	o Accuracy Enhancements
	o Bayesian Noise Reduction v2.0
	o TUM-Mode Enhancements
	o Library Performance Enhancements
	o PostgreSQL Storage Driver Enhancements
	o SQLite3 Storage Driver Support
	o Daemonized LMTP Server
	o LMTP Delivery

And more... more info in the RELEASE.NOTES file.

pkgsrc changes:

	o Add a dspam rc.d script to start the daemon.
	o The cgi configuration files were modified to support
	  CONF_FILES and PKG_SYSCONFDIR.

When using a NetBSD system, mount_umap(8) will be useful to mount
the cgi directory with www permissions, and you won't need to modify
any file in there! yay.

1 files changed, 45 insertions, 14 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 21a627eb192..a406fcacea5 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2005/03/07 21:00:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.24 2005/03/21 21:35:52 xtraeme Exp $
 
-DISTNAME=	dspam-3.2.8
+DISTNAME=	dspam-3.4.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.nuclearelephant.com/projects/dspam/sources/
 
@@ -19,16 +19,23 @@ REPLACE_PERL=		tools/dspam_genaliases.in			\
 
 PKGCONFIG_OVERRIDE+=	dspam.pc.in
 
-SUBST_CLASSES+=		cgi
+SUBST_CLASSES+=		cgi cgi2
 SUBST_STAGE.cgi=	post-patch
-SUBST_FILES.cgi=	cgi/dspam.cgi cgi/admin.cgi \
-			cgi/templates/nav_performance.html
-SUBST_SED.cgi=		-e "s|/usr/local/bin/dspam|${PREFIX}/bin/dspam|g" \
+SUBST_FILES.cgi=	cgi/dspam.cgi cgi/admin.cgi		\
+			cgi/templates/nav_performance.html	\
+			cgi/configure.pl.in
+SUBST_SED.cgi=		-e "s|/usr/local/bin/dspam|${PREFIX}/bin/dspam|g"	\
 			-e "s|/var/dspam|${DSPAM_HOME}|g"		\
 			-e "s|/usr/local|${PREFIX}|g"			\
 			-e "s|-deaf|${DSPAM_PSFLAGS}|g"			\
 			-e "s|yourdomain.com|${DSPAM_DOMAIN}|g"
 SUBST_MESSAGE.cgi=	"Fixing paths and default options."
+SUBST_STAGE.cgi2=	post-patch
+SUBST_FILES.cgi2=	cgi/dspam.cgi cgi/admin.cgi cgi/admingraph.cgi	\
+			cgi/graph.cgi
+SUBST_SED.cgi2=		-e "s|./admins|${PKG_SYSCONFDIR}/cgi-admins|"	\
+	-e "s|\$$FILE = \"./default.prefs\";|\$$FILE = \"${PKG_SYSCONFDIR}/cgi-default.prefs\";|" \
+	-e "s|configure.pl|${PKG_SYSCONFDIR}/configure.pl|"
 
 BUILD_DEFS+=		DSPAM_HOME
 BUILD_DEFS+=		DSPAM_SIGNATURE_LIFE
@@ -36,6 +43,7 @@ BUILD_DEFS+=		DSPAM_USER DSPAM_GROUP
 BUILD_DEFS+=		DSPAM_BINMODE
 BUILD_DEFS+=		DSPAM_LOGDIR
 BUILD_DEFS+=		DSPAM_DOMAIN
+BUILD_DEFS+=		DSPAM_PIDDIR
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -47,6 +55,7 @@ DSPAM_USER?=		dspam
 DSPAM_GROUP?=		dspam
 DSPAM_LOGDIR?=		${DSPAM_HOME}/log
 DSPAM_DOMAIN?=		yourdomain.com
+DSPAM_PIDDIR?=		${VARBASE}/run/dspam
 
 CONFIGURE_ARGS+=	--with-signature-life=${DSPAM_SIGNATURE_LIFE}
 CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}			\
@@ -55,7 +64,9 @@ CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}			\
 			--with-dspam-owner=${DSPAM_USER}		\
 			--with-dspam-group=${DSPAM_GROUP}		\
 			--with-dspam-mode=${DSPAM_BINMODE}		\
-			--with-logdir=${DSPAM_LOGDIR}
+			--with-logdir=${DSPAM_LOGDIR}			\
+			--sysconfdir=${PKG_SYSCONFDIR}			\
+			--enable-daemon
 
 .include "options.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
@@ -66,8 +77,18 @@ DATADIR=	${PREFIX}/share/dspam
 EGDIR=		${PREFIX}/share/examples/dspam
 
 USE_PKGINSTALL=		yes
+RCD_SCRIPTS=		dspam
+
+PKG_SYSCONFSUBDIR=	dspam
+
 CONF_FILES_PERMS=	${EGDIR}/dspam.conf ${PKG_SYSCONFDIR}/dspam.conf \
 			${BINOWN} ${DSPAM_GROUP} 0640
+CONF_FILES_PERMS+=	${EGDIR}/cgi-admins ${PKG_SYSCONFDIR}/cgi-admins \
+			www www 0640
+CONF_FILES_PERMS+=	${EGDIR}/cgi-default.prefs \
+			${PKG_SYSCONFDIR}/cgi-default.prefs www www 0640
+CONF_FILES_PERMS+=	${EGDIR}/configure.pl ${PKG_SYSCONFDIR}/configure.pl \
+			www www 0640
 
 PKG_GROUPS=		${DSPAM_GROUP}
 PKG_USERS=		${DSPAM_USER}:${DSPAM_GROUP}
@@ -75,33 +96,43 @@ SPECIAL_PERMS=		${PREFIX}/bin/dspam ${DSPAM_USER} ${DSPAM_GROUP} \
 			${DSPAM_BINMODE}
 OWN_DIRS_PERMS=		${DSPAM_HOME} ${DSPAM_USER} ${DSPAM_GROUP} 0775
 OWN_DIRS_PERMS+=	${DSPAM_LOGDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0775
+OWN_DIRS_PERMS+=	${DSPAM_PIDDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0700
+
+FILES_SUBST+=		DSPAM_USER=${DSPAM_USER}
+FILES_SUBST+=		DSPAM_GROUP=${DSPAM_GROUP}
+FILES_SUBST+=		DSPAM_PIDDIR=${DSPAM_PIDDIR}
 
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-install
-SUBST_FILES.conf=	dspam.conf.in
+SUBST_FILES.conf=	src/dspam.conf.in
 SUBST_SED.conf=		-e "s,@dspam_home@,${DSPAM_HOME},g" \
 			-e "s,@delivery_agent@,${DSPAM_DELIVERY_AGENT_BIN},g"
 SUBST_MESSAGE.conf=	"Fixing configuration file."
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README* ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/RELEASE.NOTES ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCDIR}
 	${INSTALL_DATA_DIR} ${DATADIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/dspam.conf.in ${EGDIR}/dspam.conf
+	${INSTALL_DATA} ${WRKSRC}/src/dspam.conf.in ${EGDIR}/dspam.conf
+	${INSTALL_DATA} ${WRKSRC}/cgi/admins ${EGDIR}/cgi-admins
+	${INSTALL_DATA} ${WRKSRC}/cgi/default.prefs ${EGDIR}/cgi-default.prefs
+	${INSTALL_DATA} ${WRKSRC}/cgi/configure.pl ${EGDIR}/configure.pl
+
 .for d in txt cgi
 	${INSTALL_DATA_DIR} ${DATADIR}/${d}
 	cd ${WRKSRC}/${d} && ${PAX} -rwppm '-s|.*/Makefile.*$$||'	\
-		. ${DATADIR}/${d}
+		'-s|./admins.*$$||' '-s|./default.prefs.*$$||'		\
+		'-s|./configure.pl.*$$||' . ${DATADIR}/${d}
 .endfor
-	${RM} ${DATADIR}/cgi/configure.pl.in
 .undef d
 .for drv in mysql pgsql sqlite
 .  if !empty(DSPAM_STORAGE_DRIVER:M${drv})
 	${INSTALL_DATA_DIR} ${DATADIR}/${drv}
-	cd ${WRKSRC}/tools.${drv}_drv && ${PAX} -rwppm '-s|.*/Makefile.*$$||' \
-		. ${DATADIR}/${drv}
+	cd ${WRKSRC}/src/tools.${drv}_drv && \
+		${PAX} -rwppm '-s|.*/Makefile.*$$||' . ${DATADIR}/${drv}
 .  endif
 .endfor
 .undef drv