Index: head/mail/cyrus-imapd22/Makefile =================================================================== --- head/mail/cyrus-imapd22/Makefile (revision 98222) +++ head/mail/cyrus-imapd22/Makefile (revision 98223) @@ -1,244 +1,236 @@ # New ports collection makefile for: cyrus-imapd # Date created: Jan 4th 2001 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.2.b -PORTREVISION= 2 +PORTVERSION= 2.2.3 +#PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} -DISTNAME= ${PORTNAME}-2.2.2-BETA MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend USE_RC_SUBR= YES USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \ +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-libdir=${LOCALBASE}/lib \ --with-auth=unix \ --with-com_err \ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL5} .if defined(WITH_BDB_VER) USE_BDB_VER= ${WITH_BDB_VER} .else USE_BDB_VER= 3 .endif .if ${USE_BDB_VER} == 41 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 .elif ${USE_BDB_VER} == 4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 .elif ${USE_BDB_VER} == 3 LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3 .else BROKEN= "WITH_BDB_VER must be 3, 4 or 41" .endif CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \ --with-bdb=db${USE_BDB_VER} .if defined(WITHOUT_SKIPLIST) CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat .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_IDLE) .if ${WITH_IDLE} != poll && ${WITH_IDLE} != idled && ${WITH_IDLE} != no BROKEN= "WITH_IDLE must be poll, idled or no" .endif CONFIGURE_ARGS+=--with-idle=${WITH_IDLE} .if ${WITH_IDLE} == idled PLIST_SUB+= IDLED="" .else PLIST_SUB+= IDLED="@comment " .endif .else PLIST_SUB+= IDLED="@comment " .endif .if defined(WITH_LISTEXT) CONFIGURE_ARGS+=--enable-listext .endif .if defined(WITH_ANNOTATEMORE) CONFIGURE_ARGS+=--enable-annotatemore .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-acconfig.h EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.in -#USE_AUTOHEADER= YES +USE_AUTOHEADER= YES USE_AUTOCONF= YES WANT_AUTOCONF_VER=257 CONFIGURE_ARGS+=--with-drac=${LOCALBASE} BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif .if defined(WITH_SNMP) # It seems not compilable due to lack of auto_nlist_value() in libucdagent. LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp #CONFIGURE_ENV= LIBS=-lkvm .else CONFIGURE_ARGS+=--with-ucdsnmp=no .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 MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \ cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \ deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \ lmtpd.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \ - reconstruct.8 rmnews.8 squatter.8 syncnews.8 timsieved.8 \ - tls_prune.8 + reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \ + timsieved.8 tls_prune.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-sieve install-snmpmon \ install-testing install-upgrade install-virtdomains \ mailing-list man notes os overview questions readme sieve \ sieve-protocol specs DOCSDIR= ${PREFIX}/share/doc/cyrus-imapd22 PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install .include .if ${PERL_LEVEL} < 500800 RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif .if ${PERL_LEVEL} < 500600 RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser .endif RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ RC_SUBR=${RC_SUBR} pre-everything:: .if !defined(WITH_BDB_VER) @if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \ ${ECHO_MSG} ""; \ ${ECHO_MSG} "It seems you have installed newer db than db3. If"; \ ${ECHO_MSG} "you are using newer db for cyrus-sasl2, you should"; \ ${ECHO_MSG} "specify same version by WITH_BDB_VER. For"; \ ${ECHO_MSG} "exapmle, WITH_BDB_VER=4 for db4."; \ ${ECHO_MSG} ""; \ fi .endif -.if defined(WITH_DRAC) -pre-patch: - @${REINPLACE_CMD} -e '/^Index: acconfig\.h/,/^Index: /d' \ - ${WRKSRC}/contrib/drac_auth.patch -.endif - post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ ${.CURDIR}/pkg-install > ${PKGINSTALL} @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|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 @${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 .if ${PERL_LEVEL} < 500600 @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \ ${WRKSRC}/perl/sieve/scripts/sieveshell.pl .endif post-install: @${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/man ${MKDIR} ${DOCSDIR}/text .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR} @${ECHO_CMD} share/doc/cyrus-imapd22/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${DOCSDIR}/man/$${ofile}.html; \ ${ECHO_CMD} share/doc/cyrus-imapd22/man/$${ofile}.html \ >>${TMPPLIST}; \ fi .endfor -.for file in cyrusv2.mc murder.png netnews.png +.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} @${ECHO_CMD} share/doc/cyrus-imapd22/${file} >>${TMPPLIST} .endfor .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text @${ECHO_CMD} share/doc/cyrus-imapd22/text/${file} >>${TMPPLIST} .endfor @${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/text" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST} .endif @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh @${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${PREFIX}/etc/imapd.conf.dist ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ ${PREFIX}/etc/cyrus.conf.dist ${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 Property changes on: head/mail/cyrus-imapd22/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.96 \ No newline at end of property +1.97 \ No newline at end of property Index: head/mail/cyrus-imapd22/distinfo =================================================================== --- head/mail/cyrus-imapd22/distinfo (revision 98222) +++ head/mail/cyrus-imapd22/distinfo (revision 98223) @@ -1 +1 @@ -MD5 (cyrus-imapd-2.2.2-BETA.tar.gz) = 774b55e758a2bf83d6ffd6b90a3fff4c +MD5 (cyrus-imapd-2.2.3.tar.gz) = 32888c5120edeb2867d6283fedbdb7d5 Property changes on: head/mail/cyrus-imapd22/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.25 \ No newline at end of property +1.26 \ No newline at end of property Index: head/mail/cyrus-imapd22/files/patch-dc =================================================================== --- head/mail/cyrus-imapd22/files/patch-dc (revision 98222) +++ head/mail/cyrus-imapd22/files/patch-dc (nonexistent) @@ -1,14 +0,0 @@ -Index: master/Makefile.in -diff -u master/Makefile.in.orig master/Makefile.in ---- master/Makefile.in.orig Fri Feb 7 07:41:03 2003 -+++ master/Makefile.in Fri Mar 21 18:02:28 2003 -@@ -52,7 +52,8 @@ - CYRUS_USER=@cyrus_user@ - CYRUS_GROUP=@cyrus_group@ - --DEFS = @DEFS@ @LOCALDEFS@ -+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" \ -+ -DDEFAULT_MASTER_CONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\" - CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@ - DEPLIBS = ../lib/libcyrus_min.a @DEPLIBS@ - Property changes on: head/mail/cyrus-imapd22/files/patch-dc ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.4 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd22/files/extra-patch-acconfig.h =================================================================== --- head/mail/cyrus-imapd22/files/extra-patch-acconfig.h (revision 98222) +++ head/mail/cyrus-imapd22/files/extra-patch-acconfig.h (nonexistent) @@ -1,17 +0,0 @@ -Index: acconfig.h -diff -u acconfig.h.orig acconfig.h ---- acconfig.h.orig Fri Feb 14 05:32:50 2003 -+++ acconfig.h Fri Mar 21 21:03:25 2003 -@@ -263,8 +263,12 @@ - #define FNAME_DOMAINDIR "/domain/" - #define FNAME_LOGDIR "/log/" - #define FNAME_PTSDB "/ptclient/ptscache.db" -+#if !defined(CONFIG_FILENAME) - #define CONFIG_FILENAME "/etc/imapd.conf" -+#endif -+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME) - #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf" -+#endif - - #ifndef HAVE_SHUTDOWN - #define shutdown(fd, mode) 0 Property changes on: head/mail/cyrus-imapd22/files/extra-patch-acconfig.h ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd22/files/patch-lib::Makefile.in =================================================================== --- head/mail/cyrus-imapd22/files/patch-lib::Makefile.in (revision 98222) +++ head/mail/cyrus-imapd22/files/patch-lib::Makefile.in (nonexistent) @@ -1,13 +0,0 @@ -Index: lib/Makefile.in -diff -u lib/Makefile.in.orig lib/Makefile.in ---- lib/Makefile.in.orig Thu Feb 13 04:12:42 2003 -+++ lib/Makefile.in Fri Mar 21 15:11:50 2003 -@@ -56,7 +56,7 @@ - INSTALL = @INSTALL@ - RANLIB = @RANLIB@ - --DEFS = @DEFS@ -+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@ - LIBS = @LIBS@ - Property changes on: head/mail/cyrus-imapd22/files/patch-lib::Makefile.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd22/files/patch-imap::idled.c =================================================================== --- head/mail/cyrus-imapd22/files/patch-imap::idled.c (revision 98222) +++ head/mail/cyrus-imapd22/files/patch-imap::idled.c (nonexistent) @@ -1,15 +0,0 @@ -Index: imap/idled.c -diff -u imap/idled.c.orig imap/idled.c ---- imap/idled.c.orig Thu Oct 23 03:50:07 2003 -+++ imap/idled.c Tue Jan 13 23:17:21 2004 -@@ -409,3 +409,10 @@ - /* never gets here */ - exit(1); - } -+ -+void printstring(const char *s __attribute__((unused))) -+{ -+ /* needed to link against annotate.o */ -+ fatal("printstring() executed, but its not used for IDLED!", -+ EC_SOFTWARE); -+} Property changes on: head/mail/cyrus-imapd22/files/patch-imap::idled.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd22/files/patch-config.h.in =================================================================== --- head/mail/cyrus-imapd22/files/patch-config.h.in (revision 98222) +++ head/mail/cyrus-imapd22/files/patch-config.h.in (nonexistent) @@ -1,17 +0,0 @@ -Index: config.h.in -diff -u config.h.in.orig config.h.in ---- config.h.in.orig Thu Mar 20 04:04:36 2003 -+++ config.h.in Fri Mar 21 14:33:39 2003 -@@ -360,8 +360,12 @@ - #define FNAME_DOMAINDIR "/domain/" - #define FNAME_LOGDIR "/log/" - #define FNAME_PTSDB "/ptclient/ptscache.db" -+#if !defined(CONFIG_FILENAME) - #define CONFIG_FILENAME "/etc/imapd.conf" -+#endif -+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME) - #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf" -+#endif - - #ifndef HAVE_SHUTDOWN - #define shutdown(fd, mode) 0 Property changes on: head/mail/cyrus-imapd22/files/patch-config.h.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd22/files/extra-patch-aclocal.m4 =================================================================== --- head/mail/cyrus-imapd22/files/extra-patch-aclocal.m4 (revision 98222) +++ head/mail/cyrus-imapd22/files/extra-patch-aclocal.m4 (revision 98223) @@ -1,22 +1,22 @@ Index: aclocal.m4 diff -u aclocal.m4.orig aclocal.m4 --- aclocal.m4.orig Wed Oct 29 02:24:46 2003 +++ aclocal.m4 Wed Oct 29 04:28:37 2003 @@ -505,7 +505,7 @@ BDB_LIBADD="" fi -- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db +- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db do AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; break, dblib="no") @@ -1664,7 +1664,7 @@ LIB_UCDSNMP="" if test "$with_ucdsnmp" != no; then AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?]) - LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" + LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm" AC_CHECK_LIB(rpm, rpmdbOpen, LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt) fi Property changes on: head/mail/cyrus-imapd22/files/extra-patch-aclocal.m4 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/mail/cyrus-imapd22/files/patch-ac =================================================================== --- head/mail/cyrus-imapd22/files/patch-ac (revision 98222) +++ head/mail/cyrus-imapd22/files/patch-ac (revision 98223) @@ -1,22 +1,22 @@ Index: configure diff -u configure.orig configure ---- configure.orig Wed Oct 29 02:24:50 2003 -+++ configure Wed Oct 29 03:52:02 2003 -@@ -6811,7 +6811,7 @@ +--- configure.orig Thu Jan 15 23:36:50 2004 ++++ configure Fri Jan 16 04:03:09 2004 +@@ -6565,7 +6565,7 @@ BDB_LIBADD="" fi -- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db +- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db do as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh` echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5 -@@ -13851,7 +13851,7 @@ +@@ -13854,7 +13854,7 @@ #define HAVE_UCDSNMP 1 _ACEOF - LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" + LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm" 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 Property changes on: head/mail/cyrus-imapd22/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/mail/cyrus-imapd22/files/patch-sieve::Makefile.in =================================================================== --- head/mail/cyrus-imapd22/files/patch-sieve::Makefile.in (revision 98222) +++ head/mail/cyrus-imapd22/files/patch-sieve::Makefile.in (revision 98223) @@ -1,21 +1,21 @@ Index: sieve/Makefile.in diff -u sieve/Makefile.in.orig sieve/Makefile.in ---- sieve/Makefile.in.orig Fri Feb 28 03:13:50 2003 -+++ sieve/Makefile.in Mon Mar 24 02:26:24 2003 -@@ -32,6 +32,7 @@ +--- sieve/Makefile.in.orig Wed Nov 12 13:02:12 2003 ++++ sieve/Makefile.in Fri Jan 16 03:47:03 2004 +@@ -33,6 +33,7 @@ YACC = @YACC@ YFLAGS = -d LEX = @LEX@ +INSTALL = @INSTALL@ RANLIB = @RANLIB@ COMPILE_ET = @COMPILE_ET@ -@@ -58,7 +59,7 @@ +@@ -59,7 +60,7 @@ install: sievec - $(srcdir)/../install-sh -d ${DESTDIR}$(cyrus_prefix)/bin -- $(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit -+ $(INSTALL) -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit + $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) +- $(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit ++ $(INSTALL) -m 755 sievec $(DESTDIR)$(service_path) || exit test: $(DEPLIBS) libsieve.a test.o $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS) Property changes on: head/mail/cyrus-imapd22/files/patch-sieve::Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/mail/cyrus-imapd22/pkg-plist =================================================================== --- head/mail/cyrus-imapd22/pkg-plist (revision 98222) +++ head/mail/cyrus-imapd22/pkg-plist (revision 98223) @@ -1,110 +1,111 @@ bin/cyradm 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/cyrquota cyrus/bin/deliver %%NNTP%%cyrus/bin/fetchnews cyrus/bin/fud %%IDLED%%cyrus/bin/idled cyrus/bin/imapd cyrus/bin/ipurge cyrus/bin/lmtpd %%MURDER%%cyrus/bin/lmtpproxyd 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 %%MURDER%%cyrus/bin/proxyd cyrus/bin/reconstruct cyrus/bin/sievec +cyrus/bin/smmapd cyrus/bin/squatter cyrus/bin/timsieved cyrus/bin/tls_prune @unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi etc/cyrus.conf.dist @exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf @unexec if cmp -s %D/etc/imapd.conf %D/etc/imapd.conf.dist; then rm -f %D/etc/imapd.conf; fi etc/imapd.conf.dist @exec [ -f %B/imapd.conf ] || cp %B/%f %B/imapd.conf etc/rc.d/imapd.sh include/cyrus/acl.h include/cyrus/assert.h include/cyrus/auth.h include/cyrus/bsearch.h include/cyrus/charset.h include/cyrus/cyrusdb.h include/cyrus/glob.h include/cyrus/gmtoff.h include/cyrus/hash.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/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/strhash.o include/cyrus/stristr.h include/cyrus/sysexits.h include/cyrus/util.h include/cyrus/xmalloc.h lib/libcyrus_min.a lib/libcyrus.a lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3 %%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 @dirrm cyrus/bin @dirrm cyrus @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 Property changes on: head/mail/cyrus-imapd22/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.24 \ No newline at end of property +1.25 \ No newline at end of property Index: head/mail/cyrus-imapd23/Makefile =================================================================== --- head/mail/cyrus-imapd23/Makefile (revision 98222) +++ head/mail/cyrus-imapd23/Makefile (revision 98223) @@ -1,244 +1,236 @@ # New ports collection makefile for: cyrus-imapd # Date created: Jan 4th 2001 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.2.b -PORTREVISION= 2 +PORTVERSION= 2.2.3 +#PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} -DISTNAME= ${PORTNAME}-2.2.2-BETA MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend USE_RC_SUBR= YES USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \ +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-libdir=${LOCALBASE}/lib \ --with-auth=unix \ --with-com_err \ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL5} .if defined(WITH_BDB_VER) USE_BDB_VER= ${WITH_BDB_VER} .else USE_BDB_VER= 3 .endif .if ${USE_BDB_VER} == 41 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 .elif ${USE_BDB_VER} == 4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 .elif ${USE_BDB_VER} == 3 LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3 .else BROKEN= "WITH_BDB_VER must be 3, 4 or 41" .endif CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \ --with-bdb=db${USE_BDB_VER} .if defined(WITHOUT_SKIPLIST) CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat .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_IDLE) .if ${WITH_IDLE} != poll && ${WITH_IDLE} != idled && ${WITH_IDLE} != no BROKEN= "WITH_IDLE must be poll, idled or no" .endif CONFIGURE_ARGS+=--with-idle=${WITH_IDLE} .if ${WITH_IDLE} == idled PLIST_SUB+= IDLED="" .else PLIST_SUB+= IDLED="@comment " .endif .else PLIST_SUB+= IDLED="@comment " .endif .if defined(WITH_LISTEXT) CONFIGURE_ARGS+=--enable-listext .endif .if defined(WITH_ANNOTATEMORE) CONFIGURE_ARGS+=--enable-annotatemore .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-acconfig.h EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.in -#USE_AUTOHEADER= YES +USE_AUTOHEADER= YES USE_AUTOCONF= YES WANT_AUTOCONF_VER=257 CONFIGURE_ARGS+=--with-drac=${LOCALBASE} BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif .if defined(WITH_SNMP) # It seems not compilable due to lack of auto_nlist_value() in libucdagent. LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp #CONFIGURE_ENV= LIBS=-lkvm .else CONFIGURE_ARGS+=--with-ucdsnmp=no .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 MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \ cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \ deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \ lmtpd.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \ - reconstruct.8 rmnews.8 squatter.8 syncnews.8 timsieved.8 \ - tls_prune.8 + reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \ + timsieved.8 tls_prune.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-sieve install-snmpmon \ install-testing install-upgrade install-virtdomains \ mailing-list man notes os overview questions readme sieve \ sieve-protocol specs DOCSDIR= ${PREFIX}/share/doc/cyrus-imapd22 PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install .include .if ${PERL_LEVEL} < 500800 RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif .if ${PERL_LEVEL} < 500600 RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser .endif RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ RC_SUBR=${RC_SUBR} pre-everything:: .if !defined(WITH_BDB_VER) @if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \ ${ECHO_MSG} ""; \ ${ECHO_MSG} "It seems you have installed newer db than db3. If"; \ ${ECHO_MSG} "you are using newer db for cyrus-sasl2, you should"; \ ${ECHO_MSG} "specify same version by WITH_BDB_VER. For"; \ ${ECHO_MSG} "exapmle, WITH_BDB_VER=4 for db4."; \ ${ECHO_MSG} ""; \ fi .endif -.if defined(WITH_DRAC) -pre-patch: - @${REINPLACE_CMD} -e '/^Index: acconfig\.h/,/^Index: /d' \ - ${WRKSRC}/contrib/drac_auth.patch -.endif - post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ ${.CURDIR}/pkg-install > ${PKGINSTALL} @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|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 @${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 .if ${PERL_LEVEL} < 500600 @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \ ${WRKSRC}/perl/sieve/scripts/sieveshell.pl .endif post-install: @${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/man ${MKDIR} ${DOCSDIR}/text .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR} @${ECHO_CMD} share/doc/cyrus-imapd22/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${DOCSDIR}/man/$${ofile}.html; \ ${ECHO_CMD} share/doc/cyrus-imapd22/man/$${ofile}.html \ >>${TMPPLIST}; \ fi .endfor -.for file in cyrusv2.mc murder.png netnews.png +.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} @${ECHO_CMD} share/doc/cyrus-imapd22/${file} >>${TMPPLIST} .endfor .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text @${ECHO_CMD} share/doc/cyrus-imapd22/text/${file} >>${TMPPLIST} .endfor @${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/text" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST} .endif @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh @${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${PREFIX}/etc/imapd.conf.dist ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ ${PREFIX}/etc/cyrus.conf.dist ${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 Property changes on: head/mail/cyrus-imapd23/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.96 \ No newline at end of property +1.97 \ No newline at end of property Index: head/mail/cyrus-imapd23/distinfo =================================================================== --- head/mail/cyrus-imapd23/distinfo (revision 98222) +++ head/mail/cyrus-imapd23/distinfo (revision 98223) @@ -1 +1 @@ -MD5 (cyrus-imapd-2.2.2-BETA.tar.gz) = 774b55e758a2bf83d6ffd6b90a3fff4c +MD5 (cyrus-imapd-2.2.3.tar.gz) = 32888c5120edeb2867d6283fedbdb7d5 Property changes on: head/mail/cyrus-imapd23/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.25 \ No newline at end of property +1.26 \ No newline at end of property Index: head/mail/cyrus-imapd23/files/patch-dc =================================================================== --- head/mail/cyrus-imapd23/files/patch-dc (revision 98222) +++ head/mail/cyrus-imapd23/files/patch-dc (nonexistent) @@ -1,14 +0,0 @@ -Index: master/Makefile.in -diff -u master/Makefile.in.orig master/Makefile.in ---- master/Makefile.in.orig Fri Feb 7 07:41:03 2003 -+++ master/Makefile.in Fri Mar 21 18:02:28 2003 -@@ -52,7 +52,8 @@ - CYRUS_USER=@cyrus_user@ - CYRUS_GROUP=@cyrus_group@ - --DEFS = @DEFS@ @LOCALDEFS@ -+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" \ -+ -DDEFAULT_MASTER_CONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\" - CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@ - DEPLIBS = ../lib/libcyrus_min.a @DEPLIBS@ - Property changes on: head/mail/cyrus-imapd23/files/patch-dc ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.4 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd23/files/extra-patch-acconfig.h =================================================================== --- head/mail/cyrus-imapd23/files/extra-patch-acconfig.h (revision 98222) +++ head/mail/cyrus-imapd23/files/extra-patch-acconfig.h (nonexistent) @@ -1,17 +0,0 @@ -Index: acconfig.h -diff -u acconfig.h.orig acconfig.h ---- acconfig.h.orig Fri Feb 14 05:32:50 2003 -+++ acconfig.h Fri Mar 21 21:03:25 2003 -@@ -263,8 +263,12 @@ - #define FNAME_DOMAINDIR "/domain/" - #define FNAME_LOGDIR "/log/" - #define FNAME_PTSDB "/ptclient/ptscache.db" -+#if !defined(CONFIG_FILENAME) - #define CONFIG_FILENAME "/etc/imapd.conf" -+#endif -+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME) - #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf" -+#endif - - #ifndef HAVE_SHUTDOWN - #define shutdown(fd, mode) 0 Property changes on: head/mail/cyrus-imapd23/files/extra-patch-acconfig.h ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd23/files/patch-lib::Makefile.in =================================================================== --- head/mail/cyrus-imapd23/files/patch-lib::Makefile.in (revision 98222) +++ head/mail/cyrus-imapd23/files/patch-lib::Makefile.in (nonexistent) @@ -1,13 +0,0 @@ -Index: lib/Makefile.in -diff -u lib/Makefile.in.orig lib/Makefile.in ---- lib/Makefile.in.orig Thu Feb 13 04:12:42 2003 -+++ lib/Makefile.in Fri Mar 21 15:11:50 2003 -@@ -56,7 +56,7 @@ - INSTALL = @INSTALL@ - RANLIB = @RANLIB@ - --DEFS = @DEFS@ -+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@ - LIBS = @LIBS@ - Property changes on: head/mail/cyrus-imapd23/files/patch-lib::Makefile.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd23/files/patch-imap::idled.c =================================================================== --- head/mail/cyrus-imapd23/files/patch-imap::idled.c (revision 98222) +++ head/mail/cyrus-imapd23/files/patch-imap::idled.c (nonexistent) @@ -1,15 +0,0 @@ -Index: imap/idled.c -diff -u imap/idled.c.orig imap/idled.c ---- imap/idled.c.orig Thu Oct 23 03:50:07 2003 -+++ imap/idled.c Tue Jan 13 23:17:21 2004 -@@ -409,3 +409,10 @@ - /* never gets here */ - exit(1); - } -+ -+void printstring(const char *s __attribute__((unused))) -+{ -+ /* needed to link against annotate.o */ -+ fatal("printstring() executed, but its not used for IDLED!", -+ EC_SOFTWARE); -+} Property changes on: head/mail/cyrus-imapd23/files/patch-imap::idled.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd23/files/patch-config.h.in =================================================================== --- head/mail/cyrus-imapd23/files/patch-config.h.in (revision 98222) +++ head/mail/cyrus-imapd23/files/patch-config.h.in (nonexistent) @@ -1,17 +0,0 @@ -Index: config.h.in -diff -u config.h.in.orig config.h.in ---- config.h.in.orig Thu Mar 20 04:04:36 2003 -+++ config.h.in Fri Mar 21 14:33:39 2003 -@@ -360,8 +360,12 @@ - #define FNAME_DOMAINDIR "/domain/" - #define FNAME_LOGDIR "/log/" - #define FNAME_PTSDB "/ptclient/ptscache.db" -+#if !defined(CONFIG_FILENAME) - #define CONFIG_FILENAME "/etc/imapd.conf" -+#endif -+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME) - #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf" -+#endif - - #ifndef HAVE_SHUTDOWN - #define shutdown(fd, mode) 0 Property changes on: head/mail/cyrus-imapd23/files/patch-config.h.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 =================================================================== --- head/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 (revision 98222) +++ head/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 (revision 98223) @@ -1,22 +1,22 @@ Index: aclocal.m4 diff -u aclocal.m4.orig aclocal.m4 --- aclocal.m4.orig Wed Oct 29 02:24:46 2003 +++ aclocal.m4 Wed Oct 29 04:28:37 2003 @@ -505,7 +505,7 @@ BDB_LIBADD="" fi -- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db +- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db do AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; break, dblib="no") @@ -1664,7 +1664,7 @@ LIB_UCDSNMP="" if test "$with_ucdsnmp" != no; then AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?]) - LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" + LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm" AC_CHECK_LIB(rpm, rpmdbOpen, LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt) fi Property changes on: head/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/mail/cyrus-imapd23/files/patch-ac =================================================================== --- head/mail/cyrus-imapd23/files/patch-ac (revision 98222) +++ head/mail/cyrus-imapd23/files/patch-ac (revision 98223) @@ -1,22 +1,22 @@ Index: configure diff -u configure.orig configure ---- configure.orig Wed Oct 29 02:24:50 2003 -+++ configure Wed Oct 29 03:52:02 2003 -@@ -6811,7 +6811,7 @@ +--- configure.orig Thu Jan 15 23:36:50 2004 ++++ configure Fri Jan 16 04:03:09 2004 +@@ -6565,7 +6565,7 @@ BDB_LIBADD="" fi -- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db +- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db do as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh` echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5 -@@ -13851,7 +13851,7 @@ +@@ -13854,7 +13854,7 @@ #define HAVE_UCDSNMP 1 _ACEOF - LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" + LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm" 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 Property changes on: head/mail/cyrus-imapd23/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/mail/cyrus-imapd23/files/patch-sieve::Makefile.in =================================================================== --- head/mail/cyrus-imapd23/files/patch-sieve::Makefile.in (revision 98222) +++ head/mail/cyrus-imapd23/files/patch-sieve::Makefile.in (revision 98223) @@ -1,21 +1,21 @@ Index: sieve/Makefile.in diff -u sieve/Makefile.in.orig sieve/Makefile.in ---- sieve/Makefile.in.orig Fri Feb 28 03:13:50 2003 -+++ sieve/Makefile.in Mon Mar 24 02:26:24 2003 -@@ -32,6 +32,7 @@ +--- sieve/Makefile.in.orig Wed Nov 12 13:02:12 2003 ++++ sieve/Makefile.in Fri Jan 16 03:47:03 2004 +@@ -33,6 +33,7 @@ YACC = @YACC@ YFLAGS = -d LEX = @LEX@ +INSTALL = @INSTALL@ RANLIB = @RANLIB@ COMPILE_ET = @COMPILE_ET@ -@@ -58,7 +59,7 @@ +@@ -59,7 +60,7 @@ install: sievec - $(srcdir)/../install-sh -d ${DESTDIR}$(cyrus_prefix)/bin -- $(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit -+ $(INSTALL) -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit + $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) +- $(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit ++ $(INSTALL) -m 755 sievec $(DESTDIR)$(service_path) || exit test: $(DEPLIBS) libsieve.a test.o $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS) Property changes on: head/mail/cyrus-imapd23/files/patch-sieve::Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/mail/cyrus-imapd23/pkg-plist =================================================================== --- head/mail/cyrus-imapd23/pkg-plist (revision 98222) +++ head/mail/cyrus-imapd23/pkg-plist (revision 98223) @@ -1,110 +1,111 @@ bin/cyradm 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/cyrquota cyrus/bin/deliver %%NNTP%%cyrus/bin/fetchnews cyrus/bin/fud %%IDLED%%cyrus/bin/idled cyrus/bin/imapd cyrus/bin/ipurge cyrus/bin/lmtpd %%MURDER%%cyrus/bin/lmtpproxyd 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 %%MURDER%%cyrus/bin/proxyd cyrus/bin/reconstruct cyrus/bin/sievec +cyrus/bin/smmapd cyrus/bin/squatter cyrus/bin/timsieved cyrus/bin/tls_prune @unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi etc/cyrus.conf.dist @exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf @unexec if cmp -s %D/etc/imapd.conf %D/etc/imapd.conf.dist; then rm -f %D/etc/imapd.conf; fi etc/imapd.conf.dist @exec [ -f %B/imapd.conf ] || cp %B/%f %B/imapd.conf etc/rc.d/imapd.sh include/cyrus/acl.h include/cyrus/assert.h include/cyrus/auth.h include/cyrus/bsearch.h include/cyrus/charset.h include/cyrus/cyrusdb.h include/cyrus/glob.h include/cyrus/gmtoff.h include/cyrus/hash.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/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/strhash.o include/cyrus/stristr.h include/cyrus/sysexits.h include/cyrus/util.h include/cyrus/xmalloc.h lib/libcyrus_min.a lib/libcyrus.a lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3 %%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 @dirrm cyrus/bin @dirrm cyrus @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 Property changes on: head/mail/cyrus-imapd23/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.24 \ No newline at end of property +1.25 \ No newline at end of property Index: head/mail/cyrus-imapd24/Makefile =================================================================== --- head/mail/cyrus-imapd24/Makefile (revision 98222) +++ head/mail/cyrus-imapd24/Makefile (revision 98223) @@ -1,244 +1,236 @@ # New ports collection makefile for: cyrus-imapd # Date created: Jan 4th 2001 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.2.b -PORTREVISION= 2 +PORTVERSION= 2.2.3 +#PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} -DISTNAME= ${PORTNAME}-2.2.2-BETA MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend USE_RC_SUBR= YES USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \ +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-libdir=${LOCALBASE}/lib \ --with-auth=unix \ --with-com_err \ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL5} .if defined(WITH_BDB_VER) USE_BDB_VER= ${WITH_BDB_VER} .else USE_BDB_VER= 3 .endif .if ${USE_BDB_VER} == 41 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 .elif ${USE_BDB_VER} == 4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 .elif ${USE_BDB_VER} == 3 LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3 .else BROKEN= "WITH_BDB_VER must be 3, 4 or 41" .endif CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \ --with-bdb=db${USE_BDB_VER} .if defined(WITHOUT_SKIPLIST) CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat .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_IDLE) .if ${WITH_IDLE} != poll && ${WITH_IDLE} != idled && ${WITH_IDLE} != no BROKEN= "WITH_IDLE must be poll, idled or no" .endif CONFIGURE_ARGS+=--with-idle=${WITH_IDLE} .if ${WITH_IDLE} == idled PLIST_SUB+= IDLED="" .else PLIST_SUB+= IDLED="@comment " .endif .else PLIST_SUB+= IDLED="@comment " .endif .if defined(WITH_LISTEXT) CONFIGURE_ARGS+=--enable-listext .endif .if defined(WITH_ANNOTATEMORE) CONFIGURE_ARGS+=--enable-annotatemore .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-acconfig.h EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.in -#USE_AUTOHEADER= YES +USE_AUTOHEADER= YES USE_AUTOCONF= YES WANT_AUTOCONF_VER=257 CONFIGURE_ARGS+=--with-drac=${LOCALBASE} BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif .if defined(WITH_SNMP) # It seems not compilable due to lack of auto_nlist_value() in libucdagent. LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp #CONFIGURE_ENV= LIBS=-lkvm .else CONFIGURE_ARGS+=--with-ucdsnmp=no .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 MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \ cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \ deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \ lmtpd.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \ - reconstruct.8 rmnews.8 squatter.8 syncnews.8 timsieved.8 \ - tls_prune.8 + reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \ + timsieved.8 tls_prune.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-sieve install-snmpmon \ install-testing install-upgrade install-virtdomains \ mailing-list man notes os overview questions readme sieve \ sieve-protocol specs DOCSDIR= ${PREFIX}/share/doc/cyrus-imapd22 PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install .include .if ${PERL_LEVEL} < 500800 RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp .endif .if ${PERL_LEVEL} < 500600 RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser .endif RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ RC_SUBR=${RC_SUBR} pre-everything:: .if !defined(WITH_BDB_VER) @if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \ ${ECHO_MSG} ""; \ ${ECHO_MSG} "It seems you have installed newer db than db3. If"; \ ${ECHO_MSG} "you are using newer db for cyrus-sasl2, you should"; \ ${ECHO_MSG} "specify same version by WITH_BDB_VER. For"; \ ${ECHO_MSG} "exapmle, WITH_BDB_VER=4 for db4."; \ ${ECHO_MSG} ""; \ fi .endif -.if defined(WITH_DRAC) -pre-patch: - @${REINPLACE_CMD} -e '/^Index: acconfig\.h/,/^Index: /d' \ - ${WRKSRC}/contrib/drac_auth.patch -.endif - post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ ${.CURDIR}/pkg-install > ${PKGINSTALL} @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|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 @${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 .if ${PERL_LEVEL} < 500600 @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \ ${WRKSRC}/perl/sieve/scripts/sieveshell.pl .endif post-install: @${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/man ${MKDIR} ${DOCSDIR}/text .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR} @${ECHO_CMD} share/doc/cyrus-imapd22/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${DOCSDIR}/man/$${ofile}.html; \ ${ECHO_CMD} share/doc/cyrus-imapd22/man/$${ofile}.html \ >>${TMPPLIST}; \ fi .endfor -.for file in cyrusv2.mc murder.png netnews.png +.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} @${ECHO_CMD} share/doc/cyrus-imapd22/${file} >>${TMPPLIST} .endfor .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text @${ECHO_CMD} share/doc/cyrus-imapd22/text/${file} >>${TMPPLIST} .endfor @${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/text" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST} .endif @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh @${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${PREFIX}/etc/imapd.conf.dist ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ ${PREFIX}/etc/cyrus.conf.dist ${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 Property changes on: head/mail/cyrus-imapd24/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.96 \ No newline at end of property +1.97 \ No newline at end of property Index: head/mail/cyrus-imapd24/distinfo =================================================================== --- head/mail/cyrus-imapd24/distinfo (revision 98222) +++ head/mail/cyrus-imapd24/distinfo (revision 98223) @@ -1 +1 @@ -MD5 (cyrus-imapd-2.2.2-BETA.tar.gz) = 774b55e758a2bf83d6ffd6b90a3fff4c +MD5 (cyrus-imapd-2.2.3.tar.gz) = 32888c5120edeb2867d6283fedbdb7d5 Property changes on: head/mail/cyrus-imapd24/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.25 \ No newline at end of property +1.26 \ No newline at end of property Index: head/mail/cyrus-imapd24/files/patch-dc =================================================================== --- head/mail/cyrus-imapd24/files/patch-dc (revision 98222) +++ head/mail/cyrus-imapd24/files/patch-dc (nonexistent) @@ -1,14 +0,0 @@ -Index: master/Makefile.in -diff -u master/Makefile.in.orig master/Makefile.in ---- master/Makefile.in.orig Fri Feb 7 07:41:03 2003 -+++ master/Makefile.in Fri Mar 21 18:02:28 2003 -@@ -52,7 +52,8 @@ - CYRUS_USER=@cyrus_user@ - CYRUS_GROUP=@cyrus_group@ - --DEFS = @DEFS@ @LOCALDEFS@ -+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" \ -+ -DDEFAULT_MASTER_CONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\" - CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@ - DEPLIBS = ../lib/libcyrus_min.a @DEPLIBS@ - Property changes on: head/mail/cyrus-imapd24/files/patch-dc ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.4 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd24/files/extra-patch-acconfig.h =================================================================== --- head/mail/cyrus-imapd24/files/extra-patch-acconfig.h (revision 98222) +++ head/mail/cyrus-imapd24/files/extra-patch-acconfig.h (nonexistent) @@ -1,17 +0,0 @@ -Index: acconfig.h -diff -u acconfig.h.orig acconfig.h ---- acconfig.h.orig Fri Feb 14 05:32:50 2003 -+++ acconfig.h Fri Mar 21 21:03:25 2003 -@@ -263,8 +263,12 @@ - #define FNAME_DOMAINDIR "/domain/" - #define FNAME_LOGDIR "/log/" - #define FNAME_PTSDB "/ptclient/ptscache.db" -+#if !defined(CONFIG_FILENAME) - #define CONFIG_FILENAME "/etc/imapd.conf" -+#endif -+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME) - #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf" -+#endif - - #ifndef HAVE_SHUTDOWN - #define shutdown(fd, mode) 0 Property changes on: head/mail/cyrus-imapd24/files/extra-patch-acconfig.h ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd24/files/patch-lib::Makefile.in =================================================================== --- head/mail/cyrus-imapd24/files/patch-lib::Makefile.in (revision 98222) +++ head/mail/cyrus-imapd24/files/patch-lib::Makefile.in (nonexistent) @@ -1,13 +0,0 @@ -Index: lib/Makefile.in -diff -u lib/Makefile.in.orig lib/Makefile.in ---- lib/Makefile.in.orig Thu Feb 13 04:12:42 2003 -+++ lib/Makefile.in Fri Mar 21 15:11:50 2003 -@@ -56,7 +56,7 @@ - INSTALL = @INSTALL@ - RANLIB = @RANLIB@ - --DEFS = @DEFS@ -+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@ - LIBS = @LIBS@ - Property changes on: head/mail/cyrus-imapd24/files/patch-lib::Makefile.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd24/files/patch-imap::idled.c =================================================================== --- head/mail/cyrus-imapd24/files/patch-imap::idled.c (revision 98222) +++ head/mail/cyrus-imapd24/files/patch-imap::idled.c (nonexistent) @@ -1,15 +0,0 @@ -Index: imap/idled.c -diff -u imap/idled.c.orig imap/idled.c ---- imap/idled.c.orig Thu Oct 23 03:50:07 2003 -+++ imap/idled.c Tue Jan 13 23:17:21 2004 -@@ -409,3 +409,10 @@ - /* never gets here */ - exit(1); - } -+ -+void printstring(const char *s __attribute__((unused))) -+{ -+ /* needed to link against annotate.o */ -+ fatal("printstring() executed, but its not used for IDLED!", -+ EC_SOFTWARE); -+} Property changes on: head/mail/cyrus-imapd24/files/patch-imap::idled.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd24/files/patch-config.h.in =================================================================== --- head/mail/cyrus-imapd24/files/patch-config.h.in (revision 98222) +++ head/mail/cyrus-imapd24/files/patch-config.h.in (nonexistent) @@ -1,17 +0,0 @@ -Index: config.h.in -diff -u config.h.in.orig config.h.in ---- config.h.in.orig Thu Mar 20 04:04:36 2003 -+++ config.h.in Fri Mar 21 14:33:39 2003 -@@ -360,8 +360,12 @@ - #define FNAME_DOMAINDIR "/domain/" - #define FNAME_LOGDIR "/log/" - #define FNAME_PTSDB "/ptclient/ptscache.db" -+#if !defined(CONFIG_FILENAME) - #define CONFIG_FILENAME "/etc/imapd.conf" -+#endif -+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME) - #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf" -+#endif - - #ifndef HAVE_SHUTDOWN - #define shutdown(fd, mode) 0 Property changes on: head/mail/cyrus-imapd24/files/patch-config.h.in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 =================================================================== --- head/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 (revision 98222) +++ head/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 (revision 98223) @@ -1,22 +1,22 @@ Index: aclocal.m4 diff -u aclocal.m4.orig aclocal.m4 --- aclocal.m4.orig Wed Oct 29 02:24:46 2003 +++ aclocal.m4 Wed Oct 29 04:28:37 2003 @@ -505,7 +505,7 @@ BDB_LIBADD="" fi -- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db +- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db do AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; break, dblib="no") @@ -1664,7 +1664,7 @@ LIB_UCDSNMP="" if test "$with_ucdsnmp" != no; then AC_DEFINE(HAVE_UCDSNMP,1,[Do we have SNMP support?]) - LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" + LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm" AC_CHECK_LIB(rpm, rpmdbOpen, LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt) fi Property changes on: head/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/mail/cyrus-imapd24/files/patch-ac =================================================================== --- head/mail/cyrus-imapd24/files/patch-ac (revision 98222) +++ head/mail/cyrus-imapd24/files/patch-ac (revision 98223) @@ -1,22 +1,22 @@ Index: configure diff -u configure.orig configure ---- configure.orig Wed Oct 29 02:24:50 2003 -+++ configure Wed Oct 29 03:52:02 2003 -@@ -6811,7 +6811,7 @@ +--- configure.orig Thu Jan 15 23:36:50 2004 ++++ configure Fri Jan 16 04:03:09 2004 +@@ -6565,7 +6565,7 @@ BDB_LIBADD="" fi -- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db +- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db do as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh` echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5 -@@ -13851,7 +13851,7 @@ +@@ -13854,7 +13854,7 @@ #define HAVE_UCDSNMP 1 _ACEOF - LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" + LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm" 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 Property changes on: head/mail/cyrus-imapd24/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/mail/cyrus-imapd24/files/patch-sieve::Makefile.in =================================================================== --- head/mail/cyrus-imapd24/files/patch-sieve::Makefile.in (revision 98222) +++ head/mail/cyrus-imapd24/files/patch-sieve::Makefile.in (revision 98223) @@ -1,21 +1,21 @@ Index: sieve/Makefile.in diff -u sieve/Makefile.in.orig sieve/Makefile.in ---- sieve/Makefile.in.orig Fri Feb 28 03:13:50 2003 -+++ sieve/Makefile.in Mon Mar 24 02:26:24 2003 -@@ -32,6 +32,7 @@ +--- sieve/Makefile.in.orig Wed Nov 12 13:02:12 2003 ++++ sieve/Makefile.in Fri Jan 16 03:47:03 2004 +@@ -33,6 +33,7 @@ YACC = @YACC@ YFLAGS = -d LEX = @LEX@ +INSTALL = @INSTALL@ RANLIB = @RANLIB@ COMPILE_ET = @COMPILE_ET@ -@@ -58,7 +59,7 @@ +@@ -59,7 +60,7 @@ install: sievec - $(srcdir)/../install-sh -d ${DESTDIR}$(cyrus_prefix)/bin -- $(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit -+ $(INSTALL) -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit + $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) +- $(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit ++ $(INSTALL) -m 755 sievec $(DESTDIR)$(service_path) || exit test: $(DEPLIBS) libsieve.a test.o $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS) Property changes on: head/mail/cyrus-imapd24/files/patch-sieve::Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/mail/cyrus-imapd24/pkg-plist =================================================================== --- head/mail/cyrus-imapd24/pkg-plist (revision 98222) +++ head/mail/cyrus-imapd24/pkg-plist (revision 98223) @@ -1,110 +1,111 @@ bin/cyradm 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/cyrquota cyrus/bin/deliver %%NNTP%%cyrus/bin/fetchnews cyrus/bin/fud %%IDLED%%cyrus/bin/idled cyrus/bin/imapd cyrus/bin/ipurge cyrus/bin/lmtpd %%MURDER%%cyrus/bin/lmtpproxyd 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 %%MURDER%%cyrus/bin/proxyd cyrus/bin/reconstruct cyrus/bin/sievec +cyrus/bin/smmapd cyrus/bin/squatter cyrus/bin/timsieved cyrus/bin/tls_prune @unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi etc/cyrus.conf.dist @exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf @unexec if cmp -s %D/etc/imapd.conf %D/etc/imapd.conf.dist; then rm -f %D/etc/imapd.conf; fi etc/imapd.conf.dist @exec [ -f %B/imapd.conf ] || cp %B/%f %B/imapd.conf etc/rc.d/imapd.sh include/cyrus/acl.h include/cyrus/assert.h include/cyrus/auth.h include/cyrus/bsearch.h include/cyrus/charset.h include/cyrus/cyrusdb.h include/cyrus/glob.h include/cyrus/gmtoff.h include/cyrus/hash.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/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/strhash.o include/cyrus/stristr.h include/cyrus/sysexits.h include/cyrus/util.h include/cyrus/xmalloc.h lib/libcyrus_min.a lib/libcyrus.a lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3 %%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 @dirrm cyrus/bin @dirrm cyrus @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 Property changes on: head/mail/cyrus-imapd24/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.24 \ No newline at end of property +1.25 \ No newline at end of property