From owner-svn-ports-all@freebsd.org Sun May 6 11:16:00 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 8F95FFB68BB; Sun, 6 May 2018 11:16:00 +0000 (UTC) (envelope-from ume@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 44FAE78EA2; Sun, 6 May 2018 11:16:00 +0000 (UTC) (envelope-from ume@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 25D124094; Sun, 6 May 2018 11:16:00 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w46BFxru001069; Sun, 6 May 2018 11:15:59 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w46BFx5b001067; Sun, 6 May 2018 11:15:59 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201805061115.w46BFx5b001067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Sun, 6 May 2018 11:15:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469192 - head/mail/cyrus-imapd30 X-SVN-Group: ports-head X-SVN-Commit-Author: ume X-SVN-Commit-Paths: head/mail/cyrus-imapd30 X-SVN-Commit-Revision: 469192 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, 06 May 2018 11:16:00 -0000 Author: ume Date: Sun May 6 11:15:59 2018 New Revision: 469192 URL: https://svnweb.freebsd.org/changeset/ports/469192 Log: - Fix manpage inclusion of XAPIAN. - Fix typo. Submitted by: Adam Mokhtari Modified: head/mail/cyrus-imapd30/Makefile head/mail/cyrus-imapd30/pkg-plist Modified: head/mail/cyrus-imapd30/Makefile ============================================================================== --- head/mail/cyrus-imapd30/Makefile Sun May 6 11:09:00 2018 (r469191) +++ head/mail/cyrus-imapd30/Makefile Sun May 6 11:15:59 2018 (r469192) @@ -2,7 +2,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.0.6 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ https://www.cyrusimap.org/releases/ @@ -94,7 +94,7 @@ SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ON= --with-snmp=${LOCALBASE} SNMP_CONFIGURE_OFF= --with-snmp=no SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} -SQLITE_BROKEN_OFF= SQLITE is requited +SQLITE_BROKEN_OFF= SQLITE is required SQUAT_DESC= Enable Squat support SQUAT_CONFIGURE_OFF= --disable-squat XAPIAN_DESC= Enable Xapian support @@ -175,8 +175,11 @@ CYRUS_MAN8+= fetchnews nntpd .if ${PORT_OPTIONS:MREPLICATION} CYRUS_MAN8+= sync_client sync_reset sync_server .endif -.if ${PORT_OPTIONS:MSQUAT} +.if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN} CYRUS_MAN8+= squatter +PLIST_SUB+= SQUATTER="" +.else +PLIST_SUB+= SQUATTER="@comment " .endif .if ${PORT_OPTIONS:MDRAC} Modified: head/mail/cyrus-imapd30/pkg-plist ============================================================================== --- head/mail/cyrus-imapd30/pkg-plist Sun May 6 11:09:00 2018 (r469191) +++ head/mail/cyrus-imapd30/pkg-plist Sun May 6 11:15:59 2018 (r469192) @@ -65,7 +65,7 @@ cyrus/sbin/reconstruct %%BACKUP%%cyrus/sbin/restore cyrus/sbin/sievec cyrus/sbin/sieved -%%SQUAT%%cyrus/sbin/squatter +%%SQUATTER%%cyrus/sbin/squatter %%REPLICATION%%cyrus/sbin/sync_client %%REPLICATION%%cyrus/sbin/sync_reset %%REPLICATION%%cyrus/libexec/sync_server