summaryrefslogtreecommitdiff
path: root/mail/cyrus-imapd24
diff options
context:
space:
mode:
Diffstat (limited to 'mail/cyrus-imapd24')
-rw-r--r--mail/cyrus-imapd24/Makefile251
-rw-r--r--mail/cyrus-imapd24/distinfo3
-rw-r--r--mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m427
-rw-r--r--mail/cyrus-imapd24/files/extra-patch-configure.in13
-rw-r--r--mail/cyrus-imapd24/files/imapd.conf418
-rw-r--r--mail/cyrus-imapd24/files/imapd.sh.in42
-rw-r--r--mail/cyrus-imapd24/files/patch-Makefile.in25
-rw-r--r--mail/cyrus-imapd24/files/patch-configure48
-rw-r--r--mail/cyrus-imapd24/files/patch-imap::Makefile.in33
-rw-r--r--mail/cyrus-imapd24/files/patch-imtest::imtest.c15
-rw-r--r--mail/cyrus-imapd24/files/patch-lib::Makefile.in13
-rw-r--r--mail/cyrus-imapd24/files/patch-lib::imapoptions22
-rw-r--r--mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c13
-rw-r--r--mail/cyrus-imapd24/files/patch-man::Makefile.in21
-rw-r--r--mail/cyrus-imapd24/files/patch-master::Makefile.in26
-rw-r--r--mail/cyrus-imapd24/files/patch-notifyd::Makefile.in13
-rw-r--r--mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL15
-rw-r--r--mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL15
-rw-r--r--mail/cyrus-imapd24/files/patch-sieve::Makefile.in23
-rw-r--r--mail/cyrus-imapd24/files/patch-timsieved::Makefile.in13
-rw-r--r--mail/cyrus-imapd24/files/patch-tools::mkimap38
-rw-r--r--mail/cyrus-imapd24/pkg-deinstall60
-rw-r--r--mail/cyrus-imapd24/pkg-descr21
-rw-r--r--mail/cyrus-imapd24/pkg-install61
-rw-r--r--mail/cyrus-imapd24/pkg-message8
-rw-r--r--mail/cyrus-imapd24/pkg-plist115
26 files changed, 0 insertions, 1352 deletions
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
deleted file mode 100644
index 1bc6d68350fb..000000000000
--- a/mail/cyrus-imapd24/Makefile
+++ /dev/null
@@ -1,251 +0,0 @@
-# New ports collection makefile for: cyrus-imapd
-# Date created: Dec 10th 2005
-# Whom: ume@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= cyrus-imapd
-PORTVERSION= 2.3.12p2
-PORTREVISION= 1
-CATEGORIES= mail ipv6
-MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
- http://ftp.andrew.cmu.edu/pub/cyrus/ \
- http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-
-MAINTAINER= ume@FreeBSD.org
-COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
-
-LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
- ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-
-CONFLICTS= cyrus-1.* cyrus-imapd-2.[^3].*
-
-LATEST_LINK= ${PORTNAME}23
-
-USE_RC_SUBR= imapd.sh
-USE_OPENSSL= yes
-USE_PERL5= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
- --with-cyrus-prefix=${PREFIX}/cyrus \
- --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=${PERL5}
-
-OPTIONS= BDB "Use Berkeley DB" on \
- DRAC "Enable DRAC support" off \
- IDLED "Enable IMAP idled support" off \
- LDAP_PTLOADER "Enable LDAP ptloader" off \
- LISTEXT "Enable IMAP List extensions" off \
- MURDER "Enable IMAP Murder support" off \
- NETSCAPEHACK "Enable X-NETSCAPE extensions" off \
- NNTP "Enable NNTP support" off \
- REPLICATION "Enable replication" off \
- SNMP_4 "Enable SNMP support using net-snmp v4" off \
- SNMP_5 "Enable SNMP support using net-snmp v5" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_BDB)
-BDB_LIB_NAME= no
-.else
-USE_BDB= yes
-INVALID_BDB_VER=2
-CONFIGURE_ARGS+=--with-bdb-incdir=${BDB_INCLUDE_DIR} \
- --with-bdb-libdir=${LOCALBASE}/lib
-.endif
-
-.if defined(WITH_NNTP)
-CONFIGURE_ARGS+=--enable-nntp
-PLIST_SUB+= NNTP=""
-.else
-PLIST_SUB+= NNTP="@comment "
-.endif
-
-.if defined(WITH_MURDER)
-CONFIGURE_ARGS+=--enable-murder
-CFLAGS+= ${PTHREAD_CFLAGS}
-MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS}
-PLIST_SUB+= MURDER=""
-.else
-PLIST_SUB+= MURDER="@comment "
-.endif
-
-.if defined(WITH_IDLED)
-CONFIGURE_ARGS+=--enable-idled
-PLIST_SUB+= IDLED=""
-.else
-PLIST_SUB+= IDLED="@comment "
-.endif
-
-.if defined(WITH_REPLICATION)
-CONFIGURE_ARGS+=--enable-replication
-PLIST_SUB+= REPLICATION=""
-.else
-PLIST_SUB+= REPLICATION="@comment "
-.endif
-
-.if defined(WITH_LISTEXT)
-CONFIGURE_ARGS+=--enable-listext
-.endif
-
-.if defined(WITH_NETSCAPEHACK)
-CONFIGURE_ARGS+=--enable-netscapehack
-.endif
-
-.if defined(WITH_DRAC)
-EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
- ${FILESDIR}/extra-patch-configure.in
-USE_AUTOTOOLS= autoconf:262 autoheader:262
-CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
-.endif
-
-.if defined(WITH_SNMP_4) && defined(WITH_SNMP_5)
-BROKEN= Multiple net-snmp versions selected. Run 'make config' again!
-.endif
-.if defined(WITH_SNMP_4)
-LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
-.elif defined(WITH_SNMP_5)
-LIB_DEPENDS+= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
-.endif
-.if defined(WITH_SNMP_4) || defined(WITH_SNMP_5)
-CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--with-snmp=no
-.endif
-
-.if defined(WITH_LDAP_PTLOADER)
-USE_OPENLDAP= yes
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-PLIST_SUB+= LDAP_PTLOADER=""
-.else
-PLIST_SUB+= LDAP_PTLOADER="@comment "
-.endif
-
-.if (!defined(MAKE_KERBEROS5) && ${OSVERSION} <= 500105) || \
- !exists(/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=--disable-gssapi
-.endif
-
-.if ${OSVERSION} >= 800037
-BROKEN= does not compile
-.endif
-
-CYRUS_USER?= cyrus
-CYRUS_GROUP?= cyrus
-
-MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
- nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
-MAN3= imclient.3
-MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5
-CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
- Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
-CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
- cyr_dbtool.8 cyr_expire.8 cyr_synclog.8 ctl_mboxlist.8 \
- cvt_cyrusdb.8 deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 \
- ipurge.8 lmtpd.8 make_md5.8 make_sha1.8 master.8 mbexamine.8 \
- mbpath.8 notifyd.8 pop3d.8 quota.8 reconstruct.8 rmnews.8 \
- smmapd.8 squatter.8 sync_client.8 sync_reset.8 sync_server.8 \
- syncnews.8 timsieved.8 tls_prune.8 unexpunge.8
-
-DOCS= altnamespace anoncvs bugs changes faq feedback index \
- install install-admin-mb install-auth install-compile \
- install-configure install-murder install-netnews \
- install-perf install-prereq install-replication \
- install-sieve install-snmpmon install-testing \
- install-upgrade install-virtdomains mailing-list man \
- notes os overview questions readme sieve sieve-protocol \
- specs
-
-CONFS= cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
- small.conf
-
-PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-PKGINSTALL= ${WRKDIR}/pkg-install
-
-post-patch:
- @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
- -e "s|%%PREFIX%%|${PREFIX}|g" \
- -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
- ${.CURDIR}/pkg-install > ${PKGINSTALL}
- @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
- -e "s|%%PREFIX%%|${PREFIX}|g" \
- -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
- ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
- @${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
-.if defined(WITH_DRAC)
- @${RM} -rf ${WRKSRC}/autom4te.cache
-.endif
-
-post-install:
-.for f in ${CYRUS_MAN3}
- @${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
- @${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
- >>${TMPPLIST}
-.endfor
-.for f in ${CYRUS_MAN8}
- @${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
- @${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
-.endfor
- @${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
- @${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
- @${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}/man
- @${MKDIR} ${DOCSDIR}/text
-.for f in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
- @${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
-.endfor
-.for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
- @if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
- ${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
- ${DOCSDIR}/man/${f}.html; \
- ${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
- >>${TMPPLIST}; \
- fi
-.endfor
-.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
- @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
- @${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
-.endfor
-.for f in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
- @${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
-.endfor
- @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
- @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
- @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
-.endif
- @${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR}
-.for f in ${CONFS}
- @${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR}
- @${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
-.endfor
- @${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \
- >>${TMPPLIST}
- @${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
- ${PREFIX}/cyrus/bin/mkimap
- @${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
- ${PREFIX}/cyrus/bin/masssievec
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
- POST-INSTALL
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
deleted file mode 100644
index 7e1d5feb6e49..000000000000
--- a/mail/cyrus-imapd24/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (cyrus-imapd-2.3.12p2.tar.gz) = ee2c300687994e4982c6af6aa154c742
-SHA256 (cyrus-imapd-2.3.12p2.tar.gz) = c4ea8af68d2b14d93f662fc97f805450ef0cb98ddb986b2b7330cb4aba93c4c4
-SIZE (cyrus-imapd-2.3.12p2.tar.gz) = 2305996
diff --git a/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4 b/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4
deleted file mode 100644
index 829d92d23585..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: cmulocal/ucdsnmp.m4
-diff -u cmulocal/ucdsnmp.m4.orig cmulocal/ucdsnmp.m4
---- cmulocal/ucdsnmp.m4.orig Tue May 25 10:27:58 2004
-+++ cmulocal/ucdsnmp.m4 Sat Dec 10 16:34:09 2005
-@@ -31,9 +31,12 @@
-
- if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
- CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
-- LIB_UCDSNMP=$SNMP_LIBS
-+ LIB_UCDSNMP="$SNMP_LIBS -lwrap"
-+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
-+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
- AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?])
- AC_SUBST(LIB_UCDSNMP)
-+ AC_SUBST(LDFLAGS_UCDSNMP)
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
-@@ -59,7 +62,7 @@
- LIB_UCDSNMP=""
- if test "$with_snmp" != no; then
- AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
-- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
- AC_CHECK_LIB(rpm, rpmdbOpen,
- LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
- fi
diff --git a/mail/cyrus-imapd24/files/extra-patch-configure.in b/mail/cyrus-imapd24/files/extra-patch-configure.in
deleted file mode 100644
index 1a89d771ee93..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: configure.in
-diff -u configure.in.orig configure.in
---- configure.in.orig Sat May 29 04:59:21 2004
-+++ configure.in Sat May 29 05:03:04 2004
-@@ -933,7 +933,7 @@
- dnl add perl cccdlflags when building libraries -- this ensures that the
- dnl libraries will be compiled as PIC if perl requires PIC objects
- dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris --
--dnl eval `${PERL} -V:cccdlflags`
-+ eval `${PERL} -V:cccdlflags`
- PERL_CCCDLFLAGS="$cccdlflags"
- AC_SUBST(PERL_CCCDLFLAGS)
- fi
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
deleted file mode 100644
index 3c73402c12de..000000000000
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ /dev/null
@@ -1,418 +0,0 @@
-#
-# $FreeBSD$
-#
-# 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: berkeley-nosync
-
-# 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: berkeley
-
-# 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: berkeley-nosync
-
-# 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: berkeley-nosync
-
-# 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.sh.in b/mail/cyrus-imapd24/files/imapd.sh.in
deleted file mode 100644
index b8dd83bd4a01..000000000000
--- a/mail/cyrus-imapd24/files/imapd.sh.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imapd
-# $FreeBSD$
-
-# PROVIDE: cyrus_imapd
-# REQUIRE: DAEMON
-# BEFORE: mail
-# KEYWORD: shutdown
-#
-# NOTE for FreeBSD 5.0+:
-# If you want this script to start with the base rc scripts
-# move imapd.sh to /etc/rc.d/cyrus_imapd
-
-prefix=%%PREFIX%%
-
-# 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
-
-. %%RC_SUBR%%
-
-name="cyrus_imapd"
-rcvar=`set_rcvar`
-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"
-
-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 73908ab528cf..000000000000
--- a/mail/cyrus-imapd24/files/patch-configure
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig Tue May 23 22:57:47 2006
-+++ configure Wed May 24 00:01:31 2006
-@@ -310,6 +310,7 @@
- #endif"
-
- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
-+ac_subst_vars="${ac_subst_vars} LDFLAGS_UCDSNMP"
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -16716,6 +16718,7 @@
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
- PERL_SUBDIRS="imap"
- PERL="${with_perl}"
-+ eval `${PERL} -V:cccdlflags`
- PERL_CCCDLFLAGS="$cccdlflags"
-
- fi
-@@ -17736,7 +17739,9 @@
-
- if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
- CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
-- LIB_UCDSNMP=$SNMP_LIBS
-+ LIB_UCDSNMP="$SNMP_LIBS -lwrap"
-+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
-+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_NETSNMP 1
-@@ -17985,7 +17990,7 @@
- #define HAVE_UCDSNMP 1
- _ACEOF
-
-- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
- echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
- if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
-@@ -18810,6 +18815,7 @@
- s,@LIB_WRAP@,$LIB_WRAP,;t t
- s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
- s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t
-+s,@LDFLAGS_UCDSNMP@,$LDFLAGS_UCDSNMP,;t t
- s,@LIB_RT@,$LIB_RT,;t t
- s,@IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t
- s,@IMAP_LIBS@,$IMAP_LIBS,;t t
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 163deb2807c3..000000000000
--- a/mail/cyrus-imapd24/files/patch-imap::Makefile.in
+++ /dev/null
@@ -1,33 +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
-@@ -219,13 +219,13 @@
- $(CC) $(LDFLAGS) -o mupdate \
- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- mutex_pthread.o tls.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
-
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- libimap.a $(DEPLIBS)
- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
-- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
-
- pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
- $(DEPLIBS) $(SERVICE)
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 c46c80a342a0..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 Thu Mar 20 04:00:39 2003
-+++ lib/imapoptions Fri Mar 21 15:27:44 2003
-@@ -454,7 +454,7 @@
- /* The mechanism used by the server to verify plaintext passwords.
- Possible values include "auxprop", "saslauthd", and "pwcheck". */
-
--{ "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. */
-
-@@ -475,7 +475,7 @@
- /* Maximum number of sieve scripts any user may have, enforced at
- submission by timsieved(8). */
-
--{ "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-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@
-
-@@ -95,7 +96,7 @@
- done
- for file in $(MAN8); \
- do \
-- $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \
-+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
- done
-
- clean:
diff --git a/mail/cyrus-imapd24/files/patch-master::Makefile.in b/mail/cyrus-imapd24/files/patch-master::Makefile.in
deleted file mode 100644
index c828109f247e..000000000000
--- a/mail/cyrus-imapd24/files/patch-master::Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig Sat May 29 03:03:05 2004
-+++ master/Makefile.in Wed Jul 21 04:13:16 2004
-@@ -58,7 +58,7 @@
- DEPLIBS = @DEPLIBS@
-
- CFLAGS = @CFLAGS@
--LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
-+LDFLAGS = @LDFLAGS_UCDSNMP@ @LDFLAGS@ @COM_ERR_LDFLAGS@
- LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
-
- SHELL = /bin/sh
-@@ -76,10 +76,10 @@
- all: $(PROGS) $(LOBJS)
-
- 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
-
- .c.o:
diff --git a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in b/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in
deleted file mode 100644
index d49703fa25b4..000000000000
--- a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: notifyd/Makefile.in
-diff -u notifyd/Makefile.in.orig notifyd/Makefile.in
---- notifyd/Makefile.in.orig Wed Nov 12 13:02:10 2003
-+++ notifyd/Makefile.in Fri Feb 13 18:41:07 2004
-@@ -79,7 +79,7 @@
- all: notifyd
-
- install:
-- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
-+ $(INSTALL) -s -m 755 notifyd $(DESTDIR)$(service_path)
-
- OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
-
diff --git a/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL
deleted file mode 100644
index 66140bf53219..000000000000
--- a/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/imap/Makefile.PL
-diff -u perl/imap/Makefile.PL.orig perl/imap/Makefile.PL
---- perl/imap/Makefile.PL.orig Thu Oct 23 03:50:18 2003
-+++ perl/imap/Makefile.PL Sun Dec 12 04:20:10 2004
-@@ -70,3 +70,10 @@
- 'INC' => "-I../../lib $SASL_INC $OPENSSL_INC",
- 'EXE_FILES' => [cyradm],
- );
-+
-+package MY;
-+sub install {
-+ my $inherited = shift->SUPER::install(@_);
-+ $inherited =~ s/(install :: all pure_install) doc_install/$1/;
-+ $inherited;
-+}
diff --git a/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL
deleted file mode 100644
index bde3d77b763e..000000000000
--- a/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/sieve/managesieve/Makefile.PL
-diff -u perl/sieve/managesieve/Makefile.PL.orig perl/sieve/managesieve/Makefile.PL
---- perl/sieve/managesieve/Makefile.PL.orig Thu Oct 23 03:50:27 2003
-+++ perl/sieve/managesieve/Makefile.PL Sun Dec 12 04:21:55 2004
-@@ -64,3 +64,10 @@
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
- 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
- );
-+
-+package MY;
-+sub install {
-+ my $inherited = shift->SUPER::install(@_);
-+ $inherited =~ s/(install :: all pure_install) doc_install/$1/;
-+ $inherited;
-+}
diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
deleted file mode 100644
index 99d494cf81d4..000000000000
--- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: sieve/Makefile.in
-diff -u sieve/Makefile.in.orig sieve/Makefile.in
---- sieve/Makefile.in.orig Sat May 29 03:03:09 2004
-+++ sieve/Makefile.in Sat May 29 04:53:11 2004
-@@ -34,6 +34,7 @@
- YACC = @YACC@
- YFLAGS = -d
- LEX = @LEX@
-+INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- COMPILE_ET = @COMPILE_ET@
-
-@@ -60,8 +61,8 @@
- dist: $(BUILT_SOURCES)
-
- install: sievec
-- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-- $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
-+ $(INSTALL) -d ${DESTDIR}$(service_path)
-+ $(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit
-
- test: $(DEPLIBS) libsieve.a test.o
- $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
diff --git a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in b/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in
deleted file mode 100644
index 4e0bc2841c2c..000000000000
--- a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: timsieved/Makefile.in
-diff -u timsieved/Makefile.in.orig timsieved/Makefile.in
---- timsieved/Makefile.in.orig Wed Nov 12 13:02:14 2003
-+++ timsieved/Makefile.in Fri Feb 13 18:51:17 2004
-@@ -79,7 +79,7 @@
- all: timsieved
-
- install:
-- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
-+ $(INSTALL) -s -m 755 timsieved $(DESTDIR)$(service_path)
-
- OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
- ../imap/tls.o
diff --git a/mail/cyrus-imapd24/files/patch-tools::mkimap b/mail/cyrus-imapd24/files/patch-tools::mkimap
deleted file mode 100644
index 9ee1539e3776..000000000000
--- a/mail/cyrus-imapd24/files/patch-tools::mkimap
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: tools/mkimap
-diff -u tools/mkimap.orig tools/mkimap
---- tools/mkimap.orig Fri Dec 2 07:30:22 2005
-+++ tools/mkimap Sat Dec 10 14:08:11 2005
-@@ -90,6 +90,9 @@
-
- $imapdconf = shift || "/etc/imapd.conf";
-
-+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%";
-+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%";
-+
- push @configs, $imapdconf;
-
- while ($conf = shift @configs) {
-@@ -100,6 +103,7 @@
-
- print "configuring $d...\n";
-
-+mkdir $d, 0755;
- chdir $d or die "couldn't change to $d";
-
- mkdir "proc", 0755 || warn "can't create $d/proc: $!";
-@@ -110,12 +114,15 @@
- mkdir "ptclient", 0755 || warn "can't create $d/ptclient: $!";
- mkdir "sync", 0755 || warn "can't create $d/sync: $!";
-
-+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group .";
-+
- while ($part = shift @parts) {
- print "creating $part...\n";
- mkdir $part, 0755 || warn "can't create $part: $!";
- chdir $part or die "couldn't change to partition $part";
- mkdir "stage.", 0755 || warn "can't create $part/stage.: $!";
- mkdir "sync.", 0755 || warn "can't create $part/sync.: $!";
-+ system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part";
- }
-
- print "done\n";
diff --git a/mail/cyrus-imapd24/pkg-deinstall b/mail/cyrus-imapd24/pkg-deinstall
deleted file mode 100644
index e0dd1b8bb7fc..000000000000
--- a/mail/cyrus-imapd24/pkg-deinstall
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-checkfile() {
- diff -bBqw $1 $2 >/dev/null 2>&1
- case $? in
- 0) # config file exists, but is the same
- rm $1
- ;;
- 1) # config file exists and differs
- ;;
- *) # no config file exists
- ;;
- esac
-}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
- USER=${CYRUS_USER}
- PW=/usr/sbin/pw
- if [ -x /usr/sbin/nologin ]; then
- shell=/usr/sbin/nologin
- elif [ -x /sbin/nologin ]; then
- shell=/sbin/nologin
- else
- shell=/nonexistent
- fi
- uhome=/nonexistent
-
- if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
- echo "*** Failed to update user \`${USER}'."
- else
- echo "*** Updated user \`${USER}'."
- fi
-}
-
-case $2 in
- DEINSTALL)
- cd ${PKG_PREFIX}
- checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
- checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
- ;;
- POST-DEINSTALL)
- modify_cyrus_user
- ;;
-
-esac
diff --git a/mail/cyrus-imapd24/pkg-descr b/mail/cyrus-imapd24/pkg-descr
deleted file mode 100644
index 64e5e4bcbcc2..000000000000
--- a/mail/cyrus-imapd24/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-The Cyrus IMAP (Internet Message Access Protocol) server provides access to
-personal mail and system-wide bulletin boards through the IMAP protocol.
-The Cyrus IMAP server is a scaleable enterprise mail system designed for use
-from small to large enterprise environments using standards-based
-technologies.
-
-A full Cyrus IMAP implementation allows a seamless mail and bulletin board
-environment to be set up across multiple servers. It differs from other
-IMAP server implementations in that it is run on "sealed" servers, where
-users are not normally permitted to log in. The mailbox database is stored
-in parts of the filesystem that are private to the Cyrus IMAP system. All
-user access to mail is through software using the IMAP, POP3, or KPOP
-protocols.
-
-The private mailbox database design gives the server large advantages in
-efficiency, scalability, and administratability. Multiple concurrent
-read/write connections to the same mailbox are permitted. The server
-supports access control lists on mailboxes and storage quotas on mailbox
-hierarchies.
-
-WWW: http://cyrusimap.web.cmu.edu/
diff --git a/mail/cyrus-imapd24/pkg-install b/mail/cyrus-imapd24/pkg-install
deleted file mode 100644
index d2ba72f75349..000000000000
--- a/mail/cyrus-imapd24/pkg-install
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
- USER=${CYRUS_USER}
- PW=/usr/sbin/pw
- shell=/bin/csh
- uhome=${PKG_PREFIX}/cyrus
-
- if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
- echo "*** Failed to update user \`${USER}'."
- else
- echo "*** Updated user \`${USER}'."
- fi
-}
-
-
-checkfile() {
- diff -bBqw $1 $2 >/dev/null 2>&1
- case $? in
- 0) # config file exists, but is the same
- ;;
- 1) # config file exists and differs
- echo "** Make sure $1 is in sync with this version";
- echo " of the port. See $1.dist for details.";
- ;;
- *) # no config file exists, copy it
- install -c -m 644 $2 $1
- ;;
- esac
-}
-
-case $2 in
- PRE-INSTALL)
- ;;
-
- POST-INSTALL)
- modify_cyrus_user
- cd ${PKG_PREFIX}
- checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
- checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
- if grep 'sieve' /etc/services; then
- echo
- else
- echo
- echo "** Please add an entry for the sieve protocol (2000/tcp)"
- echo " to /etc/services"
- echo
- fi
- ;;
-esac
diff --git a/mail/cyrus-imapd24/pkg-message b/mail/cyrus-imapd24/pkg-message
deleted file mode 100644
index ff816e46e925..000000000000
--- a/mail/cyrus-imapd24/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-****************************************************************************
-
-To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
-then run /usr/local/cyrus/bin/mkimap.
-To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your
-/etc/rc.conf.
-
-****************************************************************************
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
deleted file mode 100644
index 7e35fe26d09f..000000000000
--- a/mail/cyrus-imapd24/pkg-plist
+++ /dev/null
@@ -1,115 +0,0 @@
-bin/cyradm
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/nntptest
-bin/pop3test
-bin/sieveshell
-bin/sivtest
-bin/smtptest
-bin/synctest
-cyrus/bin/arbitron
-cyrus/bin/chk_cyrus
-cyrus/bin/ctl_cyrusdb
-cyrus/bin/ctl_deliver
-cyrus/bin/ctl_mboxlist
-cyrus/bin/cvt_cyrusdb
-cyrus/bin/cyr_dbtool
-cyrus/bin/cyr_expire
-cyrus/bin/cyr_synclog
-cyrus/bin/cyrdump
-cyrus/bin/deliver
-%%NNTP%%cyrus/bin/fetchnews
-cyrus/bin/fud
-%%IDLED%%cyrus/bin/idled
-cyrus/bin/imapd
-cyrus/bin/ipurge
-cyrus/bin/lmtpd
-cyrus/bin/lmtpproxyd
-%%REPLICATION%%cyrus/bin/make_md5
-%%REPLICATION%%cyrus/bin/make_sha1
-cyrus/bin/masssievec
-cyrus/bin/master
-cyrus/bin/mbexamine
-cyrus/bin/mbpath
-cyrus/bin/mkimap
-%%MURDER%%cyrus/bin/mupdate
-%%NNTP%%cyrus/bin/nntpd
-cyrus/bin/notifyd
-cyrus/bin/pop3d
-cyrus/bin/pop3proxyd
-cyrus/bin/proxyd
-%%LDAP_PTLOADER%%cyrus/bin/ptdump
-%%LDAP_PTLOADER%%cyrus/bin/ptexpire
-%%LDAP_PTLOADER%%cyrus/bin/ptloader
-cyrus/bin/quota
-cyrus/bin/reconstruct
-cyrus/bin/sievec
-cyrus/bin/smmapd
-cyrus/bin/squatter
-%%REPLICATION%%cyrus/bin/sync_client
-%%REPLICATION%%cyrus/bin/sync_reset
-%%REPLICATION%%cyrus/bin/sync_server
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-cyrus/bin/unexpunge
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/byteorder64.h
-include/cyrus/charset.h
-include/cyrus/cyrusdb.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/hash.h
-include/cyrus/hmac-md5.h
-include/cyrus/imapopts.h
-include/cyrus/imapurl.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/iptostring.h
-include/cyrus/libconfig.h
-include/cyrus/libcyr_cfg.h
-include/cyrus/lock.h
-include/cyrus/lsort.h
-include/cyrus/map.h
-include/cyrus/md5.h
-include/cyrus/mkgmtime.h
-include/cyrus/mpool.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/rfc822date.h
-include/cyrus/strhash.h
-include/cyrus/stristr.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-include/cyrus/xstrlcat.h
-include/cyrus/xstrlcpy.h
-lib/libcyrus_min.a
-lib/libcyrus.a
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
-%%EXAMPLESDIR%%/imapd.conf
-@dirrm cyrus/bin
-@dirrm include/cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus