pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/cyrus-imapd Update to 2.2.12, i.e. copy the conte...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/85354ea96992
branches:  trunk
changeset: 490073:85354ea96992
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Mar 02 21:42:48 2005 +0000

description:
Update to 2.2.12, i.e. copy the contents of mail/cyrus-imapd22 here.

diffstat:

 mail/cyrus-imapd/DEINSTALL        |   29 ++++-
 mail/cyrus-imapd/MESSAGE          |   13 +-
 mail/cyrus-imapd/Makefile         |  183 ++++++++++++++++++++++++-------------
 mail/cyrus-imapd/PLIST            |   98 +++++++++++++-------
 mail/cyrus-imapd/buildlink3.mk    |   23 ----
 mail/cyrus-imapd/distinfo         |   30 ++---
 mail/cyrus-imapd/files/cyrus.sh   |   28 ++--
 mail/cyrus-imapd/files/imapd.conf |    6 +-
 mail/cyrus-imapd/patches/patch-aa |   19 ---
 mail/cyrus-imapd/patches/patch-ab |   13 --
 mail/cyrus-imapd/patches/patch-ac |   17 ---
 mail/cyrus-imapd/patches/patch-ad |   13 --
 mail/cyrus-imapd/patches/patch-ae |   30 ------
 mail/cyrus-imapd/patches/patch-af |   12 ++
 mail/cyrus-imapd/patches/patch-ag |   12 --
 mail/cyrus-imapd/patches/patch-ah |   20 ----
 mail/cyrus-imapd/patches/patch-ai |   20 ----
 mail/cyrus-imapd/patches/patch-aj |   19 ---
 mail/cyrus-imapd/patches/patch-ak |   15 ---
 mail/cyrus-imapd/patches/patch-al |   32 ++++--
 mail/cyrus-imapd/patches/patch-am |   24 ++--
 mail/cyrus-imapd/patches/patch-an |   13 --
 mail/cyrus-imapd/patches/patch-ao |   15 ---
 mail/cyrus-imapd/patches/patch-ap |   35 +++++++
 mail/cyrus-imapd/patches/patch-ba |   14 ++
 mail/cyrus-imapd/patches/patch-bb |   14 ++
 mail/cyrus-imapd/patches/patch-bc |   14 ++
 27 files changed, 363 insertions(+), 398 deletions(-)

diffs (truncated from 1076 to 300 lines):

diff -r 7bd3e3e5a8ee -r 85354ea96992 mail/cyrus-imapd/DEINSTALL
--- a/mail/cyrus-imapd/DEINSTALL        Wed Mar 02 21:10:50 2005 +0000
+++ b/mail/cyrus-imapd/DEINSTALL        Wed Mar 02 21:42:48 2005 +0000
@@ -1,21 +1,38 @@
-# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:22:55 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2005/03/02 21:42:48 wiz Exp $
 
 IMAPDCONF=@IMAPDCONF@
 
 case ${STAGE} in
 DEINSTALL)
        if [ -f ${IMAPDCONF} ]; then
-               imap_dirs=`                                             \
+               IMAPDIRS=`
                        ${AWK} '/configdirectory:/      { print $2 };   \
                                /partition-.*:/         { print $2 };   \
                                /sievedir:/             { print $2 }'   \
-                               ${IMAPDCONF}                            \
-               `
-               for dir in ${imap_dirs}; do
+                               ${IMAPDCONF} | ${SORT} -ur`
+               _IMAPDIRS=
+               for dir in ${IMAPDIRS}; do
+                       ${RMDIR} -p ${dir} 2>/dev/null || ${TRUE}
                        if [ -d ${dir} ]; then
-                               ALL_DIRS="${ALL_DIRS} ${dir}"
+                               _IMAPDIRS="${_IMAPDIRS} ${dir}"
                        fi
                done
+               if [ -n "${_IMAPDIRS}" ]; then
+                       ${CAT} << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may want to remove
+the following directories:
+
+EOF
+                       for dir in ${_IMAPDIRS}; do
+                               if [ -d "${dir}" ]; then
+                                       ${ECHO} "       ${dir}"
+                               fi
+                       done
+                       ${CAT} << EOF
+===========================================================================
+EOF
+               fi
        fi
        ;;
 esac
