Sync with CVS in preparation to 3.6.5 release.

Bug-fixes:
- invalid read/segfault (dspam.c)
- segfault on problems establishing connectivity to clamav (dspam.c)
- segfault on NULL username (mysql_drv.c)
- bug causing writing of flat-file preferences to fail (pref.c)
- fragment file overwritten on retrain (cgi)
- corrects the output of "dspam_admin aggr pref" (tools/dspam_admin.c)
- prevent quarantining of message when delivering summary

WebUI: a lot of fixes and improvements

PostgeSQL: improvements to purge scripts and object creation script

Port changes:
------------------

Add MySQL 5.1 as backend.
Default MySQL version is now 5.0

Optionally depend on LightHTTPD instead of Apache if WITH_CGI=on

Fix OPTIONS handling for INDEX (describe); this is a long standing bug
and a *big* pontyhat for me; it affected _only_ dependecies recorded in
INDEX _if_ OPTIONS were not set (like for package building); however,
the package itself was always built right, dependecies recorded OK, etc.

Add SCE-tindy as MASTER_SITE, much faster site that my other server.

PR:		ports/96159
Submitted by:	maintainer (Ion-Mihai "IOnut" Tetcu)

4 files changed, 91 insertions, 37 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index de55efaf83f2..9ed92002df8d 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -2,14 +2,14 @@
 # Date created:		24 Jun 2004
 # Whom:			Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
 #
+# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.44 2006/04/22 12:43:37 itetcu Exp $
 # $FreeBSD$
-# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.38 2006/03/15 17:55:09 itetcu Exp $
 #
 
 # Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
 # or user variables (WITH*) changes please add an entry in ${FILESDIR}/UPDATING and
-# modify _UPD_LINE_NO=(no_of_added_lines-1) in this Makefile
-# else the port will be broken. Thanks.
+# modify _UPD_LINE_NO=(no_of_added_lines-1) in this Makefile.
+# Else the port will be broken. Thanks.
 
 PORTNAME=	dspam-devel
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
@@ -20,18 +20,20 @@ MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Bayesian spam filter - development version
 
 PORTVER_MAJ=	3.6.4
-SNAP_DATE=	.20060315.1518
-_UPD_LINE_NO=	17
+SNAP_DATE=	.20060421.2101
+_UPD_LINE_NO=	37
 
-MIN_OPTIONS_VER=	${PORTNAME}-3.6.4.20060315.1518
+MIN_OPTIONS_VER=	${PORTNAME}-3.6.4..20060421.2101
 
 .ifdef(SNAP_DATE)
-MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
+MASTER_SITES=	http://sce-tindy.tecnik93.com/FreeBSD/ports/${PORTNAME}/sources/ \
+		http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
 .else
 MASTER_SITES=	http://dspam.irontec.com/sources/ \
 	http://dspam.nuclearelephant.com/sources/ \
 	http://dspam.systemadministrator.org/sources/ \
 	http://dspam.sourceforge.net/sources/ \
+	http://sce-tindy.tecnik93.com/FreeBSD/ports/${PORTNAME}/sources/ \
 	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
 DISTFILES=	dspam-${PORTVER_MAJ}.tar.gz
 WRKSRC=		${WRKDIR}/dspam-${PORTVER_MAJ}
@@ -51,10 +53,11 @@ OPTIONS+=	CLAMAV_DEVEL "Enable clamav support" off
 OPTIONS+=	CLAMAV_LOCAL "RUN_DEPEND on selected clamav" on
 #
 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+=	MYSQL41 "Use MySQL 4.1.x as back-end" off
+OPTIONS+=	MYSQL50 "Use MySQL 5.0.x as back-end" on
+OPTIONS+=	MYSQL51 "Use MySQL 5.1.x as back-end" off
 OPTIONS+=	MYSQL_COMPRESS "Compress dspam <--> MySQL" off
