- Update to 3.6.3.

- Changed mastersites to official mirrors for release version and keep my site
  for cvs snaps.
- A few file/patch* are removed, they are now incorporated in vendor sources.
- Drop USE_REINPLACE, it's no longe needed.

PR:		ports/92335
Submitted by:	maintainer

9 files changed, 36 insertions, 128 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index f6c7e5b2c1a5..f8d156c28ff3 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -4,7 +4,7 @@
 #
 # $FreeBSD$
 #
-# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.12 2005/12/13 21:09:01 itetcu Exp $
+# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.16 2006/01/25 00:31:26 itetcu Exp $
 #
 
 # Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
@@ -14,19 +14,26 @@
 
 PORTNAME=	dspam-devel
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=	1
+#PORTREVISION=	0
 CATEGORIES=	mail
-MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
+MASTER_SITES=	# set later
 
 MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Bayesian spam filter - development version
 
-PORTVER_MAJ=	3.6.2
+PORTVER_MAJ=	3.6.3
 #SNAP_DATE=	.20051211.2134
 
 .ifdef(SNAP_DATE)
+MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
 WRKSRC=		${WRKDIR}/dspam-cvs-devel${SNAP_DATE}
 .else
+MASTER_SITES=	http://dspam.irontec.com/sources/ \
+	http://dspam.nuclearelephant.com/sources/ \
+	http://dspam.systemadministrator.org/sources/ \
+	http://dspam.sourceforge.net/sources/ \
+	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
+DISTFILES=	dspam-${PORTVER_MAJ}.tar.gz
 WRKSRC=		${WRKDIR}/dspam-${PORTVER_MAJ}
 .endif
 
@@ -42,7 +49,7 @@ DISTFILES=	snapshot-devel.tar.gz
 FETCH_BEFORE_ARGS=	-v -o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
 .endif
 
-_UPD_LINE_NO=	6
+_UPD_LINE_NO=	19
 
 ## debug / log / admin options
 OPTIONS=	DEBUG "Enable debugging logging" on
@@ -98,7 +105,6 @@ OPTIONS+=	CGI "Install CGI (pulls in apache)" off
 OPTIONS+=	TRAIN_SCRIPT "Install trainning script (needs perl)" off
 
 USE_AUTOTOOLS=	libtool:15
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 #CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index 355ef62dec98..85dfa21f326b 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (dspam-devel-3.6.2.tar.gz) = cde38b1fe37daf531475251e95253033
-SHA256 (dspam-devel-3.6.2.tar.gz) = c99b4ba5b414df6dbd8e252243ebd1a079591669de91deee456ac64a802d1178
-SIZE (dspam-devel-3.6.2.tar.gz) = 740001
+MD5 (dspam-3.6.3.tar.gz) = db1aedb9677e6bf5c7a47a72d4f130e5
+SHA256 (dspam-3.6.3.tar.gz) = 6283c067c192f589a4fb925b845ba1bd9b51fe1b3df93d7f03897d7617a4aa7a
+SIZE (dspam-3.6.3.tar.gz) = 740097
diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index d8be4719455d..c4172fe467c6 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -11,6 +11,26 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.6.3
+#
+
+BUGFIX: fixed bug causing "no trusted delivery agent configured" error when
+calling dspam withot an agent configured, but not delivering - or when using
+--classify
+BUGFIX: fixed minor bug causing ChangeUserOnParse to format incorrectly
+
+Notable changes:
+- rewrote some routines that were strdup'ing message body repeatedly
+- changes to tokenization and probability assignment make a noticeable
+difference in accuracy
+- updated dspam_stats "-S" output to use more widely accepted readings:
+SHR: Spam Hit Rate (true positive rate)
+HSR: Ham Strike Rate (false positive rate)
+OCA: Overall Classification Accuracy
+-  add large-scale support to dspam_logrotate
+
+
+###########################################################################
 # dspam-devel-3.6.2_1 (2005-12-11 19:18)
 #
 
diff --git a/mail/dspam-devel/files/dspam-devel.sh.in b/mail/dspam-devel/files/dspam-devel.sh.in
index 390a040b0fd9..4f08547ed427 100644
--- a/mail/dspam-devel/files/dspam-devel.sh.in
+++ b/mail/dspam-devel/files/dspam-devel.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 # formerly $ FreeBSD: ports/mail/dspam-devel/files/dspam.rc,v 1.2 2005/02/25 03:09:26 leeym Exp $
-# $Tecnik: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.3 2005/12/13 21:09:37 itetcu Exp $
+# $Tecnik: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.4 2006/01/24 20:52:44 itetcu Exp $
 
 # PROVIDE: dspam
 # REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%CLAMD%%
