3 files changed, 108 insertions, 0 deletions

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
new file mode 100644
index 000000000000..2c52259b31c6
--- /dev/null
+++ b/mail/milter-manager/files/patch-binding_ruby_test_run-test.sh
@@ -0,0 +1,8 @@
+--- ./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
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright (C) 2011  Kouhei Sutou <kou@clear-code.com>
+ #
diff --git a/mail/milter-manager/files/patch-configure b/mail/milter-manager/files/patch-configure
new file mode 100644
index 000000000000..a4e954ac1dd7
--- /dev/null
+++ b/mail/milter-manager/files/patch-configure
@@ -0,0 +1,53 @@
+--- ./configure.orig	2011-06-10 21:06:55.900306000 +0900
++++ ./configure	2011-06-16 20:04:32.000000000 +0900
+@@ -657,6 +657,7 @@
+ LIBEV_LIBS
+ LIBEV_LA
+ LIBEV_CFLAGS
++LIBEV_INCLUDES
+ WITH_LIBEV_FALSE
+ WITH_LIBEV_TRUE
+ GETTEXT_PACKAGE
+@@ -15573,6 +15574,7 @@
+ 
+ libev_available=no
+ 
++LIBEV_CFLAGS='-DEV_COMPAT3=0'
+ 
+ # Check whether --with-libev was given.
+ if test "${with_libev+set}" = set; then :
+@@ -15590,7 +15592,7 @@
+     libev_prefixes="$with_libev"
+   fi
+   for libev_prefix in $libev_prefixes; do
+-    CFLAGS="$CFLAGS -I$libev_prefix/include"
++    CFLAGS="$CFLAGS -I$libev_prefix/include ${LIBEV_CFLAGS}"
+     LDFLAGS="$LDFLAGS -L$libev_prefix/lib"
+     libev_available=no
+     for ac_header in ev.h
+@@ -15668,7 +15670,7 @@
+     CFLAGS="$_SAVE_CFLAGS"
+     LDFLAGS="$_SAVE_LDFLAGS"
+     if test "x$libev_available" != "xno"; then
+-      LIBEV_CFLAGS="-I$libev_prefix/include"
++      LIBEV_INCLUDES="-I$libev_prefix/include"
+       LIBEV_LA=""
+       LIBEV_LIBS="-L$libev_prefix/lib -lev"
+       break
+@@ -15933,7 +15935,7 @@
+ 
+ $as_echo "#define HAVE_LIBEV 1" >>confdefs.h
+ 
+-    LIBEV_CFLAGS='-I$(top_srcdir)/libev-'4.04
++    LIBEV_INCLUDES='-I$(top_srcdir)/libev-'4.04
+     LIBEV_LA='$(top_builddir)/libev-'4.04'/libev.la'
+     LIBEV_LIBS='$(LIBEV_LA)'
+   fi
+@@ -15954,6 +15956,7 @@
+ 
+ 
+ 
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking package-platform" >&5
+ $as_echo_n "checking package-platform... " >&6; }
+ 
diff --git a/mail/milter-manager/files/patch-milter_core_Makefile.in b/mail/milter-manager/files/patch-milter_core_Makefile.in
new file mode 100644
index 000000000000..5e50815e7b55
--- /dev/null
+++ b/mail/milter-manager/files/patch-milter_core_Makefile.in
@@ -0,0 +1,47 @@
+--- ./milter/core/Makefile.in.orig	2011-06-10 21:06:53.564370000 +0900
++++ ./milter/core/Makefile.in	2011-06-16 20:04:32.000000000 +0900
+@@ -42,10 +42,8 @@
+ @WITH_LIBEV_TRUE@am__append_1 = milter-libev-event-loop.c
+ @WITH_LIBEV_TRUE@am__append_2 = $(LIBEV_LA)
+ @WITH_LIBEV_TRUE@am__append_3 = $(LIBEV_LIBS)
+-@WITH_LIBEV_TRUE@am__append_4 = \
+-@WITH_LIBEV_TRUE@	$(LIBEV_CFLAGS)				\
+-@WITH_LIBEV_TRUE@	-DEV_COMPAT3=0
+-
++@WITH_LIBEV_TRUE@am__append_4 = $(LIBEV_CFLAGS)
++@WITH_LIBEV_TRUE@am__append_5 = $(LIBEV_INCLUDES)
+ DIST_COMMON = $(milter_core_include_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/milter-version.h.in \
+ 	$(top_srcdir)/build/enum-types.mk \
+@@ -243,6 +241,7 @@
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBEV_CFLAGS = @LIBEV_CFLAGS@
++LIBEV_INCLUDES = @LIBEV_INCLUDES@
+ LIBEV_LA = @LIBEV_LA@
+ LIBEV_LIBS = @LIBEV_LIBS@
+ LIBMILTER_LT_AGE = @LIBMILTER_LT_AGE@
+@@ -409,10 +408,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-INCLUDES = \
+-	 -I$(top_builddir)	\
+-	 -I$(top_srcdir)
+-
++INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(am__append_5)
+ AM_CFLAGS = \
+ 	-DLOCALEDIR=\""$(localedir)"\"		\
+ 	-DMILTER_LOG_DOMAIN=\""milter-core"\"	\
+@@ -505,9 +501,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign milter/core/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu milter/core/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign milter/core/Makefile
++	  $(AUTOMAKE) --gnu milter/core/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \