- Update to 3.2.4

- Drop WITH_WHITELIST, it's no longer build time option

PR:		ports/76198
Submitted by:	Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com> (maintainer)

3 files changed, 24 insertions, 14 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 870196814bf9..b1f36d2c4287 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -6,18 +6,21 @@
 #
 
 PORTNAME=	dspam
-PORTVERSION=	3.2.3${SNAP_DATE}
+PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
 PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam/sources/
-DISTFILES=	dspam.3.2.3.cvs.stable${SNAP_DATE}.tar.gz
 
 MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Bayesian spam filter - stable maintenance version
 
-WRKSRC=		${WRKDIR}/dspam-cvs-stable${SNAP_DATE}
+PORTVER_MAJ=	3.2.4
+#SNAP_DATE=	.20041229.1945
 
-SNAP_DATE=	.20041229.1945
+.ifdef(SNAP_DATE)
+DISTFILES=	dspam.${PORTVER_MAJ}.cvs.stable${SNAP_DATE}.tar.gz
+WRKSRC=		${WRKDIR}/dspam-cvs-stable${SNAP_DATE}
+.endif
 
 ## debug / log / admin options
 OPTIONS=	DEBUG "Enable debugging logging" on
@@ -32,7 +35,6 @@ OPTIONS+=	CHI_SQUARE "Use Fisher-Robinson Inv Chi-Square" off
 OPTIONS+=	RPV "Use Robinson technique combining p-values" off
 OPTIONS+=	TEST_COND "More inoculous results rapidly, risk fps" on
 OPTIONS+=	NO_BIAS "No bias toward innocent mail" off
-OPTIONS+=	WHITELIST "Automatic whitelisting of ham" off
 OPTIONS+=	NEURAL_NET "Enable neural networking" off
 
 ## run-time configure  options
@@ -161,10 +163,6 @@ CONFIGURE_ARGS+=	 --disable-test-conditional
 CONFIGURE_ARGS+=	--disable-bias
 .endif
 
-.if defined(WITH_WHITELIST)
-CONFIGURE_ARGS+=	--enable-whitelist
-.endif
-
 .if defined(WITH_NEURAL_NET)
 CONFIGURE_ARGS+=	--enable-neural-networking
 .endif
@@ -444,10 +442,10 @@ pre-extract:
 	@${ECHO_CMD} ""
 	@sleep 5
 
-.for old_opt in MAILDROP PROCMAIL TRAD_BAYES ALT_BAYES WITH_SPAM_SUBJ \
+.for old_opt in MAILDROP PROCMAIL TRAD_BAYES ALT_BAYES SPAM_SUBJ \
 	USER_LOGGING SYSTEM_LOGGING WEBMAIL OPT_IN SAT PARSE_TO_HEADERS \
 	BROKEN_MTA BROKEN_ERR_CODES SIGNATURE_HEADERS SIGNATURE_ATACH \
-	HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT
+	HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT WHITELIST
 .	if defined(WITH_${old_opt}) || defined(WITHOUT_${old_opt})
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "******************************************************************"
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index b492289aae2e..9919b8b1ca81 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1,2 +1,2 @@
-MD5 (dspam.3.2.3.cvs.stable.20041229.1945.tar.gz) = 24ad7d7a70f70ff07be5d1fb8818b758
-SIZE (dspam.3.2.3.cvs.stable.20041229.1945.tar.gz) = 620800
+MD5 (dspam-3.2.4.tar.gz) = 30885376c7300c5abde37896b0ccf89a
+SIZE (dspam-3.2.4.tar.gz) = 620924
diff --git a/mail/dspam/files/UPDATING b/mail/dspam/files/UPDATING
index 2619195b4adf..a328ad0fd16d 100644
--- a/mail/dspam/files/UPDATING
+++ b/mail/dspam/files/UPDATING
@@ -11,6 +11,19 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 #############################################################################
+# dspam-3.2.4
+#
+
+- drop WITH_WHITELIST, is not supported by ./configure but by dspam.conf
+
+[20041203.0800] jonz: performance fixes for pgsql_drv
+minor performance fixed for pgsql_drv that may have a big effect on some
+implementations. you should also consider creating the (unnecessary) index
+below to precent the pgsql query builder from getting confused:
+CREATE INDEX id_token_data_04 ON dspam_token_data(uid);
+
+
+#############################################################################
 # dspam-3.2.3.20041229.1945
 #
 
@@ -21,7 +34,6 @@ TrustedDeliveryAgent, but leave them commented out
 - change default DSPAM_HOME_MODE to 0770
 (ports/75549 by Julien Gabel <jpeg@thilelli.net>)
 - DSPAM_HOME_{OWNER,GROUP} default to DSPAM_{OWNER,GROUP}
-- fix make describe by USE_MYSQL
 
 
 #############################################################################