- Update to 1.4.0

PR:		ports/139668
Submitted by:	Sahil Tandon <sahil@tandon.net>
Approved by:	Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)

4 files changed, 22 insertions, 20 deletions

diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index 4c38b4a5cc43..501bf418eeb4 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	milter-manager
-PORTVERSION=	1.2.0
+PORTVERSION=	1.4.0
 CATEGORIES=	mail ruby
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME:S/-/%20/}/${PORTVERSION}
 
@@ -14,10 +14,11 @@ MAINTAINER=	umq@ueo.co.jp
 COMMENT=	A super milter that can invoke several milters selectively
 
 BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RC_SUBR=	milter-manager
 GNU_CONFIGURE=	yes
+MAKE_ARGS+=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 USE_GMAKE=	yes
@@ -38,10 +39,8 @@ USE_RUBY=	yes
 #USE_RUBY_FEATURES=	iconv
 #.endif
 
-SUB_FILES=	milter-manager
 MANLANG=	"" ja
 MAN1=		milter-manager-log-analyzer.1 milter-manager.1 milter-performance-check.1 \
 		milter-test-client.1 milter-test-server.1
-MANCOMPRESSED=	no
 
 .include <bsd.port.mk>
diff --git a/mail/milter-manager/distinfo b/mail/milter-manager/distinfo
index 2c084d81493a..746cfd6684ec 100644
--- a/mail/milter-manager/distinfo
+++ b/mail/milter-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (milter-manager-1.2.0.tar.gz) = 83cbd428a9d8fd154e9d484eafe761d0
-SHA256 (milter-manager-1.2.0.tar.gz) = 4bfb1389c1402e746b674f50d1b3b68f5659d36fbbb26e1a567649a60fac7856
-SIZE (milter-manager-1.2.0.tar.gz) = 5675789
+MD5 (milter-manager-1.4.0.tar.gz) = 58147aadde27fe1029656ec396f5c7f6
+SHA256 (milter-manager-1.4.0.tar.gz) = f932448bf7ed3e0ae8f899109fceeb20ccb0bfa0d944b5a1771ef6eb469c9e01
+SIZE (milter-manager-1.4.0.tar.gz) = 5791207
diff --git a/mail/milter-manager/files/patch-Makefile.in b/mail/milter-manager/files/patch-Makefile.in
deleted file mode 100644
index 6c87aea9d863..000000000000
--- a/mail/milter-manager/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.in.orig	2009-05-14 10:23:16.000000000 +0900
-+++ ./Makefile.in	2009-05-18 01:12:30.000000000 +0900
-@@ -301,7 +301,7 @@
- 	html		\
- 	license
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = \
- 	milter-core.pc				\
- 	milter-client.pc			\
diff --git a/mail/milter-manager/pkg-plist b/mail/milter-manager/pkg-plist
index b10c523412ae..67c1e0c7c749 100644
--- a/mail/milter-manager/pkg-plist
+++ b/mail/milter-manager/pkg-plist
@@ -40,6 +40,7 @@ include/milter-manager/milter/core/milter-finished-emittable.h
 include/milter-manager/milter/core/milter-headers.h
 include/milter-manager/milter/core/milter-logger.h
 include/milter-manager/milter/core/milter-macros-requests.h
+include/milter-manager/milter/core/milter-message-result.h
 include/milter-manager/milter/core/milter-option.h
 include/milter-manager/milter/core/milter-protocol-agent.h
 include/milter-manager/milter/core/milter-protocol.h
@@ -97,16 +98,18 @@ lib/milter-manager/binding/ext/milter_manager.so
 lib/milter-manager/binding/ext/milter_toolkit.la
 lib/milter-manager/binding/ext/milter_toolkit.so
 lib/milter-manager/binding/lib/milter.rb
+lib/milter-manager/binding/lib/milter/client.rb
 lib/milter-manager/binding/lib/milter/compatible.rb
 lib/milter-manager/binding/lib/milter/manager.rb
 lib/milter-manager/binding/lib/milter/manager/child-context.rb
-lib/milter-manager/binding/lib/milter/manager/clamav-milter-socket-detector.rb
+lib/milter-manager/binding/lib/milter/manager/clamav-milter-config-parser.rb
 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/freebsd-rc-detector.rb
 lib/milter-manager/binding/lib/milter/manager/init-detector.rb
-lib/milter-manager/binding/lib/milter/manager/milter-greylist-socket-detector.rb
+lib/milter-manager/binding/lib/milter/manager/milter-greylist-config-parser.rb
+lib/milter-manager/binding/lib/milter/manager/opendkim-config-parser.rb
 lib/milter-manager/binding/lib/milter/manager/pkgsrc-rc-detector.rb
 lib/milter-manager/binding/lib/milter/manager/rcng-detector.rb
 lib/milter-manager/binding/lib/milter/manager/redhat-detector.rb
@@ -130,6 +133,11 @@ share/gtk-doc/html/milter-manager/home.png
 share/gtk-doc/html/milter-manager/index.html
 share/gtk-doc/html/milter-manager/index.sgml
 share/gtk-doc/html/milter-manager/install-options-to-centos.html
+share/gtk-doc/html/milter-manager/install-options-to-debian.html
+share/gtk-doc/html/milter-manager/install-to-debian.html
+share/gtk-doc/html/milter-manager/upgrade-on-debian.html
+share/gtk-doc/html/milter-manager/upgrade-options-on-debian.html
+share/gtk-doc/html/milter-manager/users.html
 share/gtk-doc/html/milter-manager/install-options-to-freebsd.html
 share/gtk-doc/html/milter-manager/install-options-to-ubuntu.html
 share/gtk-doc/html/milter-manager/install-to-centos.html
@@ -149,6 +157,11 @@ share/gtk-doc/html/milter-manager/ja/home.png
 share/gtk-doc/html/milter-manager/ja/index.html
 share/gtk-doc/html/milter-manager/ja/index.sgml
 share/gtk-doc/html/milter-manager/ja/install-options-to-centos.html
+share/gtk-doc/html/milter-manager/ja/install-options-to-debian.html
+share/gtk-doc/html/milter-manager/ja/install-to-debian.html
+share/gtk-doc/html/milter-manager/ja/upgrade-on-debian.html
+share/gtk-doc/html/milter-manager/ja/upgrade-options-on-debian.html
+share/gtk-doc/html/milter-manager/ja/users.html
 share/gtk-doc/html/milter-manager/ja/install-options-to-freebsd.html
 share/gtk-doc/html/milter-manager/ja/install-options-to-ubuntu.html
 share/gtk-doc/html/milter-manager/ja/install-to-centos.html
@@ -352,6 +365,7 @@ share/milter-manager/admin/db/migrate/20081216130836_add_user_name_to_milters.rb
 share/milter-manager/admin/db/migrate/20090107013320_add_command_options_to_milters.rb
 share/milter-manager/admin/db/migrate/20090116065917_create_users.rb
 share/milter-manager/admin/db/migrate/20090512123747_add_fallback_status_to_milters.rb
+share/milter-manager/admin/db/migrate/20090826132057_add_evaluation_mode_to_milters.rb
 share/milter-manager/admin/doc/README_FOR_APP
 share/milter-manager/admin/lib/authenticated_system.rb
 share/milter-manager/admin/lib/authenticated_test_helper.rb