4 files changed, 39 insertions, 59 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 94172b16f70a..21180a897050 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -6,23 +6,40 @@
 #
 
 PORTNAME=	dspam
-PORTVERSION=	2.7.1
+PORTVERSION=	2.8
 CATEGORIES=	mail
 MASTER_SITES=	http://www.nuclearelephant.com/projects/dspam/sources/
 
-MAINTAINER=	dom@wirespeed.org.uk
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A server-side bayesian spam filter
 
-LIB_DEPENDS=	db41.1:${PORTSDIR}/databases/db41
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-userdir=${PREFIX}/etc/dspam \
-		--with-db4-includes=${LOCALBASE}/include/db41
+CONFIGURE_ARGS=	--with-userdir=${PREFIX}/etc/dspam
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+CONFIGURE_ARGS+=	--with-storage-driver=mysql_drv \
+		--with-mysql-includes=${LOCALBASE}/include/mysql \
+		--with-mysql-libraries=${LOCALBASE}/lib/mysql
+.else
+LIB_DEPENDS=	db41.1:${PORTSDIR}/databases/db41
+CONFIGURE_ARGS+=	--with-db4-includes=${LOCALBASE}/include/db41
+.endif
+
+.if defined(WITH_MAILDROP)
+RUN_DEPENDS=	maildrop:${PORTSDIR}/mail/maildrop
+CONFIGURE_ARGS+=	--with-local-delivery-agent='${LOCALBASE}/bin/maildrop $u'
+.endif
+
+.if defined(WITH_PROCMAIL)
+RUN_DEPENDS=	procmail:${PORTSDIR}/mail/procmail
+CONFIGURE_ARGS+=	--with-local-delivery-agent='${LOCALBASE}/bin/procmail $u'
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g ; \
 		s|-ldb-4.1|-ldb41|g' ${WRKSRC}/configure
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index 764e47f35282..5d22c51f3fab 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1 +1 @@
-MD5 (dspam-2.7.1.tar.gz) = 91af21f8f0636249c8c888b101b63f1f
+MD5 (dspam-2.8.tar.gz) = 00a74c53e72c16943974ecd0bb2db30b
diff --git a/mail/dspam/files/patch-configure b/mail/dspam/files/patch-configure
index 65ed3d0b74df..cb3208b2c46a 100644
--- a/mail/dspam/files/patch-configure
+++ b/mail/dspam/files/patch-configure
@@ -1,56 +1,12 @@
---- configure.orig      Tue Sep 23 22:45:17 2003
-+++ configure   Tue Sep 23 22:44:11 2003
-@@ -7513,7 +7513,8 @@
-
-
+--- configure.orig	Wed Nov 26 14:35:34 2003
++++ configure	Thu Dec 11 14:00:18 2003
+@@ -7548,7 +7548,8 @@
+ 
+ 
  # This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 +LIBTOOL_DEPS="%%LIBTOOLFLAGS%% $ac_aux_dir/ltmain.sh"
 +$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
+ 
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9287,9 +9288,9 @@
-     ds_db4_libs_LIBS="-L$with_db4_libraries"
- fi
-
--echo "$as_me:$LINENO: checking for db_create in -ldb-4" >&5
--echo $ECHO_N "checking for db_create in -ldb-4... $ECHO_C" >&6
--LIBS="$ds_db4_libs_LIBS -ldb-4 $ds_db4_libs_save_LIBS"
-+echo "$as_me:$LINENO: checking for db_create in -ldb41" >&5
-+echo $ECHO_N "checking for db_create in -ldb41... $ECHO_C" >&6
-+LIBS="$ds_db4_libs_LIBS -ldb41 $ds_db4_libs_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -9325,7 +9326,7 @@
-   (exit $ac_status); }; }; then
-
-         ds_db4_libs_success=yes
--        ds_db4_libs_LIBS="$ds_db4_libs_LIBS -ldb-4"
-+        ds_db4_libs_LIBS="$ds_db4_libs_LIBS -ldb41"
-
- else
-   echo "$as_me: failed program was:" >&5
-@@ -9340,9 +9341,9 @@
-
- if test "x$ds_db4_libs_success" != xyes
- then
--    echo "$as_me:$LINENO: checking for db_create in -ldb-4 (with -lpthread)" >&5
--echo $ECHO_N "checking for db_create in -ldb-4 (with -lpthread)... $ECHO_C" >&6
--    LIBS="$ds_db4_libs_LIBS -ldb-4 -lpthread $LIBS"
-+    echo "$as_me:$LINENO: checking for db_create in -ldb41 (with -lpthread)" >&5
-+echo $ECHO_N "checking for db_create in -ldb41 (with -lpthread)... $ECHO_C" >&6
-+    LIBS="$ds_db4_libs_LIBS -ldb41 -lpthread $LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -9378,7 +9379,7 @@
-   (exit $ac_status); }; }; then
-
-             ds_db4_libs_success=yes
--            ds_db4_libs_LIBS="$ds_db4_libs_LIBS -ldb-4 -lpthread"
-+            ds_db4_libs_LIBS="$ds_db4_libs_LIBS -ldb41 -lpthread"
-
- else
-   echo "$as_me: failed program was:" >&5
diff --git a/mail/dspam/pkg-plist b/mail/dspam/pkg-plist
index c8b357f6f281..549b4686172a 100644
--- a/mail/dspam/pkg-plist
+++ b/mail/dspam/pkg-plist
@@ -1,14 +1,21 @@
+@comment $FreeBSD$
 bin/dspam
+bin/dspam_2mysql
 bin/dspam_dump
 bin/dspam_clean
+bin/dspam_corpus
 bin/dspam_crc
 bin/dspam_genaliases
 bin/dspam_merge
+bin/dspam_ngstats
+bin/dspam_purge
+bin/dspam_purge.libdb4
 bin/dspam_stats
-bin/dspam_corpus
+bin/libdb4_purge
 lib/libdspam.so
-lib/libdspam.so.3
+lib/libdspam.so.4
 lib/libdspam.a
+@comment lib/libdspam.la
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/CHANGE
 %%PORTDOCS%%@dirrm %%DOCSDIR%%