3 files changed, 40 insertions, 21 deletions

diff --git a/mail/dovecot-devel/files/dovecot.sh b/mail/dovecot-devel/files/dovecot.sh
new file mode 100644
index 000000000000..42d116395a8d
--- /dev/null
+++ b/mail/dovecot-devel/files/dovecot.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: dovecot
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable dovecot:
+#
+#dovecot_enable="YES"
+#
+dovecot_enable="NO"
+
+. %%RC_SUBR%%
+
+name=dovecot
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/${name}
+required_files=%%PREFIX%%/etc/${name}.conf
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/mail/dovecot-devel/files/dovecot.sh.sample b/mail/dovecot-devel/files/dovecot.sh.sample
deleted file mode 100644
index e7c235c8d43a..000000000000
--- a/mail/dovecot-devel/files/dovecot.sh.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $(realpath $(dirname $0)) : "\(.*\)/etc/rc\.d\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-	[ -x ${PREFIX}/sbin/dovecot ] && \
-		${PREFIX}/sbin/dovecot && echo -n ' dovecot'
-	;;
-stop)
-	/usr/bin/killall dovecot && echo -n ' dovecot'
-	;;
-*)
-	echo "Usage: `basename $0` { start | stop }" >&2
-	;;
-esac
-
-exit 0
diff --git a/mail/dovecot-devel/files/patch-network.c b/mail/dovecot-devel/files/patch-network.c
new file mode 100644
index 000000000000..2a133c381eb0
--- /dev/null
+++ b/mail/dovecot-devel/files/patch-network.c
@@ -0,0 +1,14 @@
+--- src/lib/network.c.orig	Sun Jun 22 23:09:48 2003
++++ src/lib/network.c	Sun Jan 25 20:22:17 2004
+@@ -591,7 +591,11 @@
+ int net_hosterror_notfound(int error)
+ {
+ #ifdef HAVE_IPV6
++#ifdef EAI_NODATA
+ 	return error != 1 && (error == EAI_NONAME || error == EAI_NODATA);
++#else
++	return error != 1 && (error == EAI_NONAME);
++#endif
+ #else
+ 	return error == HOST_NOT_FOUND || error == NO_ADDRESS;
+ #endif