diff -r 7bd3e3e5a8ee -r 85354ea96992 mail/cyrus-imapd/MESSAGE
--- a/mail/cyrus-imapd/MESSAGE  Wed Mar 02 21:10:50 2005 +0000
+++ b/mail/cyrus-imapd/MESSAGE  Wed Mar 02 21:42:48 2005 +0000
@@ -1,12 +1,17 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/02/14 18:27:25 snj Exp $
+$NetBSD: MESSAGE,v 1.3 2005/03/02 21:42:48 wiz Exp $
 
-Please also refer to:
+Please refer to:
 
        ${PREFIX}/share/doc/html/cyrus-imapd/install.html
 
 for more detailed instructions on setting up the environment before
-starting the Cyrus IMAP server.  In particular, several services will
-probably need to be added to /etc/services.
+starting the Cyrus IMAP server.  In particular, several services may
+need to be added to /etc/services.
+
+Anyone upgrading from an earlier version of the Cyrus IMAP server should
+read:
+
+       ${PREFIX}/share/doc/html/cyrus-imapd/install-upgrade.html
 
 ===========================================================================
diff -r 7bd3e3e5a8ee -r 85354ea96992 mail/cyrus-imapd/Makefile
--- a/mail/cyrus-imapd/Makefile Wed Mar 02 21:10:50 2005 +0000
+++ b/mail/cyrus-imapd/Makefile Wed Mar 02 21:42:48 2005 +0000
@@ -1,33 +1,25 @@
-# $NetBSD: Makefile,v 1.50 2004/12/29 15:42:37 minskim Exp $
+# $NetBSD: Makefile,v 1.51 2005/03/02 21:42:48 wiz Exp $
 
-DISTNAME=              cyrus-imapd-2.0.17
-PKGREVISION=           5
-SVR4_PKGNAME=          cimap
-CATEGORIES=            mail
-MASTER_SITES=          ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-                       ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
+DISTNAME=      cyrus-imapd-2.2.12
+CATEGORIES=    mail
+MASTER_SITES=  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+               ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
 
-MAINTAINER=            tech-pkg%NetBSD.org@localhost
-HOMEPAGE=              http://asg.web.cmu.edu/cyrus/imapd/
-COMMENT=               Cyrus IMAP server
+MAINTAINER=    recht%NetBSD.org@localhost
+HOMEPAGE=      http://asg.web.cmu.edu/cyrus/imapd/
+COMMENT=       Cyrus IMAP server
 
-USE_BUILDLINK3=                YES
-GNU_CONFIGURE=         YES
-PERL5_CONFIGURE=       NO
-AUTOCONF_REQD=         2.13
+USE_BUILDLINK3=                yes
+USE_PKGLOCALEDIR=      yes
+GNU_CONFIGURE=         yes
+PERL5_CONFIGURE=       no
+BDB_ACCEPTED=          db4 db3
 
-BUILD_DEFS+=           USE_INET6
-
-USE_PKGINSTALL=                YES
+USE_PKGINSTALL=                yes
 DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(CYRUS_USE_INET6) && ${CYRUS_USE_INET6} == "YES"
-PATCH_SITES=           http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=            ${DISTNAME}-ipv6-20021205.diff.gz
-.endif
-
 # CYRUS_USER           username of the Cyrus administrator
 # CYRUS_GROUP          group of the Cyrus administrator
 #
@@ -38,36 +30,84 @@
 FILES_SUBST+=          CYRUS_USER=${CYRUS_USER}
 FILES_SUBST+=          CYRUS_GROUP=${CYRUS_GROUP}
 
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-cyrus-user=${CYRUS_USER}
 CONFIGURE_ARGS+=       --with-cyrus-group=${CYRUS_GROUP}
 CONFIGURE_ARGS+=       --with-cyrus-prefix=${PREFIX}/cyrus
 CONFIGURE_ARGS+=       --with-statedir=${VARBASE}/run
