8 files changed, 27 insertions, 18 deletions

diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index 3a9ba0ea9659..2cd42f525925 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	milter-manager
-PORTVERSION=	2.0.7
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	mail ruby
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME:S/-/%20/}/${PORTVERSION}
+MASTER_SITES=	SFJP/${PORTNAME}/67935
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Super milter that can invoke several milters selectively
@@ -13,17 +12,19 @@ COMMENT=	Super milter that can invoke several milters selectively
 LICENSE=	AGPLv3 GFDL GPLv3 LGPL3
 LICENSE_COMB=	multi
 
+BROKEN_RUBY24=	Build succeeds, but using binary results in segmentation fault
+
 BUILD_DEPENDS=	rubygem-glib2>0:devel/rubygem-glib2
 LIB_DEPENDS=	libev.so:devel/libev
 RUN_DEPENDS=	rubygem-glib2>0:devel/rubygem-glib2
 
+USES=		gettext gmake libtool pathfix pkgconfig
 USE_RC_SUBR=	milter-manager
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libev \
 		--with-package-platform=freebsd
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
-USES=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	glib20 intltool
 USE_LDCONFIG=	yes
 USE_RUBY=	yes
diff --git a/mail/milter-manager/distinfo b/mail/milter-manager/distinfo
index 7ae6f6b4dd7e..131df2a77853 100644
--- a/mail/milter-manager/distinfo
+++ b/mail/milter-manager/distinfo
@@ -1,2 +1,3 @@
-SHA256 (milter-manager-2.0.7.tar.gz) = a591d7a757de9a5f4873bdec01a4db17705a9b6db9d1a13c7d48bef567ad4be4
-SIZE (milter-manager-2.0.7.tar.gz) = 6152049
+TIMESTAMP = 1521370741
+SHA256 (milter-manager-2.1.1.tar.gz) = 315170b261f7557a896dd5607e785279a293c81ce1f7116906102f8376b120c6
+SIZE (milter-manager-2.1.1.tar.gz) = 6619833
diff --git a/mail/milter-manager/files/patch-Makefile.in b/mail/milter-manager/files/patch-Makefile.in
index 8b2e0a64d464..f9ae17b5bbe1 100644
--- a/mail/milter-manager/files/patch-Makefile.in
+++ b/mail/milter-manager/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2015-11-26 11:17:18.206724000 +0000
-+++ Makefile.in	2015-11-26 11:17:47.089805000 +0000
-@@ -513,7 +513,7 @@
- 
+--- Makefile.in.orig	2018-03-18 11:34:18 UTC
++++ Makefile.in
+@@ -510,7 +510,7 @@ SUBDIRS = $(am__append_1) milter libmilt
+ 	data test po build doc html license package vendor
  pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = milter-core.pc milter-client.pc milter-server.pc \
 -	milter-manager.pc libmilter.pc $(am__append_2)
 +	milter-manager.pc $(am__append_2)
  EXTRA_DIST = \
  	autogen.sh				\
- 	README					\
+ 	gpg_uid					\
diff --git a/mail/milter-manager/files/patch-binding_ruby_test_run-test.sh b/mail/milter-manager/files/patch-binding_ruby_test_run-test.sh
index 2c52259b31c6..9baf10f3bf9a 100644
--- a/mail/milter-manager/files/patch-binding_ruby_test_run-test.sh
+++ b/mail/milter-manager/files/patch-binding_ruby_test_run-test.sh
@@ -1,5 +1,5 @@
---- ./binding/ruby/test/run-test.sh.orig	2011-05-11 22:19:37.356427000 +0900
-+++ ./binding/ruby/test/run-test.sh	2011-06-16 20:04:31.000000000 +0900
+--- binding/ruby/test/run-test.sh.orig	2015-06-15 05:13:40 UTC
++++ binding/ruby/test/run-test.sh
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
diff --git a/mail/milter-manager/files/patch-configure b/mail/milter-manager/files/patch-configure
index 73b3749bdcc6..ba66440dbb59 100644
--- a/mail/milter-manager/files/patch-configure
+++ b/mail/milter-manager/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-01-20 02:07:12 UTC
+--- configure.orig	2017-06-28 06:21:45 UTC
 +++ configure
