- Update to a new snap and fix a bug in it so that it builds pgsql driver.

- fix OPTIONS version check
- fix rc.d script for dspam_debug enebled
- mirror DISTFILES on MASTER_SITE_LOCAL also

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
Removed features:
- dspam_corpus (replaced by newer dspam_train)
- dspam_genaliases (replaced by parse-to-headers, virtual users, etc)

Approved by:	lawrance (mentor)

5 files changed, 35 insertions, 19 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 0f8d571663b1..d17b1499aa5b 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -2,7 +2,7 @@
 # Date created:		24 Jun 2004
 # Whom:			Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
 #
-# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.49 2006/04/30 10:44:28 itetcu Exp $
+# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.52 2006/05/13 11:53:53 itetcu Exp $
 # $FreeBSD$
 #
 
@@ -13,22 +13,23 @@
 
 PORTNAME=	dspam-devel
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	# set later
 
-MAINTAINER=	itetcu@people.tecnik93.com
+MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Bayesian spam filter - development version
 
 PORTVER_MAJ=	3.6.5
-#SNAP_DATE=	.20060421.2101
-_UPD_LINE_NO=	8
+SNAP_DATE=	.20060513.1125
+_UPD_LINE_NO=	13
 
 MIN_OPTIONS_VER=	${PORTNAME}-3.6.5
 
 .ifdef(SNAP_DATE)
-MASTER_SITES=	http://sce-tindy.tecnik93.com/FreeBSD/ports/${PORTNAME}/sources/ \
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
+		http://sce-tindy.tecnik93.com/FreeBSD/ports/${PORTNAME}/sources/ \
 		http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
+MASTER_SITE_SUBDIR=	itetcu
 .else
 MASTER_SITES=	http://dspam.irontec.com/sources/ \
 	http://dspam.nuclearelephant.com/sources/ \
@@ -651,7 +652,9 @@ post-install:
 check-options-version:
 .ifdef(_OPTIONS_READ)
 	@(if ${PKG_VERSION} -t ${_OPTIONS_READ} ${MIN_OPTIONS_VER} | ${GREP} -q '<'; \
-	 then ${ECHO_CMD} "You have unsupported (old) OPTIONS, please do a 'make config; make'\n" \
+	 then	${ECHO_CMD} ""; \
+		${ECHO_CMD} "===> You have unsupported (old) OPTIONS, please do a 'make config; make'"; \
+		${ECHO_CMD} ""; \
 		exit 1; \
 	 fi)
 .endif
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index a87004af5025..a4c1dbc1fd0a 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/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-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
diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index f7b1d0c8e3cf..c056b3719135 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -11,6 +11,20 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.6.5.20060513.1125
+#
+
+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 
+Removed features:
+- dspam_corpus (replaced by newer dspam_train)
+- dspam_genaliases (replaced by parse-to-headers, virtual users, etc)
+
+
+###########################################################################
 # dspam-devel-3.6.5_1
 #
 
diff --git a/mail/dspam-devel/files/dspam-devel.in b/mail/dspam-devel/files/dspam-devel.in
index eb2237dab128..dea1d3b3e50b 100644
--- a/mail/dspam-devel/files/dspam-devel.in
+++ b/mail/dspam-devel/files/dspam-devel.in
@@ -20,6 +20,13 @@
 name="dspam"
 rcvar=${name}_enable
 
+load_rc_config $name
+
+#defaults
+: ${dspam_enable="NO"}
+: ${dspam_debug="NO"}
+: ${dspam_pidfile:-/var/run/dspam.pid}
+
 command=%%PREFIX%%/bin/${name}
 if checkyesno dspam_debug
 then
@@ -36,11 +43,4 @@ reload()
  kill -HUP `cat $pidfile`
 }
 
-load_rc_config $name
-
-#defaults
-: ${dspam_enable="NO"}
-: ${dspam_debug="NO"}
-: ${dspam_pidfile:-/var/run/dspam.pid}
-
 run_rc_command "$1"
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index 0251002d2215..8620fa070b30 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/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
@@ -81,6 +79,7 @@ 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