-OPTIONS+=	MYSQL_LOCAL "RUN_DEPEND on MySQL server selected version" off
+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
@@ -85,7 +88,8 @@ OPTIONS+=	SENDMAIL "Play nice with sendmail server" off
 OPTIONS+=	POSTFIX_MBC "Dspam as mailbox_command in Postfix" off
 OPTIONS+=	QMAIL "Play nice with Qmail mail server" off
 
-OPTIONS+=	CGI "Install CGI (pulls in apache)" off
+OPTIONS+=	CGI "Install CGI (pulls in Apache or see below)" off
+OPTIONS+=	LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
 
 USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -148,14 +152,14 @@ _SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		-e '/^%%FreeBSD/D' \
 		-e '/^%%Tecnik%%/D'
 
-.ifdef(WITH_SYSLOG)
+.ifndef(WITHOUT_SYSLOG)
 CONFIGURE_ARGS+=	--enable-syslog
 .else
 CONFIGURE_ARGS+=	--disable-syslog
 CONFIGURE_ARGS+=	--with-logfile=${LOGFILE}
 .endif
 
-.ifdef(WITH_DEBUG)
+.ifndef(WITHOUT_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
@@ -171,7 +175,7 @@ CONFIGURE_ARGS+=	--enable-bnr-debug
 CONFIGURE_ARGS+=	--enable-preferences-extension
 .endif
 
-.ifdef(WITH_DAEMON)
+.ifndef(WITHOUT_DAEMON)
 CONFIGURE_ARGS+=	--enable-daemon
 RC_SUFX=	.sh
 USE_RC_SUBR=	${PORTNAME}${RC_SUFX}
@@ -181,17 +185,17 @@ SUB_LIST+=	DSPAM_HOME=${DSPAM_HOME}
 _SED_SCRIPT+=	-e '/%%DAEMON%%/D'
 .endif
 
-.ifdef(WITH_CLAMAV) && defined(WITH_CLAMAV_LOCAL)
+.ifndef(WITHOUT_CLAMAV) && !defined(WITHOUT_CLAMAV_LOCAL)
 CONFIGURE_ARGS+=	--enable-clamav
 RUN_DEPENDS+=	clamav>=0:${PORTSDIR}/security/clamav
 SUB_LIST+=	CLAMD=clamd
 .endif
-.ifdef(WITH_CLAMAV_DEVEL)  && defined(WITH_CLAMAV_LOCAL)
+.ifdef(WITH_CLAMAV_DEVEL)  && !defined(WITHOUT_CLAMAV_LOCAL)
 CONFIGURE_ARGS+=	--enable-clamav
 RUN_DEPENDS+=	clamav-devel>=0:${PORTSDIR}/security/clamav-devel
 SUB_LIST+=	CLAMD=clamd
 .endif
-.ifndef(WITH_CLAMAV_LOCAL)
+.ifdef(WITHOUT_CLAMAV_LOCAL)
 SUB_LIST+=	CLAMD=
 .endif
 
@@ -201,7 +205,7 @@ _DBDRV_COUNT=	# blank, but defined so we can check against it
 # 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)
+.ifndef(WITHOUT_POSTGRESQL)
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-pgsql-includes=${LOCALBASE}/include \
 		--with-pgsql-libraries=${LOCALBASE}/lib
@@ -229,7 +233,7 @@ _DBDRV:=	${_DBDRV:S/pgsql_drv,//}
 #_DBDRV:=	${_DBDRV:S/ora_drv,//}
 .endif
 
-.if defined(WITH_BDB4)
+.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
@@ -241,7 +245,7 @@ _DBDRV:=	${_DBDRV:S/libdb41_drv,//}
 PLIST_SUB+=	DB4="@comment "
 .endif
 
-.if defined(WITH_SQLITE3)
+.ifndef(WITHOUT_SQLITE3)
 USE_SQLITE=	3
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 .else
@@ -263,7 +267,7 @@ PLIST_SUB+=	SQLITE=""
 PLIST_SUB+=	SQLITE="@comment "
 .endif
 
-.ifdef(WITH_HASH)
+.ifndef(WITHOUT_HASH)
 PLIST_SUB+=	HASH=""
 #PKGNAMESUFFIX=	-css
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
@@ -278,12 +282,16 @@ WANT_MYSQL_VER=	40
 .elifdef(WITH_MYSQL41)
 WANT_MYSQL_VER=	41
 #PKGNAMESUFFIX=	-mysql41
-.elifdef(WITH_MYSQL50)
+.elifndef(WITHOUT_MYSQL50)
 WANT_MYSQL_VER=	50
 #PKGNAMESUFFIX=	-mysql50
+.elifdef(WITH_MYSQL51)
+WANT_MYSQL_VER=	51
+#PKGNAMESUFFIX=	-mysql51
 .endif
 
-.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || defined(WITH_MYSQL50)
+.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || \
+	!defined(WITHOUT_MYSQL50) || defined(WITH_MYSQL51)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-includes=${LOCALBASE}/include/mysql \
 		--with-mysql-libraries=${LOCALBASE}/lib/mysql
@@ -408,7 +416,11 @@ CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
 .endif
 
 .ifdef(WITH_CGI)
+.	if defined(WITH_LIGHTTPD)
+RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
+.	else
 USE_APACHE=	1.3+
+.endif
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS+=	${SITE_PERL}/mach/GD.pm:${PORTSDIR}/graphics/p5-GD
 RUN_DEPENDS+=	${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
@@ -468,7 +480,7 @@ pre-extract:	check-options-version
 	@${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)"
-.	ifndef(WITH_SYSLOG)
+.	ifdef(WITHOUT_SYSLOG)
 	@${ECHO_CMD} "LOGFILE=${LOGFILE} (default: ${_VAR_DIR}/log/dspam/dspam.log)"
 .	endif
 .	ifdef(WITH_CGI)
@@ -508,26 +520,26 @@ pre-configure:
 	@${FALSE}
 .endif
 .if defined(WITH_VIRT_USERS) && !(defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL) || defined(WITH_ORACLE) || defined(WITH_HASH) )
-	@${ECHO_CMD} "You need MySQL, POSTGRESQL or ORACLE for virtual users."
+	!defined(WITHOUT_POSTGRESQL) || defined(WITH_ORACLE) || !defined(WITHOUT_HASH) )
+	@${ECHO_CMD} "You need MySQL, POSTGRESQL, HASH or ORACLE for virtual users."
 	@${FALSE}
 .endif
 .if defined(WITH_PREF_EXT) && !( defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL) )
+	!defined(WITHOUT_POSTGRESQL) )
 	@${ECHO_CMD} "You need MySQL or Postgres for preferences extension"
 	@${FALSE}
 .endif
