From 1d292365744ab9ba5e1f642ad172bdc0915189a9 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 13 Oct 2014 13:54:30 +0200
Subject: [PATCH] dovecot: added runit service.

---
 srcpkgs/dovecot/files/dovecot/run |  3 +++
 srcpkgs/dovecot/template          | 13 ++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100755 srcpkgs/dovecot/files/dovecot/run

diff --git a/srcpkgs/dovecot/files/dovecot/run b/srcpkgs/dovecot/files/dovecot/run
new file mode 100755
index 00000000000..c3485096af9
--- /dev/null
+++ b/srcpkgs/dovecot/files/dovecot/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+install -d -m 0755 -o root -g root /var/run/dovecot
+exec dovecot -F
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index f7e7be94c32..8b67dbf7521 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,14 +1,14 @@
 # Template file for 'dovecot'
 pkgname=dovecot
 version=2.2.13
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-nss --with-pam --with-mysql --with-pgsql
  --with-sqlite --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --with-libcap --with-solr --with-docs
- --with-systemdsystemunitdir=/usr/lib/systemd/system"
+ $(vopt_if systemd --with-systemdsystemunitdir=/usr/lib/systemd/system)"
 short_desc="IMAP and POP3 server written with security primarily in mind"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
@@ -46,7 +46,8 @@ fi
 
 # For SSL support.
 depends="virtual?openssl"
-systemd_services="dovecot.service true"
+replaces="runit-void<20141013_2"
+build_options="systemd"
 system_accounts="dovecot dovenull"
 dovecot_homedir="/var/chroot"
 dovenull_homedir="/var/chroot"
@@ -93,6 +94,8 @@ post_install() {
 	# Remove development stuff.
 	rm -rf ${DESTDIR}/usr/include
 	rm -rf ${DESTDIR}/usr/share/aclocal
+
+	vsv dovecot
 }
 
 dovecot-plugin-ldap_package() {
@@ -105,7 +108,6 @@ dovecot-plugin-ldap_package() {
 		vmove etc/dovecot/conf.d/auth-ldap.conf.ext
 	}
 }
-
 dovecot-plugin-lucene_package() {
 	depends="dovecot>=${version}"
 	short_desc+=" - Full Text Search plugin (Lucene)"
@@ -114,7 +116,6 @@ dovecot-plugin-lucene_package() {
 		vmove usr/lib/dovecot/modules/lib21_fts_lucene_plugin.so
 	}
 }
-
 dovecot-plugin-mysql_package() {
 	depends="dovecot>=${version}"
 	short_desc+=" - MySQL plugin"
@@ -124,7 +125,6 @@ dovecot-plugin-mysql_package() {
 		vmove usr/lib/dovecot/modules/libdriver_mysql.so
 	}
 }
-
 dovecot-plugin-pgsql_package() {
 	depends="dovecot>=${version}"
 	short_desc+=" - PostgreSQL plugin"
@@ -134,7 +134,6 @@ dovecot-plugin-pgsql_package() {
 		vmove usr/lib/dovecot/modules/libdriver_pgsql.so
 	}
 }
-
 dovecot-plugin-sqlite_package() {
 	depends="dovecot>=${version}"
 	short_desc+=" - SQLite plugin"