Rename dovecot2/dovecot2-pigeonhole to dovecot/dovecot-pigeonhole.

It might be necessary to manually remove and reinstall the package under
the new name.

Discussed with:	ler

15 files changed, 10 insertions, 10 deletions

diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile
index df6c8a043430..66dfc9111923 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot-pigeonhole/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dovecot-pigeonhole
 PORTVERSION=	0.4.19
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
@@ -12,8 +13,8 @@ COMMENT=	Sieve plugin for the Dovecot 'deliver' LDA and LMTP
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	dovecot2>=2.2.31:mail/dovecot2
-RUN_DEPENDS=	dovecot2>=2.2.31:mail/dovecot2
+BUILD_DEPENDS=	dovecot>=2.2.31:mail/dovecot
+RUN_DEPENDS=	dovecot>=2.2.31:mail/dovecot
 
 DOVECOTVERSION=	2.2
 
@@ -34,7 +35,7 @@ OPTIONS_SINGLE=	GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 OPTIONS_SUB=	yes
 
-GSSAPI_DESC=		GSSAPI Support (*MUST MATCH* mail/dovecot2)
+GSSAPI_DESC=		GSSAPI Support (*MUST MATCH* mail/dovecot)
 GSSAPI_NONE_DESC=	Build without GSSAPI support
 GSSAPI_BASE_DESC=	Use GSSAPI from base
 GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
diff --git a/mail/dovecot2-pigeonhole/distinfo b/mail/dovecot-pigeonhole/distinfo
index d21c78b3903e..d21c78b3903e 100644
--- a/mail/dovecot2-pigeonhole/distinfo
+++ b/mail/dovecot-pigeonhole/distinfo
diff --git a/mail/dovecot2-pigeonhole/pkg-descr b/mail/dovecot-pigeonhole/pkg-descr
index dc5ac2017a03..dc5ac2017a03 100644
--- a/mail/dovecot2-pigeonhole/pkg-descr
+++ b/mail/dovecot-pigeonhole/pkg-descr
diff --git a/mail/dovecot2-pigeonhole/pkg-message b/mail/dovecot-pigeonhole/pkg-message
index 10d1fbf98876..10d1fbf98876 100644
--- a/mail/dovecot2-pigeonhole/pkg-message
+++ b/mail/dovecot-pigeonhole/pkg-message
diff --git a/mail/dovecot2-pigeonhole/pkg-plist b/mail/dovecot-pigeonhole/pkg-plist
index a67f6f13f1ad..a67f6f13f1ad 100644
--- a/mail/dovecot2-pigeonhole/pkg-plist
+++ b/mail/dovecot-pigeonhole/pkg-plist
diff --git a/mail/dovecot2/Makefile b/mail/dovecot/Makefile
index 63c3ef5627ec..ffa8b3d1fcb7 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot/Makefile
@@ -3,10 +3,10 @@
 
 ######################################################################
 # Anytime PORTVERSION changes please bump PORTREVISION of            #
-# mail/dovecot2-pigeonhole. See ports/146029 for an explanation.     #
+# mail/dovecot-pigeonhole. See ports/146029 for an explanation.      #
 #                                                                    #
 # Please be careful when updating this port as changes to this port  #
-# can break mail/dovecot2-pigeonhole. In order to ensure the least   #
+# can break mail/dovecot-pigeonhole. In order to ensure the least    #
 # amount of breakage possible please consult the maintainer of that  #
 # port before updating this one.                                     #
 ######################################################################
@@ -16,7 +16,6 @@ PORTVERSION=	2.2.31
 PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	https://www.dovecot.org/releases/2.2/
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Secure, fast and powerful IMAP and POP3 server
diff --git a/mail/dovecot2/distinfo b/mail/dovecot/distinfo
index dac92543c70f..dac92543c70f 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot/distinfo
diff --git a/mail/dovecot2/files/dovecot.in b/mail/dovecot/files/dovecot.in
index 7a7ce56644e8..7a7ce56644e8 100644
--- a/mail/dovecot2/files/dovecot.in
+++ b/mail/dovecot/files/dovecot.in
diff --git a/mail/dovecot2/files/patch-UPSTREAM-notify b/mail/dovecot/files/patch-UPSTREAM-notify
index 3ce2f41a5808..3ce2f41a5808 100644
--- a/mail/dovecot2/files/patch-UPSTREAM-notify
+++ b/mail/dovecot/files/patch-UPSTREAM-notify
diff --git a/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh b/mail/dovecot/files/patch-src_plugins_fts_decode2text.sh
index 036303ba8079..036303ba8079 100644
--- a/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh
+++ b/mail/dovecot/files/patch-src_plugins_fts_decode2text.sh
diff --git a/mail/dovecot2/files/pkg-message.in b/mail/dovecot/files/pkg-message.in
index 1c57ad162d81..1c57ad162d81 100644
--- a/mail/dovecot2/files/pkg-message.in
+++ b/mail/dovecot/files/pkg-message.in
diff --git a/mail/dovecot2/pkg-descr b/mail/dovecot/pkg-descr
index 835233a35f71..835233a35f71 100644
--- a/mail/dovecot2/pkg-descr
+++ b/mail/dovecot/pkg-descr
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot/pkg-plist
index 098f4938ec62..098f4938ec62 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot/pkg-plist
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 328c71ed5490..9ccbad7878db 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dspam
 PORTVERSION=	3.10.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -340,7 +340,7 @@ CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
 .endif
 
 .if ${PORT_OPTIONS:MDOVECOT2}
-RUN_DEPENDS+=	${LOCALBASE}/libexec/dovecot/dovecot-lda:mail/dovecot2
+RUN_DEPENDS+=	${LOCALBASE}/libexec/dovecot/dovecot-lda:mail/dovecot
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/libexec/dovecot/dovecot-lda'
 .endif
 
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index 2eeaf642361c..e4bf188b44b2 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	imapproxy
 PORTVERSION=	1.2.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/squirrelmail/imap_proxy/${PORTVERSION}
 PKGNAMEPREFIX=	up-
@@ -33,7 +33,7 @@ SBIN=		in.imapproxyd pimpstat
 
 .if ${PORT_OPTIONS:MDOVECOT}
 SUB_LIST+=	DOVECOT="dovecot"
-RUN_DEPENDS+=	dovecot:mail/dovecot2
+RUN_DEPENDS+=	dovecot:mail/dovecot
 .else
 SUB_LIST+=	DOVECOT=""
 .endif