Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Aug 2017 21:44:01 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r447519 - in head: . mail/dovecot mail/dovecot-pigeonhole mail/dovecot2 mail/dovecot2-pigeonhole mail/dspam mail/up-imapproxy security/maia sysutils/froxlor
Message-ID:  <201708072144.v77Li1b6014095@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Mon Aug  7 21:44:00 2017
New Revision: 447519
URL: https://svnweb.freebsd.org/changeset/ports/447519

Log:
  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

Added:
  head/mail/dovecot/
     - copied from r447518, head/mail/dovecot2/
  head/mail/dovecot-pigeonhole/
     - copied from r447518, head/mail/dovecot2-pigeonhole/
Deleted:
  head/mail/dovecot2/
  head/mail/dovecot2-pigeonhole/
Modified:
  head/MOVED
  head/UPDATING
  head/mail/dovecot-pigeonhole/Makefile
  head/mail/dovecot/Makefile
  head/mail/dspam/Makefile
  head/mail/up-imapproxy/Makefile
  head/security/maia/Makefile
  head/sysutils/froxlor/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Aug  7 21:23:50 2017	(r447518)
+++ head/MOVED	Mon Aug  7 21:44:00 2017	(r447519)
@@ -9474,10 +9474,10 @@ devel/ffcall|devel/libffcall|2017-07-28|Project was re
 databases/grass|databases/grass6|2017-07-30|Project was renamed to allow for grass7
 net/rubygem-oauth212|net/rubygem-oauth2|2017-07-31|Has expired: Only created for www/gitlab; please use net/rubygem-oauth2 instead
 textproc/rubygem-liquid3|textproc/rubygem-liquid|2017-07-31|Has expired: Use textproc/rubygem-liquid instead
-mail/dovecot2-antispam-plugin|mail/dovecot2-pigeonhole|2017-07-31|Has expired: Use pigeonhole instead. See https://wiki2.dovecot.org/HowTo/AntispamWithSieve
+mail/dovecot2-antispam-plugin|mail/dovecot-pigeonhole|2017-07-31|Has expired: Use pigeonhole instead. See https://wiki2.dovecot.org/HowTo/AntispamWithSieve
 mail/dovecot-antispam|mail/dovecot2-antispam-plugin|2017-07-31|Has expired: Dovecot-1.x is deprecated. Use dovecot2 and dovecot2-antispam-plugin instead
-mail/dovecot-sieve|mail/dovecot2-pigeonhole|2017-07-31|Has expired: Dovecot-1.x is deprecated. Use dovecot2 and dovecot-pigeonhole instead
-mail/dovecot-managesieve|mail/dovecot2-pigeonhole|2017-07-31|Has expired: Dovecot-1.x is deprecated. Use dovecot2 and dovecot-pigeonhole instead
+mail/dovecot-sieve|mail/dovecot-pigeonhole|2017-07-31|Has expired: Dovecot-1.x is deprecated. Use dovecot2 and dovecot-pigeonhole instead
+mail/dovecot-managesieve|mail/dovecot-pigeonhole|2017-07-31|Has expired: Dovecot-1.x is deprecated. Use dovecot2 and dovecot-pigeonhole instead
 www/rubygem-jquery-ui-rails5-rails4|www/rubygem-jquery-ui-rails-rails4|2017-07-31|Has expired: Only created for www/gitlab; please use www/rubygem-jquery-ui-rails-rails4 instead
 security/rubygem-omniauth13|security/rubygem-omniauth|2017-07-31|Has expired: Only created for www/gitlab; please use security/rubygem-omniauth instead
 devel/rubygem-health_check22|devel/rubygem-health_check|2017-07-31|Has expired: Only created for www/gitlab; please use devel/rubygem-health_check instead
@@ -9490,7 +9490,6 @@ multimedia/avbin||2017-07-31|Has expired: Unfetchable 
 games/gondola||2017-07-31|Depends on expired multimedia/avbin
 sysutils/flyback||2017-07-31|Unfetchable for more than six months (google code has gone away)
 multimedia/py-ffmpeg||2017-07-31|Has expired: Depreciated upstream in favour of ffpyplayer
-mail/dovecot|mail/dovecot2|2017-07-31|Has expired: Deprecated by upstream years ago. Use mail/dovecot2 instead
 devel/cloudabi-binutils-aarch64|devel/cloudabi-toolchain|2017-07-31|ELF-toolchain based tools should be used instead
 devel/cloudabi-binutils-x86_64|devel/cloudabi-toolchain|2017-07-31|ELF-toolchain based tools should be used instead
 security/openvas-libraries|security/openvas8-libraries|2017-08-03|Renamed to include openvas 9 ports
