4 files changed, 25 insertions, 26 deletions

diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index 3b2d8d8e0159..42f19335a939 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spamd
-PORTVERSION=	3.4
+PORTVERSION=	3.5
 CATEGORIES=	mail
 MASTER_SITES=	http://pf4freebsd.love2party.net/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -18,12 +18,10 @@ COMMENT=	Traps spammers with a very slow smtp-login and return 4xx error
 IS_INTERACTIVE=	yes
 .endif
 
-MAN5=		spamd.conf.5
-MAN8=		spamd.8 spamd-setup.8
-
-MANCOMPRESSED=	maybe
+USE_REINPLACE=	yes
 
-MAKE_ARGS=	MANDIR="${PREFIX}/man/man"
+MAN5=		spamd.conf.5
+MAN8=		spamd.8 spamd-setup.8 spamdb.8 spamlogd.8
 
 SAMPLE_SPAMD_CONF=	${PREFIX}/etc/spamd.conf.sample
 SAMPLE_SPAMD_RC=	${PREFIX}/etc/rc.d/spamd.sh
@@ -36,19 +34,31 @@ IGNORE=		"Only for 5.0 and above"
 
 .if ${OSVERSION} < 502106
 RUN_DEPENDS=	${LOCALBASE}/sbin/pfctl:${PORTSDIR}/security/pf
+LOCAL_PFCTL=	${PREFIX}/sbin/pfctl
+.else
+LOCAL_PFCTL=	/sbin/pfctl
 .endif
 
 post-patch:
-	${SED} -e 's!%%LOCALBASE%%!${LOCALBASE}!'	\
-		${PATCHDIR}/local-patch.sed | ${PATCH} 	\
-		${WRKSRC}/spamd-setup/spamd-setup.c
+	@${REINPLACE_CMD} -e 's|%%LOCAL_PFCTL%%|${LOCAL_PFCTL}|;	\
+	    s|%%LOCAL_SPAMD_CONF%%|${PREFIX}/etc/spamd.conf|'		\
+	    ${WRKSRC}/spamd-setup/spamd-setup.c
 
 pre-su-install:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 .endif
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/spamd/spamd ${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${WRKSRC}/spamlogd/spamlogd ${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${WRKSRC}/spamd-setup/spamd-setup ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/spamdb/spamdb ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/doc/spamd.conf.5 ${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/spamd/spamd.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/spamd-setup/spamd-setup.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/spamdb/spamdb.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/spamlogd/spamlogd.8 ${PREFIX}/man/man8
 	@if [ ! -f ${SAMPLE_SPAMD_RC} ]; then			\
 		${ECHO_MSG} "Installing ${SAMPLE_SPAMD_RC} startup file."; \
 		${INSTALL_SCRIPT} ${FILESDIR}/spamd.sh.sample	\
@@ -56,7 +66,7 @@ post-install:
 	fi
 	@if [ ! -f ${SAMPLE_SPAMD_CONF} ]; then			\
 		${ECHO_MSG} "Installing ${SAMPLE_SPAMD_CONF} file."; \
-		${INSTALL_DATA} ${WRKSRC}/spamd/spamd.conf	\
+		${INSTALL_DATA} ${WRKSRC}/doc/spamd.conf	\
 		${SAMPLE_SPAMD_CONF};				\
 	fi
 
diff --git a/mail/spamd/distinfo b/mail/spamd/distinfo
index f5798dc4756d..843dbd548d51 100644
--- a/mail/spamd/distinfo
+++ b/mail/spamd/distinfo
@@ -1,2 +1,2 @@
-MD5 (spamd_3.4.tar.gz) = 628d0e0672b7bebb7bf6c562958480a6
-SIZE (spamd_3.4.tar.gz) = 19900
+MD5 (spamd_3.5.tar.gz) = 1e38e70d7d442c752fb3e0c31d56f6d8
+SIZE (spamd_3.5.tar.gz) = 30669
diff --git a/mail/spamd/files/local-patch.sed b/mail/spamd/files/local-patch.sed
deleted file mode 100644
index a95804fbc326..000000000000
--- a/mail/spamd/files/local-patch.sed
+++ /dev/null
@@ -1,13 +0,0 @@
---- spamd-setup/spamd-setup.c.orig	Mon Sep 29 14:15:19 2003
-+++ spamd-setup/spamd-setup.c	Mon Sep 29 14:16:37 2003
-@@ -47,8 +47,8 @@
- #endif
- 
- #define PATH_FTP		"/usr/bin/ftp"
--#define PATH_PFCTL		"/sbin/pfctl"
--#define PATH_SPAMD_CONF		"/etc/spamd.conf"
-+#define PATH_PFCTL		"%%LOCALBASE%%/sbin/pfctl"
-+#define PATH_SPAMD_CONF		"%%LOCALBASE%%/etc/spamd.conf"
- #define SPAMD_ARG_MAX		256 /* max # of args to an exec */
- 
- struct cidr {
diff --git a/mail/spamd/pkg-plist b/mail/spamd/pkg-plist
index 0a7d4744904d..d13376ab0ad2 100644
--- a/mail/spamd/pkg-plist
+++ b/mail/spamd/pkg-plist
@@ -1,4 +1,6 @@
 libexec/spamd
+libexec/spamlogd
 sbin/spamd-setup
+sbin/spamdb
 etc/rc.d/spamd.sh
 etc/spamd.conf.sample