svn commit: r468060 - in head/mail: . dovecot dovecot-pigeonhole dovecot-pigeonhole04 dovecot22

[Danilo G. Baio]

Author: dbaio
Date: Sun Apr 22 21:35:38 2018
New Revision: 468060
URL: https://svnweb.freebsd.org/changeset/ports/468060

Log:
  Add mail/dovecot22 (v2.2.35) and mail/dovecot-pigeonhole04 (v0.4.23)
  
  This brings back Dovecot 2.2.35 to the tree because there is an issue
  with version 2.3.1 and replication in some scenarios [1].
  
  Keep this version until this problem gets fixed upstream.
  
  1 - https://www.dovecot.org/list/dovecot/2018-April/111477.html
  
  Approved by:	adamw (maintainer of mail/dovecot)
  Approved by:	ler   (maintainer of mail/dovecot-pigeonhole)

Added:
  head/mail/dovecot-pigeonhole04/
     - copied from r465041, head/mail/dovecot-pigeonhole/
  head/mail/dovecot22/
     - copied from r465012, head/mail/dovecot/
Modified:
  head/mail/Makefile
  head/mail/dovecot-pigeonhole/Makefile
  head/mail/dovecot-pigeonhole04/Makefile
  head/mail/dovecot-pigeonhole04/pkg-plist
  head/mail/dovecot/Makefile
  head/mail/dovecot22/Makefile

Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile	Sun Apr 22 20:51:44 2018	(r468059)
+++ head/mail/Makefile	Sun Apr 22 21:35:38 2018	(r468060)
@@ -98,6 +98,8 @@
     SUBDIR += dot-forward
     SUBDIR += dovecot
     SUBDIR += dovecot-pigeonhole
+    SUBDIR += dovecot-pigeonhole04
+    SUBDIR += dovecot22
     SUBDIR += drac
     SUBDIR += dracmail
     SUBDIR += dspam

Modified: head/mail/dovecot-pigeonhole/Makefile
==============================================================================
--- head/mail/dovecot-pigeonhole/Makefile	Sun Apr 22 20:51:44 2018	(r468059)
+++ head/mail/dovecot-pigeonhole/Makefile	Sun Apr 22 21:35:38 2018	(r468060)
@@ -27,6 +27,8 @@ INSTALL_TARGET=	install-strip
 USES=		compiler:c11 libtool ssl
 USE_LDCONFIG=	${PREFIX}/lib/dovecot
 
+CONFLICTS_INSTALL=	dovecot-pigeonhole04
+
 OPTIONS_DEFINE=	DOCS LDAP MANAGESIEVE
 OPTIONS_DEFAULT=MANAGESIEVE GSSAPI_NONE
 

Modified: head/mail/dovecot-pigeonhole04/Makefile
==============================================================================
--- head/mail/dovecot-pigeonhole/Makefile	Tue Mar 20 00:25:28 2018	(r465041)
+++ head/mail/dovecot-pigeonhole04/Makefile	Sun Apr 22 21:35:38 2018	(r468060)
@@ -5,6 +5,7 @@ PORTNAME=	dovecot-pigeonhole
 PORTVERSION=	0.4.23
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
+PKGNAMESUFFIX=	04
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
 
 MAINTAINER=	ler at FreeBSD.org
@@ -12,8 +13,8 @@ COMMENT=	Sieve plugin for the Dovecot 'deliver' LDA an
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	dovecot>=2.2.31:mail/dovecot
-RUN_DEPENDS=	dovecot>=2.2.31:mail/dovecot
+BUILD_DEPENDS=	dovecot22>=2.2.31:mail/dovecot22
+RUN_DEPENDS=	dovecot22>=2.2.31:mail/dovecot22
 
 DOVECOTVERSION=	2.2
 
@@ -26,6 +27,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 USES=		compiler:c11 libtool ssl
 USE_LDCONFIG=	${PREFIX}/lib/dovecot
+
+CONFLICTS_INSTALL=	dovecot-pigeonhole
 
 OPTIONS_DEFINE=	DOCS LDAP MANAGESIEVE
 OPTIONS_DEFAULT=MANAGESIEVE GSSAPI_NONE

Modified: head/mail/dovecot-pigeonhole04/pkg-plist
==============================================================================
--- head/mail/dovecot-pigeonhole/pkg-plist	Tue Mar 20 00:25:28 2018	(r465041)
+++ head/mail/dovecot-pigeonhole04/pkg-plist	Sun Apr 22 21:35:38 2018	(r468060)
@@ -7,6 +7,7 @@ bin/sieve-filter
 bin/sieve-test
 bin/sievec
 include/dovecot-2.2-pigeonhole/sieve/edit-mail.h
+include/dovecot-2.2-pigeonhole/sieve/mail-raw.h
 include/dovecot-2.2-pigeonhole/sieve/sieve-address-source.h
 include/dovecot-2.2-pigeonhole/sieve/pigeonhole-config.h
 include/dovecot-2.2-pigeonhole/sieve/pigeonhole-version.h

Modified: head/mail/dovecot/Makefile
==============================================================================
--- head/mail/dovecot/Makefile	Sun Apr 22 20:51:44 2018	(r468059)
+++ head/mail/dovecot/Makefile	Sun Apr 22 21:35:38 2018	(r468060)
@@ -36,6 +36,8 @@ INSTALL_TARGET=	install-strip
 USERS=		dovecot dovenull
 GROUPS=		${USERS}
 
+CONFLICTS_INSTALL=	dovecot22
+
 OPTIONS_DEFINE=	LIBWRAP LUA LZ4 VPOPMAIL DOCS EXAMPLES
 OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP
 OPTIONS_SUB=	yes

Modified: head/mail/dovecot22/Makefile
==============================================================================
--- head/mail/dovecot/Makefile	Mon Mar 19 15:06:05 2018	(r465012)
+++ head/mail/dovecot22/Makefile	Sun Apr 22 21:35:38 2018	(r468060)
@@ -15,6 +15,7 @@ PORTNAME=	dovecot
 PORTVERSION=	2.2.35
 CATEGORIES=	mail ipv6
 MASTER_SITES=	https://www.dovecot.org/releases/2.2/
+PKGNAMESUFFIX=	22
 
 MAINTAINER=	adamw at FreeBSD.org
 COMMENT=	Secure, fast and powerful IMAP and POP3 server
@@ -39,6 +40,8 @@ INSTALL_TARGET=	install-strip
 
 USERS=		dovecot dovenull
 GROUPS=		${USERS}
+
+CONFLICTS_INSTALL=	dovecot
 
 OPTIONS_DEFINE=	LIBWRAP LZ4 VPOPMAIL DOCS EXAMPLES
 OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP