Update to 3.10.0 rc1, which is pretty much the upcoming 3.10.0 release,

so unIGNORE.

Adjust the port to be closer to mail/dspam.

8 files changed, 271 insertions, 184 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 0c45dccc6469..533451317615 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -6,14 +6,12 @@
 # $FreeBSD$
 #
 
-# 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.
+# Note to commiters: If not committing a maintainer patch and as a result PKGNAME
+# or user variables (WITH*) changes please add an entry in ${FILESDIR}/UPDATING
 # Else the port will be broken. Thanks.
 
 PORTNAME=	dspam-devel
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	# set later
@@ -21,18 +19,16 @@ MASTER_SITES=	# set later
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Bayesian spam filter - development version
 
-IGNORE=		- use mail/dspam, for now it is newer
+PORTVER_MAJ=	3.10.0
+SNAP_DATE=	.r1
 
-PORTVER_MAJ=	3.8.0
-#SNAP_DATE=	.20061010.1118
-
-MIN_OPTIONS_VER=	${PORTNAME}-3.6.8.20061010.1118_1
-MAKE_JOBS_UNSAFE=	yes
+#MIN_OPTIONS_VER=	${PORTNAME}-3.10.0.
 
 .ifdef(SNAP_DATE)
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
 MASTER_SITE_SUBDIR=	itetcu
+WRKSRC=		${WRKDIR}/dspam-${PORTVER_MAJ}
 .else
 MASTER_SITES=	http://dspam.irontec.com/sources/ \
 	http://dspam.nuclearelephant.com/sources/ \
@@ -56,10 +52,9 @@ OPTIONS+=	CLAMAV "Enable clamav support" on
 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" off
-OPTIONS+=	MYSQL50 "Use MySQL 5.0.x as back-end" on
+OPTIONS+=	MYSQL50 "Use MySQL 5.0.x as back-end" off
 OPTIONS+=	MYSQL51 "Use MySQL 5.1.x as back-end" off
+OPTIONS+=	MYSQL55 "Use MySQL 5.5.x as back-end" on
 OPTIONS+=	MYSQL_COMPRESS "Compress dspam <--> MySQL" off
 OPTIONS+=	MYSQL_LOCAL "RUN_DEPEND on selected MySQL server ver." off
 OPTIONS+=	POSTGRESQL "Use PostgreSQL as back-end" on
@@ -68,7 +63,7 @@ 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
 #
-OPTIONS+=	LDAP "Enable recipient verification via LDAP" off
+OPTIONS+=	EXTERNAL_LOOKUP "Enable rcpt verification via extlookup" off
 
 # layout
 OPTIONS+=	USER_HOMEDIR "Store user data in ~/.dspam" off
@@ -81,7 +76,8 @@ OPTIONS+=	DOMAIN_SCALE "File structure for multiple domains" off
 ## MTA and LDA
 OPTIONS+=	CYRUS21_LDA "Use Cyrus's 2.1 deliver as LDA" off
 OPTIONS+=	CYRUS22_LDA "Use Cyrus's 2.2 deliver as LDA" off
-OPTIONS+=       CYRUS23_LDA "Use Cyrus's 2.3 deliver as LDA" off
+OPTIONS+=	CYRUS23_LDA "Use Cyrus's 2.3 deliver as LDA" off
+OPTIONS+=	CYRUS24_LDA "Use Cyrus's 2.4 deliver as LDA" off
 OPTIONS+=	EXIM_LDA "Use Exim as local delivery agent" off
 OPTIONS+=	MAILDROP_LDA "Use Maildrop as local delivery agent" off
 OPTIONS+=	PROCMAIL_LDA "Use Procmail as local delivery agent" off
@@ -92,7 +88,7 @@ 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 or see below)" off
+OPTIONS+=	WebUI "Install WebUI, pulls in Apache or see below" off
 OPTIONS+=	LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
 
 USE_PERL5=	yes
@@ -103,10 +99,10 @@ USE_AUTOTOOLS+=	autoconf:env automake
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 #CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+#CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
+#		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+#		LDFLAGS="-L${LOCALBASE}/lib" \
+#		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .ifdef(GDBS)
 CFLAGS+=	-g -DDEBUG
