Index: head/mail/rspamd/Makefile
===================================================================
--- head/mail/rspamd/Makefile	(revision 413690)
+++ head/mail/rspamd/Makefile	(revision 413691)
@@ -1,98 +1,98 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.4
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Fast spam filtering system
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libgmime-2.4.so:mail/gmime24 \
 		libevent.so:devel/libevent2 \
 		libluajit-5.1.so:lang/luajit
 
 CONFLICTS_INSTALL=	rspamd
 
 OPTIONS_DEFINE=	GPERF REDIRECTOR HYPERSCAN
 GPERF_DESC=		Google perf-tools profiling
 REDIRECTOR_DESC=	Install HTTP redirector
 HYPERSCAN_DESC=		Use hyperscan optimizations (amd64 only)
 
 USE_RC_SUBR=	rspamd
 
 SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
 PLIST_SUB+=	ETCDIR=etc/rspamd \
 		RSPAMDVERSION=${PORTVERSION}
 CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DLOGDIR=/var/log/rspamd \
 		-DDBDIR=/var/db/rspamd \
 		-DRUNDIR=/var/run/rspamd \
 		-DMANDIR=${MANPREFIX}/man \
 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 		-DBUILD_PORT=yes \
 		-DFORCE_GMIME24=yes \
 		-DLIBDIR=${PREFIX}/lib/rspamd \
 		-DNO_SHARED=ON
 
 USES=		cmake:outsource gettext iconv pkgconfig tar:xz perl5 \
 		compiler:c11 sqlite
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 USE_GNOME=	glib20
 USE_OPENSSL=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGPERF}
  CMAKE_ARGS+=	-DENABLE_GPERF_TOOLS=ON
  LIB_DEPENDS+=	libprofiler.so:devel/google-perftools
 .endif
 
 .if ${PORT_OPTIONS:MHYPERSCAN}
  CMAKE_ARGS+=  -DENABLE_HYPERSCAN=ON
  BUILD_DEPENDS+=       ${LOCALBASE}/lib/libhs.a:devel/hyperscan
  ONLY_FOR_ARCHS=       amd64
 .endif
 
 .if ${PORT_OPTIONS:MREDIRECTOR}
  USE_PERL5+=	run
  CMAKE_ARGS+=	-DENABLE_REDIRECTOR=ON
  PLIST_SUB+=	REDIRECTOR=""
  USE_RC_SUBR+=	rspamd_redirector
  RUN_DEPENDS+=	\
 	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
 	p5-IO-String>=0:devel/p5-IO-String \
 	p5-XML-Parser>=0:textproc/p5-XML-Parser \
 	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
 	p5-POE-Component-Client-DNS>=0:dns/p5-POE-Component-Client-DNS \
 	p5-POE-Component-Client-HTTP>=0:www/p5-POE-Component-Client-HTTP \
 	p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \
 	p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
 	p5-Proc-PidUtil>=0:sysutils/p5-Proc-PidUtil \
 	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
 	p5-SWF-File>=0:graphics/p5-SWF-File
 .else
  PLIST_SUB+=		REDIRECTOR="@comment "
 .endif
 
 post-stage:
 	${INSTALL} -d \
 		${STAGEDIR}/var/log/rspamd \
 		${STAGEDIR}/var/db/rspamd \
 		${STAGEDIR}/var/run/rspamd
 	# Linux specific
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
 	# No need, since rspamd.conf.sample is a same
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
 	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 
 .include <bsd.port.mk>
Index: head/mail/rspamd/distinfo
===================================================================
--- head/mail/rspamd/distinfo	(revision 413690)
+++ head/mail/rspamd/distinfo	(revision 413691)
@@ -1,2 +1,2 @@
-SHA256 (rspamd-1.2.3.tar.xz) = 18d41ee46993c51a5aed41b6734304b15e7b98bf0ab3c5855a57851eeb08b724
-SIZE (rspamd-1.2.3.tar.xz) = 1419080
+SHA256 (rspamd-1.2.4.tar.xz) = 3f913b289ddb5fd3a8d0894f407cc8dc3c6c29864a71c373715278b1de9124c7
+SIZE (rspamd-1.2.4.tar.xz) = 1423680
Index: head/mail/rspamd/files/rspamd.in
===================================================================
--- head/mail/rspamd/files/rspamd.in	(revision 413690)
+++ head/mail/rspamd/files/rspamd.in	(revision 413691)
@@ -1,58 +1,56 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: rspamd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable rspamd:
 #
 # rspamd_enable (bool):		Set to "NO" by default.
-#							Set it to "YES" to enable rspamd.
+#				Set it to "YES" to enable rspamd.
 #
 # rspamd_user (str):		Default to "nobody".
 #
 # rspamd_group (str):		Default to "nobody".
 #
-# rspamd_flags (str):		Default to "-c %%PREFIX%%/etc/rspamd.xml".
+# rspamd_flags (str):		Default to "-c %%PREFIX%%/etc/rspamd.conf".
 
 . /etc/rc.subr
 
 name=rspamd
 rcvar=rspamd_enable
 
 load_rc_config $name
 
 : ${rspamd_enable:="NO"}
 : ${rspamd_user="nobody"}
 : ${rspamd_group="nobody"}
 : ${rspamd_flags="-c %%PREFIX%%/etc/rspamd/rspamd.conf"}
 
 pidfile=${rspamd_pidfile:-"/var/run/rspamd/rspamd.pid"}
 
 command=%%PREFIX%%/bin/rspamd
 command_adm=%%PREFIX%%/bin/rspamadm
 restart_precmd="rspamd_checkconfig"
-reload_precmd="rspamd_checkconfig"
 configtest_cmd="rspamd_checkconfig"
 reopenlog_cmd="reopenlog_cmd"
 
 required_files=%%PREFIX%%/etc/rspamd/rspamd.conf
 command_args="-u ${rspamd_user} -g ${rspamd_group}"
-sig_reload="HUP"
-extra_commands="reload configtest reopenlog"
+extra_commands="configtest reopenlog"
 stop_postcmd="rm -f $pidfile"
 
 rspamd_checkconfig()
 {
 	echo "Performing sanity check on rspamd configuration:"
 	eval ${command_adm} configtest ${rspamd_flags}
 }
 
 reopenlog_cmd()
 {
 	pkill -USR1 -F $pidfile
 }
 
 run_rc_command "$1"