-.if defined(WITH_DAEMON) && !( defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL) || defined(WITH_HASH) )
-	@${ECHO_CMD} "You need MySQL or Postgres for Daemon mode, because multithreading support is needed"
+.ifndef(WITHOUT_DAEMON) && !( defined(USE_MYSQL) || \
+	!defined(WITHOUT_POSTGRESQL) || !defined(WITHOUT_HASH) )
+	@${ECHO_CMD} "You need MySQL, PostgreSQL ot Hash for Daemon mode, because multithreading support is needed"
 	@${FALSE}
 .endif
-.if ( defined(WITH_MYSQL40) && defined(WITH_MYSQL50) && defined(WITH_MYSQL41) )
+.if ( defined(WITH_MYSQL40) && defined(WITH_MYSQL41) && !defined(WITHOUT_MYSQL50) && defined(WITH_MYSQL51))
 	@${ECHO_CMD} "You can compile with only one MySQL version driver."
 	@${FALSE}
 .endif
 .if defined(WITH_LDAP) && !( defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL) || defined(USE_SQLITE) )
+	!defined(WITHOUT_POSTGRESQL) || defined(USE_SQLITE) )
 	@${ECHO_CMD} "You need MySQL, Postgres or SQLITE for LDAP."
 	@${FALSE}
 .endif