diff --git a/mail/dspam-devel/files/patch-CHANGELOG b/mail/dspam-devel/files/patch-CHANGELOG
deleted file mode 100644
index 05f011c1fba2..000000000000
--- a/mail/dspam-devel/files/patch-CHANGELOG
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: CHANGELOG
-===================================================================
-RCS file: /usr/local/cvsroot/dspam/CHANGELOG,v
-retrieving revision 1.387
-retrieving revision 1.388
-diff -u -r1.387 -r1.388
---- CHANGELOG	25 Nov 2005 17:46:31 -0000	1.387
-+++ CHANGELOG	2 Dec 2005 05:06:11 -0000	1.388
-@@ -1,4 +1,12 @@
--$Id: CHANGELOG,v 1.387 2005/11/25 17:46:31 jonz Exp $
-+$Id: CHANGELOG,v 1.388 2005/12/02 05:06:11 jonz Exp $
-+
-+Version NEXT
-+------------
-+
-+[20051201.0000] jonz: fix for ldap calls
-+
-+fix to close connections to ldap after calls
-+fix to fail database creation on ldap failure
- 
- Version 3.6.2
- -------------
diff --git a/mail/dspam-devel/files/patch-src_ldap_client.c b/mail/dspam-devel/files/patch-src_ldap_client.c
deleted file mode 100644
index 3143daee7d6b..000000000000
--- a/mail/dspam-devel/files/patch-src_ldap_client.c
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: src/ldap_client.c
-===================================================================
-RCS file: /usr/local/cvsroot/dspam/src/ldap_client.c,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- src/ldap_client.c	24 Sep 2005 17:48:59 -0000	1.2
-+++ src/ldap_client.c	2 Dec 2005 05:06:11 -0000	1.3
-@@ -1,4 +1,4 @@
--/* $Id: ldap_client.c,v 1.2 2005/09/24 17:48:59 jonz Exp $ */
-+/* $Id: ldap_client.c,v 1.3 2005/12/02 05:06:11 jonz Exp $ */
- 
- /*
-  DSPAM
-@@ -80,7 +80,9 @@
-     return EFAILURE;
-   }
- 
--  result = ldap_count_entries(ld, msg);
-+  result = ldap_count_entries(ld, msg) > 0;
-+  ldap_msgfree (msg);
-+  ldap_unbind(ld);
-   return result;
- }
- 
diff --git a/mail/dspam-devel/files/patch-src_libdspam.c b/mail/dspam-devel/files/patch-src_libdspam.c
deleted file mode 100644
index 2e9c78dbb6bd..000000000000
--- a/mail/dspam-devel/files/patch-src_libdspam.c
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: dspam/src/libdspam.c
-===================================================================
-RCS file: /usr/local/cvsroot/dspam/src/libdspam.c,v
-retrieving revision 1.144
-retrieving revision 1.145
-diff -u -r1.144 -r1.145
---- src/libdspam.c	24 Nov 2005 14:09:12 -0000	1.144
-+++ src/libdspam.c	13 Dec 2005 16:59:45 -0000	1.145
-@@ -1,4 +1,4 @@
--/* $Id: libdspam.c,v 1.144 2005/11/24 14:09:12 jonz Exp $ */
-+/* $Id: libdspam.c,v 1.145 2005/12/13 16:59:45 jonz Exp $ */
- 
- /*
-  DSPAM
-@@ -892,7 +892,9 @@
-   /* Apply Bayesian Noise Reduction */
-   if (CTX->flags & DSF_NOISE)
-   {
--    _ds_apply_bnr(CTX, diction);
-+    ds_diction_t p = _ds_apply_bnr(CTX, diction);
-+    if (p) 
-+      ds_diction_destroy(p);
-   }
- 
-   if (CTX->flags & DSF_WHITELIST)
diff --git a/mail/dspam-devel/files/patch-src_mysql_drv.c b/mail/dspam-devel/files/patch-src_mysql_drv.c
deleted file mode 100644
index bd92853cd914..000000000000
--- a/mail/dspam-devel/files/patch-src_mysql_drv.c
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: src/mysql_drv.c
-===================================================================
-RCS file: /usr/local/cvsroot/dspam/src/mysql_drv.c,v
-retrieving revision 1.57
-retrieving revision 1.58
-diff -u -r1.57 -r1.58
---- src/mysql_drv.c	1 Oct 2005 15:33:18 -0000	1.57
-+++ src/mysql_drv.c	2 Dec 2005 05:06:11 -0000	1.58
-@@ -1,4 +1,4 @@
--/* $Id: mysql_drv.c,v 1.57 2005/10/01 15:33:18 jonz Exp $ */
-+/* $Id: mysql_drv.c,v 1.58 2005/12/02 05:06:11 jonz Exp $ */
- 
- /*
-  DSPAM
-@@ -1804,7 +1804,7 @@
- 
- #ifdef USE_LDAP
-   if (_ds_match_attribute(CTX->config->attributes, "LDAPMode", "verify") &&
--      !ldap_verify(CTX, name)) 
-+      ldap_verify(CTX, name)<=0) 
-   {
-     LOGDEBUG("LDAP verification of %s failed: not adding user", name);
-     return NULL;
diff --git a/mail/dspam-devel/files/patch-src_pgsql_drv.c b/mail/dspam-devel/files/patch-src_pgsql_drv.c
deleted file mode 100644
index a880c8c4be00..000000000000
--- a/mail/dspam-devel/files/patch-src_pgsql_drv.c
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: src/pgsql_drv.c
-===================================================================
-RCS file: /usr/local/cvsroot/dspam/src/pgsql_drv.c,v
-retrieving revision 1.47
-retrieving revision 1.48
-diff -u -r1.47 -r1.48
---- src/pgsql_drv.c	9 Oct 2005 20:29:55 -0000	1.47
-+++ src/pgsql_drv.c	2 Dec 2005 05:06:11 -0000	1.48
-@@ -1,4 +1,4 @@
--/* $Id: pgsql_drv.c,v 1.47 2005/10/09 20:29:55 jonz Exp $ */
-+/* $Id: pgsql_drv.c,v 1.48 2005/12/02 05:06:11 jonz Exp $ */
- 
- /*
-  DSPAM
-@@ -1923,7 +1923,7 @@
- 
- #ifdef USE_LDAP
-   if (_ds_match_attribute(CTX->config->attributes, "LDAPMode", "verify") &&
--      !ldap_verify(CTX, name))
-+      ldap_verify(CTX, name)<=0)
-   {
-     LOGDEBUG("LDAP verification of %s failed: not adding user", name);
-     return NULL;