- Update to 1.1.1.b2

- Add newsyslog entry [1]

PR:		205456 [1]
Submitted by:	 Alexander Moisseev [1]

5 files changed, 33 insertions, 4 deletions

diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 76ac5ac70a65..03631a66b98a 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.1.1.b1.19012016
+PORTVERSION=	1.1.1.b2.20012016
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -21,7 +21,7 @@ RSPAMD_VERSION=	1.1.1
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
 GH_PROJECT=	rspamd
-GH_TAGNAME=	5640329
+GH_TAGNAME=	a85edb5
 
 OPTIONS_DEFINE=	GPERF REDIRECTOR
 GPERF_DESC=		google perf-tools profiling
@@ -29,6 +29,7 @@ REDIRECTOR_DESC=	Install HTTP redirector
 
 USE_RC_SUBR=	rspamd
 
+SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
 PLIST_SUB+=	ETCDIR=etc/rspamd \
 		RSPAMDVERSION=${RSPAMD_VERSION}
 CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
@@ -90,5 +91,10 @@ post-stage:
 		${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}/usr/local/etc/newsyslog.conf.d
+	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}/usr/local/etc/newsyslog.conf.d
 
 .include <bsd.port.mk>
diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
index 09586c34366f..444b419997fb 100644
--- a/mail/rspamd-devel/distinfo
+++ b/mail/rspamd-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vstakhov-rspamd-1.1.1.b1.19012016-5640329_GH0.tar.xz) = ce549c643ca3f5ab2b03b660850cf09a1b2824704a435b214ee6525955f5d08d
-SIZE (vstakhov-rspamd-1.1.1.b1.19012016-5640329_GH0.tar.xz) = 1652027
+SHA256 (vstakhov-rspamd-1.1.1.b2.20012016-a85edb5_GH0.tar.xz) = 8cde39852f6b7dcb4974fcf87f938b3e90e32264cc0fa543165696229ecc588b
+SIZE (vstakhov-rspamd-1.1.1.b2.20012016-a85edb5_GH0.tar.xz) = 1652989
diff --git a/mail/rspamd-devel/files/pkg-message.in b/mail/rspamd-devel/files/pkg-message.in
new file mode 100644
index 000000000000..51c0a578bfda
--- /dev/null
+++ b/mail/rspamd-devel/files/pkg-message.in
@@ -0,0 +1,10 @@
+======================================================================
+ - Add the following line to /etc/rc.conf to enable rspamd:
+
+     rspamd_enable="YES"
+
+ - A symbolic link to %%ETCDIR%%/rspamd.newsyslog.conf
+   has been created in the /usr/local/etc/newsyslog.conf.d directory.
+   You can edit %%ETCDIR%%/rspamd.newsyslog.conf
+   to change log file rotation configuration.
+======================================================================
diff --git a/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in b/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in
new file mode 100644
index 000000000000..de693aabf0d1
--- /dev/null
+++ b/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in
@@ -0,0 +1,11 @@
+# newsyslog configuration file for rspamd(8)
+#
+# Link (or copy) rspamd.newsyslog.conf to /usr/local/etc/newsyslog.conf.d/
+# to take care of log rotation.
+#
+# ln -s /usr/local/etc/rspamd/rspamd.newsyslog.conf /usr/local/etc/newsyslog.conf.d
+#
+# See newsyslog.conf(5) for details.
+#
+# logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
+/var/log/rspamd/rspamd.log	nobody:nobody	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index 846478fab930..04db986ce1e6 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -37,6 +37,8 @@ bin/rspamc
 @sample %%ETCDIR%%/surbl-whitelist.inc.sample
 @sample %%ETCDIR%%/worker-controller.inc.sample
 @sample %%ETCDIR%%/worker-normal.inc.sample
+@sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
+/usr/local/etc/newsyslog.conf.d/rspamd.newsyslog.conf
 lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/effective_tld_names.dat
 %%DATADIR%%/lua/dmarc.lua