5 files changed, 29 insertions, 29 deletions

diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 0ad6ccdb67c8..b21a320dffb9 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.3.0.b4.25072016
+PORTVERSION=	1.3.2.b1.04082016
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Fast spam filtering system dev version
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	APACHE20
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libgmime-2.4.so:mail/gmime24 \
@@ -18,14 +18,14 @@ BUILD_DEPENDS=	ragel:devel/ragel
 
 CONFLICTS_INSTALL=	rspamd
 
-RSPAMD_VERSION=	1.3.0
+RSPAMD_VERSION=	1.3.2
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
 GH_PROJECT=	rspamd
-GH_TAGNAME=	35bebde
+GH_TAGNAME=	a569362
 
 OPTIONS_DEFINE=	GPERF REDIRECTOR HYPERSCAN
-GPERF_DESC=		google perf-tools profiling
+GPERF_DESC=		Google perf-tools profiling
 REDIRECTOR_DESC=	Install HTTP redirector
 HYPERSCAN_DESC=		Use hyperscan optimizations (amd64 only)
 
@@ -48,12 +48,11 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DGIT_ID=${GH_TAGNAME}
 
 USES=		cmake:outsource gettext iconv pkgconfig tar:xz perl5 \
-		compiler:c11 sqlite
+		compiler:c11 sqlite ssl
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 USE_GNOME=	glib20
-USE_OPENSSL=	yes
 DEBUG_FLAGS=	-g -O0
 WITH_DEBUG=	yes
 
@@ -65,7 +64,7 @@ WITH_DEBUG=	yes
 .endif
 
 .if ${PORT_OPTIONS:MHYPERSCAN}
- CMAKE_ARGS+=	-DENABLE_HYPERSCAN=ON
+ CMAKE_ARGS+=		-DENABLE_HYPERSCAN=ON
  BUILD_DEPENDS+=	${LOCALBASE}/lib/libhs.a:devel/hyperscan
  ONLY_FOR_ARCHS=	amd64
 .endif
@@ -88,7 +87,7 @@ WITH_DEBUG=	yes
 	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
 	p5-SWF-File>=0:graphics/p5-SWF-File
 .else
- PLIST_SUB+=		REDIRECTOR="@comment "
+ PLIST_SUB+=	REDIRECTOR="@comment "
 .endif
 
 post-stage:
@@ -96,10 +95,10 @@ post-stage:
 		${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
+	# 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:
diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
index 7389b804c801..e628b6e1dbcc 100644
--- a/mail/rspamd-devel/distinfo
+++ b/mail/rspamd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469452433
-SHA256 (vstakhov-rspamd-1.3.0.b4.25072016-35bebde_GH0.tar.gz) = be4b6ca8ea02dda1c75d4d7c0687ea82bfa62e6db4480a592b29fcf61f244f95
-SIZE (vstakhov-rspamd-1.3.0.b4.25072016-35bebde_GH0.tar.gz) = 1866729
+TIMESTAMP = 1470331789
+SHA256 (vstakhov-rspamd-1.3.2.b1.04082016-a569362_GH0.tar.gz) = e8c41956b33439cb3f4837d8d26aa133d339657cc5f8d67118f53ecb4193fd37
+SIZE (vstakhov-rspamd-1.3.2.b1.04082016-a569362_GH0.tar.gz) = 1886556
diff --git a/mail/rspamd-devel/files/patch-CMakeLists.txt b/mail/rspamd-devel/files/patch-CMakeLists.txt
index bfa3fd53841c..43852babe384 100644
--- a/mail/rspamd-devel/files/patch-CMakeLists.txt
+++ b/mail/rspamd-devel/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2016-01-28 17:45:10.000000000 +0000
-+++ CMakeLists.txt	2016-01-28 23:41:09.681819000 +0000
-@@ -1090,6 +1090,20 @@
+--- CMakeLists.txt.orig	2016-07-03 20:55:47 UTC
++++ CMakeLists.txt
+@@ -1223,6 +1223,21 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
  ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON")
  IF(BUILD_PORT)
  	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
@@ -8,6 +8,7 @@
 +	INSTALL_IF_NOT_EXISTS("conf/logging.inc" ${CONFDIR} "logging.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/options.inc" ${CONFDIR} "options.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/worker-controller.inc" ${CONFDIR} "worker-controller.inc" ".sample")
++	INSTALL_IF_NOT_EXISTS("conf/worker-fuzzy.inc" ${CONFDIR} "worker-fuzzy.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/worker-normal.inc" ${CONFDIR} "worker-normal.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/2tld.inc" ${CONFDIR} "2tld.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/mime_types.inc" ${CONFDIR} "mime_types.inc" ".sample")
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index 231a8b43681b..d04a338ca3ac 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -41,7 +41,7 @@ bin/rspamc
 @sample %%ETCDIR%%/statistic.conf.sample
 @sample %%ETCDIR%%/surbl-whitelist.inc.sample
 @sample %%ETCDIR%%/worker-controller.inc.sample
-@sample %%ETCDIR%%/worker-fuzzy.inc
+@sample %%ETCDIR%%/worker-fuzzy.inc.sample
 @sample %%ETCDIR%%/worker-normal.inc.sample
 @sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
 /usr/local/etc/newsyslog.conf.d/rspamd.newsyslog.conf
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 07f853e6218e..a8c8edd6b3d1 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 
@@ -16,7 +17,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libluajit-5.1.so:lang/luajit
 BUILD_DEPENDS=	ragel:devel/ragel
 
-CONFLICTS_INSTALL=	rspamd
+CONFLICTS_INSTALL=	rspamd-devel
 
 OPTIONS_DEFINE=	GPERF REDIRECTOR HYPERSCAN
 GPERF_DESC=		Google perf-tools profiling
@@ -40,12 +41,11 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DNO_SHARED=ON
 
 USES=		cmake:outsource gettext iconv pkgconfig tar:xz perl5 \
-		compiler:c11 sqlite
+		compiler:c11 sqlite ssl
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 USE_GNOME=	glib20
-USE_OPENSSL=	yes
 
 .include <bsd.port.options.mk>
 
@@ -55,9 +55,9 @@ USE_OPENSSL=	yes
 .endif
 
 .if ${PORT_OPTIONS:MHYPERSCAN}
- CMAKE_ARGS+=  -DENABLE_HYPERSCAN=ON
- BUILD_DEPENDS+=       ${LOCALBASE}/lib/libhs.a:devel/hyperscan
- ONLY_FOR_ARCHS=       amd64
+ CMAKE_ARGS+=		-DENABLE_HYPERSCAN=ON
+ BUILD_DEPENDS+=	${LOCALBASE}/lib/libhs.a:devel/hyperscan
+ ONLY_FOR_ARCHS=	amd64
 .endif
 
 .if ${PORT_OPTIONS:MREDIRECTOR}
@@ -78,7 +78,7 @@ USE_OPENSSL=	yes
 	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
 	p5-SWF-File>=0:graphics/p5-SWF-File
 .else
- PLIST_SUB+=		REDIRECTOR="@comment "
+ PLIST_SUB+=	REDIRECTOR="@comment "
 .endif
 
 post-stage:
@@ -93,7 +93,7 @@ post-stage:
 	${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
+	@${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>