aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--mail/Makefile1
-rw-r--r--mail/dovecot-devel/Makefile166
-rw-r--r--mail/dovecot-devel/distinfo3
-rw-r--r--mail/dovecot-devel/files/dovecot.sh.in26
-rw-r--r--mail/dovecot-devel/files/patch-dovecot-example.conf213
-rw-r--r--mail/dovecot-devel/pkg-deinstall65
-rw-r--r--mail/dovecot-devel/pkg-descr7
-rw-r--r--mail/dovecot-devel/pkg-install107
-rw-r--r--mail/dovecot-devel/pkg-message12
-rw-r--r--mail/dovecot-devel/pkg-plist94
11 files changed, 1 insertions, 694 deletions
diff --git a/MOVED b/MOVED
index 1777997cafc0..72e545af198c 100644
--- a/MOVED
+++ b/MOVED
@@ -4212,3 +4212,4 @@ x11-toolkits/py-gtkscintilla||2009-11-30|Has expired: no longer under developmen
www/xulrunner|www/libxul|2009-12-02|Superseded by www/libxul
secuirty/nettel2|security/nettel|2009-12-02|Please use security/nettel
security/pear-Crypt_HMAC||2009-12-07|Please use security/pear-Crypt_HMAC2
+mail/dovecot-devel|mail/dovecot|2009-12-08|Non-devel version is newer
diff --git a/mail/Makefile b/mail/Makefile
index 4f407d8d5642..0dcf7299a9a0 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -95,7 +95,6 @@
SUBDIR += dma
SUBDIR += dovecot
SUBDIR += dovecot-antispam
- SUBDIR += dovecot-devel
SUBDIR += dovecot-managesieve
SUBDIR += dovecot-sieve
SUBDIR += drac
diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
deleted file mode 100644
index 91bd20b758d4..000000000000
--- a/mail/dovecot-devel/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# ex:ts=8
-# New ports collection makefile for: dovecot
-# Date created: 12/08/2002
-# Whom: Dominic Marks <dominic.marks@btinternet.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= dovecot
-DISTVERSION= 1.1.0
-CATEGORIES= mail ipv6
-MASTER_SITES= http://www.dovecot.org/releases/1.1/
-
-MAINTAINER= yds@coolrat.org
-COMMENT= Secure and compact IMAP and POP3 servers
-
-USE_ICONV= yes
-USE_RC_SUBR= dovecot.sh
-
-DEPRECATED= Please use mail/dovecot instead
-
-CONFLICTS?= ${PORTNAME}-1.[02-9].*
-NO_LATEST_LINK= yes
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-shadow --localstatedir=/var
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-USE_LDCONFIG= ${PREFIX}/lib/dovecot \
- ${PREFIX}/lib/dovecot/imap \
- ${PREFIX}/lib/dovecot/pop3 \
- ${PREFIX}/lib/dovecot/lda
-
-.if !defined(NOPORTDOCS)
-PORTDOCS= *.txt wiki
-.else
-CONFIGURE_ARGS+= --without-docs
-.endif
-
-DOVECOT_UID?= 143
-DOVECOT_GID?= 143
-SCRIPT_ENV+= DOVECOT_UID=${DOVECOT_UID} \
- DOVECOT_GID=${DOVECOT_GID}
-
-OPTIONS= KQUEUE "kqueue(2) support" on \
- SSL "SSL support" on \
- IPV6 "IPv6 support" on \
- POP3 "POP3 support" on \
- LDA "LDA support" on \
- GSSAPI "GSSAPI support" off \
- VPOPMAIL "VPopMail support" off \
- LDAP "OpenLDAP support" off \
- PGSQL "PostgreSQL support" off \
- MYSQL "MySQL support" off \
- SQLITE "SQLite support" off
-
-.include <bsd.port.pre.mk>
-
-## kqueue(2) support
-#
-.if !defined(WITHOUT_KQUEUE)
-CONFIGURE_ARGS+= --with-ioloop=kqueue
-.endif
-
-## SSL support
-#
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+= --without-ssl
-.endif
-
-## IPv6 support
-#
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-## POP3 support
-#
-.if defined(WITHOUT_POP3)
-CONFIGURE_ARGS+= --without-pop3d
-PROTOCOLS= imap
-PLIST_SUB+= POP3="@comment "
-.else
-PROTOCOLS= imap pop3
-PLIST_SUB+= POP3=""
-.endif
-
-## LDA support
-#
-.if defined(WITHOUT_LDA)
-CONFIGURE_ARGS+= --without-deliver
-PLIST_SUB+= LDA="@comment "
-.else
-PLIST_SUB+= LDA=""
-.endif
-
-## GSSAPI support
-#
-.if defined(WITH_GSSAPI)
-CONFIGURE_ARGS+= --with-gssapi
-.else
-CONFIGURE_ARGS+= --without-gssapi
-.endif
-
-## VPopMail Support
-#
-.if defined(WITH_VPOPMAIL)
-VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw
-BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail
-CONFIGURE_ARGS+= --with-vpopmail
-.else
-CONFIGURE_ARGS+= --without-vpopmail
-.endif
-
-## OpenLDAP Support
-#
-.if defined(WITH_LDAP)
-USE_OPENLDAP= yes
-CONFIGURE_ARGS+= --with-ldap
-.endif
-
-## PostgreSQL Support
-#
-.if defined(WITH_PGSQL)
-USE_PGSQL= yes
-CONFIGURE_ARGS+= --with-pgsql
-.endif
-
-## MySQL Support
-#
-.if defined(WITH_MYSQL)
-USE_MYSQL= yes
-CONFIGURE_ARGS+= --with-mysql
-.endif
-
-## SQLite Support
-#
-.if defined(WITH_SQLITE)
-USE_SQLITE= 3
-CONFIGURE_ARGS+= --with-sqlite
-.endif
-
-post-patch:
-.if defined(WITH_GSSAPI)
- @${REINPLACE_CMD} -e 's,<gssapi/gssapi\.h>,<gssapi.h>,' \
- ${WRKSRC}/src/auth/mech-gssapi.c \
- ${WRKSRC}/configure
-.endif
-
-post-build:
- @${REINPLACE_CMD} \
- -e 's,%%PREFIX%%,${PREFIX},g' \
- -e 's,%%PROTOCOLS%%,${PROTOCOLS},g' \
- ${WRKSRC}/dovecot-example.conf
-
-pre-install:
- @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
- @${MKDIR} ${DATADIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DATADIR}
- @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/dovecot-devel/distinfo b/mail/dovecot-devel/distinfo
deleted file mode 100644
index 95a25f2d6b2e..000000000000
--- a/mail/dovecot-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (dovecot-1.1.0.tar.gz) = 2f173eaad8ae74782bbceecaf90d1e45
-SHA256 (dovecot-1.1.0.tar.gz) = 893db448a10da6e1dd0107218e78d2585d10f7d2bb998fedd4c1859443e30fb2
-SIZE (dovecot-1.1.0.tar.gz) = 2273262
diff --git a/mail/dovecot-devel/files/dovecot.sh.in b/mail/dovecot-devel/files/dovecot.sh.in
deleted file mode 100644
index 4d6d3ecc21a8..000000000000
--- a/mail/dovecot-devel/files/dovecot.sh.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dovecot
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dovecot:
-#
-#dovecot_enable="YES"
-#
-
-. %%RC_SUBR%%
-
-name=dovecot
-rcvar=`set_rcvar`
-
-: ${dovecot_enable:="NO"}
-command=%%PREFIX%%/sbin/${name}
-required_files=%%PREFIX%%/etc/${name}.conf
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf
deleted file mode 100644
index cd57d29ee03d..000000000000
--- a/mail/dovecot-devel/files/patch-dovecot-example.conf
+++ /dev/null
@@ -1,213 +0,0 @@
---- dovecot-example.conf.orig 2008-06-21 21:21:38.422213158 +0100
-+++ dovecot-example.conf 2008-06-21 21:29:47.638914442 +0100
-@@ -12,7 +12,7 @@
- # Default values are shown for each setting, it's not required to uncomment
- # any of the lines. Exception to this are paths, they're just examples with
- # the real defaults being based on configure options. The paths listed here
--# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-+# are for configure --prefix=%%PREFIX%% --sysconfdir=%%PREFIX%%/etc --localstatedir=/var
- # --with-ssldir=/etc/ssl
-
- # Base directory where to store runtime data.
-@@ -21,6 +21,7 @@
- # Protocols we want to be serving: imap imaps pop3 pop3s
- # If you only want to use dovecot-auth, you can set this to "none".
- #protocols = imap imaps
-+protocols = %%PROTOCOLS%%
-
- # A space separated list of IP or host addresses where to listen in for
- # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
-@@ -213,6 +214,7 @@
- # <doc/wiki/MailLocation.txt>
- #
- #mail_location =
-+mail_location = mbox:~/mail/:INBOX=/var/mail/%u
-
- # If you need to set multiple mailbox locations or want to change default
- # namespace settings, you can do it by defining namespace sections.
-@@ -273,6 +275,7 @@
- # used only with INBOX when either its initial creation or dotlocking fails.
- # Typically this is set to "mail" to give access to /var/mail.
- #mail_privileged_group =
-+mail_privileged_group = mail
-
- # Grant access to these supplementary groups for mail processes. Typically
- # these are used to set up access to shared mailboxes. Note that it may be
-@@ -340,6 +343,7 @@
- # IP address. Useful for seeing who are actually using the IMAP processes
- # (eg. shared mailboxes or if same uid is used for multiple accounts).
- #verbose_proctitle = no
-+verbose_proctitle = yes
-
- # Valid UID range for users, defaults to 500 and above. This is mostly
- # to make sure that users can't log in as daemons or other system users.
-@@ -353,6 +357,7 @@
- # belongs to supplementary groups with non-valid GIDs, those groups are
- # not set.
- #first_valid_gid = 1
-+first_valid_gid = 0
- #last_valid_gid = 0
-
- # Maximum number of running mail processes. When this limit is reached,
-@@ -503,19 +508,19 @@
-
- protocol imap {
- # Login executable location.
-- #login_executable = /usr/libexec/dovecot/imap-login
-+ #login_executable = %%PREFIX%%/libexec/dovecot/imap-login
-
- # IMAP executable location. Changing this allows you to execute other
- # binaries before the imap process is executed.
- #
- # This would write rawlogs into ~/dovecot.rawlog/ directory:
-- # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
-+ # mail_executable = %%PREFIX%%/libexec/dovecot/rawlog %%PREFIX%%/libexec/dovecot/imap
- #
- # This would attach gdb into the imap process and write backtraces into
- # /tmp/gdbhelper.* files:
-- # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
-+ # mail_executable = %%PREFIX%%/libexec/dovecot/gdbhelper %%PREFIX%%/libexec/dovecot/imap
- #
-- #mail_executable = /usr/libexec/dovecot/imap
-+ #mail_executable = %%PREFIX%%/libexec/dovecot/imap
-
- # Maximum IMAP command line length in bytes. Some clients generate very long
- # command lines with huge mailboxes, so you may need to raise this if you get
-@@ -529,7 +534,7 @@
- # Support for dynamically loadable plugins. mail_plugins is a space separated
- # list of plugins to load.
- #mail_plugins =
-- #mail_plugin_dir = /usr/lib/dovecot/imap
-+ #mail_plugin_dir = %%PREFIX%%/lib/dovecot/imap
-
- # Send IMAP capabilities in greeting message. This makes it unnecessary for
- # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -564,6 +569,7 @@
- # accept '/' suffix in mailbox names in subscriptions list.
- # The list is space-separated.
- #imap_client_workarounds =
-+ imap_client_workarounds = delay-newmail netscape-eoh tb-extra-mailbox-sep
- }
-
- ##
-@@ -572,11 +578,11 @@
-
- protocol pop3 {
- # Login executable location.
-- #login_executable = /usr/libexec/dovecot/pop3-login
-+ #login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
-
- # POP3 executable location. See IMAP's mail_executable above for examples
- # how this could be changed.
-- #mail_executable = /usr/libexec/dovecot/pop3
-+ #mail_executable = %%PREFIX%%/libexec/dovecot/pop3
-
- # Don't try to set mails non-recent or seen with POP3 sessions. This is
- # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -636,7 +642,7 @@
- # Support for dynamically loadable plugins. mail_plugins is a space separated
- # list of plugins to load.
- #mail_plugins =
-- #mail_plugin_dir = /usr/lib/dovecot/pop3
-+ #mail_plugin_dir = %%PREFIX%%/lib/dovecot/pop3
-
- # Workarounds for various client bugs:
- # outlook-no-nuls:
-@@ -647,6 +653,7 @@
- # missing. This option simply sends it if it's missing.
- # The list is space-separated.
- #pop3_client_workarounds =
-+ pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
- }
-
- ##
-@@ -664,7 +671,7 @@
- # Support for dynamically loadable plugins. mail_plugins is a space separated
- # list of plugins to load.
- #mail_plugins =
-- #mail_plugin_dir = /usr/lib/dovecot/lda
-+ #mail_plugin_dir = %%PREFIX%%/lib/dovecot/lda
-
- # If user is over quota, return with temporary failure instead of
- # bouncing the mail.
-@@ -679,6 +686,7 @@
-
- # Binary to use for sending mails.
- #sendmail_path = /usr/lib/sendmail
-+ sendmail_path = /usr/sbin/sendmail
-
- # Human readable error message for rejection mails. Use can use variables:
- # %n = CRLF, %r = reason, %s = subject, %t = recipient
-@@ -693,7 +701,7 @@
- ##
-
- # Executable location
--#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+#auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth
-
- # Set max. process size in megabytes.
- #auth_process_size = 256
-@@ -783,7 +791,7 @@
- #auth_ntlm_use_winbind = no
-
- # Path for Samba's ntlm_auth helper binary.
--#auth_winbind_helper_path = /usr/bin/ntlm_auth
-+#auth_winbind_helper_path = %%PREFIX%%/bin/ntlm_auth
-
- # Number of seconds to delay before replying to failed authentications.
- #auth_failure_delay = 2
-@@ -816,7 +824,7 @@
-
- #passdb passwd-file {
- # File contains a list of usernames, one per line
-- #args = /etc/dovecot.deny
-+ #args = %%PREFIX%%/etc/dovecot.deny
- #deny = yes
- #}
-
-@@ -1053,7 +1061,7 @@
- # referenced using URIs in format "proxy:<name>".
-
- dict {
-- #quota = mysql:/etc/dovecot-dict-quota.conf
-+ #quota = mysql:%%PREFIX%%/etc/dovecot-dict-quota.conf
- }
-
- # Path to Berkeley DB's configuration file. See doc/dovecot-db.conf for an
-@@ -1095,8 +1103,8 @@
- # Each quota root has separate limits. Only the command for the first
- # exceeded limit is excecuted, so put the highest limit first.
- # Note that % needs to be escaped as %%, otherwise "% " expands to empty.
-- # quota_warning = storage=95%% /usr/local/bin/quota-warning.sh 95
-- # quota_warning2 = storage=80%% /usr/local/bin/quota-warning.sh 80
-+ # quota_warning = storage=95%% %%PREFIX%%/local/bin/quota-warning.sh 95
-+ # quota_warning2 = storage=80%% %%PREFIX%%/local/bin/quota-warning.sh 80
- #quota = maildir
-
- # ACL plugin. vfile backend reads ACLs from "dovecot-acl" file from maildir
-@@ -1105,7 +1113,7 @@
- # one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter
- # specifies how many seconds to wait between stat()ing dovecot-acl file
- # to see if it changed.
-- #acl = vfile:/etc/dovecot-acls:cache_secs=300
-+ #acl = vfile:%%PREFIX%%/etc/dovecot-acls:cache_secs=300
-
- # Convert plugin. If set, specifies the source storage path which is
- # converted to destination storage (mail_location) when the user logs in.
-@@ -1124,14 +1132,14 @@
- # until the message can be saved within quota limits. The configuration file
- # is a text file where each line is in format: <priority> <mailbox name>
- # Mails are first deleted in lowest -> highest priority number order
-- #trash = /etc/dovecot-trash.conf
-+ #trash = %%PREFIX%%/etc/dovecot-trash.conf
-
- # Expire plugin. Mails are expunged from mailboxes after being there the
- # configurable time. The first expiration date for each mailbox is stored in
- # a dictionary so it can be quickly determined which mailboxes contain
- # expired mails. The actual expunging is done in a nightly cronjob, which
- # you must set up:
-- # dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool
-+ # dovecot --exec-mail ext %%PREFIX%%/libexec/dovecot/expire-tool
- #expire = Trash 7 Spam 30
- #expire_dict = db:/var/lib/dovecot/expire.db
-
diff --git a/mail/dovecot-devel/pkg-deinstall b/mail/dovecot-devel/pkg-deinstall
deleted file mode 100644
index b2d28cc62ef3..000000000000
--- a/mail/dovecot-devel/pkg-deinstall
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-#
-# ex:ts=4
-
-ask() {
- local question default answer
-
- question=$1
- default=$2
- if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
- read -p "${question} [${default}]? " answer
- fi
- echo ${answer:-${default}}
-}
-
-yesno() {
- local question default answer
-
- question=$1
- default=$2
- while :; do
- answer=$(ask "${question}" "${default}")
- case "${answer}" in
- [Yy]*) return 0;;
- [Nn]*) return 1;;
- esac
- echo "Please answer yes or no."
- done
-}
-
-delete_account() {
- local port user uid group gid
-
- port=$1
- user=${2%:*}
- uid=${2#*:}
- group=${3%:*}
- gid=${3#*:}
-
- echo "If you do not intend to reinstall ${port}, you should manually remove the user '${user}' (uid='${uid}') and the group '${group}' (gid='${gid}')."
-}
-
-case $2 in
-
-DEINSTALL)
- if ps -axc | grep -qw dovecot; then
- if yesno "Dovecot is still running. Shall I stop it?" y; then
- killall dovecot
- sleep 2
- else
- echo "OK ... I hope you know what you are doing."
- fi
- fi
-
- delete_account Dovecot dovecot:${DOVECOT_UID:-143} dovecot:${DOVECOT_GID:-143}
-
- base=/var/run/dovecot
- DIRLIST="${base}/login ${base}"
- echo "Cleaning up \"${base}\"."
- for directory in ${DIRLIST}; do
- rmdir ${directory} 2>/dev/null || :
- done
- ;;
-
-esac
diff --git a/mail/dovecot-devel/pkg-descr b/mail/dovecot-devel/pkg-descr
deleted file mode 100644
index 48a277c6a21a..000000000000
--- a/mail/dovecot-devel/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Dovecot is a secure and compact IMAP server which is in the early stages
-of development. It supports Maildirs and mbox formats and much of the
-IMAP v4 protocol including SSL/TLS. IPv6 support is also included.
-Dovecot supports authentication with OpenLDAP, PostgreSQL, MySQL, vpopmail
-and PAM.
-
-WWW: http://www.dovecot.org/
diff --git a/mail/dovecot-devel/pkg-install b/mail/dovecot-devel/pkg-install
deleted file mode 100644
index ad6d5ae3357e..000000000000
--- a/mail/dovecot-devel/pkg-install
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# ex:ts=4
-
-ask() {
- local question default answer
-
- question=$1
- default=$2
- if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
- read -p "${question} [${default}]? " answer
- fi
- echo ${answer:-${default}}
-}
-
-yesno() {
- local question default answer
-
- question=$1
- default=$2
- while :; do
- answer=$(ask "${question}" "${default}")
- case "${answer}" in
- [Yy]*) return 0;;
- [Nn]*) return 1;;
- esac
- echo "Please answer yes or no."
- done
-}
-
-create_account() {
- local port user uid group gid gcos home shell
-
- port=$1
- user=${2%:*}
- uid=${2#*:}
- group=${3%:*}
- gid=${3#*:}
- gcos=$4
- home=$5
- shell=$6
-
- pw_user_uid=$(pw usershow -n "${user}" 2>/dev/null | cut -d: -f3)
- pw_uid_user=$(pw usershow -u "${uid}" 2>/dev/null | cut -d: -f1)
- pw_group_gid=$(pw groupshow -n "${group}" 2>/dev/null | cut -d: -f3)
- pw_gid_group=$(pw groupshow -g "${gid}" 2>/dev/null | cut -d: -f1)
-
- if [ -z "${pw_group_gid}" -a -z "${pw_gid_group}" ]; then
- echo "You need a ${group} group; creating it..."
- pw groupadd "${group}" -g "${gid}" || exit
- echo "Done."
- elif [ "${gid}" = "${pw_group_gid}" -a "${group}" = "${pw_gid_group}" ]; then
- echo "Using existing ${group} group."
- else
- echo "${port} has reserved the groupname '${group}' and gid '${gid}':"
- [ -n "${pw_group_gid}" -a "${gid}" != "${pw_group_gid}" ] \
- && echo "ERROR: groupname '${group}' already in use by gid '${pw_group_gid}'"
- [ -n "${pw_gid_group}" -a "${group}" != "${pw_gid_group}" ] \
- && echo "ERROR: gid '${gid}' already in use by group '${pw_gid_group}'"
- echo "Please resolve these issues and try again:"
- echo "Either remove the conflicting group or if you wish to continue using a legacy group override DOVECOT_GID."
- exit 1
- fi
-
- if [ -z "${pw_user_uid}" -a -z "${pw_uid_user}" ]; then
- echo "You need a ${user} user; creating it..."
- pw useradd "${user}" -u "${uid}" -g "${group}" -c "${gcos}" -d "${home}" -s "${shell}"
- echo "Done."
- elif [ "${uid}" = "${pw_user_uid}" -a "${user}" = "${pw_uid_user}" ]; then
- echo "Using existing ${user} user."
- else
- echo "${port} has reserved the username '${user}' and uid '${uid}':"
- [ -n "${pw_user_uid}" -a "${uid}" != "${pw_user_uid}" ] \
- && echo "ERROR: username '${user}' already in use by uid '${pw_user_uid}'"
- [ -n "${pw_uid_user}" -a "${user}" != "${pw_uid_user}" ] \
- && echo "ERROR: uid '${uid}' already in use by user '${pw_uid_user}'"
- echo "Please resolve these issues and try again:"
- echo "Either remove the conflicting user or if you wish to continue using a legacy user override DOVECOT_UID."
- exit 1
- fi
-}
-
-case $2 in
-
-PRE-INSTALL)
- create_account Dovecot dovecot:${DOVECOT_UID:-143} dovecot:${DOVECOT_GID:-143} "Dovecot User" /var/empty /usr/sbin/nologin
- ;;
-
-POST-INSTALL)
- base=/var/run/dovecot
- DIRLIST="${base} ${base}/login"
- echo "Fixing ownerships and modes in \"${base}\"."
- for directory in ${DIRLIST}; do
- if [ ! -d "${directory}" ]; then
- mkdir -p ${directory}
- echo "Created directory: ${directory}"
- fi
- done
- chown -R root:wheel ${base}
- chmod -R 0755 ${base}
- chown -R root:dovecot ${base}/login
- chmod -R 0750 ${base}/login
- ;;
-
-esac
diff --git a/mail/dovecot-devel/pkg-message b/mail/dovecot-devel/pkg-message
deleted file mode 100644
index a86b76ee9d4f..000000000000
--- a/mail/dovecot-devel/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
----------------------------------------------------------------------
-
- You can get basic IMAP and POP3 services running by enabling
- dovecot in /etc/rc.conf.
-
- In this basic configuration Dovecot will authenticate users against
- the system's passwd file and use the default /var/mail/$USER mbox
- files.
-
- echo dovecot_enable="YES" >> /etc/rc.conf
-
----------------------------------------------------------------------
diff --git a/mail/dovecot-devel/pkg-plist b/mail/dovecot-devel/pkg-plist
deleted file mode 100644
index 1e80a99473da..000000000000
--- a/mail/dovecot-devel/pkg-plist
+++ /dev/null
@@ -1,94 +0,0 @@
-@comment $FreeBSD$
-@unexec if cmp -s %D/etc/dovecot-example.conf %D/etc/dovecot.conf; then rm -f %D/etc/dovecot.conf; fi
-etc/dovecot-example.conf
-@exec if [ ! -f %D/etc/dovecot.conf ] ; then cp -p %D/%F %B/dovecot.conf; fi
-%%PORTDOCS%%etc/dovecot-ldap-example.conf
-%%PORTDOCS%%etc/dovecot-sql-example.conf
-@dirrmtry include/dovecot
-lib/dovecot/imap/lib01_acl_plugin.so
-lib/dovecot/imap/lib02_lazy_expunge_plugin.so
-lib/dovecot/imap/lib10_quota_plugin.so
-lib/dovecot/imap/lib11_imap_quota_plugin.a
-lib/dovecot/imap/lib11_imap_quota_plugin.la
-lib/dovecot/imap/lib11_imap_quota_plugin.so
-lib/dovecot/imap/lib11_trash_plugin.so
-lib/dovecot/imap/lib20_convert_plugin.so
-lib/dovecot/imap/lib20_expire_plugin.so
-lib/dovecot/imap/lib20_fts_plugin.so
-lib/dovecot/imap/lib20_mail_log_plugin.so
-lib/dovecot/imap/lib20_mbox_snarf_plugin.so
-lib/dovecot/imap/lib20_zlib_plugin.a
-lib/dovecot/imap/lib20_zlib_plugin.la
-lib/dovecot/imap/lib20_zlib_plugin.so
-lib/dovecot/imap/lib21_fts_squat_plugin.so
-@dirrm lib/dovecot/imap
-lib/dovecot/lda/lib01_acl_plugin.so
-lib/dovecot/lda/lib10_quota_plugin.so
-lib/dovecot/lda/lib11_trash_plugin.so
-lib/dovecot/lda/lib20_convert_plugin.so
-lib/dovecot/lda/lib20_expire_plugin.so
-lib/dovecot/lda/lib20_fts_plugin.so
-lib/dovecot/lda/lib20_mail_log_plugin.so
-lib/dovecot/lda/lib21_fts_squat_plugin.so
-@dirrm lib/dovecot/lda
-lib/dovecot/pop3/lib02_lazy_expunge_plugin.so
-lib/dovecot/pop3/lib10_quota_plugin.so
-lib/dovecot/pop3/lib20_convert_plugin.so
-lib/dovecot/pop3/lib20_expire_plugin.so
-lib/dovecot/pop3/lib20_mail_log_plugin.so
-lib/dovecot/pop3/lib20_mbox_snarf_plugin.so
-@dirrm lib/dovecot/pop3
-@dirrm lib/dovecot/auth
-lib/dovecot/lib01_acl_plugin.a
-lib/dovecot/lib01_acl_plugin.la
-lib/dovecot/lib01_acl_plugin.so
-lib/dovecot/lib02_lazy_expunge_plugin.a
-lib/dovecot/lib02_lazy_expunge_plugin.la
-lib/dovecot/lib02_lazy_expunge_plugin.so
-lib/dovecot/lib10_quota_plugin.a
-lib/dovecot/lib10_quota_plugin.la
-lib/dovecot/lib10_quota_plugin.so
-lib/dovecot/lib11_trash_plugin.a
-lib/dovecot/lib11_trash_plugin.la
-lib/dovecot/lib11_trash_plugin.so
-lib/dovecot/lib20_convert_plugin.a
-lib/dovecot/lib20_convert_plugin.la
-lib/dovecot/lib20_convert_plugin.so
-lib/dovecot/lib20_expire_plugin.a
-lib/dovecot/lib20_expire_plugin.la
-lib/dovecot/lib20_expire_plugin.so
-lib/dovecot/lib20_fts_plugin.a
-lib/dovecot/lib20_fts_plugin.la
-lib/dovecot/lib20_fts_plugin.so
-lib/dovecot/lib20_mail_log_plugin.a
-lib/dovecot/lib20_mail_log_plugin.la
-lib/dovecot/lib20_mail_log_plugin.so
-lib/dovecot/lib20_mbox_snarf_plugin.a
-lib/dovecot/lib20_mbox_snarf_plugin.la
-lib/dovecot/lib20_mbox_snarf_plugin.so
-lib/dovecot/lib21_fts_squat_plugin.a
-lib/dovecot/lib21_fts_squat_plugin.la
-lib/dovecot/lib21_fts_squat_plugin.so
-@dirrm lib/dovecot
-libexec/dovecot/checkpassword-reply
-libexec/dovecot/convert-tool
-%%LDA%%libexec/dovecot/deliver
-libexec/dovecot/dict
-libexec/dovecot/dovecot-auth
-libexec/dovecot/expire-tool
-libexec/dovecot/gdbhelper
-libexec/dovecot/idxview
-libexec/dovecot/imap
-libexec/dovecot/imap-login
-libexec/dovecot/listview
-libexec/dovecot/logview
-%%POP3%%libexec/dovecot/pop3
-%%POP3%%libexec/dovecot/pop3-login
-libexec/dovecot/rawlog
-libexec/dovecot/ssl-build-param
-@dirrm libexec/dovecot
-sbin/dovecot
-sbin/dovecotpw
-%%DATADIR%%/dovecot-openssl.cnf
-%%DATADIR%%/mkcert.sh
-@dirrm %%DATADIR%%