-@@ -14169,7 +14169,7 @@ fi
+@@ -14803,7 +14803,7 @@ fi
  	  end
  	end
  	ruby_glib2_path = ruby_glib2_gem.full_gem_path
diff --git a/mail/milter-manager/files/patch-libev-4.19__ev.c b/mail/milter-manager/files/patch-libev-4.19__ev.c
index 52457c6636d7..af4e590da374 100644
--- a/mail/milter-manager/files/patch-libev-4.19__ev.c
+++ b/mail/milter-manager/files/patch-libev-4.19__ev.c
@@ -1,5 +1,5 @@
---- libev-4.19/ev.c.orig	2015-12-10 10:12:15.511854000 +0800
-+++ libev-4.19/ev.c	2015-12-10 10:13:19.665492000 +0800
+--- libev-4.19/ev.c.orig	2016-07-20 07:58:51 UTC
++++ libev-4.19/ev.c
 @@ -1022,12 +1022,12 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
    }
  #endif
diff --git a/mail/milter-manager/pkg-descr b/mail/milter-manager/pkg-descr
index 6c072aeb18cd..5177a0022953 100644
--- a/mail/milter-manager/pkg-descr
+++ b/mail/milter-manager/pkg-descr
@@ -2,4 +2,4 @@ milter manager protects you from spam mails and virus mails effectively
 with milter. milter manager has embedded Ruby interpreter to control
 milters flexibly.
 
-WWW: http://milter-manager.sourceforge.net/
+WWW: https://milter-manager.osdn.jp/
diff --git a/mail/milter-manager/pkg-plist b/mail/milter-manager/pkg-plist
index 7883b8bc804f..480a224997aa 100644
--- a/mail/milter-manager/pkg-plist
+++ b/mail/milter-manager/pkg-plist
@@ -6,6 +6,7 @@ bin/milter-test-client-libmilter
 bin/milter-test-server
 etc/cron.d/milter-manager-log
 %%ETCDIR%%/applicable-conditions/authentication.conf
+%%ETCDIR%%/applicable-conditions/dnsbl.conf
 %%ETCDIR%%/applicable-conditions/remote-network.conf
 %%ETCDIR%%/applicable-conditions/restrict-accounts.conf
 %%ETCDIR%%/applicable-conditions/s25r.conf
@@ -133,7 +134,9 @@ lib/milter-manager/binding/lib/milter/manager/child-context.rb
 lib/milter-manager/binding/lib/milter/manager/clamav-milter-config-parser.rb
 lib/milter-manager/binding/lib/milter/manager/condition-table.rb
 lib/milter-manager/binding/lib/milter/manager/connection-check-context.rb
+lib/milter-manager/binding/lib/milter/manager/debian-detector.rb
 lib/milter-manager/binding/lib/milter/manager/debian-init-detector.rb
+lib/milter-manager/binding/lib/milter/manager/debian-systemd-detector.rb
 lib/milter-manager/binding/lib/milter/manager/detector.rb
 lib/milter-manager/binding/lib/milter/manager/enma-socket-detector.rb
 lib/milter-manager/binding/lib/milter/manager/exception.rb
@@ -151,7 +154,11 @@ lib/milter-manager/binding/lib/milter/manager/postfix-regexp-table.rb
 lib/milter-manager/binding/lib/milter/manager/rcng-detector.rb
 lib/milter-manager/binding/lib/milter/manager/redhat-detector.rb
 lib/milter-manager/binding/lib/milter/manager/redhat-init-detector.rb
+lib/milter-manager/binding/lib/milter/manager/redhat-systemd-detector.rb
 lib/milter-manager/binding/lib/milter/manager/redhat-upstart-detector.rb
+lib/milter-manager/binding/lib/milter/manager/rmilter-socket-detector.rb
+lib/milter-manager/binding/lib/milter/manager/rspamd-proxy-detector.rb
+lib/milter-manager/binding/lib/milter/manager/systemd-detector.rb
 lib/milter-manager/binding/lib/milter/server.rb
 lib/milter-manager/binding/lib/milter/server/testing.rb
 lib/milter-manager/libmilter.so