4 files changed, 168 insertions, 171 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 493ea6760837..8455e07babca 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -19,8 +19,8 @@ MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sourc
 MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Bayesian spam filter - development version
 
-PORTVER_MAJ=	3.5.2
-SNAP_DATE=	.20050725.0800
+PORTVER_MAJ=	3.6.0
+#SNAP_DATE=	.20051016.2141
 
 .ifdef(SNAP_DATE)
 WRKSRC=		${WRKDIR}/dspam-cvs-devel${SNAP_DATE}
@@ -45,19 +45,12 @@ 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
-OPTIONS+=	DAEMON "Daemonize dspam; speak proprietary LMTP" on
+OPTIONS+=	DAEMON "Daemonize dspam; speak LMTP or DLMTP" on
 
 ## algorithm options
-OPTIONS+=	GRAHAM_BAYES "Enable Graham (traditional) bayesian" on
-OPTIONS+=	BURTON_BAYES "Enable Burton (alternative) bayesian" on
-OPTIONS+=	RNB "Use Robinson Naive Bayesian calculation" off
-OPTIONS+=	CHI_SQUARE "Use Fisher-Robinson Inv Chi-Square" off
-OPTIONS+=	RPV "Use Robinson technique combining p-values" on
-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 "Enable clamav support" on
 OPTIONS+=	CLAMAV_DEVEL "Enable clamav support" off
 
 ## run-time configure  options
@@ -69,18 +62,17 @@ OPTIONS+=	MYSQL40 "Use MySQL 4.0.x as back-end" off
 OPTIONS+=	MYSQL41 "Use MySQL 4.1.x as back-end" on
 OPTIONS+=	MYSQL50 "Use MySQL 5.0.x as back-end" off
 OPTIONS+=	MYSQL_COMPRESS "Compress dspam <--> MySQL" off
-OPTIONS+=	POSTGRESQL "Use PostgreSQL as back-end" off
+OPTIONS+=	POSTGRESQL "Use PostgreSQL as back-end" on
 OPTIONS+=	ORACLE "Use Oracle as back-end (BROKEN)" off
 OPTIONS+=	BDB4 "Use BDB4 as back-end (not recomanded)" off
 OPTIONS+=	SQLITE2 "Use SQLite v2.x as back-end" off
-OPTIONS+=	SQLITE3 "Use SQLite v3.x as back-end" off
-OPTIONS+=	CSS "Use CRM114 Sparse Spectra driver (BROKEN)" off
+OPTIONS+=	SQLITE3 "Use SQLite v3.x as back-end" on
+OPTIONS+=	HASH "Use hash driver" on
 OPTIONS+=	VIRT_USERS "Enable virtual users (needs SQL back-end)" off
 OPTIONS+=	LDAP "Enable recipient verification via LDAP" off
 OPTIONS+=	LONG_USERNAMES "Usernames longer that OS supports" off
 OPTIONS+=	LARGE_SCALE "File structure for large scale" off
 OPTIONS+=	DOMAIN_SCALE "File structure for multiple domains" off
-#OPTIONS+=	SIGNATURE_ATACH "Put server-side signature in mails" off
 
 ## MTA and LDA
 OPTIONS+=	CYRUS21_LDA "Use Cyrus's 2.1 deliver as LDA" off
@@ -100,7 +92,11 @@ USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+#CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .ifdef(GDBS)
@@ -141,39 +137,30 @@ PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME}
 
 CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
 CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
-# we set DSPAM_MODE at the end as some LDA whant specific mode
+# we set DSPAM_MODE at the end as some LDAs whant specific mode
 
 _SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
 		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g' \
 		-e 's,%%PORTNAME%%,${PORTNAME},g' \
 		-e 's,%%_VAR_DIR%%,${_VAR_DIR},g'
-#		-e 's,%%LOCALBASE%%,${LOCALBASE},g' \
-#		-e 's,%%PREFIX%%,${PREFIX},g' \
-#		-e 's,%%PKGNAME%%,${PKGNAME},g' \
 
