From owner-svn-ports-all@FreeBSD.ORG Mon Jun 30 10:19:17 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C22D188; Mon, 30 Jun 2014 10:19:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 295842594; Mon, 30 Jun 2014 10:19:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5UAJG9F006731; Mon, 30 Jun 2014 10:19:16 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5UAJGST006728; Mon, 30 Jun 2014 10:19:16 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201406301019.s5UAJGST006728@svn.freebsd.org> From: Rene Ladan Date: Mon, 30 Jun 2014 10:19:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359820 - head/mail/websieve X-SVN-Group: ports-head 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.18 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: Mon, 30 Jun 2014 10:19:17 -0000 Author: rene Date: Mon Jun 30 10:19:16 2014 New Revision: 359820 URL: http://svnweb.freebsd.org/changeset/ports/359820 QAT: https://qat.redports.org/buildarchive/r359820/ Log: - Remove optional dependencies on expired Cyrus 2.1 / 2.2 - Stage support - Fix runtime dependencies - Use @sample - Unmute installation commands - Bump PORTREVISION Modified: head/mail/websieve/Makefile head/mail/websieve/pkg-plist Modified: head/mail/websieve/Makefile ============================================================================== --- head/mail/websieve/Makefile Mon Jun 30 10:14:58 2014 (r359819) +++ head/mail/websieve/Makefile Mon Jun 30 10:19:16 2014 (r359820) @@ -3,6 +3,7 @@ PORTNAME= websieve PORTVERSION= 0.63.a +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/063a DISTNAME?= ${PORTNAME}-${DISTVERSION} @@ -21,32 +22,23 @@ NO_BUILD= yes # highest select version number. If no Cyrus IMAPd versions are # selected, use some generic IMAP modules -OPTIONS_DEFINE= CYRUS_IMAPD_21 CYRUS_IMAPD_22 CYRUS_IMAPD_23 CYRUS_IMAPD_24 +OPTIONS_DEFINE= CYRUS_IMAPD_23 CYRUS_IMAPD_24 OPTIONS_DEFAULT= CYRUS_IMAPD_23 -CYRUS_IMAPD_21_DESC= With Cyrus IMAPd version 2.1.x -CYRUS_IMAPD_22_DESC= With Cyrus IMAPd version 2.2.x CYRUS_IMAPD_23_DESC= With Cyrus IMAPd version 2.3.x CYRUS_IMAPD_24_DESC= With Cyrus IMAPd version 2.4.x -NO_STAGE= yes .include .if ${PORT_OPTIONS:MCYRUS_IMAPD_24} -RUN_DEPENDS+= cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd24 +RUN_DEPENDS+= cyradm:${PORTSDIR}/mail/cyrus-imapd24 FUNCLIB_PL= funclib.cyrus .elif ${PORT_OPTIONS:MCYRUS_IMAPD_23} -RUN_DEPENDS+= cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd23 -FUNCLIB_PL= funclib.cyrus -.elif ${PORT_OPTIONS:MCYRUS_IMAPD_22} -RUN_DEPENDS+= cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd22 -FUNCLIB_PL= funclib.cyrus -.elif ${PORT_OPTIONS:MCYRUS_IMAPD_21} -RUN_DEPENDS+= cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd2 +RUN_DEPENDS+= cyradm:${PORTSDIR}/mail/cyrus-imapd23 FUNCLIB_PL= funclib.cyrus .else -RUN_DEPENDS+= p5-IMAP-Admin>=0:${PORTSDIR}/mail/p5-IMAP-Admin \ - p5-IMAP-Sieve>=0:${PORTSDIR}/mail/p5-IMAP-Sieve +RUN_DEPENDS+= p5-IMAP-Admin:${PORTSDIR}/mail/p5-IMAP-Admin \ + p5-IMAP-Sieve:${PORTSDIR}/mail/p5-IMAP-Sieve FUNCLIB_PL= funclib.pl .endif @@ -57,13 +49,10 @@ post-configure: ${WRKSRC}/websieve.pl do-install: - @${MKDIR} ${WWWDIR} - @${INSTALL_SCRIPT} ${WRKSRC}/websieve.pl ${WWWDIR}/websieve.pl - @${MKDIR} ${PREFIX}/etc/websieve - @${INSTALL_DATA} ${WRKSRC}/websieve.conf ${PREFIX}/etc/websieve/websieve.conf.sample - @${INSTALL_DATA} ${WRKSRC}/${FUNCLIB_PL} ${PREFIX}/etc/websieve/funclib.pl - -post-install: - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${WWWDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/websieve.pl ${STAGEDIR}${WWWDIR}/websieve.pl + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/websieve + ${INSTALL_DATA} ${WRKSRC}/websieve.conf ${STAGEDIR}${PREFIX}/etc/websieve/websieve.conf.sample + ${INSTALL_DATA} ${WRKSRC}/${FUNCLIB_PL} ${STAGEDIR}${PREFIX}/etc/websieve/funclib.pl .include Modified: head/mail/websieve/pkg-plist ============================================================================== --- head/mail/websieve/pkg-plist Mon Jun 30 10:14:58 2014 (r359819) +++ head/mail/websieve/pkg-plist Mon Jun 30 10:19:16 2014 (r359820) @@ -1,5 +1,5 @@ %%WWWDIR%%/websieve.pl -etc/websieve/websieve.conf.sample +@sample etc/websieve/websieve.conf.sample etc/websieve/funclib.pl @dirrmtry etc/websieve @dirrm %%WWWDIR%%