-CONFIGURE_ARGS+=       --with-dbdir=${BUILDLINK_PREFIX.db3}
-CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=       --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-CONFIGURE_ARGS+=       --without-ucdsnmp
-CONFIGURE_ARGS+=       --without-notify
-CONFIGURE_ARGS+=       --without-zephyr
-CONFIGURE_ARGS+=       --enable-netscapehack
-
+CONFIGURE_ARGS+=       --with-perl=${PERL5}
 CONFIGURE_ARGS+=       --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
 CONFIGURE_ENV+=                ac_cv_lib_wrap_request_init=yes
 
-.if exists(/usr/include/krb5/com_err.h)
-CPPFLAGS+=             -I/usr/include/krb5
-CONFIGURE_ARGS+=       --with-com_err=
-.else
-CONFIGURE_ARGS+=       --with-com_err=yes
+CONFIGURE_ARGS+=       --enable-listext
+CONFIGURE_ARGS+=       --enable-murder
+CONFIGURE_ARGS+=       --enable-nntp
+CONFIGURE_ARGS+=       --without-zephyr
+CONFIGURE_ARGS+=       --without-ucdsnmp
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.cyrus-imapd
+PKG_SUPPORTED_OPTIONS= gssapi kerberos kerberos4
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mkerberos)
+.  if empty(PKG_OPTIONS:Mgssapi)
+PKG_OPTIONS+=  gssapi
+.  endif
 .endif
 
-.if defined(KERBEROS) && ${KERBEROS} == 4
-PKG_USE_KERBEROS=      # defined
+.if !empty(PKG_OPTIONS:Mkerberos4)
+.  if exists(/usr/include/kerberosIV/krb.h)
+CRYPTO+=               uses Kerberos encryption code
 CONFIGURE_ARGS+=       --with-auth=krb
+CONFIGURE_ARGS+=       --with-krb=/usr
+.  endif
+.elif !empty(PKG_OPTIONS:Mgssapi)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-auth=krb5
+CONFIGURE_ARGS+=       --enable-gssapi=${KRB5BASE}
+CONFIGURE_ARGS+=       --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
+GSSIMPL.heimdal=       heimdal
+GSSIMPL.mit-krb5=      mit
+CONFIGURE_ENV+=                COMPILE_ET=${KRB5BASE}/bin/compile_et
+COMERRBASE=            ${KRB5BASE}
 .else
 CONFIGURE_ARGS+=       --with-auth=unix
 CONFIGURE_ARGS+=       --without-krb
+CONFIGURE_ARGS+=       --disable-gssapi
 .endif
 
+.if exists(/usr/bin/compile_et)
+COMERRBASE?=           /usr
+.endif
+.if defined(COMERRBASE)
+.  if exists(${COMERRBASE}/include/krb5/com_err.h)
+CPPFLAGS+=             -I${COMERRBASE}/include/krb5
+.  endif
+CONFIGURE_ENV+=                COMPILE_ET=${COMERRBASE}/bin/compile_et
+.else
+CONFIGURE_ARGS+=       --with-com-err=yes
+.endif
+
+# CYRUS_IDLE selects the method used to implement IMAP IDLE.  Valid values
+# are "poll", "idled" or "no".  The default is "poll".
+#
+CYRUS_IDLE?=           poll
+BUILD_DEFS+=           CYRUS_IDLE
+.if (${CYRUS_IDLE} != "poll") && (${CYRUS_IDLE} != "idled") && \
+    (${CYRUS_IDLE} != "no")
+PKG_FAIL_REASON+=      "CYRUS_IDLE must be poll, idled or no"
+.endif
+CONFIGURE_ARGS+=       --with-idle=${CYRUS_IDLE}
+.if ${CYRUS_IDLE} == "idled"
+PLIST_SUBST+=          IDLED=
+.else
+PLIST_SUBST+=          IDLED="@comment "
+.endif
+
+MAKE_ENV+=             PERL=${PERL5}
+
 HTMLDIR=               ${PREFIX}/share/doc/html/cyrus-imapd
 EGDIR=                 ${PREFIX}/share/examples/cyrus-imapd
 CONF_FILES=            ${EGDIR}/imapd.conf ${PKG_SYSCONFDIR}/imapd.conf
