Update to dspam-3.4.6

- BUG FIX: "obscure" [1] bug causing dspam to crash under certain conditions
when the loose signature was provided without the appropriate delimiter
- BUG FIX: fix sqlite3 dependency check [2]
- BUG FIX: don't strip binary if we want GDB suport
- BUG FIX: DOMAIN_SCALE and LARGE_SCALE are incompatible so catch this
before ./cofigure fails [3]

[1] "Obscure" = it took me about 4 hours and a 500 queue processed one by
one by hand to catch and reproduce the problem after 7 days of mail
processing w/o error
[2] Pointed out by vanilla@
[3] Pointed out by Arvinn Lokkebakken <arvinn@whitebird.no> for

PR:		ports/80790
Submitted by:	maintainer

3 files changed, 45 insertions, 15 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 91ba6e9d88f6..3ef865d05a32 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -19,7 +19,7 @@ MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sourc
 MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Bayesian spam filter - stable maintenance version
 
-PORTVER_MAJ=	3.4.5
+PORTVER_MAJ=	3.4.6
 #SNAP_DATE=	.20050417.0700
 
 .ifdef(SNAP_DATE)
@@ -53,6 +53,9 @@ OPTIONS+=	TEST_COND "More inoculous results rapidly, risk fps" on
 OPTIONS+=	NO_BIAS "No bias toward innocent mail" off
 OPTIONS+=	NEURAL_NET "Enable neural networking" off
 
+#OPTIONS+=	CLAMAV "Enable clamav support" off
+#OPTIONS+=	CLAMAV_DEVEL "Enable clamav support" off
+
 ## run-time configure  options
 OPTIONS+=	USER_HOMEDIR "Store user data in ~/.dspam" off
 OPTIONS+=	TRUSTED_USERS "Disable trusted user security" off
@@ -96,11 +99,12 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .ifdef(GDBS)
 CFLAGS+=	-g -DDEBUG
+STRIP=
 .endif
 
 PKGMESSAGE=	 ${WRKSRC}/src/README.FreeBSD
 
-_UPD_LINE_NO=	16
+_UPD_LINE_NO=	17
 
 CONFLICTS=	dspam-2* dspam-3*
 
@@ -120,13 +124,6 @@ DSPAM_HOME_MODE?=	0770
 
 .include <bsd.port.pre.mk>
 
-## Actually Thu Feb 10 17:38:05 EET 2005 works
-#.if ${OSVERSION} >= 500036
-#.	if	${OSVERSION} < 503102
-#IGNORE=	Need newer pthread support, please upgrade your system
-#.	endif
-#.endif
-
 CONFIGURE_ARGS+=	--with-logdir=${LOG_DIR}
 PLIST_SUB+=	LOG_DIR=${LOG_DIR}
 
@@ -216,6 +213,16 @@ CONFIGURE_ARGS+=	--disable-bias
 CONFIGURE_ARGS+=	--enable-neural-networking
 .endif
 
+#.if defined(WITH_CLAMAV)
+#RUN_DEPENDS+=	${LOCALBASE}/etc/clamd.conf:${PORTSDIR}/security/clamav
+#CONFIGURE_ARGS+=	--enable-clamav
+#.endif
+#
+#.if defined(WITH_CLAMAV_DEVEL)
+#RUN_DEPENDS+=	${LOCALBASE}/etc/clamd.conf:${PORTSDIR}/security/clamav-devel
+#CONFIGURE_ARGS+=	--enable-clamav
+#.endif
+
 .if defined(WITH_USER_HOMEDIR)
 CONFIGURE_ARGS+=	--enable-homedir
 .endif
@@ -269,18 +276,19 @@ DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
 
 .if defined(WITH_SQLITE3)
 HAVE_SQLITE=	yes
-LIB_DEPENDS+=	sqlite.3:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=        --with-storage-driver=sqlite3_drv
 .endif
 
 .if defined(WITH_SQLITE2)
 HAVE_SQLITE=	yes
 LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
+CONFIGURE_ARGS+=	--with-storage-driver=sqlite_drv
 .endif
 
 .if defined(HAVE_SQLITE)
-CONFIGURE_ARGS+=	--with-storage-driver=sqlite_drv \
-	--with-sqlite-includes=${LOCALBASE}/include \
-	--with-sqlite-libraries=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-sqlite-includes=${LOCALBASE}/include \
+			--with-sqlite-libraries=${LOCALBASE}/lib
 PLIST_SUB+=	DB4="@comment "
 PLIST_SUB+=	MYSQL="@comment "
 PLIST_SUB+=	PGSQL="@comment "
@@ -556,6 +564,10 @@ pre-configure:
 	@${ECHO_CMD} "USER_HOMEDIR and CGI are incopatible"
 	@${FALSE}
 .endif
+.if defined(WITH_DOMAIN_SCALE) && defined(WITH_LARGE_SCALE)
+	@${ECHO_CMD} "DOMAIN_SCALE and LARGE_SCALE are incopatible"
+	@${FALSE}
+.endif
 
 post-install:
 	${CP} ${WRKSRC}/src/dspam.conf ${WRKSRC}/src/dspam.conf.sample
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index 6fb162d8a3b0..0a522eb6e86f 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1,2 +1,2 @@
-MD5 (dspam-3.4.5.tar.gz) = fcb16a275e343baaa657eda045123e06
-SIZE (dspam-3.4.5.tar.gz) = 698456
+MD5 (dspam-3.4.6.tar.gz) = 05d6d5546967305e9f1c394f443f8e93
+SIZE (dspam-3.4.6.tar.gz) = 698599
diff --git a/mail/dspam/files/UPDATING b/mail/dspam/files/UPDATING
index a2d9e7f4b38e..dd8ea9ab775c 100644
--- a/mail/dspam/files/UPDATING
+++ b/mail/dspam/files/UPDATING
@@ -16,6 +16,24 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-3.4.6
+#
+
+- BUG FIX: "obscure" [1] bug causing dspam to crash under certain conditions
+when the loose signature was provided without the appropriate delimiter
+- BUG FIX: fix sqlite3 dependency check [2]
+- BUG FIX: don't strip binary if we want GDB suport
+- BUG FIX: DOMAIN_SCALE and LARGE_SCALE are incompatible so catch this
+before ./cofigure fails [3]
+
+[1] "Obscure" = it took me about 4 hours and a 500 queue processed one by
+one by hand to catch and reproduce the problem after 7 days of mail 
+processing w/o error
+[2] Pointed out by vanilla@
+[3] Pointed out by Arvinn Løkkebakken <arvinn@whitebird.no> for mail/dspam
+
+
+###########################################################################
 # dspam-3.4.5
 #