Source-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mail Remove old cyrus-imapds that no longer build with...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ab20121564ce
branches:  trunk
changeset: 431540:ab20121564ce
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu May 14 16:58:41 2020 +0000

description:
Remove old cyrus-imapds that no longer build with pkgsrc OpenSSL

diffstat:

 mail/Makefile                                      |    4 +-
 mail/cyrus-imapd/DEINSTALL                         |   38 ---
 mail/cyrus-imapd/DESCR                             |    7 -
 mail/cyrus-imapd/MESSAGE                           |   17 -
 mail/cyrus-imapd/Makefile                          |  202 ---------------------
 mail/cyrus-imapd/PLIST                             |  165 -----------------
 mail/cyrus-imapd/distinfo                          |   24 --
 mail/cyrus-imapd/files/cyrus.sh                    |   78 --------
 mail/cyrus-imapd/files/imapd.conf                  |   23 --
 mail/cyrus-imapd/patches/patch-aa                  |   19 -
 mail/cyrus-imapd/patches/patch-ab                  |   15 -
 mail/cyrus-imapd/patches/patch-ac                  |   15 -
 mail/cyrus-imapd/patches/patch-ad                  |   15 -
 mail/cyrus-imapd/patches/patch-ae                  |   80 --------
 mail/cyrus-imapd/patches/patch-af                  |   59 ------
 mail/cyrus-imapd/patches/patch-ag                  |   65 ------
 mail/cyrus-imapd/patches/patch-al                  |   38 ---
 mail/cyrus-imapd/patches/patch-am                  |   13 -
 mail/cyrus-imapd/patches/patch-ap                  |   35 ---
 mail/cyrus-imapd/patches/patch-aq                  |   48 ----
 mail/cyrus-imapd/patches/patch-ba                  |   14 -
 mail/cyrus-imapd/patches/patch-bb                  |   14 -
 mail/cyrus-imapd/patches/patch-bc                  |   14 -
 mail/cyrus-imapd/patches/patch-ca                  |   13 -
 mail/cyrus-imapd/patches/patch-cb                  |   13 -
 mail/cyrus-imapd/patches/patch-cc                  |   15 -
 mail/cyrus-imapd/patches/patch-perl_imap_IMAP.xs   |   83 --------
 mail/cyrus-imapd23/DEINSTALL                       |   38 ---
 mail/cyrus-imapd23/DESCR                           |    7 -
 mail/cyrus-imapd23/MESSAGE                         |   17 -
 mail/cyrus-imapd23/Makefile                        |  143 --------------
 mail/cyrus-imapd23/PLIST                           |  189 -------------------
 mail/cyrus-imapd23/distinfo                        |   23 --
 mail/cyrus-imapd23/files/cyrus.sh                  |   78 --------
 mail/cyrus-imapd23/files/imapd.conf                |   25 --
 mail/cyrus-imapd23/options.mk                      |   98 ----------
 mail/cyrus-imapd23/patches/patch-aa                |   27 --
 mail/cyrus-imapd23/patches/patch-ab                |   29 ---
 mail/cyrus-imapd23/patches/patch-ac                |   47 ----
 mail/cyrus-imapd23/patches/patch-ad                |   14 -
 mail/cyrus-imapd23/patches/patch-ae                |   14 -
 mail/cyrus-imapd23/patches/patch-af                |   15 -
 mail/cyrus-imapd23/patches/patch-ag                |   25 --
 mail/cyrus-imapd23/patches/patch-ah                |   13 -
 mail/cyrus-imapd23/patches/patch-ai                |   13 -
 mail/cyrus-imapd23/patches/patch-aj                |   14 -
 mail/cyrus-imapd23/patches/patch-ak                |   15 -
 mail/cyrus-imapd23/patches/patch-al                |   15 -
 mail/cyrus-imapd23/patches/patch-am                |   19 -
 mail/cyrus-imapd23/patches/patch-ao                |   17 -
 mail/cyrus-imapd23/patches/patch-ap                |   51 -----
 mail/cyrus-imapd23/patches/patch-lib_charset.c     |   13 -
 mail/cyrus-imapd23/patches/patch-perl_imap_IMAP.xs |   99 ----------
 53 files changed, 1 insertions(+), 2183 deletions(-)

diffs (truncated from 2406 to 300 lines):

diff -r 6fe3e19828be -r ab20121564ce mail/Makefile
--- a/mail/Makefile     Thu May 14 16:54:54 2020 +0000
+++ b/mail/Makefile     Thu May 14 16:58:41 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.549 2020/04/30 09:11:34 wiz Exp $
+# $NetBSD: Makefile,v 1.550 2020/05/14 16:58:41 nia Exp $
 #
 
 COMMENT=       Electronic mail utilities
@@ -53,8 +53,6 @@
 SUBDIR+=       courier-unicode
 SUBDIR+=       cucipop
 SUBDIR+=       cue
-SUBDIR+=       cyrus-imapd
-SUBDIR+=       cyrus-imapd23
 SUBDIR+=       cyrus-imapd24
 SUBDIR+=       dbmail
 SUBDIR+=       dcc
