Index: head/mail/spampd/Makefile
===================================================================
--- head/mail/spampd/Makefile	(revision 474723)
+++ head/mail/spampd/Makefile	(revision 474724)
@@ -1,30 +1,29 @@
 # Created by: chris
 # $FreeBSD$
 
 PORTNAME=	spampd
-PORTVERSION=	2.42
-PORTREVISION=	2
+PORTVERSION=	2.51
 CATEGORIES=	mail perl5
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Spamassassin SMTP Proxy
 
-LICENSE=	GPLv2
+LICENSE=	GPLv3
 
 RUN_DEPENDS=	spamc:mail/spamassassin \
 		p5-Net-Server>=0:net/p5-Net-Server
 
 NO_BUILD=	yes
 PLIST_FILES=	sbin/spampd
 USES=		perl5 shebangfix
 SHEBANG_FILES=	spampd.pl
 SUB_LIST=	PERL=${PERL}
 USE_RC_SUBR=	spampd
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mpaperno
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/spampd.pl ${STAGEDIR}${PREFIX}/sbin/spampd
 
 .include <bsd.port.mk>
Index: head/mail/spampd/distinfo
===================================================================
--- head/mail/spampd/distinfo	(revision 474723)
+++ head/mail/spampd/distinfo	(revision 474724)
@@ -1,2 +1,3 @@
-SHA256 (mpaperno-spampd-2.42_GH0.tar.gz) = c6dcef8df0c471b3982e777bcccfe343f1f6f921113c2b369a76144724b1d15d
-SIZE (mpaperno-spampd-2.42_GH0.tar.gz) = 202504
+TIMESTAMP = 1525190858
+SHA256 (mpaperno-spampd-2.51_GH0.tar.gz) = 93cc3ef19ecff224ac00f6c7a0e028f059ec839703329f4567846b750964ac07
+SIZE (mpaperno-spampd-2.51_GH0.tar.gz) = 215462
Index: head/mail/spampd/files/patch-setsid
===================================================================
--- head/mail/spampd/files/patch-setsid	(revision 474723)
+++ head/mail/spampd/files/patch-setsid	(nonexistent)
@@ -1,11 +0,0 @@
---- spampd.pl.orig	2013-12-08 11:34:02 UTC
-+++ spampd.pl
-@@ -961,7 +961,7 @@ my $server = bless {
- 				syslog_ident => 'spampd',
- 				syslog_facility => 'mail',
- 				background => $background,
--				# setsid => 1,
-+				setsid => 1,
- 				pid_file => $pidfile,
- 				user => $user,
- 				group => $group,

Property changes on: head/mail/spampd/files/patch-setsid
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/spampd/files/spampd.in
===================================================================
--- head/mail/spampd/files/spampd.in	(revision 474723)
+++ head/mail/spampd/files/spampd.in	(revision 474724)
@@ -1,30 +1,34 @@
 #!/bin/sh
 #
 # PROVIDE: spampd
 # REQUIRE: LOGIN
 # BEFORE: mail
 # KEYWORD: shutdown
 #
 # Add the fellowing line to /etc/rc.conf to enable spampd:
 #
 # spampd_enable (bool):		Set it to "YES" to enable spampd
 #				Default is "NO"
-# spampd_flags
+# spampd_flags:			Flags to spampd
+# spampd_extra_flags:		Additional flags, so one can
+#                               keep defaults in spampd_flags, e.g.
+#                               spampd_extra_flags="--sef" to add
+#                               "X-Envelope-From" header.
 
 . /etc/rc.subr
 
 name="spampd"
 rcvar=spampd_enable
 
 : ${spampd_enable="NO"}
 : ${spampd_pidfile="/var/run/spamd/spampd.pid"}
 : ${spampd_flags="--user=spamd --group=spamd --host 127.0.0.1:10024 --relayhost=127.0.0.1:10025 --dose --tagall --auto-whitelist"}
 
 load_rc_config $name
 
 command="%%PREFIX%%/sbin/$name"
-command_args="--pid=${spampd_pidfile}"
+command_args="--setsid --pid=${spampd_pidfile} ${spampd_extra_flags}"
 command_interpreter="%%PERL%% -T"
 pidfile="${spampd_pidfile}"
 
 run_rc_command $1