@@ -9499,3 +9498,5 @@ security/openvas-manager|security/openvas8-manager|201
 security/openvas-scanner|security/openvas8-scanner|2017-08-03|Renamed to include openvas 9 ports. It reflects a better name
 security/greenbone-security-assistant|security/greenbone-security-assistant8|2017-08-03|Renamed to include openvas 9 ports. It reflects a better name
 sysutils/consolekit|sysutils/consolekit2|2017-08-05|Continuation of the consolekit project
+mail/dovecot2|mail/dovecot|2017-08-07|Renamed to mail/dovecot
+mail/dovecot2-pigeonhole|mail/dovecot-pigeonhole|2017-08-07|Renamed to mail/dovecot-pigeonhole

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Aug  7 21:23:50 2017	(r447518)
+++ head/UPDATING	Mon Aug  7 21:44:00 2017	(r447519)
@@ -5,6 +5,17 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20170807:
+  AFFECTS: users of mail/dovecot2 and mail/dovecot2-pigeonhole
+  AUTHOR: adamw@FreeBSD.org
+
+  Now that dovecot1 has been removed from the ports tree, dovecot2
+  and dovecot2-pigeonhole have been renamed to simply dovecot and
+  dovecot-pigeonhole.
+
+  Depending upon your local setup, you may need to manually run
+  'pkg delete dovecot2' and 'pkg install dovecot' (or -pigeonhole).
+
 20170806:
   AFFECTS: users of mail/dovecot2-antispam-plugin
   AUTHOR: adamw@FreeBSD.org

Modified: head/mail/dovecot-pigeonhole/Makefile
==============================================================================
--- head/mail/dovecot2-pigeonhole/Makefile	Mon Aug  7 21:23:50 2017	(r447518)
+++ head/mail/dovecot-pigeonhole/Makefile	Mon Aug  7 21:44:00 2017	(r447519)
@@ -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 an
 
 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

Modified: head/mail/dovecot/Makefile
==============================================================================
--- head/mail/dovecot2/Makefile	Mon Aug  7 21:23:50 2017	(r447518)
+++ head/mail/dovecot/Makefile	Mon Aug  7 21:44:00 2017	(r447519)
@@ -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

Modified: head/mail/dspam/Makefile
==============================================================================
--- head/mail/dspam/Makefile	Mon Aug  7 21:23:50 2017	(r447518)
+++ head/mail/dspam/Makefile	Mon Aug  7 21:44:00 2017	(r447519)
@@ -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}/c
 .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
 

Modified: head/mail/up-imapproxy/Makefile
==============================================================================
--- head/mail/up-imapproxy/Makefile	Mon Aug  7 21:23:50 2017	(r447518)
+++ head/mail/up-imapproxy/Makefile	Mon Aug  7 21:44:00 2017	(r447519)
@@ -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

Modified: head/security/maia/Makefile
==============================================================================
--- head/security/maia/Makefile	Mon Aug  7 21:23:50 2017	(r447518)
+++ head/security/maia/Makefile	Mon Aug  7 21:44:00 2017	(r447519)
@@ -3,7 +3,7 @@
 
 PORTNAME=	maia
 DISTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.purplehat.org/downloads/maia/
 
@@ -168,7 +168,7 @@ WANT_PGSQL=	server
 .endif
 
 .if ${PORT_OPTIONS:MDOVECOT2}
-RUN_DEPENDS+=	dovecot:mail/dovecot2
+RUN_DEPENDS+=	dovecot:mail/dovecot
 .endif
 
 .if ${PORT_OPTIONS:MPOSTFIX}

Modified: head/sysutils/froxlor/Makefile
==============================================================================
--- head/sysutils/froxlor/Makefile	Mon Aug  7 21:23:50 2017	(r447518)
+++ head/sysutils/froxlor/Makefile	Mon Aug  7 21:44:00 2017	(r447519)
@@ -3,7 +3,7 @@
 
 PORTNAME=	froxlor
 PORTVERSION=	0.9.38.7
-PORTREVIION=	1
+PORTREVIION=	2
 CATEGORIES=	sysutils www
 MASTER_SITES=	http://files.froxlor.org/releases/
 
@@ -72,7 +72,7 @@ EXIM_RUN_DEPENDS=	exim:mail/exim
 
 DKIM_RUN_DEPENDS=	opendkim:mail/opendkim
 
-DOVECOT2_RUN_DEPENDS=	dovecot2>=2:mail/dovecot2
+DOVECOT2_RUN_DEPENDS=	dovecot>=2:mail/dovecot
 
 COURIER_RUN_DEPENDS=	courier:mail/courier
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708072144.v77Li1b6014095>