svn commit: r403909 - in head/mail: . rspamd rspamd-devel rspamd-devel/files

[Vsevolod Stakhov]

Author: vsevolod
Date: Thu Dec 17 16:29:22 2015
New Revision: 403909
URL: https://svnweb.freebsd.org/changeset/ports/403909

Log:
  Add rspamd-devel - development version of rspamd spam filter

Added:
  head/mail/rspamd-devel/
     - copied from r403907, head/mail/rspamd/
Modified:
  head/mail/Makefile
  head/mail/rspamd-devel/Makefile
  head/mail/rspamd-devel/distinfo
  head/mail/rspamd-devel/files/patch-CMakeLists.txt
  head/mail/rspamd-devel/pkg-descr
  head/mail/rspamd/Makefile

Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile	Thu Dec 17 16:16:51 2015	(r403908)
+++ head/mail/Makefile	Thu Dec 17 16:29:22 2015	(r403909)
@@ -574,6 +574,7 @@
     SUBDIR += roundcube-umich
     SUBDIR += roundcube-veximaccountadmin
     SUBDIR += rspamd
+    SUBDIR += rspamd-devel
     SUBDIR += rss2email2
     SUBDIR += rss2email3
     SUBDIR += ruby-rfilter

Modified: head/mail/rspamd-devel/Makefile
==============================================================================
--- head/mail/rspamd/Makefile	Thu Dec 17 15:16:03 2015	(r403907)
+++ head/mail/rspamd-devel/Makefile	Thu Dec 17 16:29:22 2015	(r403909)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.0.10
+PORTVERSION=	1.1.0.a.17122015
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 
 MAINTAINER=	vsevolod at FreeBSD.org
-COMMENT=	Fast spam filtering system
+COMMENT=	Fast spam filtering system dev version
 
 LICENSE=	BSD2CLAUSE
 
@@ -16,6 +16,10 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/deve
 		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
 		libhiredis.so:${PORTSDIR}/databases/hiredis
 
+RSPAMD_VERSION=	1.1.0
+CONFLICTS_INSTALL=	rspamd
+WRKSRC=		${WRKDIR}/${PORTNAME}-${RSPAMD_VERSION}
+
 OPTIONS_DEFINE=	GPERF REDIRECTOR
 GPERF_DESC=		google perf-tools profiling
 REDIRECTOR_DESC=	Install HTTP redirector
@@ -23,7 +27,7 @@ REDIRECTOR_DESC=	Install HTTP redirector
 USE_RC_SUBR=	rspamd
 
 PLIST_SUB+=	ETCDIR=etc/rspamd \
-		RSPAMDVERSION=${PORTVERSION}
+		RSPAMDVERSION=${RSPAMD_VERSION}
 CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DLOGDIR=/var/log/rspamd \
 		-DDBDIR=/var/db/rspamd \

Modified: head/mail/rspamd-devel/distinfo
==============================================================================
--- head/mail/rspamd/distinfo	Thu Dec 17 15:16:03 2015	(r403907)
+++ head/mail/rspamd-devel/distinfo	Thu Dec 17 16:29:22 2015	(r403909)
@@ -1,2 +1,2 @@
-SHA256 (rspamd-1.0.10.tar.xz) = da8b3404ddd46e1a20fc629dfb681d28cee680160821f34d58336d733552bd38
-SIZE (rspamd-1.0.10.tar.xz) = 1176584
+SHA256 (rspamd-1.1.0.a.17122015.tar.xz) = 7fbc96177d9fd563068586dc020489463582d63938813ab0cbf337ef0baf80ad
+SIZE (rspamd-1.1.0.a.17122015.tar.xz) = 1234800

Modified: head/mail/rspamd-devel/files/patch-CMakeLists.txt
==============================================================================
--- head/mail/rspamd/files/patch-CMakeLists.txt	Thu Dec 17 15:16:03 2015	(r403907)
+++ head/mail/rspamd-devel/files/patch-CMakeLists.txt	Thu Dec 17 16:29:22 2015	(r403909)
@@ -1,6 +1,6 @@
---- ./CMakeLists.txt.orig	2015-09-01 16:28:36.000000000 +0300
-+++ ./CMakeLists.txt	2015-09-21 14:10:42.046330451 +0300
-@@ -1042,6 +1042,19 @@
+--- CMakeLists.txt.orig	2015-12-17 14:52:24.000000000 +0000
++++ CMakeLists.txt	2015-12-17 16:21:31.231703000 +0000
+@@ -1103,6 +1103,19 @@
  ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON")
  IF(BUILD_PORT)
  	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
@@ -20,10 +20,3 @@
  ELSE(BUILD_PORT)
  	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" "")
  ENDIF(BUILD_PORT)
-@@ -1109,4 +1122,4 @@
- IF(NOT DEBIAN_BUILD)
- 	ADD_CUSTOM_TARGET(check DEPENDS rspamd-test)
- 	ADD_CUSTOM_TARGET(run-test DEPENDS check COMMAND test/rspamd-test)
--ENDIF(NOT DEBIAN_BUILD)
-\ No newline at end of file
-+ENDIF(NOT DEBIAN_BUILD)

Modified: head/mail/rspamd-devel/pkg-descr
==============================================================================
--- head/mail/rspamd/pkg-descr	Thu Dec 17 15:16:03 2015	(r403907)
+++ head/mail/rspamd-devel/pkg-descr	Thu Dec 17 16:29:22 2015	(r403909)
@@ -1,5 +1,5 @@
 Rspamd is fast, modular and lightweight spam filter. It is designed to work
 with big ammount of mail and can be easily extended with own filters written in
-lua.
+lua. This port provides development version of rspamd.
 
 WWW: https://rspamd.com

Modified: head/mail/rspamd/Makefile
==============================================================================
--- head/mail/rspamd/Makefile	Thu Dec 17 16:16:51 2015	(r403908)
+++ head/mail/rspamd/Makefile	Thu Dec 17 16:29:22 2015	(r403909)
@@ -2,6 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	1.0.10
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 
@@ -16,6 +17,8 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/deve
 		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
 		libhiredis.so:${PORTSDIR}/databases/hiredis
 
+CONFLICTS_INSTALL=	rspamd
+
 OPTIONS_DEFINE=	GPERF REDIRECTOR
 GPERF_DESC=		google perf-tools profiling
 REDIRECTOR_DESC=	Install HTTP redirector