@@ -539,6 +551,10 @@ pre-configure:
 	@${ECHO_CMD} "DOMAIN_SCALE and LARGE_SCALE are incopatible"
 	@${FALSE}
 .endif
+.if defined(WITH_LIGHTHTTPD) && !defined(WITH_CGI)
+	@${ECHO_CMD} "There's no reason to depend on LightHTTPD if you're not using CGI"
+	@${FALSE}
+.endif
 .ifdef(SNAP_DATE)
 	@${ECHO_CMD}
 	@${ECHO_CMD} "You can safely ignore the following auto*  errors"
@@ -569,7 +585,7 @@ post-install:
 			virtual_user_aliases.sql \
 			virtual_users.sql ${EXAMPLESDIR}/mysql
 .endif
-.ifdef(WITH_POSTGRESQL)
+.ifndef(WITHOUT_POSTGRESQL)
 	@${MKDIR} ${EXAMPLESDIR}/pgsql
 	@cd  ${WRKSRC}/src/tools.pgsql_drv && \
 		${INSTALL_DATA} *.sql ${EXAMPLESDIR}/pgsql
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index 442df1d12a4e..4419f37d09a8 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (dspam-devel-3.6.4.20060315.1518.tar.gz) = c40ec96422922451f4875bdb6089aa1f
-SHA256 (dspam-devel-3.6.4.20060315.1518.tar.gz) = fcb81c908da122307b8685b5668618c2d3eb52fe3023e058c53335700a12b8f7
-SIZE (dspam-devel-3.6.4.20060315.1518.tar.gz) = 401405
+MD5 (dspam-devel-3.6.4.20060421.2101.tar.gz) = 1299022ec1630b69cfb406511eb18fc4
+SHA256 (dspam-devel-3.6.4.20060421.2101.tar.gz) = a7ae934cab62d5582a17c5f807cd073277ada775d44716be106b2edb64aa96bb
+SIZE (dspam-devel-3.6.4.20060421.2101.tar.gz) = 398223
diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index 96277995c81a..a762f9b690ba 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -11,6 +11,44 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.6.4.20060421.2101
+#
+
+Bug-fixes:
+- invalid read/segfault (dspam.c)
+- segfault on problems establishing connectivity to clamav (dspam.c)
+- segfault on NULL username (mysql_drv.c)
+- bug causing writing of flat-file preferences to fail (pref.c)
+- fragment file overwritten on retrain (cgi)
+- corrects the output of "dspam_admin aggr pref" (tools/dspam_admin.c)
+- prevent quarantining of message when delivering summary
+
+WebUI: a lot of fixes and improvements
+
+PostgeSQL: improvements to purge scripts and object creation script
+
+Port changes:
+-------------
+
+Add MySQL 5.1 as backend. [1]
+Default MySQL version is now 5.0
+
+Optionally depend on LightHTTPD instead of Apache if WITH_CGI=on [2]
+
+Fix OPTIONS handling for INDEX (describe); this is a long standing bug
+and a *big* pontyhat for me; it affected _only_ dependecies recorded in
+INDEX _if_ OPTIONS were not set (like for package building); however,
+the package itself was always built right, dependecies recorded OK, etc.
+
+Add SCE-tindy as MASTER_SITE, much faster site that my other server. [3]
+
+Requested by:	Odhiambo WASHINGTON <odhiambo.raburu@wananchi.com> [1]
+Submitted by:	"Daniel S. Haischt" 
+		<me@daniel.stefan.haischt.name> [2] (based on)
+My thanks again to Joey Freeland for this machine and the bandwidth [3]
+
+
+###########################################################################
 # dspam-devel-3.6.4.20060315.1518
 #
 
diff --git a/mail/dspam-devel/files/dspam-devel.sh.in b/mail/dspam-devel/files/dspam-devel.sh.in
index 0bd58aeb903d..60606a0544f0 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.8 2006/02/26 00:08:23 itetcu Exp $
+# $Tecnik: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.9 2006/03/15 17:55:13 itetcu Exp $
 
 # PROVIDE: dspam
 # REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%CLAMD%%