From owner-svn-ports-all@freebsd.org Sun Jan 28 13:09:09 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 270B0EC5446; Sun, 28 Jan 2018 13:09:09 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C56517A200; Sun, 28 Jan 2018 13:09:08 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A61DA1A08F; Sun, 28 Jan 2018 13:09:08 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0SD98AO097280; Sun, 28 Jan 2018 13:09:08 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0SD98WN097278; Sun, 28 Jan 2018 13:09:08 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201801281309.w0SD98WN097278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Sun, 28 Jan 2018 13:09:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460171 - in head/mail/up-imapproxy: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: in head/mail/up-imapproxy: . files X-SVN-Commit-Revision: 460171 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Jan 2018 13:09:09 -0000 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@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 - -.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 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 #