Upgrade dspam to 2.7.1 (no response from maintainer for 10 days)

PR:		ports/57144
Submitted By:	Marius Strom <marius@marius.org>

8 files changed, 112 insertions, 24 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index b2813c542f20..f2ea37eb8df8 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	dspam
-PORTVERSION=	2.6.3
+PORTVERSION=	2.7.1
 CATEGORIES=	mail
-MASTER_SITES=	http://www.networkdweebs.com/software/dspam/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+MASTER_SITES=	http://www.nuclearelephant.com/projects/dspam/
 
 MAINTAINER=	dom@wirespeed.org.uk
 COMMENT=	A server-side bayesian spam filter
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index 67a22ef8b223..764e47f35282 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1 +1 @@
-MD5 (dspam-2.6.tar.gz) = 3fd1eb76bd4d28fd7707b64e7899b3cd
+MD5 (dspam-2.7.1.tar.gz) = 91af21f8f0636249c8c888b101b63f1f
diff --git a/mail/dspam-devel/files/patch-configure b/mail/dspam-devel/files/patch-configure
index 04f295d439b7..65ed3d0b74df 100644
--- a/mail/dspam-devel/files/patch-configure
+++ b/mail/dspam-devel/files/patch-configure
@@ -1,12 +1,56 @@
---- configure.orig	Sun Aug  3 01:16:30 2003
-+++ configure	Mon Aug  4 12:03:04 2003
-@@ -18216,7 +18216,8 @@
- 
- 
+--- configure.orig      Tue Sep 23 22:45:17 2003
++++ configure   Tue Sep 23 22:44:11 2003
+@@ -7513,7 +7513,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-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index 8295c7911b06..3107e2290be0 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -1,13 +1,14 @@
 bin/dspam
 bin/dspam_dump
-bin/dspam_convert
 bin/dspam_clean
 bin/dspam_crc
+bin/dspam_genaliases
+bin/dspam_merge
 bin/dspam_purge
 bin/dspam_stats
 bin/dspam_corpus
-lib/libdspam.so.2
 lib/libdspam.so
+lib/libdspam.so.3
 lib/libdspam.a
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/CHANGE
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index b2813c542f20..f2ea37eb8df8 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	dspam
-PORTVERSION=	2.6.3
+PORTVERSION=	2.7.1
 CATEGORIES=	mail
-MASTER_SITES=	http://www.networkdweebs.com/software/dspam/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+MASTER_SITES=	http://www.nuclearelephant.com/projects/dspam/
 
 MAINTAINER=	dom@wirespeed.org.uk
 COMMENT=	A server-side bayesian spam filter
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index 67a22ef8b223..764e47f35282 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1 +1 @@
-MD5 (dspam-2.6.tar.gz) = 3fd1eb76bd4d28fd7707b64e7899b3cd
+MD5 (dspam-2.7.1.tar.gz) = 91af21f8f0636249c8c888b101b63f1f
diff --git a/mail/dspam/files/patch-configure b/mail/dspam/files/patch-configure
index 04f295d439b7..65ed3d0b74df 100644
--- a/mail/dspam/files/patch-configure
+++ b/mail/dspam/files/patch-configure
@@ -1,12 +1,56 @@
---- configure.orig	Sun Aug  3 01:16:30 2003
-+++ configure	Mon Aug  4 12:03:04 2003
-@@ -18216,7 +18216,8 @@
- 
- 
+--- configure.orig      Tue Sep 23 22:45:17 2003
++++ configure   Tue Sep 23 22:44:11 2003
+@@ -7513,7 +7513,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 8295c7911b06..3107e2290be0 100644
--- a/mail/dspam/pkg-plist
+++ b/mail/dspam/pkg-plist
@@ -1,13 +1,14 @@
 bin/dspam
 bin/dspam_dump
-bin/dspam_convert
 bin/dspam_clean
 bin/dspam_crc
+bin/dspam_genaliases
+bin/dspam_merge
 bin/dspam_purge
 bin/dspam_stats
 bin/dspam_corpus
-lib/libdspam.so.2
 lib/libdspam.so
+lib/libdspam.so.3
 lib/libdspam.a
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/CHANGE