svn commit: r460171 - in head/mail/up-imapproxy: . files

[Danilo G. Baio]

Author: dbaio
Date: Sun Jan 28 13:09:08 2018
New Revision: 460171
URL: https://svnweb.freebsd.org/changeset/ports/460171

Log:
  mail/up-imapproxy: Add dovecot unconditionally in rcfile
  
  This helps users that are using default packages and installing
  dovecot manually in having the startup order correctly.
  
  While here, switch to options helper and reorder Makefile.
  
  PR:		225432
  Submitted by:	topical at gmx.net

Modified:
  head/mail/up-imapproxy/Makefile
  head/mail/up-imapproxy/files/imapproxyd.in

Modified: head/mail/up-imapproxy/Makefile
==============================================================================
--- head/mail/up-imapproxy/Makefile	Sun Jan 28 13:01:03 2018	(r460170)
+++ head/mail/up-imapproxy/Makefile	Sun Jan 28 13:09:08 2018	(r460171)
@@ -3,7 +3,7 @@
 
 PORTNAME=	imapproxy
 PORTVERSION=	1.2.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	SF/squirrelmail/imap_proxy/${PORTVERSION}
 PKGNAMEPREFIX=	up-
@@ -15,10 +15,13 @@ 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}
 
@@ -29,26 +32,17 @@ 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>

Modified: head/mail/up-imapproxy/files/imapproxyd.in
==============================================================================
--- head/mail/up-imapproxy/files/imapproxyd.in	Sun Jan 28 13:01:03 2018	(r460170)
+++ head/mail/up-imapproxy/files/imapproxyd.in	Sun Jan 28 13:09:08 2018	(r460171)
@@ -3,7 +3,7 @@
 # $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
 
 #