Update milter-manager to 2.0.5.

== [release-2-0-5] 2.0.5: 2014-12-09

A bug fix release of 2.0.4.
Add experimental APIs can hold data between the mail transaction.

=== Package

==== Improvements

  * Drop CentOS5 support
  * Add CentOS7 support
  * Drop Ubuntu Saucy (13.10) support
  * Add Ubuntu Utopic (14.10) support
  * Build deb packages in clean room
    [Patched by Youhei SASAKI][milter-manager-users-ja:00224]
  * Improve auto detection for ruby-glib2
    [Suggested by Youhei SASAKI and Kazuhiro NISHIYAMA][milter-manager-users-ja:00243]
  * Require libev
    [Reported by OBATA Akio][GitHub #48][GitHub #49]

=== milter manager

==== Fixes

  * Ensure to set UTF-8 encoding to file content
    [Reported by Panagiotis Skarvelis][SF.net #6]

=== milter-client

==== Improvements

  * Add APIs can hold data between the mail transaction. (experimental)

=== Ruby milter

==== Improvements

  * Drop Ruby1.8 support
  * Add APIs can hold data between the mail transaction. (experimental)

==== Fixes

  * Setup signal handler when invoke milter in single process mode
    [GitHub #53]

=== Document

==== Fixes

  * Execute sa-update before invoke sa-spamd on FreeBSD
    [Reported by moto kawasaki][milter-manager-users-ja:00250]

=== Thanks

  * Youhei SASAKI
  * Kazuhiro NISHIYAMA
  * OBATA Akio
  * Panagiotis Skarvelis
  * moto kawasaki

4 files changed, 15 insertions, 77 deletions

diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index cd7fc1433bb..995da42f736 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2014/06/28 06:42:12 obache Exp $
+# $NetBSD: Makefile,v 1.40 2014/12/11 09:05:07 obache Exp $
 #
 
-DISTNAME=	milter-manager-2.0.4
+DISTNAME=	milter-manager-2.0.5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=milter-manager/}
 
@@ -26,6 +26,12 @@ CONFIGURE_ARGS+=	--with-ruby=${RUBY}
 CONFIGURE_ARGS+=	--enable-ruby-milter=${PREFIX}/${RUBY_VENDORLIB}
 CONFIGURE_ARGS+=	--with-bundled-ruby-glib2=no
 
+SUBST_CLASSES+=		libev_inc
+SUBST_STAGE.libev_inc=	pre-configure
+SUBST_MESSAGE.libev_inc=Adjust include path for libevent from pkgsrc.
+SUBST_FILES.libev_inc=	configure
+SUBST_SED.libev_inc=	's,/include/ev.h,/include/ev/ev.h,g'
+
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
@@ -77,10 +83,6 @@ BUILD_DEFS+=		MILTER_MANAGER_USER
 BUILD_DEFS+=		MILTER_MANAGER_GROUP
 BUILD_DEFS+=		MILTER_MANAGER_SOCKET_GROUP
 
-REPLACE_RUBY=		admin/public/dispatch.*
-REPLACE_RUBY+=		admin/script/*
-REPLACE_RUBY+=		admin/script/performance/*
-REPLACE_RUBY+=		admin/script/process/*
 REPLACE_RUBY+=		data/munin/milter_manager_
 REPLACE_RUBY+=		tool/milter-manager-log-analyzer
 REPLACE_RUBY+=		tool/milter-performance-check
diff --git a/mail/milter-manager/PLIST b/mail/milter-manager/PLIST
index 4573df14f3c..76f07ffc570 100644
--- a/mail/milter-manager/PLIST
+++ b/mail/milter-manager/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2014/06/28 06:42:12 obache Exp $
+@comment $NetBSD: PLIST,v 1.19 2014/12/11 09:05:07 obache Exp $
 bin/milter-manager-log-analyzer
 bin/milter-performance-check
 bin/milter-report-statistics
@@ -94,6 +94,7 @@ lib/milter-manager/binding/lib/milter/client/configuration.rb
 lib/milter-manager/binding/lib/milter/client/context-state.rb
 lib/milter-manager/binding/lib/milter/client/envelope-address.rb
 lib/milter-manager/binding/lib/milter/client/fallback-session.rb
+lib/milter-manager/binding/lib/milter/client/mail-transaction-shelf.rb
 lib/milter-manager/binding/lib/milter/client/session-context.rb
 lib/milter-manager/binding/lib/milter/client/session.rb
 lib/milter-manager/binding/lib/milter/client/testing.rb
@@ -115,6 +116,7 @@ lib/milter-manager/binding/lib/milter/manager/debian-init-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
+lib/milter-manager/binding/lib/milter/manager/file-reader.rb
 lib/milter-manager/binding/lib/milter/manager/freebsd-rc-detector.rb
 lib/milter-manager/binding/lib/milter/manager/init-detector.rb
 lib/milter-manager/binding/lib/milter/manager/milter-greylist-config-parser.rb
@@ -180,32 +182,9 @@ share/doc/milter-manager/install.html
 share/doc/milter-manager/introduction.html
 share/doc/milter-manager/ja/api-index-deprecated.xml
 share/doc/milter-manager/ja/api-index-full.xml
-share/doc/milter-manager/ja/available-milters.html
 share/doc/milter-manager/ja/client.xml
-share/doc/milter-manager/ja/commands.html
-share/doc/milter-manager/ja/configuration.html
 share/doc/milter-manager/ja/core.xml
-share/doc/milter-manager/ja/home.png
-share/doc/milter-manager/ja/index.html
-share/doc/milter-manager/ja/index.sgml
-share/doc/milter-manager/ja/install-options-to-centos.html
-share/doc/milter-manager/ja/install-options-to-debian.html
-share/doc/milter-manager/ja/install-options-to-freebsd.html
-share/doc/milter-manager/ja/install-options-to-ubuntu.html
-share/doc/milter-manager/ja/install-to-centos.html
-share/doc/milter-manager/ja/install-to-centos5.html
-share/doc/milter-manager/ja/install-to-debian.html
-share/doc/milter-manager/ja/install-to-freebsd.html
-share/doc/milter-manager/ja/install-to-others.html
-share/doc/milter-manager/ja/install-to-ubuntu.html
-share/doc/milter-manager/ja/install-to.html
-share/doc/milter-manager/ja/install.html
-share/doc/milter-manager/ja/introduction.html
-share/doc/milter-manager/ja/left-insensitive.png
-share/doc/milter-manager/ja/left.png
 share/doc/milter-manager/ja/libmilter-compatible.xml
-share/doc/milter-manager/ja/log-list.html
-share/doc/milter-manager/ja/maintenance-policy.html
 share/doc/milter-manager/ja/manager.xml
 share/doc/milter-manager/ja/mfapi.xml
 share/doc/milter-manager/ja/mfdef.xml
@@ -240,7 +219,6 @@ share/doc/milter-manager/ja/milter-manager-launch-command-encoder.xml
 share/doc/milter-manager/ja/milter-manager-launch-protocol.xml
 share/doc/milter-manager/ja/milter-manager-leader.xml
 share/doc/milter-manager/ja/milter-manager-log-analyzer-graphs.png
-share/doc/milter-manager/ja/milter-manager-log-analyzer.html
 share/doc/milter-manager/ja/milter-manager-module-impl.xml
 share/doc/milter-manager/ja/milter-manager-module.xml
 share/doc/milter-manager/ja/milter-manager-objects.xml
@@ -248,55 +226,26 @@ share/doc/milter-manager/ja/milter-manager-process-launcher.xml
 share/doc/milter-manager/ja/milter-manager-reply-decoder.xml
 share/doc/milter-manager/ja/milter-manager-reply-encoder.xml
 share/doc/milter-manager/ja/milter-manager-reply-protocol.xml
-share/doc/milter-manager/ja/milter-manager.devhelp2
-share/doc/milter-manager/ja/milter-manager.html
 share/doc/milter-manager/ja/milter-manager.xml
 share/doc/milter-manager/ja/milter-option.xml
-share/doc/milter-manager/ja/milter-performance-check.html
 share/doc/milter-manager/ja/milter-protocol-agent.xml
 share/doc/milter-manager/ja/milter-protocol.xml
 share/doc/milter-manager/ja/milter-reader.xml
 share/doc/milter-manager/ja/milter-reply-decoder.xml
 share/doc/milter-manager/ja/milter-reply-encoder.xml
 share/doc/milter-manager/ja/milter-reply-signals.xml
-share/doc/milter-manager/ja/milter-report-statistics.html
 share/doc/milter-manager/ja/milter-server-context.xml
 share/doc/milter-manager/ja/milter-server-enum-types.xml
 share/doc/milter-manager/ja/milter-syslog-logger.xml
-share/doc/milter-manager/ja/milter-test-client.html
-share/doc/milter-manager/ja/milter-test-server.html
 share/doc/milter-manager/ja/milter-utils.xml
 share/doc/milter-manager/ja/milter-version.xml
 share/doc/milter-manager/ja/milter-writer.xml
 share/doc/milter-manager/ja/mta-and-milter-manager-and-child-milter-ja.png
 share/doc/milter-manager/ja/mta-and-milter-manager-and-child-milter.png
-share/doc/milter-manager/ja/news.html
-share/doc/milter-manager/ja/readme.html
-share/doc/milter-manager/ja/reverse-dictionary.html
-share/doc/milter-manager/ja/right-insensitive.png
-share/doc/milter-manager/ja/right.png
-share/doc/milter-manager/ja/ruby-milter-configuration.html
-share/doc/milter-manager/ja/ruby-milter-reference.html
-share/doc/milter-manager/ja/ruby-milter-tutorial.html
-share/doc/milter-manager/ja/ruby.html
 share/doc/milter-manager/ja/sendmail-and-milter-ja.png
 share/doc/milter-manager/ja/sendmail-and-milter.png
 share/doc/milter-manager/ja/sendmail-and-postfix-and-milter-ja.png
 share/doc/milter-manager/ja/sendmail-and-postfix-and-milter.png
-share/doc/milter-manager/ja/start.html
-share/doc/milter-manager/ja/style.css
-share/doc/milter-manager/ja/up-insensitive.png
-share/doc/milter-manager/ja/up.png
-share/doc/milter-manager/ja/upgrade-on-centos.html
-share/doc/milter-manager/ja/upgrade-on-debian.html
-share/doc/milter-manager/ja/upgrade-on-freebsd.html
-share/doc/milter-manager/ja/upgrade-on-ubuntu.html
-share/doc/milter-manager/ja/upgrade-options-on-centos.html
-share/doc/milter-manager/ja/upgrade-options-on-debian.html
-share/doc/milter-manager/ja/upgrade-options-on-freebsd.html
-share/doc/milter-manager/ja/upgrade-options-on-ubuntu.html
-share/doc/milter-manager/ja/upgrade.html
-share/doc/milter-manager/ja/users.html
 share/doc/milter-manager/left-insensitive.png
 share/doc/milter-manager/left.png
 share/doc/milter-manager/log-list.html
diff --git a/mail/milter-manager/distinfo b/mail/milter-manager/distinfo
index 61c2a91a8ed..1582cd47f2d 100644
--- a/mail/milter-manager/distinfo
+++ b/mail/milter-manager/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2014/11/10 18:09:10 joerg Exp $
+$NetBSD: distinfo,v 1.26 2014/12/11 09:05:07 obache Exp $
 
-SHA1 (milter-manager-2.0.4.tar.gz) = 531613b8640e98f64fd086c98be6b3c5f521fd8c
-RMD160 (milter-manager-2.0.4.tar.gz) = 0dea0146b00db3f06126d0cf70c6c6c5624a0556
-Size (milter-manager-2.0.4.tar.gz) = 6628656 bytes
+SHA1 (milter-manager-2.0.5.tar.gz) = 47982e63d3515c1df3599c5e70b3aed9fd4662f6
+RMD160 (milter-manager-2.0.5.tar.gz) = c0d64c5001c42d49954f0bafdbc2c6d241ed3e70
+Size (milter-manager-2.0.5.tar.gz) = 5873997 bytes
 SHA1 (patch-configure) = ee1f31e83354c4c6b38ae1c0d4fda40f28ad92b6
 SHA1 (patch-libev-4.15_ev.c) = 8393cc727fda6a812931e42507e5db2fdf370c33
diff --git a/mail/milter-manager/patches/patch-libev-4.15_ev.c b/mail/milter-manager/patches/patch-libev-4.15_ev.c
deleted file mode 100644
index fa139679a77..00000000000
--- a/mail/milter-manager/patches/patch-libev-4.15_ev.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libev-4.15_ev.c,v 1.1 2014/11/10 18:09:11 joerg Exp $
-
---- libev-4.15/ev.c.orig	2014-11-10 11:47:48.000000000 +0000
-+++ libev-4.15/ev.c
-@@ -963,7 +963,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t
-   }
- #endif
- 
--#if ECB_GCC_VERSION(4,5)
-+#if ECB_GCC_VERSION(4,5) || defined(__clang__)
-   #define ecb_unreachable() __builtin_unreachable ()
- #else
-   /* this seems to work fine, but gcc always emits a warning for it :/ */