pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mail Moved cyrus-imapd22 to cyrus-imapd.



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

description:
Moved cyrus-imapd22 to cyrus-imapd.

diffstat:

 mail/Makefile                       |    3 +-
 mail/cyrus-imapd22/DEINSTALL        |   38 -------
 mail/cyrus-imapd22/DESCR            |    7 -
 mail/cyrus-imapd22/MESSAGE          |   17 ---
 mail/cyrus-imapd22/Makefile         |  179 ------------------------------------
 mail/cyrus-imapd22/PLIST            |  165 ---------------------------------
 mail/cyrus-imapd22/distinfo         |   12 --
 mail/cyrus-imapd22/files/cyrus.sh   |   78 ---------------
 mail/cyrus-imapd22/files/imapd.conf |   23 ----
 mail/cyrus-imapd22/patches/patch-af |   12 --
 mail/cyrus-imapd22/patches/patch-al |   25 -----
 mail/cyrus-imapd22/patches/patch-am |   13 --
 mail/cyrus-imapd22/patches/patch-ap |   35 -------
 mail/cyrus-imapd22/patches/patch-ba |   14 --
 mail/cyrus-imapd22/patches/patch-bb |   14 --
 mail/cyrus-imapd22/patches/patch-bc |   14 --
 16 files changed, 1 insertions(+), 648 deletions(-)

diffs (truncated from 723 to 300 lines):

diff -r 85354ea96992 -r bf563bb26892 mail/Makefile
--- a/mail/Makefile     Wed Mar 02 21:42:48 2005 +0000
+++ b/mail/Makefile     Wed Mar 02 21:43:48 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.249 2005/03/02 16:05:26 wiz Exp $
+# $NetBSD: Makefile,v 1.250 2005/03/02 21:43:48 wiz Exp $
 #
 
 COMMENT=       Electronic mail utilities
@@ -25,7 +25,6 @@
 SUBDIR+=       cue
 SUBDIR+=       cyrus-imapd
 SUBDIR+=       cyrus-imapd21
-SUBDIR+=       cyrus-imapd22
 SUBDIR+=       dbmail
 SUBDIR+=       deliver
 SUBDIR+=       demime
diff -r 85354ea96992 -r bf563bb26892 mail/cyrus-imapd22/DEINSTALL
--- a/mail/cyrus-imapd22/DEINSTALL      Wed Mar 02 21:42:48 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.3 2004/07/30 23:03:58 jlam Exp $
-
-IMAPDCONF=@IMAPDCONF@
-
-case ${STAGE} in
-DEINSTALL)
-       if [ -f ${IMAPDCONF} ]; then
-               IMAPDIRS=`
-                       ${AWK} '/configdirectory:/      { print $2 };   \
-                               /partition-.*:/         { print $2 };   \
-                               /sievedir:/             { print $2 }'   \
-                               ${IMAPDCONF} | ${SORT} -ur`
-               _IMAPDIRS=
-               for dir in ${IMAPDIRS}; do
-                       ${RMDIR} -p ${dir} 2>/dev/null || ${TRUE}
-                       if [ -d ${dir} ]; then
-                               _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 85354ea96992 -r bf563bb26892 mail/cyrus-imapd22/DESCR
--- a/mail/cyrus-imapd22/DESCR  Wed Mar 02 21:42:48 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-IMAP (Internet Message Access Protocol) is an Internet standards-track
-protocol for accessing messages (mail, bboards, news, etc). The Cyrus
-IMAP server differs from other IMAP server implementations in that it
-is generally intended to be run on "sealed" servers, where normal users
-are not 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 the IMAP, POP3, or KPOP protocols.
diff -r 85354ea96992 -r bf563bb26892 mail/cyrus-imapd22/MESSAGE
--- a/mail/cyrus-imapd22/MESSAGE        Wed Mar 02 21:42:48 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/05/27 05:06:43 jlam Exp $
-
-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 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 85354ea96992 -r bf563bb26892 mail/cyrus-imapd22/Makefile
--- a/mail/cyrus-imapd22/Makefile       Wed Mar 02 21:42:48 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-# $NetBSD: Makefile,v 1.33 2005/02/25 10:21:15 adrianp Exp $
-
-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=    recht%NetBSD.org@localhost
-HOMEPAGE=      http://asg.web.cmu.edu/cyrus/imapd/
-COMMENT=       Cyrus IMAP server
-
-USE_BUILDLINK3=                yes
-USE_PKGLOCALEDIR=      yes
-GNU_CONFIGURE=         yes
-PERL5_CONFIGURE=       no
-BDB_ACCEPTED=          db4 db3
-
-USE_PKGINSTALL=                yes
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-
-.include "../../mk/bsd.prefs.mk"
-
-# CYRUS_USER           username of the Cyrus administrator
-# CYRUS_GROUP          group of the Cyrus administrator
-#
-CYRUS_USER?=           cyrus
-CYRUS_GROUP?=          mail
-
-BUILD_DEFS+=           CYRUS_USER CYRUS_GROUP
-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-openssl=${SSLBASE}
-CONFIGURE_ARGS+=       --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-CONFIGURE_ARGS+=       --with-perl=${PERL5}
-CONFIGURE_ARGS+=       --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
-CONFIGURE_ENV+=                ac_cv_lib_wrap_request_init=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 !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
-CONF_FILES+=           ${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf
-RCD_SCRIPTS=           cyrus
-FILES_SUBST+=          IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
-
-PERL5_PACKLIST= \
-       ${PERL5_SITEARCH}/auto/Cyrus/IMAP/.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;                                               \
-       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
-       ${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;                           \
-       done
-
-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; for file in *.conf; do                \
-               ${INSTALL_DATA} $$file ${EGDIR};                        \
-       done
-       ${INSTALL_DATA_DIR} ${HTMLDIR}
-       cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do             \
-               ${INSTALL_DATA} $$file ${HTMLDIR};                      \
-       done
-
-.include "../../mk/bsd.pkg.mk"
diff -r 85354ea96992 -r bf563bb26892 mail/cyrus-imapd22/PLIST
--- a/mail/cyrus-imapd22/PLIST  Wed Mar 02 21:42:48 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/01/11 03:58:22 kim Exp $
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/nntptest
-bin/pop3test
-bin/sieveshell
-bin/sivtest
-bin/smtptest
-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_expire
-cyrus/bin/cyrdump
-cyrus/bin/deliver
-cyrus/bin/fetchnews
-cyrus/bin/fud
-${IDLED}cyrus/bin/idled



Home | Main Index | Thread Index | Old Index