-.if defined(WITH_DEBUG)
+.ifdef(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if defined(WITH_VERBOSE_DEBUG)
+.ifdef(WITH_VERBOSE_DEBUG)
 CONFIGURE_ARGS+=	--enable-verbose-debug
 .endif
 
-.if defined(WITH_BNR_DEBUG)
+.ifdef(WITH_BNR_DEBUG)
 CONFIGURE_ARGS+=	--enable-bnr-debug
 .endif
 
-.if defined(WITH_PREF_EXT)
+.ifdef(WITH_PREF_EXT)
 CONFIGURE_ARGS+=	--enable-preferences-extension
 .endif
 
-####
-# quick hack to build the package with daemon
-.ifndef(WITHOUT_DAEMON)
-WITH_DAEMON=	on
-.endif
-
 .ifdef(WITH_DAEMON)
 CONFIGURE_ARGS+=	--enable-daemon
 RC_SUFX=	.sh
@@ -184,138 +171,103 @@ SUB_LIST+=	DSPAM_HOME=${DSPAM_HOME}
 _SED_SCRIPT+=	-e '/%%DAEMON%%/D'
 .endif
 
-.if !defined(WITH_GRAHAM_BAYES)
-CONFIGURE_ARGS+=	--disable-traditional-bayesian
-.endif
-
-.if !defined(WITH_BURTON_BAYES)
-CONFIGURE_ARGS+=	--disable-alternative-bayesian
-.endif
-
-.if defined(WITH_RNB)
-CONFIGURE_ARGS+=	 --enable-robinson
-.endif
-
-.if defined(WITH_CHI_SQUARE)
-CONFIGURE_ARGS+=	 --enable-robinson
-.endif
-
-.if defined(WITH_RPV)
-CONFIGURE_ARGS+=	 --enable-robinson-pvalues
-.endif
-
-.if !defined(WITH_TEST_COND)
-CONFIGURE_ARGS+=	 --disable-test-conditional
-.endif
-
-.if defined(WITH_NO_BIAS)
-CONFIGURE_ARGS+=	--disable-bias
-.endif
-
-.if defined(WITH_NEURAL_NET)
+.ifdef(WITH_NEURAL_NET)
 CONFIGURE_ARGS+=	--enable-neural-networking
 .endif
 
-.if defined(WITH_CLAMAV)
+.ifdef(WITH_CLAMAV)
 RUN_DEPENDS+=	${LOCALBASE}/etc/clamd.conf:${PORTSDIR}/security/clamav
 .endif
 
-.if defined(WITH_CLAMAV_DEVEL)
+.ifdef(WITH_CLAMAV_DEVEL)
 RUN_DEPENDS+=	${LOCALBASE}/etc/clamd.conf:${PORTSDIR}/security/clamav-devel
 .endif
 
-.if defined(WITH_CLAMAV) || defined(WITH_CLAMAV_DEVEL)
+.ifdef(WITH_CLAMAV) || defined(WITH_CLAMAV_DEVEL)
 CONFIGURE_ARGS+=	--enable-clamav
 SUB_LIST+=	CLAMD=clamd
 .else
 SUB_LIST+=	CLAMD=
 .endif
 
-.if defined(WITH_USER_HOMEDIR)
+.ifdef(WITH_USER_HOMEDIR)
 CONFIGURE_ARGS+=	--enable-homedir
 .endif
 
-.if defined(WITH_TRUSTED_USERS)
+.ifdef(WITH_TRUSTED_USERS)
 CONFIGURE_ARGS+=	--disable-trusted-user-security
 .endif
 
-DBDRV_TOTAL_COUNT=	oooooooooo # 9
-DBDRV_COUNT=	${DBDRV_TOTAL_COUNT}
+# we need to know if we are building statically or dynamicaly for the plist
+_DBDRV_COUNT=	# blank, but defined so we can check against it
+#_DBDRV_ALL=	pgsql_drv,ora_drv,libdb4_drv,sqlite3_drv,sqlite_drv,hash_drv,mysql_drv
+# above won't work because ORACLE support is broken so
+_DBDRV=		pgsql_drv,libdb41_drv,sqlite3_drv,sqlite_drv,hash_drv,mysql_drv,
 
 .if defined(WITH_POSTGRESQL)
 USE_PGSQL=	yes
-CONFIGURE_ARGS+=	--with-storage-driver=pgsql_drv \
-		--with-pgsql-includes=${LOCALBASE}/include \
+CONFIGURE_ARGS+=	--with-pgsql-includes=${LOCALBASE}/include \
 		--with-pgsql-libraries=${LOCALBASE}/lib
-PLIST_SUB+=	DB4="@comment "
-PLIST_SUB+=	MYSQL="@comment "
 PLIST_SUB+=	PGSQL=""
-PLIST_SUB+=	SQLITE="@comment "
-#_SED_SCRIPT+=	-e '/%%MYSQL%%/D'
-#_SED_SCRIPT+=	-e 's,%%PGSQL%%,,g'
-#_SED_SCRIPT+=	-e '/%%SQLITE%%/D'
 #PKGNAMESUFFIX=	-pgsql
-DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
+_DBDRV_COUNT:=	${_DBDRV_COUNT}o
+.else
+PLIST_SUB+=	PGSQL="@comment "
+_DBDRV:=	${_DBDRV:S/pgsql_drv,//}
 .endif
 
 .if defined(WITH_ORACLE)
-BUILD_DEPENDS=	${LOCALBASE}/oracle7/rdbms/lib/libnlsrtl3.a:\
-	${PORTSDIR}/databases/oracle7-client
-CONFIGURE_ARGS+=	--with-storage-driver=ora_drv \
-		--with-oracle-home=	${LOCALBASE}/oracle7
+#BUILD_DEPENDS=	${LOCALBASE}/oracle7/rdbms/lib/libnlsrtl3.a:\
+#	${PORTSDIR}/databases/oracle7-client
+#CONFIGURE_ARGS+=	--with-oracle-home=	${LOCALBASE}/oracle7
 #PKGNAMESUFFIX=	-oracle
-DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
+#_DBDRV_COUNT:=	${_DBDRV_COUNT}o
+#.else
+#_DBDRV:=	${_DBDRV:S/ora_drv,//}
 .endif
 
 .if defined(WITH_BDB4)
 LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
-CONFIGURE_ARGS+=	--with-storage-driver=libdb4_drv \
-	--with-db4-includes=${LOCALBASE}/include/db41
+CONFIGURE_ARGS+=	--with-db4-includes=${LOCALBASE}/include/db41
 PLIST_SUB+=	DB4=""
-PLIST_SUB+=	MYSQL="@comment "
-PLIST_SUB+=	PGSQL="@comment "
-PLIST_SUB+=	SQLITE="@comment "
-#_SED_SCRIPT+=	-e '/%%MYSQL%%/D'
-#_SED_SCRIPT+=	-e '/%%PGSQL%%/D'
-#_SED_SCRIPT+=	-e '/%%SQLITE%%/D'
-#PKGNAMESUFFIX=	-bdb
-DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
+#PKGNAMESUFFIX=	-bdb41
+_DBDRV_COUNT:=	${_DBDRV_COUNT}o
+.else
+_DBDRV:=	${_DBDRV:S/libdb41_drv,//}
+PLIST_SUB+=	DB4="@comment "
 .endif
 
 .if defined(WITH_SQLITE3)
 HAVE_SQLITE=	yes
 LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
-CONFIGURE_ARGS+=	--with-storage-driver=sqlite3_drv
+_DBDRV_COUNT:=	${_DBDRV_COUNT}o
+.else
+_DBDRV:=	${_DBDRV:S/sqlite3_drv,//}
 .endif
 
 .if defined(WITH_SQLITE2)
 HAVE_SQLITE=	yes
 LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
-CONFIGURE_ARGS+=	--with-storage-driver=sqlite_drv
+_DBDRV_COUNT:=	${_DBDRV_COUNT}o
+.else
+_DBDRV:=	${_DBDRV:S/sqlite_drv,//}
 .endif
 
 .if defined(HAVE_SQLITE)
 CONFIGURE_ARGS+=	--with-sqlite-includes=${LOCALBASE}/include \
 			--with-sqlite-libraries=${LOCALBASE}/lib
-PLIST_SUB+=	DB4="@comment "
-PLIST_SUB+=	MYSQL="@comment "
-PLIST_SUB+=	PGSQL="@comment "
 PLIST_SUB+=	SQLITE=""
-#_SED_SCRIPT+=	-e '/%%MYSQL%%/D'
-#_SED_SCRIPT+=	-e '/%%PGSQL%%/D'
-#_SED_SCRIPT+=	-e 's,%%SQLITE%%,,g'
-#PKGNAMESUFFIX=	-sqlite2
-DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
+.else
+PLIST_SUB+=	SQLITE="@comment "
 .endif
 
-.ifdef(WITH_CSS)
-CONFIGURE_ARGS+=	--with-storage-driver=css_drv
-PLIST_SUB+=	DB4="@comment "
-PLIST_SUB+=	MYSQL="@comment "
-PLIST_SUB+=	PGSQL="@comment "
-PLIST_SUB+=	SQLITE="@comment "
+.ifdef(WITH_HASH)
+PLIST_SUB+=	HASH=""
 #PKGNAMESUFFIX=	-css
-DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
+_DBDRV_COUNT:=	${_DBDRV_COUNT}o
+.else
+_DBDRV:=	${_DBDRV:S/hash_drv,//}
+PLIST_SUB+=	HASH="@comment "
 .endif
 
 .ifdef(WITH_MYSQL40)
@@ -329,46 +281,50 @@ WANT_MYSQL_VER=	50
 #PKGNAMESUFFIX=	-mysql50
 .endif
 
-.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || defined(WITH_MYSQL50) || ${DBDRV_TOTAL_COUNT}==${DBDRV_COUNT}
+.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || defined(WITH_MYSQL50)
 USE_MYSQL=	yes
-CONFIGURE_ARGS+=	--with-storage-driver=mysql_drv \
-		--with-mysql-includes=${LOCALBASE}/include/mysql \
+CONFIGURE_ARGS+=	--with-mysql-includes=${LOCALBASE}/include/mysql \
 		--with-mysql-libraries=${LOCALBASE}/lib/mysql
-PLIST_SUB+=	DB4="@comment "
 PLIST_SUB+=	MYSQL=""
-PLIST_SUB+=	PGSQL="@comment "
-PLIST_SUB+=	SQLITE="@comment "
-#_SED_SCRIPT+=	-e 's,%%MYSQL%%,,g'
-#_SED_SCRIPT+=	-e '/%%PGSQL%%/D'
-#_SED_SCRIPT+=	-e '/%%SQLITE%%/D'
-DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
+_DBDRV_COUNT:=	${_DBDRV_COUNT}o
 .	if defined(WITH_MYSQL_COMPRESS)
 CONFIGURE_ARGS+=	--enable-client-compression
 .	endif
 SUB_LIST+=	MYSQL=mysql
 .else
 SUB_LIST+=	MYSQL=
+_DBDRV:=	${_DBDRV:S/mysql_drv,//}
+PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if defined(WITH_VIRT_USERS)
+# now we have all the db backends the user wants and we remove last ','
+CONFIGURE_ARGS+=	--with-storage-driver=${_DBDRV:S/,$//}
+
+.if ${_DBDRV_COUNT} != "o"
+PLIST_SUB+=	DYNAMIC=""
+.else
+PLIST_SUB+=	DYNAMIC="@comment "
+.endif
+
+.ifdef(WITH_VIRT_USERS)
 CONFIGURE_ARGS+=	--enable-virtual-users
 .endif
 
-.if defined(WITH_LDAP)
-CONFIGURE_ARGS+=	--enable-ldap \
-USE_OPENLDAP=YES
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lldap -llber
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+.ifdef(WITH_LDAP)
+CONFIGURE_ARGS+=	--enable-ldap
+USE_OPENLDAP=	YES
+#CPPFLAGS+=	-I${LOCALBASE}/include
+#LDFLAGS+=	-lldap -llber
+#CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .endif
 
-.if defined(WITH_LONG_USERNAMES)
+.ifdef(WITH_LONG_USERNAMES)
 CONFIGURE_ARGS+=	--enable-long-usernames
 .endif
-.if defined(WITH_LARGE_SCALE)
+.ifdef(WITH_LARGE_SCALE)
 CONFIGURE_ARGS+=	--enable-large-scale
 .endif
-.if defined(WITH_DOMAIN_SCALE)
+.ifdef(WITH_DOMAIN_SCALE)
 CONFIGURE_ARGS+=	--enable-domain-scale
 .endif
 
@@ -388,10 +344,10 @@ CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
 LDA_COUNT:=	${LDA_COUNT:S/o//}
 .endif
 
-.if defined(WITH_EXIM_LDA)
-.	if defined(WITH_MYSQL40) || (WITH_MYSQL41)
+.ifdef(WITH_EXIM_LDA)
+.	ifdef(WITH_MYSQL40) || (WITH_MYSQL41)
 _EXIM_EXT=	-mysql
-.	elif defined(WITH_POSTGRESQL)
+.	elifdef(WITH_POSTGRESQL)
 _EXIM_EXT=	-postgresql
 .	endif
 RUN_DEPENDS+=	exim:${PORTSDIR}/mail/exim${_EXIM_EXT}
@@ -399,48 +355,45 @@ CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/sbin/exim'
 LDA_COUNT:=	${LDA_COUNT:S/o//}
 .endif
 
-.if defined(WITH_MAILDROP_LDA)
+.ifdef(WITH_MAILDROP_LDA)
 RUN_DEPENDS+=	maildrop:${PORTSDIR}/mail/maildrop
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/maildrop'
 LDA_COUNT:=	${LDA_COUNT:S/o//}
 .endif
 
-.if defined(WITH_PROCMAIL_LDA)
+.ifdef(WITH_PROCMAIL_LDA)
 RUN_DEPENDS+=	procmail:${PORTSDIR}/mail/procmail
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/procmail'
 LDA_COUNT:=	${LDA_COUNT:S/o//}
 .endif
 
-.if defined(WITH_SENDMAIL_LDA) && exists(/usr/sbin/sendmail)
+.ifdef(WITH_SENDMAIL_LDA) && exists(/usr/sbin/sendmail)
 CONFIGURE_ARGS+=	--with-delivery-agent=/usr/sbin/sendmail
 LDA_COUNT:=	${LDA_COUNT:S/o//}
 .else
-.	if defined(WITH_SENDMAIL_LDA) && exists(${LOCALBASE}/sbin/sendmail)
+.	ifdef(WITH_SENDMAIL_LDA) && exists(${LOCALBASE}/sbin/sendmail)
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/sbin/sendmail'
 LDA_COUNT:=	${LDA_COUNT:S/o//}
 .	endif
 .endif
 
-.if defined(WITH_SENDMAIL)
+.ifdef(WITH_SENDMAIL)
 DSPAM_MODE=	4511
 .endif
 
-.if defined(WITH_POSTFIX_MBC)
+.ifdef(WITH_POSTFIX_MBC)
 DSPAM_MODE=	4511
-#_SED_SCRIPT+=	-e 's,%%POSTFIX_MBC%%,,g'
-.else
-#_SED_SCRIPT+=	-e '/%%POSTFIX_MBC%%/D'
 .endif
 
-.if defined(WITH_QMAIL)
+.ifdef(WITH_QMAIL)
 DSPAM_MODE=	4511
 .endif
 
-.if defined(DSPAM_MODE)
+.ifdef(DSPAM_MODE)
 CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
 .endif
 
-.if defined(WITH_CGI)
+.ifdef(WITH_CGI)
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS+=	${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS+=	${SITE_PERL}/mach/GD.pm:${PORTSDIR}/graphics/p5-GD
@@ -505,7 +458,7 @@ pre-extract:
 	@${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)"
-.	if defined(WITH_CGI)
+.	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"
 		@${ECHO_CMD} "${PREFIX}/www/vhosts/dspam"
@@ -518,13 +471,14 @@ pre-extract:
 	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 WHITELIST \
-	POSTGRESQL73 POSTGRESQL74
+	POSTGRESQL73 POSTGRESQL74 GRAHAM_BAYES BURTON_BAYES RNB \
+	TEST_COND NO_BIAS CHI_SQUARE RPV
 .	if defined(WITH_${old_opt}) || defined(WITHOUT_${old_opt})
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "******************************************************************"
 	@${ECHO_CMD} "******************************************************************"
 	@${ECHO_CMD} "Either:"
-	@${ECHO_CMD} "an old option ${old_opt} or "
+	@${ECHO_CMD} "an old option ${old_opt} or an old"
 	@${ECHO_CMD} "OPTIONS config-file ${_OPTIONS_READ} has been detected !!!"
 	@${ECHO_CMD} "Trying to prevent self-shooting this port's make ends here."
 	@${ECHO_CMD} "You shold always read ${PORTSDIR}/UPDATING before installing/updating"
@@ -560,17 +514,18 @@ pre-configure:
 	@${ECHO_CMD} "See ${LOCALBASE}/etc/dspam.conf for how to chage it at run time."
 	@${FALSE}
 .endif
-.if ${DBDRV_TOTAL_COUNT:S/o//}!=${DBDRV_COUNT}
+.if ${_DBDRV}==""
 	@${ECHO_CMD}
-	@${ECHO_CMD} "You can use one and only one database back-end at once."
+	@${ECHO_CMD} "You need to enable at least one database back-end."
 	@${FALSE}
 .endif
-.if defined(WITH_NEURAL_NET) && !(defined(USE_MYSQL) || defined(WITH_POSTGRESQL))
+.if defined(WITH_NEURAL_NET) && \
+	!( defined(USE_MYSQL) || defined(WITH_POSTGRESQL) )
 	@${ECHO_CMD} "You need MySQL or POSTGRESQL to use neural networking."
 	@${FALSE}
 .endif
 .if defined(WITH_VIRT_USERS) && !(defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL) || defined(WITH_ORACLE))
+	defined(WITH_POSTGRESQL) || defined(WITH_ORACLE) || defined(WITH_HASH) )
 	@${ECHO_CMD} "You need MySQL, POSTGRESQL or ORACLE for virtual users."
 	@${FALSE}
 .endif
@@ -580,12 +535,16 @@ pre-configure:
 	@${FALSE}
 .endif
 .if defined(WITH_DAEMON) && !( defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL) )
+	defined(WITH_POSTGRESQL) || defined(WITH_HASH) )
 	@${ECHO_CMD} "You need MySQL or Postgres for Daemon mode, because multithreading support is needed"
 	@${FALSE}
 .endif
+.if ( defined(WITH_MYSQL40) && defined(WITH_MYSQL50) && defined(WITH_MYSQL41) )
+	@${ECHO_CMD} "You can compile with only one MySQL version driver."
+	@${FALSE}
+.endif
 .if defined(WITH_LDAP) && !( defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL) || defined(HAVE_SQLITE))
+	defined(WITH_POSTGRESQL) || defined(HAVE_SQLITE) )
 	@${ECHO_CMD} "You need MySQL, Postgres or SQLITE for LDAP."
 	@${FALSE}
 .endif
@@ -611,33 +570,36 @@ post-install:
 	${TEST} `ls -1 ${PREFIX}/lib/pkgconfig | wc -l` -eq 0 && \
 		${RM} -R ${PREFIX}/lib/pkgconfig || true
 
-.if defined(USE_MYSQL)
+.ifdef(USE_MYSQL)
 	@${MKDIR} ${EXAMPLESDIR}/mysql
 	cd  ${WRKSRC}/src/tools.mysql_drv && \
-		${INSTALL_DATA} mysql_objects-space.sql \
-			mysql_objects-speed.sql purge.sql \
-			virtual_users.sql mysql_objects-4.1.sql \
-			purge-4.1.sql neural.sql  ${EXAMPLESDIR}/mysql
-	@${INSTALL_DATA} ${FILESDIR}/2x_to_3x_db.sql ${EXAMPLESDIR}/mysql
-	@${INSTALL_DATA} ${FILESDIR}/310_to_320.my.sql ${EXAMPLESDIR}/mysql
-.endif
-.if defined(WITH_POSTGRESQL)
+		${INSTALL_DATA} mysql_objects-4.1.sql \
+			mysql_objects-space.sql \
+			mysql_objects-speed.sql \
+			neural.sql \
+			purge-4.1.sql purge.sql \
+			virtual_user_aliases.sql \
+			virtual_users.sql ${EXAMPLESDIR}/mysql
+#	@${INSTALL_DATA} ${FILESDIR}/2x_to_3x_db.sql ${EXAMPLESDIR}/mysql
+#	@${INSTALL_DATA} ${FILESDIR}/310_to_320.my.sql ${EXAMPLESDIR}/mysql
+.endif
+.ifdef(WITH_POSTGRESQL)
 	@${MKDIR} ${EXAMPLESDIR}/pgsql
 	@cd  ${WRKSRC}/src/tools.pgsql_drv && \
 		${INSTALL_DATA} *.sql ${EXAMPLESDIR}/pgsql
 .endif
-.if defined(HAVE_SQLITE)
+.ifdef(HAVE_SQLITE)
 	@${MKDIR} ${EXAMPLESDIR}/sqlite
 	cd ${WRKSRC}/src/tools.sqlite_drv && \
 		${INSTALL_DATA} *.sql ${EXAMPLESDIR}/sqlite
 .endif
-.if defined(WITH_ORACLE)
+.ifdef(WITH_ORACLE)
 	@${MKDIR} ${EXAMPLESDIR}/oracle
 	cd ${WRKSRC}/src/tools.ora_drv && \
 		${INSTALL_DATA} *.sql ${EXAMPLESDIR}/oracle
 .endif
 
-.if defined(WITH_CGI)
+.ifdef(WITH_CGI)
 .	for I in admin.cgi admingraph.cgi configure.pl dspam.cgi graph.cgi
 		@${SED} -i '' -e "s,/usr/bin/perl,${PERL},g" ${WRKSRC}/webui/cgi-bin/${I}
 .	endfor
@@ -657,11 +619,12 @@ post-install:
 .endif
 
 	@${SED} ${_SED_SCRIPT} ${.CURDIR}/pkg-message > ${WRKSRC}/README.FreeBSD
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${_DOCSL} ${DOCSDIR}
-	cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${DOCSDIR}/UPDATING
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${DOCSDIR}
+	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${_DOCSL} ${DOCSDIR}
+	@cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${DOCSDIR}/UPDATING
 .endif
 
 	@${MKDIR} -m ${DSPAM_HOME_MODE} ${DSPAM_HOME}
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index ed6c4964429d..665646d3c417 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (dspam-devel-3.5.2.20050725.0800.tar.gz) = c87afd317ccb3dfe9435c0c1502b6945
-SIZE (dspam-devel-3.5.2.20050725.0800.tar.gz) = 712449
+MD5 (dspam-devel-3.6.0.tar.gz) = d9ee63a8cf67ea933d711b00851ce916
+SIZE (dspam-devel-3.6.0.tar.gz) = 732042
diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index 9a1636cd262b..4503e8d3ad25 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -12,6 +12,24 @@ also the UPGRADING enclosed in the dspam distribution. You can see it by doing
 in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
+
+###########################################################################
+# dspam-devel-3.6.0
+#
+
+- css_drv (CRM Sparse Spectra Storage Driver) is now called hash_drv,
+hence: WITH_CSS -> WITH_HASH; also the max records number in hash_drv can
+be set in dspam.conf; WARNING: the new file format is incompatble with the
+old one but is considerable smaller
+- you can now have the database drivers dynamically loaded at run time so
+you can select multiple drivers in the OPTIONS screen; see dspam.conf.
+- also algorithm selection is done exclusively via dspam.conf
+- documented MySQL quoting bug in some versions of 4.1 (see mysql.txt),
+and added MySQLSupressQuote option to compensate
+- read UPGRADING and CHANGELOG and adjust your dspam.conf accordingly
+- !!! WARNING !!! MaxMessageSize is also applied to ClamAV virus scanning.
+    Thanks to Patrick Hurrelmann <outi@bytephobia.de> for beta-testing and catching a few mistakes.
+
 ###########################################################################
 # dspam-devel-3.5.2.20050725.0800
 #
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index 411988c41c22..9808731f752a 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -1,3 +1,6 @@
+%%HASH%%bin/cssstat
+%%HASH%%bin/csscompress
+%%HASH%%bin/cssclean
 bin/dspam
 bin/dspamc
 bin/dspam_2sql
@@ -24,9 +27,22 @@ include/dspam/libdspam.h
 include/dspam/libdspam_objects.h
 include/dspam/nodetree.h
 include/dspam/storage_driver.h
+include/dspam/tokenizer.h
 lib/libdspam.a
 lib/libdspam.so
 lib/libdspam.so.7
+%%DYNAMIC%%%%HASH%%lib/libhash_drv.so
+%%DYNAMIC%%%%HASH%%lib/libhash_drv.so.7
+%%DYNAMIC%%%%HASH%%lib/libhash_drv.a
+%%DYNAMIC%%%%MYSQL%%lib/libmysql_drv.so
+%%DYNAMIC%%%%MYSQL%%lib/libmysql_drv.so.7
+%%DYNAMIC%%%%MYSQL%%lib/libmysql_drv.a
+%%DYNAMIC%%%%PGSQL%%lib/libpgsql_drv.so
+%%DYNAMIC%%%%PGSQL%%lib/libpgsql_drv.so.7
+%%DYNAMIC%%%%PGSQL%%lib/libpgsql_drv.a
+%%DYNAMIC%%%%SQLITE%%lib/libsqlite3_drv.so
+%%DYNAMIC%%%%SQLITE%%lib/libsqlite3_drv.so.7
+%%DYNAMIC%%%%SQLITE%%lib/libsqlite3_drv.a
 libdata/pkgconfig/dspam.pc
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
@@ -48,14 +64,13 @@ libdata/pkgconfig/dspam.pc
 %%PORTDOCS%%%%DOCSDIR%%/UPDATING
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/2x_to_3x_db.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/310_to_320.my.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/neural.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/purge-4.1.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/purge.sql
+%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_user_aliases.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
 %%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
 %%MYSQL%%@dirrm %%EXAMPLESDIR%%
@@ -64,7 +79,8 @@ libdata/pkgconfig/dspam.pc
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
 %%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
 %%PGSQL%%@dirrm %%EXAMPLESDIR%%
-%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge.sql
+%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql
+%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-3.sql
 %%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
 %%SQLITE%%@dirrm %%EXAMPLESDIR%%
 %%CGI%%www/vhosts/dspam/admins.sample