- Update to 3.6.4.20060315.1518

PR:		ports/94501
Submitted by:	maintainer

4 files changed, 41 insertions, 9 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 63e1a8f161a2..de55efaf83f2 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
 #
 # $FreeBSD$
-# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.36 2006/02/26 02:23:16 itetcu Exp $
+# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.38 2006/03/15 17:55:09 itetcu Exp $
 #
 
 # Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
@@ -13,7 +13,6 @@
 
 PORTNAME=	dspam-devel
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	# set later
 
@@ -21,10 +20,10 @@ MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Bayesian spam filter - development version
 
 PORTVER_MAJ=	3.6.4
-#SNAP_DATE=	.20060211.0037
-_UPD_LINE_NO=	7
+SNAP_DATE=	.20060315.1518
+_UPD_LINE_NO=	17
 
-MIN_OPTIONS_VER=	${PORTNAME}-3.6.3.20060203.1409
+MIN_OPTIONS_VER=	${PORTNAME}-3.6.4.20060315.1518
 
 .ifdef(SNAP_DATE)
 MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
@@ -39,7 +38,8 @@ WRKSRC=		${WRKDIR}/dspam-${PORTVER_MAJ}
 .endif
 
 ## debug / log / admin options
-OPTIONS=	DEBUG "Enable debugging logging" on
+OPTIONS=	SYSLOG "Logs via syslog" on
+OPTIONS+=	DEBUG "Enable debugging logging" on
 OPTIONS+=	VERBOSE_DEBUG "Enable debug in LOGDIR/dspam.debug" off
 OPTIONS+=	BNR_DEBUG "Enable debug for BNR" off
 OPTIONS+=	PREF_EXT "Preferences in database not in files" off
@@ -114,6 +114,7 @@ SIGNATURE_LIFE?=	15
 
 _VAR_DIR=	/var
 LOG_DIR?=	${_VAR_DIR}/log/dspam
+LOGFILE?=	${LOG_DIR}/dspam.log
 
 DSPAM_MODE?=	4510
 DSPAM_OWNER?=	root
@@ -147,6 +148,13 @@ _SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		-e '/^%%FreeBSD/D' \
 		-e '/^%%Tecnik%%/D'
 
+.ifdef(WITH_SYSLOG)
+CONFIGURE_ARGS+=	--enable-syslog
+.else
+CONFIGURE_ARGS+=	--disable-syslog
+CONFIGURE_ARGS+=	--with-logfile=${LOGFILE}
+.endif
+
 .ifdef(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
@@ -460,6 +468,9 @@ pre-extract:	check-options-version
 	@${ECHO_CMD} "DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP}"
 	@${ECHO_CMD} "DSPAM_HOME_MODE=${DSPAM_HOME_MODE} (default: 0770)"
 	@${ECHO_CMD} "LOG_DIR=${LOG_DIR} (default: ${_VAR_DIR}/log/dspam)"
+.	ifndef(WITH_SYSLOG)
+	@${ECHO_CMD} "LOGFILE=${LOGFILE} (default: ${_VAR_DIR}/log/dspam/dspam.log)"
+.	endif
 .	ifdef(WITH_CGI)
 		@${ECHO_CMD} "Define CGI_PATH before make-ing if you need the CGI files"
 		@${ECHO_CMD} "installed in other place that this installation's default"
@@ -529,7 +540,9 @@ pre-configure:
 	@${FALSE}
 .endif
 .ifdef(SNAP_DATE)
+	@${ECHO_CMD}
 	@${ECHO_CMD} "You can safely ignore the following auto*  errors"
+	@${ECHO_CMD}
 	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)
 .endif
 
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index cdc98b3d0711..442df1d12a4e 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (dspam-3.6.4.tar.gz) = e9fdb00a23a99e05c9e4c22aa8aa3655
-SHA256 (dspam-3.6.4.tar.gz) = bdb10acbff97483db8ef7aafee8ba2e9113f6b7d5fc76cf569334b32937ca304
-SIZE (dspam-3.6.4.tar.gz) = 743664
+MD5 (dspam-devel-3.6.4.20060315.1518.tar.gz) = c40ec96422922451f4875bdb6089aa1f
+SHA256 (dspam-devel-3.6.4.20060315.1518.tar.gz) = fcb81c908da122307b8685b5668618c2d3eb52fe3023e058c53335700a12b8f7
+SIZE (dspam-devel-3.6.4.20060315.1518.tar.gz) = 401405
diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index 812ca1ac72a3..96277995c81a 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -11,6 +11,24 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.6.4.20060315.1518
+#
+
+New feature:
+- support for reading from multiple mysql servers; support for separate
+read/write servers to be used with mysql_drv; see dspam.conf
+- SYSLOG options knob: log to via syslog if "on" or in flat file if "off"
+- dspam_stats: -t for displaying a total of all stats included in the 
+original query
+
+Bugfixes:
+- fixed a bug causing --deliver=summary to return no output when used in
+dspamc
+- fixed a segfault which can occur if TrainingMode is not specified in
+dspam.conf
+
+
+###########################################################################
 # dspam-devel-3.6.4_1 (Added post-factum, mega libtool commit)
 #
 
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index 0251002d2215..d5c43e20414f 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -81,6 +81,7 @@ libdata/pkgconfig/dspam.pc
 %%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
+%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge-pe.sql
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
 %%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
 %%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql