summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradamw <adamw@FreeBSD.org>2017-08-07 21:44:00 +0000
committeradamw <adamw@FreeBSD.org>2017-08-07 21:44:00 +0000
commit6bfd8c3b1c428e57b619f59030e08413394d7712 (patch)
treeb44ecc5f2c2ba20397232fb6057395d2fcbb7c30
parenta2f3033d825b34c7f95adcc0b5cfececbffce7ba (diff)
downloadFreeBSD-ports-6bfd8c3b1c428e57b619f59030e08413394d7712.zip
FreeBSD-ports-6bfd8c3b1c428e57b619f59030e08413394d7712.tar.gz
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
-rw-r--r--MOVED9
-rw-r--r--UPDATING11
-rw-r--r--mail/dovecot-pigeonhole/Makefile (renamed from mail/dovecot2-pigeonhole/Makefile)7
-rw-r--r--mail/dovecot-pigeonhole/distinfo (renamed from mail/dovecot2-pigeonhole/distinfo)0
-rw-r--r--mail/dovecot-pigeonhole/pkg-descr (renamed from mail/dovecot2-pigeonhole/pkg-descr)0
-rw-r--r--mail/dovecot-pigeonhole/pkg-message (renamed from mail/dovecot2-pigeonhole/pkg-message)0
-rw-r--r--mail/dovecot-pigeonhole/pkg-plist (renamed from mail/dovecot2-pigeonhole/pkg-plist)0
-rw-r--r--mail/dovecot/Makefile (renamed from mail/dovecot2/Makefile)5
-rw-r--r--mail/dovecot/distinfo (renamed from mail/dovecot2/distinfo)0
-rw-r--r--mail/dovecot/files/dovecot.in (renamed from mail/dovecot2/files/dovecot.in)0
-rw-r--r--mail/dovecot/files/patch-UPSTREAM-notify (renamed from mail/dovecot2/files/patch-UPSTREAM-notify)0
-rw-r--r--mail/dovecot/files/patch-src_plugins_fts_decode2text.sh (renamed from mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh)0
-rw-r--r--mail/dovecot/files/pkg-message.in (renamed from mail/dovecot2/files/pkg-message.in)0
-rw-r--r--mail/dovecot/pkg-descr (renamed from mail/dovecot2/pkg-descr)0
-rw-r--r--mail/dovecot/pkg-plist (renamed from mail/dovecot2/pkg-plist)0
-rw-r--r--mail/dspam/Makefile4
-rw-r--r--mail/up-imapproxy/Makefile4
-rw-r--r--security/maia/Makefile4
-rw-r--r--sysutils/froxlor/Makefile4
19 files changed, 30 insertions, 18 deletions
diff --git a/MOVED b/MOVED
index b3bc21e..2afcebb 100644
--- a/MOVED
+++ b/MOVED
@@ -9474,10 +9474,10 @@ devel/ffcall|devel/libffcall|2017-07-28|Project was renamed
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 for more than six months (
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|2017-08-03|Renamed to include
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
diff --git a/UPDATING b/UPDATING
index b90d1fa..89d78de 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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
diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile
index df6c8a0..66dfc91 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 d21c78b..d21c78b 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 dc5ac20..dc5ac20 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 10d1fbf..10d1fbf 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 a67f6f1..a67f6f1 100644
--- a/mail/dovecot2-pigeonhole/pkg-plist
+++ b/mail/dovecot-pigeonhole/pkg-plist
diff --git a/mail/dovecot2/Makefile b/mail/dovecot/Makefile
index 63c3ef5..ffa8b3d 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 dac9254..dac9254 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot/distinfo
diff --git a/mail/dovecot2/files/dovecot.in b/mail/dovecot/files/dovecot.in
index 7a7ce56..7a7ce56 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 3ce2f41..3ce2f41 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 036303b..036303b 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 1c57ad1..1c57ad1 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 835233a..835233a 100644
--- a/mail/dovecot2/pkg-descr
+++ b/mail/dovecot/pkg-descr
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot/pkg-plist
index 098f493..098f493 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot/pkg-plist
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 328c71e..9ccbad7 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 2eeaf64..e4bf188 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
diff --git a/security/maia/Makefile b/security/maia/Makefile
index d8d0c54..119ae42 100644
--- a/security/maia/Makefile
+++ b/security/maia/Makefile
@@ -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}
diff --git a/sysutils/froxlor/Makefile b/sysutils/froxlor/Makefile
index 0a5a23e..7dcbe5e 100644
--- a/sysutils/froxlor/Makefile
+++ b/sysutils/froxlor/Makefile
@@ -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
OpenPOWER on IntegriCloud