Index: head/mail/rspamd/Makefile =================================================================== --- head/mail/rspamd/Makefile (revision 434205) +++ head/mail/rspamd/Makefile (revision 434206) @@ -1,100 +1,99 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTVERSION= 1.4.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.6.so:mail/gmime26 \ libevent.so:devel/libevent2 \ libluajit-5.1.so:lang/luajit \ libfann.so:math/fann BUILD_DEPENDS= ragel:devel/ragel CONFLICTS_INSTALL= rspamd-devel 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 \ -DENABLE_FANN=ON \ -DNO_SHARED=ON USES= cmake:outsource gettext iconv pkgconfig tar:xz perl5 \ compiler:c11 sqlite ssl USE_LDCONFIG= yes USE_PERL5= build USE_GNOME= glib20 .include .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 LIB_DEPENDS+= libhs.so: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-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${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} .include Index: head/mail/rspamd/distinfo =================================================================== --- head/mail/rspamd/distinfo (revision 434205) +++ head/mail/rspamd/distinfo (revision 434206) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484822631 -SHA256 (rspamd-1.4.3.tar.xz) = 144cddc25ce8d8519b289d2c00d34b37c931f3c7293e2b0d16c408680021a1bf -SIZE (rspamd-1.4.3.tar.xz) = 1780104 +TIMESTAMP = 1487243417 +SHA256 (rspamd-1.4.4.tar.xz) = 51342639dd1e50b235ae7fb2e877dee1d5b90c8102ce7ff817545fa0fb6ebc6d +SIZE (rspamd-1.4.4.tar.xz) = 1780816 Index: head/mail/rspamd/files/patch-contrib_t1ha_t1ha.h =================================================================== --- head/mail/rspamd/files/patch-contrib_t1ha_t1ha.h (revision 434205) +++ head/mail/rspamd/files/patch-contrib_t1ha_t1ha.h (nonexistent) @@ -1,52 +0,0 @@ ---- contrib/t1ha/t1ha.h.orig 2017-01-19 23:47:16 UTC -+++ contrib/t1ha/t1ha.h -@@ -42,6 +42,14 @@ - #define T1HA_INCLUDED - #include "config.h" - #include -+#include -+ -+#ifndef __has_attribute -+#define __has_attribute(x) (0) -+#endif -+#ifndef __has_builtin -+#define __has_builtin(x) (0) -+#endif - - #ifdef BYTE_ORDER - #ifndef __ORDER_LITTLE_ENDIAN__ -@@ -88,9 +96,19 @@ - #endif - #endif - --#if defined(__GNUC__) && (__GNUC__ > 3) -+#ifndef __GNUC_PREREQ -+#if defined(__GNUC__) && defined(__GNUC_MINOR__) -+#define __GNUC_PREREQ(maj, min) \ -+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -+#else -+#define __GNUC_PREREQ(maj, min) 0 -+#endif -+#endif - --#if defined(__i386) || defined(__x86_64) -+ -+#if __GNUC_PREREQ(4, 4) || defined(__clang__) -+ -+#if defined(__i386__) || defined(__x86_64__) - #include - #endif - #define likely(cond) __builtin_expect(!!(cond), 1) -@@ -98,7 +116,12 @@ - #define unreachable() __builtin_unreachable() - #define bswap64(v) __builtin_bswap64(v) - #define bswap32(v) __builtin_bswap32(v) -+#if __GNUC_PREREQ(4, 8) || __has_builtin(__builtin_bswap16) - #define bswap16(v) __builtin_bswap16(v) -+#endif -+#if __GNUC_PREREQ(4, 3) || __has_attribute(unused) -+#define maybe_unused __attribute__((unused)) -+#endif - - #elif defined(_MSC_VER) - Property changes on: head/mail/rspamd/files/patch-contrib_t1ha_t1ha.h ___________________________________________________________________ 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