Update to 3.6.6 (stable) release.

(At this moment it should be indentical to mail/dspam.)

Removed features:
- Phased out deprecated Berkeley DB drivers
Bugfixes:
- when using logfile, write errors result in segfault

Approved by:	lawrance (mentor)

4 files changed, 20 insertions, 24 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index d17b1499aa5b..74af2da6eac4 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -19,11 +19,11 @@ MASTER_SITES=	# set later
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Bayesian spam filter - development version
 
-PORTVER_MAJ=	3.6.5
-SNAP_DATE=	.20060513.1125
-_UPD_LINE_NO=	13
+PORTVER_MAJ=	3.6.6
+#SNAP_DATE=	.20060513.1125
+_UPD_LINE_NO=	9
 
-MIN_OPTIONS_VER=	${PORTNAME}-3.6.5
+MIN_OPTIONS_VER=	${PORTNAME}-3.6.6
 
 .ifdef(SNAP_DATE)
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
@@ -63,7 +63,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
@@ -204,7 +203,7 @@ SUB_LIST+=	CLAMD=
 _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,
+_DBDRV=		pgsql_drv,sqlite3_drv,sqlite_drv,hash_drv,mysql_drv,
 
 .ifndef(WITHOUT_POSTGRESQL)
 USE_PGSQL=	yes
@@ -234,18 +233,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
@@ -441,7 +428,7 @@ 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 \
+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
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index a4c1dbc1fd0a..d0096dd47427 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (dspam-devel-3.6.5.20060513.1125.tar.gz) = ca614114ab6021570c90307cfaf2ac59
-SHA256 (dspam-devel-3.6.5.20060513.1125.tar.gz) = 8df2da7a2e9739d1a38b8afaa25c1619fd81c70fcdc18e2396f479c7b1a0bc4b
-SIZE (dspam-devel-3.6.5.20060513.1125.tar.gz) = 395410
+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-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index c056b3719135..cee55b9b2576 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -11,6 +11,16 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.6.6 (stable release)
+#
+
+Removed features:
+- Phased out deprecated Berkeley DB drivers
+Bugfixes:
+- when using logfile, write errors result in segfault
+
+
+###########################################################################
 # dspam-devel-3.6.5.20060513.1125
 #
 
@@ -18,7 +28,7 @@ New feature:
 - Fallback domains (see 2.6 in README)
 Bug fixes:
 - trainPristine preference turned "off" now overrides config turned "on"
-- segfault fix for when correcting messages using UIDInSignature 
+- segfault fix for when correcting messages using UIDInSignature with MySQL
 Removed features:
 - dspam_corpus (replaced by newer dspam_train)
 - dspam_genaliases (replaced by parse-to-headers, virtual users, etc)
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index 8620fa070b30..8899330d3438 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -79,7 +79,6 @@ 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