Update to 4.0.0. The changelog is unwieldy; highlights:

* Several options have changed names, behaviors, defaults, and/or
  possible settings, all of which are explained in the upgrade
  instructions.

* Many new options have been added:
  config-dir
  config-dir-search
  dns-blacklist-file
  dns-level
  dns-max-retries-total
  dns-max-retries-primary
  dns-server-ip
  dns-server-ip-primary
  dns-timeout-secs
  dns-whitelist-file
  filter-level
  graylist-exception-ip-entry
  graylist-exception-rdns-entry
  graylist-level
  ip-blacklist-entry
  ip-in-rdns-keyword-blacklist-entry
  ip-in-rdns-keyword-whitelist-entry
  ip-in-rdns-keyword-whitelist-file
  ip-whitelist-entry
  local-domain-entry
  rdns-blacklist-entry
  rdns-whitelist-entry
  recipient-blacklist-entry
  recipient-whitelist-entry
  rejection-text-access-denied
  rejection-text-dns-blacklist
  rejection-text-earlytalker
  rejection-text-empty-rdns
  rejection-text-graylist
  rejection-text-ip-blacklist
  rejection-text-ip-in-cc-rdns
  rejection-text-ip-in-rdns-keyword-blacklist
  rejection-text-local-recipient
  rejection-text-max-recipients
  rejection-text-missing-sender-mx
  rejection-text-rdns-blacklist
  rejection-text-recipient-blacklist
  rejection-text-reject-all
  rejection-text-relaying-denied
  rejection-text-rhs-blacklist
  rejection-text-sender-blacklist
  rejection-text-smtp-auth-required
  rejection-text-timeout
  rejection-text-unresolvable-rdns
  relay-level
  rhs-blacklist-file
  rhs-whitelist-file
  run-as-user
  sender-blacklist-entry
  sender-whitelist-entry
  smtp-auth-level
  tls-level

* An example spamdyke.conf has been provided.

6 files changed, 23 insertions, 43 deletions

diff --git a/mail/spamdyke/Makefile b/mail/spamdyke/Makefile
index 8eef5ebcace..868f8728b8b 100644
--- a/mail/spamdyke/Makefile
+++ b/mail/spamdyke/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2008/05/28 23:57:27 schmonz Exp $
+# $NetBSD: Makefile,v 1.14 2008/07/16 07:03:21 schmonz Exp $
 #
 
-DISTNAME=	spamdyke-3.1.8
+DISTNAME=	spamdyke-4.0.0
 CATEGORIES=	mail
 MASTER_SITES=	${HOMEPAGE}releases/
 EXTRACT_SUFX=	.tgz
@@ -25,7 +25,10 @@ SUBST_STAGE.paths=	do-configure
 
 BUILD_DEFS+=		QMAILDIR
 
-INSTALLATION_DIRS=	bin share/doc/${PKGBASE}
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+CONF_FILES+=		${EGDIR}/spamdyke.conf.example ${PKG_SYSCONFDIR}/spamdyke.conf
+
+INSTALLATION_DIRS=	bin share/doc/${PKGBASE} share/examples/${PKGBASE}
 
 .include "options.mk"
 
@@ -35,6 +38,7 @@ do-install:
 		${INSTALL_PROGRAM} $${f} ${DESTDIR}${PREFIX}/bin;	\
 	done;								\
 	cd ../documentation;						\
+	${INSTALL_DATA} spamdyke.conf.example ${DESTDIR}${EGDIR};	\
 	for f in *.txt *.html; do					\
 		${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE};\
 	done
diff --git a/mail/spamdyke/PLIST b/mail/spamdyke/PLIST
index 162a587358e..7c814a9d9fb 100644
--- a/mail/spamdyke/PLIST
+++ b/mail/spamdyke/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/02/25 07:38:00 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/07/16 07:03:21 schmonz Exp $
 bin/spamdyke
 share/doc/spamdyke/Changelog.txt
 share/doc/spamdyke/FAQ.html
@@ -8,5 +8,9 @@ share/doc/spamdyke/README.html
 share/doc/spamdyke/README_ip_file_format.html
 share/doc/spamdyke/README_rdns_directory_format.html
 share/doc/spamdyke/README_rdns_file_format.html
+share/doc/spamdyke/TODO.txt
 share/doc/spamdyke/UPGRADING.txt
+share/doc/spamdyke/UPGRADING_version_3_to_version_4.txt
+share/examples/spamdyke/spamdyke.conf.example
+@dirrm share/examples/spamdyke
 @dirrm share/doc/spamdyke
diff --git a/mail/spamdyke/distinfo b/mail/spamdyke/distinfo
index 33baa5ad3b2..d3c646ed825 100644
--- a/mail/spamdyke/distinfo
+++ b/mail/spamdyke/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.13 2008/05/28 23:57:27 schmonz Exp $
+$NetBSD: distinfo,v 1.14 2008/07/16 07:03:21 schmonz Exp $
 