@@ -261,22 +257,19 @@ _DBDRV:=	${_DBDRV:S/hash_drv,//}
 PLIST_SUB+=	HASH="@comment "
 .endif
 
-.ifdef(WITH_MYSQL40)
-WANT_MYSQL_VER=	40
-#PKGNAMESUFFIX=	-mysql40
-.elifdef(WITH_MYSQL41)
-WANT_MYSQL_VER=	41
-#PKGNAMESUFFIX=	-mysql41
-.elifndef(WITHOUT_MYSQL50)
+.ifndef(WITHOUT_MYSQL50)
 WANT_MYSQL_VER=	50
 #PKGNAMESUFFIX=	-mysql50
 .elifdef(WITH_MYSQL51)
 WANT_MYSQL_VER=	51
 #PKGNAMESUFFIX=	-mysql51
+.elifdef(WITH_MYSQL55)
+WANT_MYSQL_VER=	55
+#PKGNAMESUFFIX=	-mysql55
 .endif
 
 .if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || \
-	!defined(WITHOUT_MYSQL50) || defined(WITH_MYSQL51)
+	!defined(WITHOUT_MYSQL50) || defined(WITH_MYSQL51) || defined(WITH_MYSQL55)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-includes=${LOCALBASE}/include/mysql \
 		--with-mysql-libraries=${LOCALBASE}/lib/mysql
@@ -305,8 +298,8 @@ PLIST_SUB+=	DYNAMIC=""
 PLIST_SUB+=	DYNAMIC="@comment "
 .endif
 
-.ifdef(WITH_LDAP)
-CONFIGURE_ARGS+=	--enable-ldap
+.ifdef(WITH_EXTERNAL_LOOKUP)
+CONFIGURE_ARGS+=	--enable-external-lookup
 USE_OPENLDAP=	YES
 #CPPFLAGS+=	-I${LOCALBASE}/include
 #LDFLAGS+=	-lldap -llber
@@ -336,7 +329,7 @@ CONFIGURE_ARGS+=	--enable-domain-scale
 .endif
 
 # add one 'o' here for each new LDA
-LDA_TOTAL_COUNT=	ooooooooo	# 9
+LDA_TOTAL_COUNT=	oooooooooo	# 10
 LDA_COUNT=	${LDA_TOTAL_COUNT}
 
 .if defined(WITH_CYRUS21_LDA)
@@ -357,6 +350,12 @@ CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
 LDA_COUNT:=	${LDA_COUNT:S/o//}
 .endif
 
+.if defined(WITH_CYRUS24_LDA)
+RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus-imapd24
+CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
+LDA_COUNT:=	${LDA_COUNT:S/o//}
+.endif
+
 .ifdef(WITH_EXIM_LDA)
 .	ifdef(WITH_MYSQL40) || (WITH_MYSQL41)
 _EXIM_EXT=	-mysql
@@ -412,7 +411,7 @@ DSPAM_MODE=	4511
 CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
 .endif
 
-.ifdef(WITH_CGI)
+.ifdef(WITH_WebUI)
 .	if defined(WITH_LIGHTTPD)
 RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
 .	else
@@ -426,20 +425,18 @@ RUN_DEPENDS+=	${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil
 CONFIGURE_ARGS+=--enable-logging
 CONFIGURE_ARGS+=--enable-user-logging
 USE_PERL5=	yes
-PLIST_SUB+=	CGI=""
-CGI_PATH?=	${PREFIX}/www/vhosts/dspam
-_SED_SCRIPT+=	-e 's/%%CGI%%//g'
-_SED_SCRIPT+=	-e 's,%%CGI_PATH%%,${CGI_PATH},g'
-#SED_FILES=	${LS}  ${WRKSRC}/cgi/*.pl
-#SED_FILES+=	${LS} $PWRKSRC}/cgi/*.cgi
+PLIST_SUB+=	WebUI=""
+_SED_SCRIPT+=	-e 's/%%WebUI%%//g'
+_SED_SCRIPT+=	-e 's,%%WWWDIR%%,${WWWDIR},g'
+PLIST_SUB+=	WWWDIR=${WWWDIR_REL}
 .else
-PLIST_SUB+=	CGI="@comment "
-_SED_SCRIPT+=	-e '/%%CGI%%/D'
+PLIST_SUB+=	WebUI="@comment "
+_SED_SCRIPT+=	-e '/%%WebUI%%/D'
 .endif
 
-MAN1=	dspam.1 dspam_clean.1 dspam_dump.1 dspam_merge.1 \
-	dspam_stats.1 dspam_train.1
-MAN3=	libdspam.3
+MAN1=	dspam.1 dspam_admin.1 dspam_clean.1 dspam_crc.1 dspam_dump.1 \
+	dspam_logrotate.1 dspam_merge.1 dspam_stats.1 dspam_train.1
+MAN3=	dspam_clearattributes.3 libdspam.3
 MLINKS=		libdspam.3 dspam_init.3
 MLINKS+=	libdspam.3 dspam_create.3
 MLINKS+=	libdspam.3 dspam_addattribute.3
@@ -450,7 +447,7 @@ MLINKS+=	libdspam.3 dspam_destroy.3
 MLINKS+=	libdspam.3 dspam_detach.3
 
 _DOCS=	CHANGELOG LICENSE README README.FreeBSD RELEASE.NOTES UPGRADING
-_DOCSL=	courier.txt exim.txt markov.txt mysql_drv.txt pgsql_drv.txt\
+_DOCSL=	courier.txt exim.txt markov.txt mysql_drv.txt pgsql_drv.txt \
 	pop3filter.txt postfix.txt qmail.txt relay.txt sendmail.txt \
 	sqlite_drv.txt
 
@@ -464,7 +461,7 @@ pre-everything::
 	@sleep 5
 .endif
 
-pre-extract:	check-options-version
+pre-extract:
 .ifndef(MAINT)
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Define vars below before make-ing if you need:"
@@ -473,7 +470,7 @@ pre-extract:	check-options-version
 	@${ECHO_CMD} "DSPAM_OWNER=${DSPAM_OWNER} (default: root)"
 	@${ECHO_CMD} "DSPAM_GROUP=${DSPAM_GROUP} (default: mail)"
 	@${ECHO_CMD} "DSPAM_MODE=${DSPAM_MODE}"
-	@${ECHO_CMD} "DSPAM_ETC=${DSPAM_ETC} (default: ${LOCALBASE}/etc"
+	@${ECHO_CMD} "DSPAM_ETC=${DSPAM_ETC} (default: ${PREFIX}/etc"
 	@${ECHO_CMD} "DSPAM_HOME=${DSPAM_HOME} (default: ${_VAR_DIR}/db/dspam)"
 	@${ECHO_CMD} "DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER}"
 	@${ECHO_CMD} "DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP}"
@@ -482,10 +479,10 @@ pre-extract:	check-options-version
 .	ifdef(WITHOUT_SYSLOG)
 	@${ECHO_CMD} "LOGFILE=${LOGFILE} (default: ${_VAR_DIR}/log/dspam/dspam.log)"
 .	endif
-.	ifdef(WITH_CGI)
-		@${ECHO_CMD} "Define CGI_PATH before make-ing if you need the CGI files"
+.	ifdef(WITH_WebUI)
+		@${ECHO_CMD} "Define WWWDIR before making if you need the WebUI files"
 		@${ECHO_CMD} "installed in other place that this installation's default"
-		@${ECHO_CMD} "${PREFIX}/www/vhosts/dspam"
+		@${ECHO_CMD} "${WWWDIR}"
 .	endif
 	@${ECHO_CMD} ""
 	@sleep 5
@@ -502,7 +499,8 @@ post-patch:
 		${WRKSRC}/src/tools.sqlite_drv/purge-2.sql
 	@${REINPLACE_CMD} -e "s|where julianday('now')-julianday(created_on) > 14;|where julianday('now')-julianday(created_on) > ${SIGNATURE_LIFE};|" \
 		 ${WRKSRC}/src/tools.sqlite_drv/purge-3.sql
-	@${REINPLACE_CMD} -e "s^%%PERL%%^${PERL}^; s^%%DSPAM_PATH%%^${PREFIX}/bin^" ${WRKSRC}/scripts/train.pl
+	@${REINPLACE_CMD} -e "s^%%PERL%%^${PERL}^" \
+		${WRKSRC}/src/tools/dspam_train.in ${WRKSRC}/src/tools/dspam_notify.in
 
 pre-configure:
 	@${ECHO_CMD}
@@ -535,21 +533,21 @@ pre-configure:
 	@${ECHO_CMD} "You can compile with only one MySQL version driver."
 	@${FALSE}
 .endif
-.if defined(WITH_LDAP) && !( defined(USE_MYSQL) || \
+.if defined(WITH_EXTERNAL_LOOKUP) && !( defined(USE_MYSQL) || \
 	!defined(WITHOUT_POSTGRESQL) || defined(USE_SQLITE) )
-	@${ECHO_CMD} "You need MySQL, Postgres or SQLITE for LDAP."
+	@${ECHO_CMD} "You need MySQL, Postgres or SQLITE for EXTERNAL_LOOKUP."
 	@${FALSE}
 .endif
-.if defined(WITH_USER_HOMEDIR) && defined(WITH_CGI)
-	@${ECHO_CMD} "USER_HOMEDIR and CGI are incopatible"
+.if defined(WITH_USER_HOMEDIR) && defined(WITH_WebUI)
+	@${ECHO_CMD} "USER_HOMEDIR and WebUI are incopatible"
 	@${FALSE}
 .endif
 .if defined(WITH_DOMAIN_SCALE) && defined(WITH_LARGE_SCALE)
 	@${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"
+.if defined(WITH_LIGHTHTTPD) && !defined(WITH_WebUI)
+	@${ECHO_CMD} "There's no reason to depend on LightHTTPD if you're not using WebUI"
 	@${FALSE}
 .endif
 .ifdef(SNAP_DATE)
@@ -572,6 +570,7 @@ post-install:
 	${TEST} `ls -1 ${PREFIX}/lib/pkgconfig | wc -l` -eq 0 && \
 		${RM} -R ${PREFIX}/lib/pkgconfig || true
 
+#.ifndef NOPORTDATA
 .ifdef(USE_MYSQL)
 	@${MKDIR} ${EXAMPLESDIR}/mysql
 	cd  ${WRKSRC}/src/tools.mysql_drv && \
@@ -592,24 +591,35 @@ post-install:
 	cd ${WRKSRC}/src/tools.sqlite_drv && \
 		${INSTALL_DATA} *.sql ${EXAMPLESDIR}/sqlite
 .endif
+#.endif # NOPORTDATA
 
-.ifdef(WITH_CGI)
-.	for I in admin.cgi admingraph.cgi configure.pl dspam.cgi graph.cgi
-		@${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL},g" ${WRKSRC}/webui/cgi-bin/${I}
+.ifdef(WITH_WebUI)
+.	for I in admin.cgi admingraph.cgi configure.pl dspam.cgi graph.cgi templates/strings.pl
+		${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL},g" ${WRKSRC}/webui/cgi-bin/${I}
 .	endfor
-	cd ${WRKSRC}/webui/cgi-bin && ${MV} configure.pl configure.pl.sample
-	cd ${WRKSRC}/webui/cgi-bin && ${MKDIR} ${CGI_PATH} && \
-		${INSTALL_SCRIPT} configure.pl.sample ${CGI_PATH}/ && \
-		${INSTALL_SCRIPT} *.cgi ${CGI_PATH} && \
-		${INSTALL_DATA} rgb.txt ${CGI_PATH}/
+	${MV} ${WRKSRC}/webui/cgi-bin/configure.pl ${WRKSRC}/webui/cgi-bin/configure.pl.sample
+	cd ${WRKSRC}/webui/cgi-bin && ${MKDIR} ${WWWDIR} && \
+		${INSTALL_SCRIPT} configure.pl.sample ${WWWDIR}/ && \
+		${INSTALL_SCRIPT} *.cgi ${WWWDIR} && \
+		${INSTALL_DATA} rgb.txt ${WWWDIR}/
 	cd ${WRKSRC}/webui/htdocs && \
-		${INSTALL_DATA} base.css dspam-logo-small.gif ${CGI_PATH}/
+		${INSTALL_DATA} base.css dspam-logo-small.gif ${WWWDIR}/
 	cd ${WRKSRC}/webui/cgi-bin && \
-		${INSTALL_DATA} default.prefs ${CGI_PATH}/default.prefs.sample
+		${INSTALL_DATA} default.prefs ${WWWDIR}/default.prefs.sample
 	cd ${WRKSRC}/webui/cgi-bin && \
-		${INSTALL_DATA} admins ${CGI_PATH}/admins.sample
-	${MKDIR} ${CGI_PATH}/templates && cd ${WRKSRC}/webui/cgi-bin/templates && \
-		${INSTALL_DATA} *.html ${CGI_PATH}/templates/
+		${INSTALL_DATA} admins ${WWWDIR}/admins.sample
+	${MKDIR} ${WWWDIR}/templates && cd ${WRKSRC}/webui/cgi-bin/templates && \
+		${INSTALL_DATA} *.html ${WWWDIR}/templates/ && \
+		${INSTALL_SCRIPT} strings.pl ${WWWDIR}/templates/ &&
+		for _dir in de es-es fr he pt-br ro; do \
+			${INSTALL_DATA} -d ${WWWDIR}/templates/$${_dir} && \
+			cd ${WRKSRC}/webui/cgi-bin/templates/$${_dir} && \
+				${INSTALL_DATA} *.html ${WWWDIR}/templates/$${_dir}; \
+		done && \
+		for _dir in de es-es pt-br; do \
+			cd ${WRKSRC}/webui/cgi-bin/templates/$${_dir} && \
+				${INSTALL_SCRIPT} strings.pl ${WWWDIR}/templates/$${_dir}/; \
+		done
 .endif
 
 	@${SED} ${_SED_SCRIPT} ${.CURDIR}/pkg-message > ${WRKSRC}/README.FreeBSD
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index 5351ea92fe52..d33191eebff5 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dspam-3.8.0.tar.gz) = 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7
-SIZE (dspam-3.8.0.tar.gz) = 726160
+SHA256 (dspam-devel-3.10.0.r1.tar.gz) = 9195f584bbfdf8d55efe6b383aac551c1ebbd2024305502f1fd7491da5f7e29b
+SIZE (dspam-devel-3.10.0.r1.tar.gz) = 1027188
diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index 10103e1343a2..0fb87993191f 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -11,6 +11,13 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.10.0.r1,1
+#
+
+Various small fixes / improvements, see the CHANGELOG for details.
+
+
+###########################################################################
 # dspam-devel-3.8.0,1
 #
 
diff --git a/mail/dspam-devel/files/patch-scripts_train.pl b/mail/dspam-devel/files/patch-scripts_train.pl
deleted file mode 100644
index 3550e64474f5..000000000000
--- a/mail/dspam-devel/files/patch-scripts_train.pl
+++ /dev/null
@@ -1,17 +0,0 @@
---- scripts/train.pl.dist	Tue Nov  8 14:34:38 2005
-+++ scripts/train.pl	Tue Nov  8 14:36:06 2005
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!%%PERL%%
- 
- # train.pl
- # This tool trains a corpus of messages (a directory containing a nonspam and
-@@ -14,7 +14,7 @@
- use vars qw { $USER $PATH $REPORTING_WINDOW $CORPUS $TRAINING_MODE };
- 
- $REPORTING_WINDOW  = 250;			# How often to summarize
--$PATH              = "/usr/local/dspam/bin";	# Path to dspam binaries
-+$PATH              = "%%DSPAM_PATH%%";		# Path to dspam binaries
- $TRAINING_MODE     = "teft";			# Training mode
- 
- ### DO NOT CONFIGURE BELOW THIS LINE ###
diff --git a/mail/dspam-devel/files/patch-src_dspam.conf.in b/mail/dspam-devel/files/patch-src__dspam.conf.in
index 81ace77090a8..b46692766dca 100644
--- a/mail/dspam-devel/files/patch-src_dspam.conf.in
+++ b/mail/dspam-devel/files/patch-src__dspam.conf.in
@@ -1,53 +1,53 @@
---- src/dspam.conf.in.dist	Fri Feb 25 23:08:31 2005
-+++ src/dspam.conf.in	Fri Feb 25 23:19:02 2005
-@@ -35,6 +35,7 @@
+--- ./src/dspam.conf.in.orig	2011-06-30 21:07:00.000000000 +0300
++++ ./src/dspam.conf.in	2011-07-30 17:47:14.000000000 +0300
+@@ -56,6 +56,7 @@
  # necessary if you plan on allowing untrusted processing.
  #
  #UntrustedDeliveryAgent "/usr/bin/procmail -d %u"
 +#UntrustedDeliveryAgent "@delivery_agent@"
  
  #
- # LMTP Delivery: Alternatively, you may wish to use LMTP delivery to deliver
-@@ -53,6 +54,7 @@
+ # SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP
+@@ -89,6 +90,7 @@
  # spam. Use %u to specify the user DSPAM is processing mail for.
  #
  #QuarantineAgent	"/usr/bin/procmail -d spam"
 +#QuarantineAgent       "@delivery_agent@"
  
  #
- # OnFail: What to do if local delivery or quarantine should fail. If set
-@@ -179,7 +181,7 @@
+ # DSPAM can optionally process "plused users" (addresses in the user+detail
+@@ -346,7 +348,7 @@
  # Storage driver settings: Specific to a particular storage driver. Uncomment
  # the configuration specific to your installation, if applicable.
  #
--#MySQLServer    	/var/lib/mysql/mysql.sock
-+#MySQLServer    	/tmp/mysql.sock
- #MySQLPort
- #MySQLUser 	     	dspam
- #MySQLPass    		changeme
-@@ -385,6 +387,7 @@
+-#MySQLServer		/var/lib/mysql/mysql.sock
++#MySQLServer		/tmp/mysql.sock
+ #MySQLPort		
+ #MySQLUser		dspam
+ #MySQLPass		changeme
+@@ -768,6 +770,7 @@
  # without processing. Value is in bytes.
  #
  #MaxMessageSize 4194304
 +MaxMessageSize 307200
  
- #
- # Daemonized Server: If you are running DSPAM as a daemonized server using
-@@ -396,6 +399,7 @@
- #
+ # --- ClamAV ---
+ 
+@@ -800,6 +803,7 @@
+ #ServerHost		127.0.0.1
  #ServerPort		24
  #ServerQueueSize	32
-+# keep this is sync with /usr/local/etc/rc.d/dspam[.sh] rc.d script
- #ServerPID              /var/run/dspam.pid
++# keep this is sync with /usr/local/etc/rc.d/dspam rc script
+ #ServerPID		/var/run/dspam.pid
  
  #
-@@ -422,7 +426,8 @@
+@@ -836,7 +840,8 @@
  # you are running the client and server on the same machine, as it eliminates
  # much of the bandwidth overhead.
  #
--#ServerDomainSocketPath  "/tmp/dspam.sock"
+-#ServerDomainSocketPath	"/tmp/dspam.sock"
 +# keep this is sync with /usr/local/etc/rd.d/dspam[.sh] rc.d script
-+#ServerDomainSocketPath  "/var/run/dspam.sock"
++#ServerDomainSocketPath	"/var/run/dspam.sock"
  
  #
  # Client Mode: If you are running DSPAM in client/server mode, uncomment and
diff --git a/mail/dspam-devel/pkg-descr b/mail/dspam-devel/pkg-descr
index 2dce6e735aa5..3c3ff6cdf844 100644
--- a/mail/dspam-devel/pkg-descr
+++ b/mail/dspam-devel/pkg-descr
@@ -4,4 +4,4 @@ server-side agent for UNIX email servers and a developer's library
 for mail clients, other anti-spam tools, and similar projects
 requiring drop-in spam filtering.
 
-WWW: http://dspam.nuclearelephant.com
+WWW: http://dspam.sf.net
diff --git a/mail/dspam-devel/pkg-message b/mail/dspam-devel/pkg-message
index a1f6028c9783..6c5e1446bd92 100644
--- a/mail/dspam-devel/pkg-message
+++ b/mail/dspam-devel/pkg-message
@@ -1,38 +1,35 @@
 -------------------------------------------------------------------------------
  Reporting problems, asking questions:
- - FreeBSD specific port-related problems/questions/paches: maintainer
-(and ports@ if you fell the need); send-pr only if you get no timely reply
- - dspam specific questions: dspam/dspam-dev mailling list (maintainer cc'ed)
- - dspam specific patches: dspam/dspam-dev mailling list (maintainer cc'ed if)
+ - FreeBSD specific port-related problems/questions/patches: maintainer
+(and ports@ if you feel the need); send-pr only if you get no timely reply
+ - dspam specific questions: dspam/dspam-dev mailing list (maintainer cc'ed)
+ - dspam specific patches: dspam/dspam-dev mailing list (maintainer cc'ed)
  Please be sure to include in your email/pr relevant information such as:
  uname -a, dspam --version, %%_VAR_DIR%%/db/ports/%%PORTNAME%%/options, MTA setup.
 
-Asking about updates or telling me there is one: not only I am active on the
-mailing lists and IRC but I also track dspam CVS so I already know; either there
-is a problem with the new version or I didn't have enough time to patch the port
-and _test_ the new version; please report your succes/failure if you run the
-new version or the cvs version.
+Asking about updates or telling me there is one: there's no need, I am one of
+the developers.
 
-%%CGI%% The CGI files had been installed in
-%%CGI%% %%CGI_PATH%%
-%%CGI%% Copy
-%%CGI%% %%CGI_PATH%%/default.prefs.sample
-%%CGI%% to
-%%CGI%% %%CGI_PATH%%/default.prefs
-%%CGI%% and edit it to your needs.
-%%CGI%% Copy
-%%CGI%% %%CGI_PATH%%/configure.pl.sample
-%%CGI%% to
-%%CGI%% %%CGI_PATH%%/configure.pl
-%%CGI%% and edit it to your needs.
-%%CGI%% If you symlink this file in %%DSPAM_HOME%%/
-%%CGI%% an administrator can edit these options in the DSPAM Admin Suite.
-%%CGI%% Define administrators by copying 
-%%CGI%% %%CGI_PATH%%/admins.sample
-%%CGI%% to
-%%CGI%% %%CGI_PATH%%/admins 
-%%CGI%% and edit the file to your needs. 
-%%CGI%% If you have problems (after upgrading) check permissions.
+%%WebUI%% The CGI files had been installed in
+%%WebUI%% %%WWWDIR%%
+%%WebUI%% Copy
+%%WebUI%% %%WWWDIR%%/default.prefs.sample
+%%WebUI%% to
+%%WebUI%% %%WWWDIR%%/default.prefs
+%%WebUI%% and edit it to your needs.
+%%WebUI%% Copy
+%%WebUI%% %%WWWDIR%%/configure.pl.sample
+%%WebUI%% to
+%%WebUI%% %%WWWDIR%%/configure.pl
+%%WebUI%% and edit it to your needs.
+%%WebUI%% If you symlink this file in %%DSPAM_HOME%%/
+%%WebUI%% an administrator can edit these options in the DSPAM Admin Suite.
+%%WebUI%% Define administrators by copying 
+%%WebUI%% %%WWWDIR%%/admins.sample
+%%WebUI%% to
+%%WebUI%% %%WWWDIR%%/admins 
+%%WebUI%% and edit the file to your needs. 
+%%WebUI%% If you have problems (after upgrading) check permissions.
 %%DAEMON%%
 %%DAEMON%% To enable the dspam deamon put dspam_enable="YES" in your
 %%DAEMON%% /etc/rc.conf
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index 7edd63eac458..1ff50410026f 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -11,6 +11,7 @@ bin/dspam_crc
 bin/dspam_dump
 bin/dspam_logrotate
 bin/dspam_merge
+bin/dspam_notify
 %%PGSQL%%bin/dspam_pg2int8
 bin/dspam_stats
 bin/dspam_train
@@ -23,32 +24,34 @@ include/dspam/decode.h
 include/dspam/diction.h
 include/dspam/error.h
 include/dspam/heap.h
-include/dspam/ldap_client.h
 include/dspam/libdspam.h
 include/dspam/libdspam_objects.h
 include/dspam/nodetree.h
+include/dspam/pref.h
+include/dspam/read_config.h
 include/dspam/storage_driver.h
 include/dspam/tokenizer.h
 lib/libdspam.a
 lib/libdspam.la
 lib/libdspam.so
 lib/libdspam.so.7
-%%DYNAMIC%%%%HASH%%lib/libhash_drv.a
-%%DYNAMIC%%%%HASH%%lib/libhash_drv.la
-%%DYNAMIC%%%%HASH%%lib/libhash_drv.so
-%%DYNAMIC%%%%HASH%%lib/libhash_drv.so.7
-%%DYNAMIC%%%%MYSQL%%lib/libmysql_drv.a
-%%DYNAMIC%%%%MYSQL%%lib/libmysql_drv.la
-%%DYNAMIC%%%%MYSQL%%lib/libmysql_drv.so
-%%DYNAMIC%%%%MYSQL%%lib/libmysql_drv.so.7
-%%DYNAMIC%%%%PGSQL%%lib/libpgsql_drv.a
-%%DYNAMIC%%%%PGSQL%%lib/libpgsql_drv.la
-%%DYNAMIC%%%%PGSQL%%lib/libpgsql_drv.so
-%%DYNAMIC%%%%PGSQL%%lib/libpgsql_drv.so.7
-%%DYNAMIC%%%%SQLITE%%lib/libsqlite3_drv.a
-%%DYNAMIC%%%%SQLITE%%lib/libsqlite3_drv.la
-%%DYNAMIC%%%%SQLITE%%lib/libsqlite3_drv.so
-%%DYNAMIC%%%%SQLITE%%lib/libsqlite3_drv.so.7
+%%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.a
+%%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.la
+%%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so
+%%DYNAMIC%%%%HASH%%lib/dspam/libhash_drv.so.7
+%%DYNAMIC%%%%MYSQL%%lib/dspam/libmysql_drv.a
+%%DYNAMIC%%%%MYSQL%%lib/dspam/libmysql_drv.la
+%%DYNAMIC%%%%MYSQL%%lib/dspam/libmysql_drv.so
+%%DYNAMIC%%%%MYSQL%%lib/dspam/libmysql_drv.so.7
+%%DYNAMIC%%%%PGSQL%%lib/dspam/libpgsql_drv.a
+%%DYNAMIC%%%%PGSQL%%lib/dspam/libpgsql_drv.la
+%%DYNAMIC%%%%PGSQL%%lib/dspam/libpgsql_drv.so
+%%DYNAMIC%%%%PGSQL%%lib/dspam/libpgsql_drv.so.7
+%%DYNAMIC%%%%SQLITE%%lib/dspam/libsqlite3_drv.a
+%%DYNAMIC%%%%SQLITE%%lib/dspam/libsqlite3_drv.la
+%%DYNAMIC%%%%SQLITE%%lib/dspam/libsqlite3_drv.so
+%%DYNAMIC%%%%SQLITE%%lib/dspam/libsqlite3_drv.so.7
+@dirrm lib/dspam
 libdata/pkgconfig/dspam.pc
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
@@ -79,39 +82,126 @@ 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
 %%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-3.sql
 %%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
 @dirrmtry %%EXAMPLESDIR%%
-%%CGI%%www/vhosts/dspam/admins.sample
-%%CGI%%www/vhosts/dspam/admin.cgi
-%%CGI%%www/vhosts/dspam/admingraph.cgi
-%%CGI%%www/vhosts/dspam/base.css
-%%CGI%%www/vhosts/dspam/configure.pl.sample
-%%CGI%%www/vhosts/dspam/default.prefs.sample
-%%CGI%%www/vhosts/dspam/dspam.cgi
-%%CGI%%www/vhosts/dspam/graph.cgi
-%%CGI%%www/vhosts/dspam/dspam-logo-small.gif
-%%CGI%%www/vhosts/dspam/rgb.txt
-%%CGI%%www/vhosts/dspam/templates/nav_admin_error.html
-%%CGI%%www/vhosts/dspam/templates/nav_admin_preferences.html
-%%CGI%%www/vhosts/dspam/templates/nav_admin_status.html
-%%CGI%%www/vhosts/dspam/templates/nav_admin_user.html
-%%CGI%%www/vhosts/dspam/templates/nav_alerts.html
-%%CGI%%www/vhosts/dspam/templates/nav_analysis.html
-%%CGI%%www/vhosts/dspam/templates/nav_error.html
-%%CGI%%www/vhosts/dspam/templates/nav_fragment.html
-%%CGI%%www/vhosts/dspam/templates/nav_history.html
-%%CGI%%www/vhosts/dspam/templates/nav_performance.html
-%%CGI%%www/vhosts/dspam/templates/nav_preferences.html
-%%CGI%%www/vhosts/dspam/templates/nav_quarantine.html
-%%CGI%%www/vhosts/dspam/templates/nav_viewmessage.html
-%%CGI%%@dirrm www/vhosts/dspam/templates
-%%CGI%%@dirrm www/vhosts/dspam
-%%CGI%%@dirrm www/vhosts
-%%CGI%%@dirrmtry www
+%%WebUI%%%%WWWDIR%%/admins.sample
+%%WebUI%%%%WWWDIR%%/admin.cgi
+%%WebUI%%%%WWWDIR%%/admingraph.cgi
+%%WebUI%%%%WWWDIR%%/base.css
+%%WebUI%%%%WWWDIR%%/configure.pl.sample
+%%WebUI%%%%WWWDIR%%/default.prefs.sample
+%%WebUI%%%%WWWDIR%%/dspam.cgi
+%%WebUI%%%%WWWDIR%%/graph.cgi
+%%WebUI%%%%WWWDIR%%/dspam-logo-small.gif
+%%WebUI%%%%WWWDIR%%/rgb.txt
+%%WebUI%%%%WWWDIR%%/templates/nav_admin_error.html
+%%WebUI%%%%WWWDIR%%/templates/nav_admin_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/nav_admin_status.html
+%%WebUI%%%%WWWDIR%%/templates/nav_admin_user.html
+%%WebUI%%%%WWWDIR%%/templates/nav_alerts.html
+%%WebUI%%%%WWWDIR%%/templates/nav_analysis.html
+%%WebUI%%%%WWWDIR%%/templates/nav_error.html
+%%WebUI%%%%WWWDIR%%/templates/nav_fragment.html
+%%WebUI%%%%WWWDIR%%/templates/nav_history.html
+%%WebUI%%%%WWWDIR%%/templates/nav_performance.html
+%%WebUI%%%%WWWDIR%%/templates/nav_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/nav_quarantine.html
+%%WebUI%%%%WWWDIR%%/templates/nav_viewmessage.html
+%%WebUI%%%%WWWDIR%%/templates/strings.pl
+%%WebUI%%%%WWWDIR%%/templates/de/nav_admin_error.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_admin_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_admin_status.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_admin_user.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_alerts.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_analysis.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_error.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_fragment.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_history.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_performance.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_quarantine.html
+%%WebUI%%%%WWWDIR%%/templates/de/nav_viewmessage.html
+%%WebUI%%%%WWWDIR%%/templates/de/strings.pl
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_admin_error.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_admin_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_admin_status.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_admin_user.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_alerts.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_analysis.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_error.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_fragment.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_history.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_performance.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_quarantine.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/nav_viewmessage.html
+%%WebUI%%%%WWWDIR%%/templates/es-es/strings.pl
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_admin_error.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_admin_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_admin_status.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_admin_user.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_alerts.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_analysis.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_error.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_fragment.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_history.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_performance.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_quarantine.html
+%%WebUI%%%%WWWDIR%%/templates/fr/nav_viewmessage.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_admin_error.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_admin_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_admin_status.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_admin_user.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_alerts.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_analysis.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_error.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_fragment.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_history.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_performance.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_quarantine.html
+%%WebUI%%%%WWWDIR%%/templates/he/nav_viewmessage.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_admin_error.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_admin_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_admin_status.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_admin_user.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_alerts.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_analysis.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_error.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_fragment.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_history.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_performance.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_quarantine.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/nav_viewmessage.html
+%%WebUI%%%%WWWDIR%%/templates/pt-br/strings.pl
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_admin_error.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_admin_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_admin_status.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_admin_user.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_alerts.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_analysis.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_error.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_fragment.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_history.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_performance.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_preferences.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_quarantine.html
+%%WebUI%%%%WWWDIR%%/templates/ro/nav_viewmessage.html
+%%WebUI%%@dirrm %%WWWDIR%%/templates/de
+%%WebUI%%@dirrm %%WWWDIR%%/templates/es-es
+%%WebUI%%@dirrm %%WWWDIR%%/templates/fr
+%%WebUI%%@dirrm %%WWWDIR%%/templates/he
+%%WebUI%%@dirrm %%WWWDIR%%/templates/pt-br
+%%WebUI%%@dirrm %%WWWDIR%%/templates/ro
+%%WebUI%%@dirrm %%WWWDIR%%/templates
+%%WebUI%%@dirrm %%WWWDIR%%
 @dirrm include/dspam
 @cwd %%DSPAM_HOME%%
 firstrun.txt.sample