@@ -77,52 +117,63 @@
 
 PERL5_PACKLIST= \
        ${PERL5_SITEARCH}/auto/Cyrus/IMAP/.packlist                     \
-       ${PERL5_SITEARCH}/auto/Cyrus/SIEVE/acap/.packlist               \
        ${PERL5_SITEARCH}/auto/Cyrus/SIEVE/managesieve/.packlist
 
+.include "../../lang/perl5/module.mk"
+.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
+
+# Only imap/mupdate needs to be build with pthreads support, so selectively
+# enable it via patches for just that one program.
+#
+.include "../../mk/pthread.buildlink3.mk"
+
 # Change references of some manpages from foo.8 to cyrus-foo.8 to avoid
 # manpage conflicts with other packages.  Also change references to
 # "/etc/{cyrus,imapd}.conf" into "${PKG_SYSCONFDIR}/{cyrus,imapd}.conf".
 #
 post-patch:
        cd ${WRKSRC}/man;                                               \
-       for file in deliver.8 imapd.8 master.8 pop3d.8; do              \
-               ${MV} $${file} cyrus-$${file};                          \
-               ${SED}  -e "s|\(\$$(srcdir)/\)\($${file}\)|\1cyrus-\2|g" \
-                       Makefile.in > Makefile.in.fixed;                \
-               ${MV} -f Makefile.in.fixed Makefile.in;                 \
+       set --  deliver 8 fetchnews 8 idled 8 imapd 8 lmtpd 8 master 8  \
+               nntpd 8 notifyd 8 pop3d 8 quota 8;                      \
+       while [ $$# -gt 0 ]; do                                         \
+               man=$$1.$$2;                                            \
+               for file in Makefile.in *.[0-9]; do                     \
+                       ${SED}  -e "s|\(\$$(srcdir)/\)\($$man\)|\1cyrus-\2|g" \
+                               -e "s|\(\\\fB\)\($$1($$2)\\\fR\)|\1cyrus-\2|g" \
+                               $$file > $$file.fixed;                  \
+                       ${MV} -f $$file.fixed $$file;                   \
+               done;                                                   \
+               if [ -f $$man ]; then                                   \
+                       ${MV} $$man cyrus-$$man;                        \
+               fi;                                                     \
+               shift 2;                                                \
        done
-       files=`${FIND} ${WRKSRC} -type f -exec ${GREP} -l \
-               -e /etc/imapd\.conf -e /etc/cyrus\.conf {} \;`; \
-       for file in $${files}; do                                       \
-               ${SED}  -e "s|\(\\fB\)\($${name}($${suffix})\)|\1cyrus-\2|g" \
-                       -e "s|\(\$$(srcdir)/\)\($${man}\)|\1cyrus-\2|g" \
-                       -e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
+       ${FIND} ${WRKSRC} -type f -print |                              \
+       ${XARGS} -n 1 ${GREP} -l -e /etc/imapd\.conf -e /etc/cyrus\.conf | \
+       while read file; do                                             \
+               ${SED}  -e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
                        -e "s|/etc/\(imapd\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
-                       $${file} > $${file}.fixed;                      \
-               ${MV} -f $${file}.fixed $${file};                       \
+                       $$file > $$file.fixed;                          \
+               ${MV} -f $$file.fixed $$file;                           \
        done
 
-pre-configure:
-       cd ${WRKSRC};                                                   \
-       ${AUTOHEADER};                                                  \
-       ${AUTOCONF}
-
 post-install:
+       ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${PREFIX}/cyrus/bin
        ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${PREFIX}/cyrus/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${PREFIX}/cyrus/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${PREFIX}/cyrus/bin
        ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR}
-       cd ${WRKSRC}/master/conf; ${INSTALL_DATA} *.conf ${EGDIR}
+       cd ${WRKSRC}/master/conf; for file in *.conf; do                \
+               ${INSTALL_DATA} $$file ${EGDIR};                        \



Home | Main Index | Thread Index | Old Index