3 files changed, 6 insertions, 45 deletions
diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index d9acf664199..e5851cdbd4e 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2011/05/12 11:28:11 obache Exp $
+# $NetBSD: Makefile,v 1.16 2011/06/12 11:08:37 obache Exp $
 #
 
-DISTNAME=	milter-manager-1.6.9
-PKGREVISION=	1
+DISTNAME=	milter-manager-1.8.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=milter-manager/}
 
diff --git a/mail/milter-manager/distinfo b/mail/milter-manager/distinfo
index fcc8c22a92a..33e8fa858b2 100644
--- a/mail/milter-manager/distinfo
+++ b/mail/milter-manager/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.10 2011/05/12 11:28:11 obache Exp $
+$NetBSD: distinfo,v 1.11 2011/06/12 11:08:37 obache Exp $
 
-SHA1 (milter-manager-1.6.9.tar.gz) = 3c02897fa9808f8c6c4ad71c7d3d96375a8a5dc7
-RMD160 (milter-manager-1.6.9.tar.gz) = e059910ccfc93e9dd7d2dd7e0cec5a4a65fbeef0
-Size (milter-manager-1.6.9.tar.gz) = 6842567 bytes
-SHA1 (patch-milter_manager_milter-manager-main.c) = 4b2f7bc16b8de17fbf100e45c68689a11d41ad44
+SHA1 (milter-manager-1.8.0.tar.gz) = 2d77036fa96394e92e3c125eaee273b27a52e7fe
+RMD160 (milter-manager-1.8.0.tar.gz) = 24b0890aa4f8cc9ff2989ec5819b1128fedc425e
+Size (milter-manager-1.8.0.tar.gz) = 7025668 bytes
diff --git a/mail/milter-manager/patches/patch-milter_manager_milter-manager-main.c b/mail/milter-manager/patches/patch-milter_manager_milter-manager-main.c
deleted file mode 100644
index 3815073f674..00000000000
--- a/mail/milter-manager/patches/patch-milter_manager_milter-manager-main.c
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-milter_manager_milter-manager-main.c,v 1.1 2011/05/12 11:28:11 obache Exp $
-
-[manager][process-launcher] fix a bug that process launcher isn't quitted.
-https://github.com/milter-manager/milter-manager/commit/6803264e130cb562f972d57ae9d2fcd6e51310fd
-
---- milter/manager/milter-manager-main.c.orig	2011-04-03 01:56:52.000000000 +0000
-+++ milter/manager/milter-manager-main.c
-@@ -315,6 +315,16 @@ prepare_process_launcher_pipes_for_manag
-     *read_channel = create_read_io_channel(reply_pipe[MILTER_UTILS_READ_PIPE]);
- }
- 
-+static void
-+cb_launcher_finished (MilterFinishedEmittable *emittable,
-+                      gpointer user_data)
-+{
-+    MilterManagerProcessLauncher *launcher;
-+
-+    launcher = MILTER_MANAGER_PROCESS_LAUNCHER(emittable);
-+    milter_manager_process_launcher_shutdown(launcher);
-+}
-+
- static gboolean
- start_process_launcher (GIOChannel *read_channel, GIOChannel *write_channel,
-                         gboolean daemon)
-@@ -360,8 +370,11 @@ start_process_launcher (GIOChannel *read
-         success = FALSE;
-     }
- 
--    if (success)
-+    if (success) {
-+        g_signal_connect(launcher, "finished",
-+                         G_CALLBACK(cb_launcher_finished), NULL);
-         milter_manager_process_launcher_run(launcher);
-+    }
- 
-     g_object_unref(launcher);
-