git: ea1abb86ad5c - main - mail/cyrus-imapd24: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 20 Sep 2023 12:10:32 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ea1abb86ad5c88914479c854a2854bb4e09b2b7a
commit ea1abb86ad5c88914479c854a2854bb4e09b2b7a
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-09-20 12:05:09 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-09-20 12:10:11 +0000
mail/cyrus-imapd24: Remove expired port
2023-09-15 mail/cyrus-imapd24: No longer supported by upstream
---
MOVED | 1 +
mail/Makefile | 1 -
mail/cyrus-imapd24/Makefile | 207 ----------
mail/cyrus-imapd24/distinfo | 7 -
mail/cyrus-imapd24/files/cyrus-imapd-man.conf.in | 1 -
.../files/extra-patch-imap__lmtp_sieve.c | 11 -
mail/cyrus-imapd24/files/imapd.conf | 415 ---------------------
mail/cyrus-imapd24/files/imapd.in | 36 --
mail/cyrus-imapd24/files/patch-Makefile.in | 25 --
mail/cyrus-imapd24/files/patch-configure | 22 --
mail/cyrus-imapd24/files/patch-imap__Makefile.in | 17 -
mail/cyrus-imapd24/files/patch-imtest__imtest.c | 15 -
mail/cyrus-imapd24/files/patch-lib__Makefile.in | 13 -
mail/cyrus-imapd24/files/patch-lib__imapoptions | 22 --
mail/cyrus-imapd24/files/patch-lib__libcyr_cfg.c | 13 -
mail/cyrus-imapd24/files/patch-lib__util.c | 14 -
mail/cyrus-imapd24/files/patch-man__Makefile.in | 21 --
mail/cyrus-imapd24/files/patch-master__Makefile.in | 17 -
.../cyrus-imapd24/files/patch-notifyd__Makefile.in | 13 -
.../files/patch-perl__imap__Makefile.PL | 15 -
.../patch-perl__sieve__managesieve__Makefile.PL | 15 -
mail/cyrus-imapd24/files/patch-sieve__Makefile.in | 25 --
.../files/patch-timsieved__Makefile.in | 13 -
mail/cyrus-imapd24/files/patch-tools__mkimap | 38 --
mail/cyrus-imapd24/files/pkg-deinstall.in | 40 --
mail/cyrus-imapd24/files/pkg-install.in | 41 --
mail/cyrus-imapd24/files/pkg-message.in | 10 -
mail/cyrus-imapd24/pkg-descr | 19 -
mail/cyrus-imapd24/pkg-plist | 109 ------
29 files changed, 1 insertion(+), 1195 deletions(-)
diff --git a/MOVED b/MOVED
index 401fb50392af..15e09e82baea 100644
--- a/MOVED
+++ b/MOVED
@@ -7856,3 +7856,4 @@ devel/rubygem-cucumber-tag-expressions4|devel/rubygem-cucumber-tag-expressions|2
security/rosenpass|net/rosenpass|2023-09-12|Remove duplicate port
dns/tinystats||2023-09-20|Has expired: djbdns got removed, port is no longer required
mail/cyrus-imapd23||2023-09-20|Has expired: No longer supported by upstream
+mail/cyrus-imapd24||2023-09-20|Has expired: No longer supported by upstream
diff --git a/mail/Makefile b/mail/Makefile
index 3b81fa453a01..547fb9b50b68 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -77,7 +77,6 @@
SUBDIR += couriergraph
SUBDIR += crm114
SUBDIR += cvsmail
- SUBDIR += cyrus-imapd24
SUBDIR += cyrus-imapd25
SUBDIR += cyrus-imapd30
SUBDIR += cyrus-imapd32
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
deleted file mode 100644
index 80761a4f0c56..000000000000
--- a/mail/cyrus-imapd24/Makefile
+++ /dev/null
@@ -1,207 +0,0 @@
-PORTNAME= cyrus-imapd
-PORTVERSION= 2.4.22
-PORTREVISION= 0
-CATEGORIES= mail
-MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
-PKGNAMESUFFIX= 24
-
-MAINTAINER= ume@FreeBSD.org
-COMMENT= Cyrus mail server, supporting POP3 and IMAP4 protocols
-WWW= https://www.cyrusimap.org/
-
-LICENSE= BSD4CLAUSE
-LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-
-DEPRECATED= No longer supported by upstream
-EXPIRATION_DATE=2023-09-15
-
-LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
- libpcre.so:devel/pcre
-
-CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3? cyrus-imapd3?-http
-
-USE_RC_SUBR= imapd
-
-USES= compiler cpe perl5 ssl
-GNU_CONFIGURE= yes
-CYRUS_PREFIX= ${PREFIX}/cyrus
-CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
- --with-cyrus-prefix=${CYRUS_PREFIX} \
- --with-cyrus-user=${CYRUS_USER} \
- --with-cyrus-group=${CYRUS_GROUP} \
- --with-sasl=${LOCALBASE} \
- --with-bdb=${BDB_LIB_NAME} \
- --with-com_err \
- --with-openssl=${OPENSSLBASE} \
- --with-perl=${PERL}
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
-MAKE_JOBS_UNSAFE= yes
-
-CPE_VENDOR= cmu
-CPE_PRODUCT= cyrus_imap_server
-
-OPTIONS_DEFINE= AUTOCREATE AUTOSIEVE BDB IDLED LDAP \
- MURDER MYSQL NETSCAPEHACK NNTP PGSQL \
- REPLICATION SNMP SQLITE DOCS EXAMPLES
-OPTIONS_DEFAULT= BDB IDLED
-OPTIONS_SUB= yes
-AUTOCREATE_DESC= Use autocreate INBOX patch (UoA)
-AUTOSIEVE_DESC= Use autosievefolder patch (UoA)
-BDB_USES= bdb
-BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} \
- --with-bdb-libdir=${LOCALBASE}/lib
-IDLED_DESC= Enable IMAP idled support
-IDLED_CONFIGURE_ENABLE= idled
-LDAP_DESC= Enable LDAP support (experimental)
-LDAP_USES= ldap
-LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}
-MURDER_DESC= Enable IMAP Murder support
-MURDER_CONFIGURE_ENABLE=murder
-MURDER_MAKE_ENV= PTHREAD_LIBS="-lpthread"
-MYSQL_USES= mysql
-MYSQL_CONFIGURE_ON= --with-mysql=yes \
- --with-mysql-libdir=${LOCALBASE}/lib/mysql \
- --with-mysql-incdir=${LOCALBASE}/include/mysql
-NETSCAPEHACK_DESC= Enable X-NETSCAPE extensions
-NETSCAPEHACK_CONFIGURE_ENABLE=netscapehack
-NNTP_DESC= Enable NNTP support
-NNTP_CONFIGURE_ENABLE= nntp
-PGSQL_USES= pgsql
-PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE}
-REPLICATION_DESC= Enable replication (experimental)
-REPLICATION_CONFIGURE_ENABLE=replication
-SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
-SNMP_CONFIGURE_ON= --with-snmp=${LOCALBASE}
-SNMP_CONFIGURE_OFF= --with-snmp=no
-SQLITE_USES= sqlite
-SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE}
-
-OPTIONS_RADIO= GSSAPI
-OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
-.if exists(/usr/lib/libkrb5.a)
-OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE
-OPTIONS_DEFAULT+= GSSAPI_BASE
-.endif
-GSSAPI_BASE_USES= gssapi
-GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
- --with-gss_impl=heimdal
-GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
-GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
- --with-gss_impl=heimdal
-GSSAPI_MIT_USES= gssapi:mit
-GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \
- --with-gss_impl=mit
-
-# Autocreate Inbox and Autosieve patches from UoA
-# http://email.uoa.gr/projects/cyrus/
-# http://blog.vx.sk/archives/13-Cyrus-IMAP-UoA.html
-
-AUTOCREATE_VERSION= 0.10-0
-AUTOCREATE_PATCH_SITES= LOCAL/mm:autocreate
-AUTOCREATE_PATCHFILES= ${PORTNAME}-2.4.4-autocreate-${AUTOCREATE_VERSION}.patch:-p1:autocreate
-AUTOCREATE_BROKEN= Patch is not applicable
-
-AUTOSIEVE_VERSION= 0.6.0
-AUTOSIEVE_PATCH_SITES= LOCAL/mm:autosieve
-AUTOSIEVE_PATCHFILES= ${PORTNAME}-2.4.12-autosieve-${AUTOSIEVE_VERSION}.patch:-p1:autosieve
-AUTOSIEVE_EXTRA_PATCHES=${FILESDIR}/extra-patch-imap__lmtp_sieve.c
-
-MANDIRS= ${CYRUS_PREFIX}/man
-
-PORTDOCS= *
-
-SUB_FILES= pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf
-
-SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP}
-
-CYRUS_USER?= cyrus
-CYRUS_GROUP?= cyrus
-
-MAN_MAN1= imtest installsieve lmtptest mupdatetest nntptest pop3test \
- sieveshell sivtest smtptest
-MAN_MAN3= imclient
-MAN_MAN5= cyrus.conf imapd.conf krb.equiv
-
-CYRUS_MAN8= arbitron chk_cyrus ctl_cyrusdb ctl_deliver ctl_mboxlist \
- cvt_cyrusdb cyr_dbtool cyr_df cyr_expire cyr_synclog deliver \
- fetchnews fud idled imapd ipurge lmtpd master mbexamine \
- mbpath nntpd notifyd pop3d quota reconstruct rmnews smmapd \
- squatter sync_client sync_reset sync_server syncnews \
- timsieved tls_prune unexpunge
-
-CYRUS_PERL_MAN1=cyradm
-CYRUS_PERL_MAN3=Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \
- Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve
-
-CONFS= cmu-backend.conf cmu-frontend.conf normal.conf prefork.conf \
- small.conf
-
-.include <bsd.port.options.mk>
-
-.if empty(${PORT_OPTIONS:MBDB})
-BDB_LIB_NAME= no
-.endif
-
-.if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \
- !${PORT_OPTIONS:MGSSAPI_MIT}
-CONFIGURE_ARGS+=--disable-gssapi
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
-IGNORE= does not build with llvm 16
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
- -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
- -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
- ${WRKSRC}/tools/mkimap
- @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
- -e "s|/usr/sieve|/var/imap/sieve|g" \
- ${WRKSRC}/tools/masssievec
-
-post-install:
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_DATA} ${FILESDIR}/imapd.conf \
- ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
- ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
- ${STAGEDIR}${CYRUS_PREFIX}/bin/mkimap
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
- ${STAGEDIR}${CYRUS_PREFIX}/bin/masssievec
- ${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
- ${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
-.for s in 1 3 5
-. for m in ${MAN_MAN${s}}
- @${ECHO_CMD} man/man${s}/${m}.${s}.gz >> ${TMPPLIST}
-. endfor
-.endfor
-.for s in 1 3
-. for m in ${CYRUS_PERL_MAN${s}}
- @${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST}
-. endfor
-.endfor
-.for m in ${CYRUS_MAN8}
- @${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST}
-.endfor
-
-post-install-DOCS-on:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
- "! ( -name Makefile.dist -o -name Makefile \
- -o -name .cvsignore -o -name htmlstrip.c )"
-
-# there are already files in EXAMPLESDIR at that point, so no
-# need to create it.
-post-install-EXAMPLES-on:
-.for f in ${CONFS:Nnormal.conf}
- ${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \
- ${STAGEDIR}${EXAMPLESDIR}
- @${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
-.endfor
-
-.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
deleted file mode 100644
index b4e6575e2d66..000000000000
--- a/mail/cyrus-imapd24/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1615288616
-SHA256 (cyrus-imapd-2.4.22.tar.gz) = 1a1a0133c39a2a2ba0dc60e7ef4a53af27c615b4e19e865ce0c77dcc3fd204d5
-SIZE (cyrus-imapd-2.4.22.tar.gz) = 2498555
-SHA256 (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 1130e80b6604901ba8cf887c792fa8e4ef181b4cfc212720bcfc984163fe8a13
-SIZE (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 74039
-SHA256 (cyrus-imapd-2.4.12-autosieve-0.6.0.patch) = daafab6c1a824d1d16745ea25a0bb6e404655ef690961e1dc236805e5c923135
-SIZE (cyrus-imapd-2.4.12-autosieve-0.6.0.patch) = 7626
diff --git a/mail/cyrus-imapd24/files/cyrus-imapd-man.conf.in b/mail/cyrus-imapd24/files/cyrus-imapd-man.conf.in
deleted file mode 100644
index b7ba70fcce77..000000000000
--- a/mail/cyrus-imapd24/files/cyrus-imapd-man.conf.in
+++ /dev/null
@@ -1 +0,0 @@
-MANPATH %%PREFIX%%/cyrus/man
diff --git a/mail/cyrus-imapd24/files/extra-patch-imap__lmtp_sieve.c b/mail/cyrus-imapd24/files/extra-patch-imap__lmtp_sieve.c
deleted file mode 100644
index 828283b0f0b0..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-imap__lmtp_sieve.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- imap/lmtp_sieve.c.orig 2015-10-17 06:54:40 UTC
-+++ imap/lmtp_sieve.c
-@@ -511,7 +511,7 @@ static int sieve_fileinto(void *ac,
- /* Try to deliver the mail again. */
- if (!ret)
- ret = deliver_mailbox(md->f, mdata->content, mdata->stage, md->size,
-- fc->imapflags->flag, fc->imapflags->nflags,
-+ fc->imapflags,
- (char *) sd->username, sd->authstate, md->id,
- sd->username, mdata->notifyheader,
- namebuf, md->date, quotaoverride, 0);
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
deleted file mode 100644
index 6b8db13c1cec..000000000000
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ /dev/null
@@ -1,415 +0,0 @@
-# Sample configurations file for Cyrus IMAPd
-# Most lines in this file are commented; in this case the default is used.
-# The commented lines (usually) contain the default value
-
-# The pathname of the IMAP configuration directory
-#
-configdirectory: /var/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# Use the UNIX separator character '/' for delimiting levels of
-# mailbox hierarchy. The default is to use the netnews separator
-# character '.'.
-#unixhierarchysep: no
-
-# Use the alternate IMAP namespace, where personal folders reside at
-# the same level in the hierarchy as INBOX.
-#
-#altnamespace: no
-
-# If using the alternate IMAP namespace, the prefix for the other
-# users namespace. The hierarchy delimiter will be automatically
-# appended.
-#
-#userprefix: Other Users
-
-# If using the alternate IMAP namespace, the prefix for the shared
-# namespace. The hierarchy delimiter will be automatically appended.
-#
-#sharedprefix: Shared Folders
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# This is the hostname visible in the greeting messages of the POP,
-# IMAP and LMTP daemons. If it is unset, then the result returned from
-# gethostname(2) is used.
-#
-#servername: <result returned by gethostname(2)>
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# Allow the use of cleartext passwords on the wire.
-#
-#allowplaintext: yes
-
-# The percent of quota utilization over which the server generates
-# warnings.
-#
-#quotawarn: 90
-
-# The length of the IMAP server's inactivity autologout timer, in minutes.
-# The minimum value is 30, the default.
-#
-#timeout: 30
-
-# The interval (in seconds) for polling the mailbox for changes while
-# running the IDLE command. This option is used when idled can not be
-# contacted or when polling is used exclusively. The minimum value is
-# 1. A value of 0 will disable polling (and disable IDLE if polling
-# is the only method available).
-#
-#imapidlepoll: 60
-
-# If enabled, the server responds to an ID command with a parameter
-# list containing: version, vendor, support-url, os, os-version,
-# command, arguments, environment. Otherwise the server returns NIL.
-#
-#imapidresponse: yes
-
-# Set the length of the POP server's inactivity autologout timer, in
-# minutes. The minimum value is 10, the default.
-#
-#poptimeout: 10
-
-# Set the minimum amount of time the server forces users to wait between
-# successive POP logins, in minutes. The default is 0.
-#
-#popminpoll: 0
-
-# The number of days advertised as being the minimum a message may be
-# left on the POP server before it is deleted (via the CAPA command,
-# defined in the POP3 Extension Mechanism, which some clients may
-# support). "NEVER", the default, may be specified with a negative
-# number. The Cyrus POP3 server never deletes mail, no matter what
-# the value of this parameter is. However, if a site implements a
-# less liberal policy, it needs to change this parameter accordingly.
-#
-#popexpiretime: 0
-
-# The list of userids with administrative rights. Separate each userid
-# with a space. We recommend that administrator userids be separate from
-# standard userids. Sites using Kerberos authentication may use separate
-# "admin" instances.
-#
-#admins: <none>
-
-# A list of users and groups that are allowed to proxy for other
-# users, seperated by spaces. Any user listed in this will be allowed
-# to login for any other user: use with caution.
-#
-#proxyservers: <none>
-
-# The Access Control List (ACL) placed on a newly-created (non-user)
-# mailbox that does not have a parent mailbox.
-#
-#defaultacl: anyone lrs
-
-# The pathname of the news spool directory. Only used if the partition-news
-# configuration option is set.
-#
-#newsspool: <no default>
-
-# Prefix to be prepended to newsgroup names to make the corresponding IMAP
-# mailbox names.
-#
-#newsprefix: <none>
-
-# If nonzero, normal users may create their own IMAP accounts by creating
-# the mailbox INBOX. The user's quota is set to the value if it is positive,
-# otherwise the user has unlimited quota.
-#
-#autocreatequota: 0
-
-# Include notations in the protocol telemetry logs indicating the number
-# of seconds since the last command or response.
-#
-#logtimestamps: no
-
-# Number of seconds to pause after a successful plaintext login. For systems
-# that support strong authentication, this permits users to perceive a cost
-# of using plaintext passwords.
-#
-#plaintextloginpause: 0
-
-# The pathname of srvtab file containing the server's private key.
-# This option is passed to the SASL library and overrides its default
-# setting.
-#
-#srvtab: /etc/srvtab
-
-# The list of remote realms whose users may log in using cross-realm
-# authentications. Seperate each realm name by a space. This option is
-# only used when the server is compiled with Kerberos authentication.
-#
-#loginrealms: <none>
-
-# If enabled, any authentication identity which has a rights on a user's
-# INBOX may log in as that user. This option is only used when the server
-# is compiled with Kerberos authentication.
-#
-#loginuseacl: no
-
-# If enabled, lmtpd attempts to only write one copy of a message per
-# partition and create hard links, resulting in a potentially large
-# disk savings.
-#
-#singleinstancestore: yes
-
-# If enabled, lmtpd will suppress delivery of a message to a mailbox
-# if a message with the same message-id (or resent-message-id) is
-# recorded as having already been delivered to the mailbox. Records
-# the mailbox and message-id/resent-message-id of all successful
-# deliveries.
-#
-#duplicatesuppression: yes
-
-# If enabled, lmtpd rejects messages with 8-bit characters in the
-# headers. Otherwise, 8-bit characters are changed to `X'. (A proper
-# soultion to non-ASCII characters in headers is offered by RFC 2047
-# and its predecessors.)
-#
-#reject8bit: no
-
-# Maximum incoming LMTP message size. If set, lmtpd will reject
-# messages larger than maxmessagesize bytes. The default is to allow
-# messages of any size.
-#
-#maxmessagesize: <unlimited>
-
-# Userid used to deliver messages to shared folders. For example, if
-# set to "bb", email sent to "bb+shared.blah" would be delivered to
-# the "shared.blah" folder. By default, an email address of
-# "+shared.blah" would be used.
-#postuser: <none>
-
-# If enabled at compile time, this specifies a URL to reply when
-# Netscape asks the server where the mail administration HTTP server
-# is. The default is a site at CMU with a hopefully informative
-# message; administrators should set this to a local resource with
-# some information of greater use.
-#
-#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
-
-# Notifyd(8) method to use for "MAIL" notifications. If not set,
-# "MAIL" notifications are disabled.
-#
-#mailnotifier: <no default>
-
-# Notifyd(8) method to use for "SIEVE" notifications. If not set,
-# "SIEVE" notifications are disabled.
-#
-# This method is only used when no method is specified in the script.
-#
-#sievenotifier: <no default>
-
-# If enabled, lmtpd will look for Sieve scripts in user's home
-# directories: ~user/.sieve.
-#
-sieveusehomedir: false
-
-# If sieveusehomedir is false, this directory is searched for Sieve scripts.
-# The active Sieve script is s called "default", placed in the users sieve
-# sieve directory (ie. /var/imap/sieve/u/user).
-#
-sievedir: /var/imap/sieve
-
-# The pathname of the sendmail executable. Sieve uses sendmail for
-# sending rejections, redirects and vaca- tion responses.
-#
-#sendmail: /usr/sbin/sendmail
-
-# Username that is used as the 'From' address in rejection MDNs
-# produced by sieve.
-#
-#postmaster: postmaster
-
-# If enabled, the partitions will also be hashed, in addition to the hashing
-# done on configuration directories. This is recommended if one partition has
-# a very bushy mailbox tree.
-#
-#hashimapspool: false
-
-# Maximum size (in kilobytes) any sieve script can be, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscriptsize: 32
-
-# Maximum number of sieve scripts any user may have, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscripts: 5
-
-# The cyrusdb backend to use for mailbox annotations.
-# Allowed values: berkeley, skiplist
-#
-#annotation_db: skiplist
-
-# The cyrusdb backend to use for the duplicate delivery suppression
-# and sieve.
-# Allowed values: berkeley, berkeley-nosync, skiplist
-#
-#duplicate_db: skiplist
-
-# The cyrusdb backend to use for the mailbox list.
-# Allowed values: flat, berkeley, skiplist
-#
-#mboxlist_db: skiplist
-
-# The cyrusdb backend to use for the pts cache.
-# Allowed values: berkeley, skiplist
-#
-#ptscache_db: skiplist
-
-# The cyrusdb backend to use for the seen state.
-# Allowed values: flat, berkeley, skiplist
-#
-#seenstate_db: skiplist
-
-# The cyrusdb backend to use for the imap status cache.
-# Allowed values: berkeley, berkeley-nosync, berkeley-hash,
-# berkeley-hash-nosync, skiplist
-#
-#statuscache_db: skiplist
-
-# The cyrusdb backend to use for the subscriptions list.
-# Allowed values: flat, berkeley, skiplist
-#
-#subscription_db: flat
-
-# The cyrusdb backend to use for the TLS cache.
-# Allowed values: berkeley, berkeley-nosync, skiplist
-#
-#tlscache_db: skiplist
-
-# Maximum SSF (security strength factor) that the server will allow a
-# client to negotiate.
-#
-#sasl_maximum_layer: 256
-
-# The minimum SSF that the server will allow a client to negotiate. A
-# value of 1 requires integrity protection; any higher value requires
-# some amount of encryption.
-#
-#sasl_minimum_layer: 0
-
-# The mechanism used by the server to verify plaintext passwords. Possible
-# values include "auxprop" or "saslauthd"
-#
-sasl_pwcheck_method: auxprop
-
-# If enabled, the SASL library will automatically create authentication
-# secrets when given a plaintext password. See the SASL documentation.
-#
-#sasl_auto_transition: no
-
-# Whitespace separated list of mechanisms to allow (e.g. 'plain otp').
-# Used to restrict the mechanisms to a subset of the installed
-# plugins. The default is all available.
-#
-#sasl_mech_list: cram-md5 digest-md5
-
-# Location of the opiekeys file
-#
-#sasl_opiekeys: /etc/opiekeys
-
-# File containing the global certificate used for ALL services (imap,
-# pop3, lmtp).
-#
-#tls_cert_file: <none>
-
-# File containing the private key belonging to the global server
-# certificate.
-#
-#tls_key_file: <none>
-
-# File containing the certificate used for imap ONLY. If not
-# specified, the global certificate is used. A value of "disabled"
-# will disable SSL/TLS for imap.
-#
-#imap_tls_cert_file: <none>
-
-# File containing the private key belonging to the imap-specific
-# server certificate. If not specified, the global private key is
-# used. A value of "disabled" will disable SSL/TLS for imap.
-#
-#imap_tls_key_file: <none>
-
-# File containing the certificate used for pop3 ONLY. If not
-# specified, the global certificate is used. A value of "disabled"
-# will disable SSL/TLS for pop3.
-#
-#pop3_tls_cert_file: <none>
-
-# File containing the private key belonging to the pop3-specific
-# server certificate. If not specified, the global private key is
-# used. A value of "disabled" will disable SSL/TLS for pop3.
-#
-#pop3_tls_key_file: <none>
-
-# File containing the certificate used for lmtp ONLY. If not
-# specified, the global certificate is used. A value of "disabled"
-# will disable TLS for lmtp.
-#
-#lmtp_tls_cert_file: <none>
-
-# File containing the private key belonging to the lmtp-specific
-# server certificate. If not specified, the global private key is
-# used. A value of "disabled" will disable TLS for lmtp.
-#
-#lmtp_tls_key_file: <none>
-
-# File containing the certificate used for sieve ONLY. If not
-# specified, the global certificate is used. A value of "disabled"
-# will disable TLS for sieve.
-#
-#sieve_tls_cert_file: <none>
-
-# File containing the private key belonging to the sieve-specific
-# server certificate. If not specified, the global private key is
-# used. A value of "disabled" will disable TLS for sieve.
-#
-#sieve_tls_key_file: <none>
-
-# File containing one or more Certificate Authority (CA) certificates.
-#
-#tls_ca_file: <none>
-
-# Path to directory with certificates of CAs.
-#
-#tls_ca_path: <none>
-
-# The length of time (in minutes) that a TLS session will be cached
-# for later reuse. The maximum value is 1440 (24 hours), the default.
-# A value of 0 will disable session caching.
-#
-#tls_session_timeout: 1440
-
-# The right that a user needs to delete a mailbox.
-#
-#deleteright: c
-
-# Unix domain socket that lmtpd listens on, used by deliver(8).
-#
-#lmtpsocket: /var/imap/socket/lmtp
-
-# Unix domain socket that idled listens on.
-#
-#idlesocket: /var/imap/socket/idle
-
-# Unix domain socket that the new mail notification daemon listens on.
-#
-#notifysocket: /var/imap/socket/notify
-
-#
-# EOF
diff --git a/mail/cyrus-imapd24/files/imapd.in b/mail/cyrus-imapd24/files/imapd.in
deleted file mode 100644
index 1623c9b7e54e..000000000000
--- a/mail/cyrus-imapd24/files/imapd.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imapd
-
-# PROVIDE: cyrus_imapd imap
-# REQUIRE: DAEMON
-# BEFORE: mail
-# KEYWORD: shutdown
-
-# Define these cyrus_imapd_* variables in one of these files:
-# /etc/rc.conf
-# /etc/rc.conf.local
-# /etc/rc.conf.d/cyrus_imapd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd
-#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master" # Location of imapd
-[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program
-
-. /etc/rc.subr
-
-name="cyrus_imapd"
-rcvar=cyrus_imapd_enable
-command="%%PREFIX%%/cyrus/bin/master"
-pidfile="/var/run/cyrus-master.pid"
-required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf"
-stop_postcmd="cyrus_imapd_poststop"
-extra_commands="reload"
-
-cyrus_imapd_poststop() {
- /bin/rm -f ${pidfile}
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/cyrus-imapd24/files/patch-Makefile.in b/mail/cyrus-imapd24/files/patch-Makefile.in
deleted file mode 100644
index 71800e59efb8..000000000000
--- a/mail/cyrus-imapd24/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: Makefile.in
-diff -u Makefile.in.orig Makefile.in
---- Makefile.in.orig Sat May 15 05:59:10 2004
-+++ Makefile.in Wed May 19 00:23:11 2004
-@@ -97,13 +97,13 @@
- touch distcvs
-
- install::
-- $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin
-- $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib
-- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus
-- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1
-- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3
-- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5
-- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8
-+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/bin
-+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/lib
-+ $(INSTALL) -d ${DESTDIR}$(prefix)/include/cyrus
-+ $(INSTALL) -d ${DESTDIR}$(mandir)/man1
-+ $(INSTALL) -d ${DESTDIR}$(mandir)/man3
-+ $(INSTALL) -d ${DESTDIR}$(mandir)/man5
-+ $(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8
- @for d in $(SUBDIRS); \
- do \
- (cd $$d; echo "### Making" install "in" `pwd`; \
diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure
deleted file mode 100644
index 4d3deee12dcf..000000000000
--- a/mail/cyrus-imapd24/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig 2010-10-18 21:36:00.000000000 +0900
-+++ configure 2010-10-18 23:50:45.966557478 +0900
-@@ -9501,7 +9501,7 @@
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-+LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -9803,7 +9803,7 @@
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
- elif test "$gss_impl" = "heimdal"; then
- CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
-- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509"
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
- elif test "$gss_impl" = "cybersafe03"; then
- # Version of CyberSafe with two libraries
diff --git a/mail/cyrus-imapd24/files/patch-imap__Makefile.in b/mail/cyrus-imapd24/files/patch-imap__Makefile.in
deleted file mode 100644
index e1a94d35f26f..000000000000
--- a/mail/cyrus-imapd24/files/patch-imap__Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig Fri Nov 18 00:46:14 2005
-+++ imap/Makefile.in Sat Dec 10 16:46:31 2005
-@@ -130,10 +130,10 @@
-
-
- install:
-- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-+ $(INSTALL) -d ${DESTDIR}$(service_path)
- for file in $(PROGS); \
- do \
-- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
-+ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
- done
- ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
- ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
diff --git a/mail/cyrus-imapd24/files/patch-imtest__imtest.c b/mail/cyrus-imapd24/files/patch-imtest__imtest.c
deleted file mode 100644
index 30b84fb9556a..000000000000
--- a/mail/cyrus-imapd24/files/patch-imtest__imtest.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: imtest/imtest.c
-diff -u imtest/imtest.c.orig imtest/imtest.c
---- imtest/imtest.c.orig Sun Jul 13 05:10:56 2003
-+++ imtest/imtest.c Fri Jul 18 00:52:29 2003
-@@ -419,8 +420,8 @@
- }
-
-
--char *var_tls_CAfile="";
--char *var_tls_CApath="";
-+static char *var_tls_CAfile="";
-+static char *var_tls_CApath="";
- /*
- * This is the setup routine for the SSL client.
- *
diff --git a/mail/cyrus-imapd24/files/patch-lib__Makefile.in b/mail/cyrus-imapd24/files/patch-lib__Makefile.in
deleted file mode 100644
index 543ece89f131..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib__Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig Thu Mar 11 06:25:39 2004
-+++ lib/Makefile.in Wed May 19 00:34:19 2004
-@@ -102,7 +102,7 @@
- all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
-
- install:
-- $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
-+ $(INSTALL) -d $(DESTDIR)$(libdir)
- $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
- $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
- $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
diff --git a/mail/cyrus-imapd24/files/patch-lib__imapoptions b/mail/cyrus-imapd24/files/patch-lib__imapoptions
deleted file mode 100644
index 8c79e3b2e8f4..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib__imapoptions
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig 2008-10-12 21:22:03.000000000 +0900
-+++ lib/imapoptions 2008-10-12 21:23:33.000000000 +0900
-@@ -893,7 +893,7 @@
- { "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
- /* The cyrusdb backend to use for the seen state. */
-
--{ "sendmail", "/usr/lib/sendmail", STRING }
-+{ "sendmail", "/usr/sbin/sendmail", STRING }
- /* The pathname of the sendmail executable. Sieve invokes sendmail
- for sending rejections, redirects and vacation responses. */
-
-@@ -956,7 +956,7 @@
- /* If enabled, timsieved will expect a capability response after a successful
- SASL authentication, per draft-martin-mangesieve-12.txt . */
-
--{ "sievedir", "/usr/sieve", STRING }
-+{ "sievedir", "/var/imap/sieve", STRING }
- /* If sieveusehomedir is false, this directory is searched for Sieve
- scripts. */
-
diff --git a/mail/cyrus-imapd24/files/patch-lib__libcyr_cfg.c b/mail/cyrus-imapd24/files/patch-lib__libcyr_cfg.c
deleted file mode 100644
index 5cbb64001209..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib__libcyr_cfg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/libcyr_cfg.c
-diff -u -p lib/libcyr_cfg.c.orig lib/libcyr_cfg.c
---- lib/libcyr_cfg.c.orig Wed Mar 10 00:05:58 2004
-+++ lib/libcyr_cfg.c Fri Feb 25 00:06:44 2005
-@@ -52,7 +52,7 @@
- #include "libcyr_cfg.h"
- #include "cyrusdb.h"
-
--#if defined(__GNUC__) && __GNUC__ > 1
-+#if defined(__GNUC__) && __GNUC__ > 1 && !defined(__INTEL_COMPILER)
- /* We can use the GCC union constructor extension */
- #define CFGVAL(t,v) (union cyrus_config_value)((t)(v))
- #else
diff --git a/mail/cyrus-imapd24/files/patch-lib__util.c b/mail/cyrus-imapd24/files/patch-lib__util.c
deleted file mode 100644
index aca6416970c3..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib__util.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: lib/util.c
-diff -u -p lib/util.c.orig lib/util.c
---- lib/util.c.orig 2012-04-18 20:28:37.000000000 +0900
-+++ lib/util.c 2012-04-18 22:29:24.521844579 +0900
-@@ -55,6 +55,9 @@
- #include <syslog.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
diff --git a/mail/cyrus-imapd24/files/patch-man__Makefile.in b/mail/cyrus-imapd24/files/patch-man__Makefile.in
deleted file mode 100644
index 1b0061897d43..000000000000
--- a/mail/cyrus-imapd24/files/patch-man__Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: man/Makefile.in
-diff -u man/Makefile.in.orig man/Makefile.in
---- man/Makefile.in.orig Wed May 11 00:02:35 2005
-+++ man/Makefile.in Sat Dec 10 15:26:05 2005
-@@ -50,6 +50,7 @@
- SHELL = /bin/sh
-
- prefix = @prefix@
-+cyrus_prefix = @cyrus_prefix@
-
- mandir = @mandir@
-
*** 436 LINES SKIPPED ***