Index: head/mail/up-imapproxy/Makefile
===================================================================
--- head/mail/up-imapproxy/Makefile	(revision 460170)
+++ head/mail/up-imapproxy/Makefile	(revision 460171)
@@ -1,54 +1,48 @@
 # Created by: Martin Blapp
 # $FreeBSD$
 
 PORTNAME=	imapproxy
 PORTVERSION=	1.2.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	SF/squirrelmail/imap_proxy/${PORTVERSION}
 PKGNAMEPREFIX=	up-
 DISTNAME=	squirrelmail-imap_proxy-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Caching IMAP proxy server
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		autoreconf tar:bzip2 ncurses pathfix ssl
+
 OPTIONS_DEFINE=	DOVECOT DOCS
+
 DOVECOT_DESC=	Use with dovecot2
+DOVECOT_RUN_DEPENDS=	dovecot:mail/dovecot
 
-USES=		autoreconf tar:bzip2 ncurses pathfix ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE}
 
 USE_RC_SUBR=	imapproxyd
 
 SUB_FILES=	pkg-message
 
 DOCS=		ChangeLog README README.debian README.known_issues README.ssl
 SBIN=		in.imapproxyd pimpstat
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOVECOT}
-SUB_LIST+=	DOVECOT="dovecot"
-RUN_DEPENDS+=	dovecot:mail/dovecot
-.else
-SUB_LIST+=	DOVECOT=""
-.endif
-
 do-install:
 .for i in ${SBIN}
 	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/sbin)
 .endfor
 	(cd ${WRKSRC}/scripts && ${INSTALL_DATA} imapproxy.conf \
 		${STAGEDIR}${PREFIX}/etc/imapproxyd.conf.sample)
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
 .endfor
-.endif
 
 .include <bsd.port.mk>
Index: head/mail/up-imapproxy/files/imapproxyd.in
===================================================================
--- head/mail/up-imapproxy/files/imapproxyd.in	(revision 460170)
+++ head/mail/up-imapproxy/files/imapproxyd.in	(revision 460171)
@@ -1,30 +1,30 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: imapproxyd
-# REQUIRE: DAEMON courier_imap_imapd courier_imap_imapd_ssl cyrus_imapd inetd %%DOVECOT%%
+# REQUIRE: DAEMON courier_imap_imapd courier_imap_imapd_ssl cyrus_imapd dovecot inetd
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable imapproxyd:
 #
 # imapproxyd_enable (bool):	Set "YES" to enable imapproxyd
 #				Default is "NO"
 # imapproxyd_conf (file):	Set location of conf file.
 #				Default is "%%PREFIX%%/etc/imapproxyd.conf"
 
 . /etc/rc.subr
 
 name=imapproxyd
 rcvar=imapproxyd_enable
 
 load_rc_config $name
 
 : ${imapproxyd_enable="NO"}
 : ${imapproxyd_conf="%%PREFIX%%/etc/imapproxyd.conf"}
 
 command=%%PREFIX%%/sbin/in.imapproxyd
 required_files="${imapproxyd_conf}"
 
 run_rc_command "$1"