-SHA1 (spamdyke-3.1.8.tgz) = d572dc0c354c1b114418666f6ce29048f16bedc1
-RMD160 (spamdyke-3.1.8.tgz) = 478b5ec97ea48c87727cab9db3471340ca6cf00d
-Size (spamdyke-3.1.8.tgz) = 266739 bytes
-SHA1 (patch-aa) = dd689a4d203873b6fe68a19bbcad7c89f977cd2c
-SHA1 (patch-ab) = e737db1666afb26e8f4985e7d966f0b17c8a08f1
-SHA1 (patch-ac) = 505b227e9b0417433ed0421a8532b4489be67ac7
+SHA1 (spamdyke-4.0.0.tgz) = 874cc6a951065a74fa89f9ed08bca9af46ea4ad5
+RMD160 (spamdyke-4.0.0.tgz) = f24183f8d9ce9f1ecd4470337f7b2b26a955e9a8
+Size (spamdyke-4.0.0.tgz) = 437877 bytes
+SHA1 (patch-aa) = bb988fc5cad08f8e4e05a0aa67d767c48f975955
diff --git a/mail/spamdyke/patches/patch-aa b/mail/spamdyke/patches/patch-aa
index 70d9c5d69aa..6e5e5683839 100644
--- a/mail/spamdyke/patches/patch-aa
+++ b/mail/spamdyke/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.8 2008/05/28 23:57:27 schmonz Exp $
+$NetBSD: patch-aa,v 1.9 2008/07/16 07:03:21 schmonz Exp $
 
---- spamdyke.h.orig	2008-04-22 22:46:02.000000000 -0400
+--- spamdyke.h.orig	2008-06-25 23:11:26.000000000 -0400
 +++ spamdyke.h
-@@ -38,7 +38,7 @@
+@@ -93,7 +93,7 @@
  #define STRINGIFY(X)                    _STRINGIFY(X)
  
  #define DEFAULT_REMOTE_IP               "0.0.0.0"
 -#define DEFAULT_PATH                    "/bin:/usr/bin:/usr/local/bin:/var/qmail/bin:/home/vpopmail/bin"
 +#define DEFAULT_PATH                    "/bin:/usr/bin:@LOCALBASE@/bin:@QMAILDIR@/bin:/home/vpopmail/bin"
- #define DEFAULT_TIMEOUT_COMMAND_SECS    60
- #define DEFAULT_TIMEOUT_CONNECTION_SECS 0
- #define TIMEOUT_CHECKPASSWORD_SECS      30
+ #define DEFAULT_NIHDNS_RESOLVER_FILENAME        "/etc/resolv.conf"
+ #define DEFAULT_NIHDNS_PORT             53
+ #define DEFAULT_TIMEOUT_NIHDNS_TOTAL_SECS       30
diff --git a/mail/spamdyke/patches/patch-ab b/mail/spamdyke/patches/patch-ab
deleted file mode 100644
index 1b63381ea9f..00000000000
--- a/mail/spamdyke/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2008/05/28 23:57:27 schmonz Exp $
-
---- configure.ac.orig	2008-05-21 10:33:14.000000000 -0400
-+++ configure.ac
-@@ -62,7 +62,7 @@ AS_IF([ test "x$enable_tls" != "xno" ],
-                                         AC_MSG_CHECKING([for OpenSSL libraries (for TLS support)]) 
-                                         AC_MSG_RESULT([yes])
-                                       ],
--                                      [ AS_IF([ test "x$enable_tls" == "xcheck" ],
-+                                      [ AS_IF([ test "x$enable_tls" = "xcheck" ],
-                                               [ AC_MSG_CHECKING([for OpenSSL libraries (for TLS support)])
-                                                 AC_MSG_RESULT([no, TLS disabled]) ],
-                                               [ AC_MSG_FAILURE([--enable-tls was given but OpenSSL was not found])
diff --git a/mail/spamdyke/patches/patch-ac b/mail/spamdyke/patches/patch-ac
deleted file mode 100644
index 99a2d2973f7..00000000000
--- a/mail/spamdyke/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2008/05/28 23:57:27 schmonz Exp $
-
---- configure.orig	2008-05-21 10:33:25.000000000 -0400
-+++ configure
-@@ -2715,7 +2715,7 @@ echo $ECHO_N "checking for OpenSSL libra
- echo "${ECHO_T}yes" >&6; }
- 
- else
--   if  test "x$enable_tls" == "xcheck" ; then
-+   if  test "x$enable_tls" = "xcheck" ; then
-    { echo "$as_me:$LINENO: checking for OpenSSL libraries (for TLS support)" >&5
- echo $ECHO_N "checking for OpenSSL libraries (for TLS support)... $ECHO_C" >&6; }
-                                                 { echo "$as_me:$LINENO: result: no, TLS disabled" >&5