4 files changed, 23 insertions, 26 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 8cb476dbd56c..ac5885f5fa34 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -17,14 +17,14 @@ PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
 CATEGORIES=	mail
 MASTER_SITES=	# set later
 
-MAINTAINER=	itetcu@people.tecnik93.com
+MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Bayesian spam filter - stable maintenance version
 
-PORTVER_MAJ=	3.6.5
+PORTVER_MAJ=	3.6.6
 #SNAP_DATE=	.20060421.2101
-_UPD_LINE_NO=	51
+_UPD_LINE_NO=	11
 
-MIN_OPTIONS_VER=	${PORTNAME}-3.6.5
+MIN_OPTIONS_VER=	${PORTNAME}-3.6.6
 
 .ifdef(SNAP_DATE)
 MASTER_SITES=	http://sce-tindy.tecnik93.com/FreeBSD/ports/${PORTNAME}/sources/ \
@@ -61,7 +61,6 @@ OPTIONS+=	MYSQL_LOCAL "RUN_DEPEND on selected MySQL server ver." off
 OPTIONS+=	POSTGRESQL "Use PostgreSQL as back-end" on
 OPTIONS+=	POSTGRESQL_LOCAL "RUN_DEPEND on PostgreSQL server" off
 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" on
 OPTIONS+=	HASH "Use hash driver" on
@@ -197,9 +196,9 @@ SUB_LIST+=	CLAMD=
 
 # 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
+#_DBDRV_ALL=	pgsql_drv,ora_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,
+_DBDRV=		pgsql_drv,sqlite3_drv,sqlite_drv,hash_drv,mysql_drv,
 
 .ifndef(WITHOUT_POSTGRESQL)
 USE_PGSQL=	yes
@@ -229,18 +228,6 @@ _DBDRV:=	${_DBDRV:S/pgsql_drv,//}
 #_DBDRV:=	${_DBDRV:S/ora_drv,//}
 .endif
 
-.ifdef(WITH_BDB4)
-# change me when we have BDB_VERSOIN in bsd.databases.mk
-USE_BDB=	41
-CONFIGURE_ARGS+=	--with-db4-includes=${LOCALBASE}/include/db41
-PLIST_SUB+=	DB4=""
-#PKGNAMESUFFIX=	-bdb41
-_DBDRV_COUNT:=	${_DBDRV_COUNT}o
-.else
-_DBDRV:=	${_DBDRV:S/libdb41_drv,//}
-PLIST_SUB+=	DB4="@comment "
-.endif
-
 .ifndef(WITHOUT_SQLITE3)
 USE_SQLITE=	3
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
@@ -436,8 +423,8 @@ PLIST_SUB+=	CGI="@comment "
 _SED_SCRIPT+=	-e '/%%CGI%%/D'
 .endif
 
-MAN1=	dspam.1 dspam_clean.1 dspam_corpus.1 dspam_dump.1 dspam_merge.1 \
-	dspam_stats.1 dspam_train.1
+MAN1=	dspam.1 dspam_clean.1 dspam_dump.1 dspam_merge.1 dspam_stats.1 \
+	dspam_train.1
 MAN3=	libdspam.3
 MLINKS=		libdspam.3 dspam_init.3
 MLINKS+=	libdspam.3 dspam_create.3
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index a87004af5025..d0096dd47427 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1,3 +1,3 @@
-MD5 (dspam-3.6.5.tar.gz) = da4f0e00633bff49d71fde418caaf14b
-SHA256 (dspam-3.6.5.tar.gz) = d8033773840f51cad27466b018e26c5232990f576108af79f6aa910bc2556fda
-SIZE (dspam-3.6.5.tar.gz) = 747196
+MD5 (dspam-3.6.6.tar.gz) = 72dbf9d802ac3645c93b715c81cc9f50
+SHA256 (dspam-3.6.6.tar.gz) = af9b9429ee3b69c5d1fe8e8891f21c8640ca572f6244a794835646301ce84e91
+SIZE (dspam-3.6.6.tar.gz) = 725502
diff --git a/mail/dspam/files/UPDATING b/mail/dspam/files/UPDATING
index 401e0cea8cd9..708f8418e4a1 100644
--- a/mail/dspam/files/UPDATING
+++ b/mail/dspam/files/UPDATING
@@ -17,6 +17,18 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-3.6.6
+#
+
+Removed feature:
+- Phased out deprecated Berkeley DB drivers
+- Phased out legacy tools (dspam_corpus, dspam_genaliases)
+Bugfixes:
+- trainPristine preference turned "off" now overrides config turned "on"
+- segfault fix for when correcting messages using UIDInSignature with MySQL
+- when using logfile, write errors result in segfault
+
+###########################################################################
 # dspam-3.6.5
 #
 
diff --git a/mail/dspam/pkg-plist b/mail/dspam/pkg-plist
index 0251002d2215..8899330d3438 100644
--- a/mail/dspam/pkg-plist
+++ b/mail/dspam/pkg-plist
@@ -7,10 +7,8 @@ bin/dspamc
 bin/dspam_2sql
 bin/dspam_admin
 bin/dspam_clean
-bin/dspam_corpus
 bin/dspam_crc
 bin/dspam_dump
-bin/dspam_genaliases
 bin/dspam_logrotate
 bin/dspam_merge
 %%PGSQL%%bin/dspam_pg2int8