diff -r 6fe3e19828be -r ab20121564ce mail/cyrus-imapd/DEINSTALL
--- a/mail/cyrus-imapd/DEINSTALL        Thu May 14 16:54:54 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.4 2005/03/02 21:42:48 wiz 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 6fe3e19828be -r ab20121564ce mail/cyrus-imapd/DESCR
--- a/mail/cyrus-imapd/DESCR    Thu May 14 16:54:54 2020 +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 6fe3e19828be -r ab20121564ce mail/cyrus-imapd/MESSAGE
--- a/mail/cyrus-imapd/MESSAGE  Thu May 14 16:54:54 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2005/03/02 21:42:48 wiz 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 6fe3e19828be -r ab20121564ce mail/cyrus-imapd/Makefile
--- a/mail/cyrus-imapd/Makefile Thu May 14 16:54:54 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +0,0 @@
-# $NetBSD: Makefile,v 1.115 2020/04/24 11:23:07 nia Exp $
-
-DISTNAME=      cyrus-imapd-2.2.13p1
-PKGREVISION=   20
-CATEGORIES=    mail
-MASTER_SITES=  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
-MASTER_SITES+= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.cyrusimap.org/
-COMMENT=       Cyrus IMAP server
-
-BROKEN=                "Fails to build with OpenSSL 1.1"
-
-MAKE_JOBS_SAFE=                no
-
-USE_TOOLS+=            perl
-USE_PKGLOCALEDIR=      yes
-GNU_CONFIGURE=         yes
-PERL5_CONFIGURE=       no
-BDB_ACCEPTED=          db3 db4 db5
-
-.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
-
-PKG_GROUPS_VARS+=      CYRUS_GROUP
-PKG_USERS_VARS+=       CYRUS_USER
-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:Q}
-CONFIGURE_ARGS+=       --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-CONFIGURE_ARGS+=       --with-perl=${PERL5:Q}
-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
-
-CONFIGURE_ARGS+=       andrew_runpath_switch=${COMPILER_RPATH_FLAG}
-
-LDFLAGS.SunOS+=                -lsocket
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.cyrus-imapd
-PKG_SUPPORTED_OPTIONS= gssapi kerberos kerberos4 ldap
-.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)
-CONFIGURE_ARGS+=       --with-krb=/usr
-.  endif
-.elif !empty(PKG_OPTIONS:Mgssapi)
-.  include "../../mk/krb5.buildlink3.mk"
-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
-.else
-CONFIGURE_ARGS+=       --without-krb
-CONFIGURE_ARGS+=       --disable-gssapi
-CHECK_BUILTIN.heimdal:=                yes
-.  include "../../security/heimdal/builtin.mk"
-CHECK_BUILTIN.heimdal:=                no
-CHECK_BUILTIN.mit-krb5:=       yes
-.  include "../../security/mit-krb5/builtin.mk"
-CHECK_BUILTIN.mit-krb5:=       no
-.  if ( !empty(USE_BUILTIN.heimdal:M[Yy][Ee][Ss]) || \
-       !empty(USE_BUILTIN.mit-krb5:M[Yy][Ee][Ss])) && \
-        exists(/usr/bin/compile_et) && exists(/usr/include/krb5/com_err.h)
-CPPFLAGS+=     -I/usr/include/krb5
-CONFIGURE_ENV+=        COMPILE_ET=/usr/bin/compile_et
-.  elif ${OPSYS} != "Linux" && \
-       exists(/usr/bin/compile_et) && exists(/usr/include/com_err.h)
-CONFIGURE_ENV+=        COMPILE_ET=/usr/bin/compile_et
-.  else
-CONFIGURE_ARGS+=       --with-com-err=yes
-.  endif
-.endif
-
-PLIST_VARS+=           ldap
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+=       --with-ldap=${BUILDLINK_PREFIX.openldap-client}
-PLIST.ldap=            yes
-.  include "../../databases/openldap-client/buildlink3.mk"
-.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
-PLIST_VARS+=           idled
-.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:Q}
-.if ${CYRUS_IDLE} == "idled"
-PLIST.idled=           yes
-.endif
-
-MAKE_ENV+=             PERL=${PERL5:Q}
-
-HTMLDIR=               ${PREFIX}/share/doc/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
-
-# Fix path to /bin/sh that was replaced by Perl's MakeMaker to
-# point to the shell in the tools directory.
-#
-SUBST_CLASSES+=                sh
-SUBST_STAGE.sh=                post-build
-SUBST_FILES.sh=                perl/imap/blib/script/cyradm
-SUBST_SED.sh+=         -e 's|^\#!.*|\#!/bin/sh|'
-
-PERL5_PACKLIST= \
-       auto/Cyrus/IMAP/.packlist                       \
-       auto/Cyrus/SIEVE/managesieve/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../security/cyrus-sasl/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-
-CONFIGURE_ENV+=        BDB_TYPE=${BDB_TYPE}
-
-# 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 ${DESTDIR}${PREFIX}/cyrus/bin
-       ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${DESTDIR}${PREFIX}/cyrus/bin
-       ${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${DESTDIR}${PREFIX}/cyrus/bin
-       ${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${DESTDIR}${PREFIX}/cyrus/bin
-       ${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${DESTDIR}${PREFIX}/cyrus/bin
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
-       ${INSTALL_DATA} ${FILESDIR}/imapd.conf ${DESTDIR}${EGDIR}
-       cd ${WRKSRC}/master/conf; for file in *.conf; do                \
-               ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR};              \
-       done
-       ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
-       cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do             \
-               ${INSTALL_DATA} $$file ${DESTDIR}${HTMLDIR};            \
-       done
-
-.include "../../mk/bsd.pkg.mk"
diff -r 6fe3e19828be -r ab20121564ce mail/cyrus-imapd/PLIST
--- a/mail/cyrus-imapd/PLIST    Thu May 14 16:54:54 2020 +0000



Home | Main Index | Thread Index | Old Index