From 5b9b5b7b87d4ad636a93e88719fcb49cfbee2532 Mon Sep 17 00:00:00 2001 From: John Marino Date: Thu, 7 Aug 2014 08:17:15 +0000 Subject: [PATCH] mail/milter-manager: Upgrade version 1.8.6 => 2.0.4 and stage PR: 192344 Submitted by: fullermd (over-yonder.net) tweaked by: marino --- mail/milter-manager/Makefile | 22 ++---- mail/milter-manager/distinfo | 4 +- mail/milter-manager/files/milter-manager.in | 4 +- mail/milter-manager/pkg-descr | 2 +- mail/milter-manager/pkg-plist | 88 +++++++++++++-------- 5 files changed, 70 insertions(+), 50 deletions(-) diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile index a9da4d49191b..00dead5fee3d 100644 --- a/mail/milter-manager/Makefile +++ b/mail/milter-manager/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= milter-manager -PORTVERSION= 1.8.6 +PORTVERSION= 2.0.4 CATEGORIES= mail ruby MASTER_SITES= SF/${PORTNAME}/${PORTNAME:S/-/%20/}/${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Super milter that can invoke several milters selectively LICENSE= AGPLv3 GFDL GPLv3 LGPL3 @@ -22,35 +22,29 @@ MAKE_ARGS+= pkgconfigdir=${PREFIX}/libdata/pkgconfig CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ --with-libev \ LDFLAGS="-L${LOCALBASE}/lib -lintl" -USES= gmake pkgconfig +USES= gmake pkgconfig libtool USE_GNOME= glib20 intltool USE_LDCONFIG= yes USE_RUBY= yes +INSTALL_TARGET= install-strip -NO_STAGE= yes - -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS EXAMPLES .include -MANLANG= "" ja -MAN1= milter-manager-log-analyzer.1 milter-manager.1 milter-performance-check.1 \ - milter-report-statistics.1 milter-test-client.1 milter-test-server.1 +MANLANG= "" ja PORTDOCS= * PORTEXAMPLES= * -PORTDATA= * .if ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+=--with-html-dir=${DOCSDIR} .else CONFIGURE_ARGS+=--with-html-dir=${WRKDIR}/doc .endif -.ifdef NOPORTEXAMPLES + +.if ! ${PORT_OPTIONS:MEXAMPLES} EXAMPLESDIR= ${WRKDIR}/examples .endif -.ifdef NOPORTDATA -DATADIR= ${WRKDIR}/data -.endif post-patch: ${FIND} ${WRKSRC} -type f -name Makefile.in -exec \ diff --git a/mail/milter-manager/distinfo b/mail/milter-manager/distinfo index 72a8518b7fa1..d0ef52c7f098 100644 --- a/mail/milter-manager/distinfo +++ b/mail/milter-manager/distinfo @@ -1,2 +1,2 @@ -SHA256 (milter-manager-1.8.6.tar.gz) = 1517a4d3d0c97459fe92dd262639a2c0cefbd4945323ec825b1227be2f835a45 -SIZE (milter-manager-1.8.6.tar.gz) = 7361160 +SHA256 (milter-manager-2.0.4.tar.gz) = 0ce72ee020cf2167bd72ef28d537cbf1cb9df2fc42cd0fb5262b2ed1637aaba0 +SIZE (milter-manager-2.0.4.tar.gz) = 6628656 diff --git a/mail/milter-manager/files/milter-manager.in b/mail/milter-manager/files/milter-manager.in index 271922cc1023..19ba694bf9aa 100644 --- a/mail/milter-manager/files/milter-manager.in +++ b/mail/milter-manager/files/milter-manager.in @@ -80,7 +80,7 @@ if [ -n "$2" ]; then command_args="${command_args} --group-name ${miltermanager_gid}" fi if [ -n "${miltermanager_socket_gid}" ] ; then - command_args="${command_args} --socket-group-name ${miltermanager_socket_gid}" + command_args="${command_args} --unix-socket-group ${miltermanager_socket_gid}" fi if [ -n "${miltermanager_socket}" ] ; then command_args="${command_args} --connection-spec ${miltermanager_socket}" @@ -119,7 +119,7 @@ else command_args="${command_args} --group-name ${miltermanager_gid}" fi if [ -n "${miltermanager_socket_gid}" ] ; then - command_args="${command_args} --socket-group-name ${miltermanager_socket_gid}" + command_args="${command_args} --unix-socket-group ${miltermanager_socket_gid}" fi if [ -n "${miltermanager_socket}" ] ; then command_args="${command_args} --connection-spec ${miltermanager_socket}" diff --git a/mail/milter-manager/pkg-descr b/mail/milter-manager/pkg-descr index 0395066dcdc9..6c072aeb18cd 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: http://milter-manager.sourceforge.net/ diff --git a/mail/milter-manager/pkg-plist b/mail/milter-manager/pkg-plist index 46201a9c1876..c99a85178527 100644 --- a/mail/milter-manager/pkg-plist +++ b/mail/milter-manager/pkg-plist @@ -88,25 +88,21 @@ include/milter-manager/milter/manager/milter-manager.h include/milter-manager/milter/server.h include/milter-manager/milter/server/milter-server-context.h include/milter-manager/milter/server/milter-server-enum-types.h -lib/libmilter-client.la lib/libmilter-client.so lib/libmilter-client.so.0 -lib/libmilter-core.la +lib/libmilter-client.so.0.0.0 lib/libmilter-core.so lib/libmilter-core.so.0 -lib/libmilter-manager.la +lib/libmilter-core.so.0.0.0 lib/libmilter-manager.so lib/libmilter-manager.so.0 -lib/libmilter-server.la +lib/libmilter-manager.so.0.0.0 lib/libmilter-server.so lib/libmilter-server.so.0 -lib/milter-manager/binding/ext/milter_client.la +lib/libmilter-server.so.0.0.0 lib/milter-manager/binding/ext/milter_client.so -lib/milter-manager/binding/ext/milter_core.la lib/milter-manager/binding/ext/milter_core.so -lib/milter-manager/binding/ext/milter_manager.la lib/milter-manager/binding/ext/milter_manager.so -lib/milter-manager/binding/ext/milter_server.la lib/milter-manager/binding/ext/milter_server.so lib/milter-manager/binding/ext/rb-milter-client.h lib/milter-manager/binding/ext/rb-milter-core.h @@ -116,6 +112,12 @@ lib/milter-manager/binding/lib/milter/client.rb lib/milter-manager/binding/lib/milter/client/command-line.rb lib/milter-manager/binding/lib/milter/client/composite-session.rb 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/session-context.rb +lib/milter-manager/binding/lib/milter/client/session.rb +lib/milter-manager/binding/lib/milter/client/testing.rb lib/milter-manager/binding/lib/milter/core.rb lib/milter-manager/binding/lib/milter/core/callback.rb lib/milter-manager/binding/lib/milter/core/compatible.rb @@ -150,38 +152,62 @@ lib/milter-manager/binding/lib/milter/manager/redhat-init-detector.rb lib/milter-manager/binding/lib/milter/manager/redhat-upstart-detector.rb lib/milter-manager/binding/lib/milter/server.rb lib/milter-manager/binding/lib/milter/server/testing.rb -lib/milter-manager/libmilter.la lib/milter-manager/libmilter.so lib/milter-manager/libmilter.so.1 -lib/milter-manager/module/configuration/milter-manager-ruby-configuration.la +lib/milter-manager/libmilter.so.1.0.1 lib/milter-manager/module/configuration/milter-manager-ruby-configuration.so libdata/pkgconfig/libmilter.pc libdata/pkgconfig/milter-client.pc libdata/pkgconfig/milter-core.pc libdata/pkgconfig/milter-manager.pc libdata/pkgconfig/milter-server.pc +man/ja/man1/milter-manager-log-analyzer.1.gz +man/ja/man1/milter-manager.1.gz +man/ja/man1/milter-performance-check.1.gz +man/ja/man1/milter-report-statistics.1.gz +man/ja/man1/milter-test-client.1.gz +man/ja/man1/milter-test-server.1.gz +man/man1/milter-manager-log-analyzer.1.gz +man/man1/milter-manager.1.gz +man/man1/milter-performance-check.1.gz +man/man1/milter-report-statistics.1.gz +man/man1/milter-test-client.1.gz +man/man1/milter-test-server.1.gz sbin/milter-manager -@dirrm lib/milter-manager/module/configuration -@dirrm lib/milter-manager/module -@dirrm lib/milter-manager/binding/lib/milter/server -@dirrm lib/milter-manager/binding/lib/milter/manager -@dirrm lib/milter-manager/binding/lib/milter/core -@dirrm lib/milter-manager/binding/lib/milter/client -@dirrm lib/milter-manager/binding/lib/milter -@dirrm lib/milter-manager/binding/lib -@dirrm lib/milter-manager/binding/ext -@dirrm lib/milter-manager/binding -@dirrm lib/milter-manager -@dirrm include/milter-manager/milter/server -@dirrm include/milter-manager/milter/manager -@dirrm include/milter-manager/milter/core -@dirrm include/milter-manager/milter/client -@dirrm include/milter-manager/milter +%%DATADIR%%/license/fdl.txt +%%DATADIR%%/license/gpl.txt +%%DATADIR%%/license/lgpl.txt +%%DATADIR%%/license/ruby.ja.txt +%%DATADIR%%/license/ruby.txt +%%DATADIR%%/munin/plugins/milter_manager_ +%%DATADIR%%/munin/plugins/milter_manager_memory +%%DATADIR%%/munin/plugins/postfix_processes +%%DATADIR%%/munin/plugins/sendmail_processes +@dirrmtry etc/cron.d +@dirrm %%ETCDIR%%/applicable-conditions +@dirrm %%ETCDIR%%/defaults +@dirrm %%ETCDIR%%/models +@dirrmtry %%ETCDIR%% @dirrm include/milter-manager/libmilter/libmilter @dirrm include/milter-manager/libmilter +@dirrm include/milter-manager/milter/client +@dirrm include/milter-manager/milter/core +@dirrm include/milter-manager/milter/manager +@dirrm include/milter-manager/milter/server +@dirrm include/milter-manager/milter @dirrm include/milter-manager -@dirrm %%ETCDIR%%/models -@dirrm %%ETCDIR%%/defaults -@dirrm %%ETCDIR%%/applicable-conditions -@dirrmtry %%ETCDIR%% -@dirrmtry etc/cron.d +@dirrm lib/milter-manager/binding/ext +@dirrm lib/milter-manager/binding/lib/milter/client +@dirrm lib/milter-manager/binding/lib/milter/core +@dirrm lib/milter-manager/binding/lib/milter/manager +@dirrm lib/milter-manager/binding/lib/milter/server +@dirrm lib/milter-manager/binding/lib/milter +@dirrm lib/milter-manager/binding/lib +@dirrm lib/milter-manager/binding +@dirrm lib/milter-manager/module/configuration +@dirrm lib/milter-manager/module +@dirrm lib/milter-manager +@dirrm %%DATADIR%%/license +@dirrm %%DATADIR%%/munin/plugins +@dirrm %%DATADIR%%/munin +@dirrm %%DATADIR%%