Index: head/mail/cyrus-imapd22/Makefile =================================================================== --- head/mail/cyrus-imapd22/Makefile (revision 109457) +++ head/mail/cyrus-imapd22/Makefile (revision 109458) @@ -1,252 +1,241 @@ # New ports collection makefile for: cyrus-imapd # Date created: Jan 4th 2001 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.3 -PORTREVISION= 3 +PORTVERSION= 2.2.4 +#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/&,} 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 LATEST_LINK= ${PORTNAME}22 USE_RC_SUBR= YES - USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-cyrus-prefix=${PREFIX}/cyrus \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ --with-bdb-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} == 3 LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db3 --with-bdb=db3 .elif ${USE_BDB_VER} == 4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db4 --with-bdb=db4 .elif ${USE_BDB_VER} == 41 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db41 --with-bdb=db41 .elif ${USE_BDB_VER} == 42 LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2 .else BROKEN= "WITH_BDB_VER must be 3, 4, 41 or 42" .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-aclocal.m4 \ ${FILESDIR}/extra-patch-configure.in USE_AUTOHEADER= YES USE_AUTOCONF_VER=257 CONFIGURE_ARGS+=--with-drac=${LOCALBASE} BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif .include .if defined(WITH_SNMP) LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE} .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 CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \ Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3 CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \ cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.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 quota.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 PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install .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 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 .if ${PERL_LEVEL} < 500600 @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \ ${WRKSRC}/perl/sieve/scripts/sieveshell.pl .endif -.if !defined(NOPORTDOCS) -post-build: - @/usr/bin/groff -man -Thtml ${WRKSRC}/man/imapd.conf.5 \ - > ${WRKSRC}/doc/man/imapd.conf.5.html -.endif - post-install: -.for file in ${CYRUS_MAN3} - @${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${file} - @${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${file}.gz \ +.for f in ${CYRUS_MAN3} + @${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f} + @${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \ >>${TMPPLIST} .endfor -.for file in ${CYRUS_MAN8} - @${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${file} - @${ECHO_CMD} cyrus/man/man8/${file}.gz >>${TMPPLIST} +.for f in ${CYRUS_MAN8} + @${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f} + @${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST} .endfor @${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST} @${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/man @${MKDIR} ${DOCSDIR}/text -.for file in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${file}.html >>${TMPPLIST} +.for f in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR} + @${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST} .endfor -.for file in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8} - @if [ -f ${WRKSRC}/doc/man/${file}.html ]; then \ - ${INSTALL_DATA} ${WRKSRC}/doc/man/${file}.html \ - ${DOCSDIR}/man/${file}.html; \ - ${ECHO_CMD} share/doc/${PORTNAME}/man/${file}.html \ +.for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8} + @if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \ + ${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \ + ${DOCSDIR}/man/${f}.html; \ + ${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \ >>${TMPPLIST}; \ fi .endfor -.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png - @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${file} >>${TMPPLIST} +.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png + @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} + @${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST} .endfor -.for file in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text - @${ECHO_CMD} share/doc/${PORTNAME}/text/${file} >>${TMPPLIST} +.for f in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text + @${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST} .endfor @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} .endif @${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.109 \ No newline at end of property +1.110 \ No newline at end of property Index: head/mail/cyrus-imapd22/distinfo =================================================================== --- head/mail/cyrus-imapd22/distinfo (revision 109457) +++ head/mail/cyrus-imapd22/distinfo (revision 109458) @@ -1,2 +1,2 @@ -MD5 (cyrus-imapd-2.2.3.tar.gz) = 32888c5120edeb2867d6283fedbdb7d5 -SIZE (cyrus-imapd-2.2.3.tar.gz) = 1887717 +MD5 (cyrus-imapd-2.2.4.tar.gz) = 50831a41ba0121754431e8507887d511 +SIZE (cyrus-imapd-2.2.4.tar.gz) = 1927519 Property changes on: head/mail/cyrus-imapd22/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.27 \ No newline at end of property +1.28 \ No newline at end of property Index: head/mail/cyrus-imapd22/files/patch-Makefile.in =================================================================== --- head/mail/cyrus-imapd22/files/patch-Makefile.in (revision 109457) +++ head/mail/cyrus-imapd22/files/patch-Makefile.in (revision 109458) @@ -1,25 +1,25 @@ Index: Makefile.in diff -u Makefile.in.orig Makefile.in ---- Makefile.in.orig Tue Jan 13 06:02:09 2004 -+++ Makefile.in Sat Apr 3 00:04:36 2004 -@@ -90,13 +90,13 @@ +--- Makefile.in.orig Sat May 15 05:59:10 2004 ++++ Makefile.in Wed May 19 00:23:11 2004 +@@ -97,13 +97,13 @@ touch distcvs install:: - $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin - $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib - $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8 + $(INSTALL) -d ${DESTDIR}$(exec_prefix)/bin + $(INSTALL) -d ${DESTDIR}$(exec_prefix)/lib + $(INSTALL) -d ${DESTDIR}$(prefix)/include/cyrus -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man1 -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man3 -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man5 ++ $(INSTALL) -d ${DESTDIR}$(mandir)/man1 ++ $(INSTALL) -d ${DESTDIR}$(mandir)/man3 ++ $(INSTALL) -d ${DESTDIR}$(mandir)/man5 + $(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8 @for d in $(SUBDIRS); \ do \ (cd $$d; echo "### Making" install "in" `pwd`; \ Property changes on: head/mail/cyrus-imapd22/files/patch-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/mail/cyrus-imapd22/files/patch-aa =================================================================== --- head/mail/cyrus-imapd22/files/patch-aa (revision 109457) +++ head/mail/cyrus-imapd22/files/patch-aa (revision 109458) @@ -1,13 +1,21 @@ Index: man/Makefile.in diff -u man/Makefile.in.orig man/Makefile.in ---- man/Makefile.in.orig Sat Nov 8 06:33:54 2003 -+++ man/Makefile.in Fri Apr 2 23:50:30 2004 -@@ -102,7 +102,7 @@ +--- man/Makefile.in.orig Wed Mar 31 00:18:41 2004 ++++ man/Makefile.in Wed May 19 01:52:50 2004 +@@ -50,6 +50,7 @@ + SHELL = /bin/sh + + prefix = @prefix@ ++cyrus_prefix = @cyrus_prefix@ + + mandir = @mandir@ + +@@ -93,7 +94,7 @@ done for file in $(MAN8); \ do \ -- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \ +- $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \ + $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \ done - .c.o: + clean: Property changes on: head/mail/cyrus-imapd22/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/mail/cyrus-imapd22/files/patch-ac =================================================================== --- head/mail/cyrus-imapd22/files/patch-ac (revision 109457) +++ head/mail/cyrus-imapd22/files/patch-ac (revision 109458) @@ -1,62 +1,62 @@ Index: configure diff -u configure.orig configure ---- configure.orig Thu Jan 15 23:36:50 2004 -+++ configure Sun Mar 7 23:46:32 2004 +--- configure.orig Mon May 17 06:05:03 2004 ++++ configure Wed May 19 00:29:21 2004 @@ -308,7 +308,7 @@ # include #endif" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS' ac_subst_files='' # Initialize some variables set by options. -@@ -6565,7 +6565,7 @@ +@@ -6551,7 +6551,7 @@ BDB_LIBADD="" fi - 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 -@@ -6589,11 +6589,11 @@ +@@ -6575,11 +6575,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char db_create (); +#include int main () { -db_create (); +db_create (0, 0, 0); ; return 0; } -@@ -13187,6 +13187,8 @@ +@@ -13183,6 +13183,8 @@ EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" + eval `${PERL} -V:cccdlflags` + PERL_CCCDLFLAGS="$cccdlflags" fi if test "$sievedir" != "no"; then -@@ -13854,7 +13856,7 @@ +@@ -13850,7 +13852,7 @@ #define HAVE_UCDSNMP 1 _ACEOF - LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" + LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5 echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6 if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then -@@ -14660,6 +14662,7 @@ +@@ -14657,6 +14659,7 @@ s,@LIB_SASL@,$LIB_SASL,;t t s,@SASLFLAGS@,$SASLFLAGS,;t t s,@PERL@,$PERL,;t t +s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t s,@MD5OBJ@,$MD5OBJ,;t t s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t s,@LIB_WRAP@,$LIB_WRAP,;t t Property changes on: head/mail/cyrus-imapd22/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ 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 109457) +++ head/mail/cyrus-imapd22/files/patch-lib::Makefile.in (revision 109458) @@ -1,22 +1,22 @@ Index: lib/Makefile.in diff -u lib/Makefile.in.orig lib/Makefile.in ---- lib/Makefile.in.orig Sun Jan 4 00:16:44 2004 -+++ lib/Makefile.in Thu Mar 11 01:35:47 2004 +--- lib/Makefile.in.orig Thu Mar 11 06:25:39 2004 ++++ lib/Makefile.in Wed May 19 00:34:19 2004 @@ -60,7 +60,7 @@ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@ LIBS = @LIBS@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ LDFLAGS = @LDFLAGS@ SHELL = /bin/sh -@@ -100,7 +100,7 @@ +@@ -102,7 +102,7 @@ all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a install: -- $(srcdir)/../install-sh -d $(DESTDIR)$(exec_prefix)/lib -+ $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(exec_prefix)/lib - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(exec_prefix)/lib - $(RANLIB) $(DESTDIR)$(exec_prefix)/lib/libcyrus.a +- $(srcdir)/../install-sh -d $(DESTDIR)$(libdir) ++ $(INSTALL) -d $(DESTDIR)$(libdir) + $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir) + $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir) + $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a Property changes on: head/mail/cyrus-imapd22/files/patch-lib::Makefile.in ___________________________________________________________________ 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-sieve::Makefile.in =================================================================== --- head/mail/cyrus-imapd22/files/patch-sieve::Makefile.in (revision 109457) +++ head/mail/cyrus-imapd22/files/patch-sieve::Makefile.in (revision 109458) @@ -1,30 +1,30 @@ Index: sieve/Makefile.in diff -u sieve/Makefile.in.orig sieve/Makefile.in ---- sieve/Makefile.in.orig Wed Nov 12 13:02:12 2003 -+++ sieve/Makefile.in Thu Mar 11 01:22:05 2004 +--- sieve/Makefile.in.orig Fri Mar 12 00:25:35 2004 ++++ sieve/Makefile.in Wed May 19 00:38:00 2004 @@ -33,12 +33,13 @@ YACC = @YACC@ YFLAGS = -d LEX = @LEX@ +INSTALL = @INSTALL@ RANLIB = @RANLIB@ COMPILE_ET = @COMPILE_ET@ DEFS = @DEFS@ - CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ LDFLAGS = @LDFLAGS@ MAKEDEPEND = @MAKEDEPEND@ @@ -58,8 +59,8 @@ dist: $(BUILT_SOURCES) install: sievec - $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -- $(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit +- $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit + $(INSTALL) -d ${DESTDIR}$(service_path) -+ $(INSTALL) -s -m 755 sievec $(DESTDIR)$(service_path) || exit ++ $(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit test: $(DEPLIBS) libsieve.a test.o $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS) Property changes on: head/mail/cyrus-imapd22/files/patch-sieve::Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/mail/cyrus-imapd23/Makefile =================================================================== --- head/mail/cyrus-imapd23/Makefile (revision 109457) +++ head/mail/cyrus-imapd23/Makefile (revision 109458) @@ -1,252 +1,241 @@ # New ports collection makefile for: cyrus-imapd # Date created: Jan 4th 2001 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.3 -PORTREVISION= 3 +PORTVERSION= 2.2.4 +#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/&,} 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 LATEST_LINK= ${PORTNAME}22 USE_RC_SUBR= YES - USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-cyrus-prefix=${PREFIX}/cyrus \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ --with-bdb-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} == 3 LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db3 --with-bdb=db3 .elif ${USE_BDB_VER} == 4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db4 --with-bdb=db4 .elif ${USE_BDB_VER} == 41 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db41 --with-bdb=db41 .elif ${USE_BDB_VER} == 42 LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2 .else BROKEN= "WITH_BDB_VER must be 3, 4, 41 or 42" .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-aclocal.m4 \ ${FILESDIR}/extra-patch-configure.in USE_AUTOHEADER= YES USE_AUTOCONF_VER=257 CONFIGURE_ARGS+=--with-drac=${LOCALBASE} BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif .include .if defined(WITH_SNMP) LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE} .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 CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \ Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3 CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \ cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.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 quota.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 PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install .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 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 .if ${PERL_LEVEL} < 500600 @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \ ${WRKSRC}/perl/sieve/scripts/sieveshell.pl .endif -.if !defined(NOPORTDOCS) -post-build: - @/usr/bin/groff -man -Thtml ${WRKSRC}/man/imapd.conf.5 \ - > ${WRKSRC}/doc/man/imapd.conf.5.html -.endif - post-install: -.for file in ${CYRUS_MAN3} - @${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${file} - @${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${file}.gz \ +.for f in ${CYRUS_MAN3} + @${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f} + @${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \ >>${TMPPLIST} .endfor -.for file in ${CYRUS_MAN8} - @${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${file} - @${ECHO_CMD} cyrus/man/man8/${file}.gz >>${TMPPLIST} +.for f in ${CYRUS_MAN8} + @${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f} + @${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST} .endfor @${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST} @${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/man @${MKDIR} ${DOCSDIR}/text -.for file in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${file}.html >>${TMPPLIST} +.for f in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR} + @${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST} .endfor -.for file in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8} - @if [ -f ${WRKSRC}/doc/man/${file}.html ]; then \ - ${INSTALL_DATA} ${WRKSRC}/doc/man/${file}.html \ - ${DOCSDIR}/man/${file}.html; \ - ${ECHO_CMD} share/doc/${PORTNAME}/man/${file}.html \ +.for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8} + @if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \ + ${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \ + ${DOCSDIR}/man/${f}.html; \ + ${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \ >>${TMPPLIST}; \ fi .endfor -.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png - @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${file} >>${TMPPLIST} +.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png + @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} + @${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST} .endfor -.for file in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text - @${ECHO_CMD} share/doc/${PORTNAME}/text/${file} >>${TMPPLIST} +.for f in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text + @${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST} .endfor @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} .endif @${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.109 \ No newline at end of property +1.110 \ No newline at end of property Index: head/mail/cyrus-imapd23/distinfo =================================================================== --- head/mail/cyrus-imapd23/distinfo (revision 109457) +++ head/mail/cyrus-imapd23/distinfo (revision 109458) @@ -1,2 +1,2 @@ -MD5 (cyrus-imapd-2.2.3.tar.gz) = 32888c5120edeb2867d6283fedbdb7d5 -SIZE (cyrus-imapd-2.2.3.tar.gz) = 1887717 +MD5 (cyrus-imapd-2.2.4.tar.gz) = 50831a41ba0121754431e8507887d511 +SIZE (cyrus-imapd-2.2.4.tar.gz) = 1927519 Property changes on: head/mail/cyrus-imapd23/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.27 \ No newline at end of property +1.28 \ No newline at end of property Index: head/mail/cyrus-imapd23/files/patch-Makefile.in =================================================================== --- head/mail/cyrus-imapd23/files/patch-Makefile.in (revision 109457) +++ head/mail/cyrus-imapd23/files/patch-Makefile.in (revision 109458) @@ -1,25 +1,25 @@ Index: Makefile.in diff -u Makefile.in.orig Makefile.in ---- Makefile.in.orig Tue Jan 13 06:02:09 2004 -+++ Makefile.in Sat Apr 3 00:04:36 2004 -@@ -90,13 +90,13 @@ +--- Makefile.in.orig Sat May 15 05:59:10 2004 ++++ Makefile.in Wed May 19 00:23:11 2004 +@@ -97,13 +97,13 @@ touch distcvs install:: - $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin - $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib - $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8 + $(INSTALL) -d ${DESTDIR}$(exec_prefix)/bin + $(INSTALL) -d ${DESTDIR}$(exec_prefix)/lib + $(INSTALL) -d ${DESTDIR}$(prefix)/include/cyrus -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man1 -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man3 -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man5 ++ $(INSTALL) -d ${DESTDIR}$(mandir)/man1 ++ $(INSTALL) -d ${DESTDIR}$(mandir)/man3 ++ $(INSTALL) -d ${DESTDIR}$(mandir)/man5 + $(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8 @for d in $(SUBDIRS); \ do \ (cd $$d; echo "### Making" install "in" `pwd`; \ Property changes on: head/mail/cyrus-imapd23/files/patch-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/mail/cyrus-imapd23/files/patch-aa =================================================================== --- head/mail/cyrus-imapd23/files/patch-aa (revision 109457) +++ head/mail/cyrus-imapd23/files/patch-aa (revision 109458) @@ -1,13 +1,21 @@ Index: man/Makefile.in diff -u man/Makefile.in.orig man/Makefile.in ---- man/Makefile.in.orig Sat Nov 8 06:33:54 2003 -+++ man/Makefile.in Fri Apr 2 23:50:30 2004 -@@ -102,7 +102,7 @@ +--- man/Makefile.in.orig Wed Mar 31 00:18:41 2004 ++++ man/Makefile.in Wed May 19 01:52:50 2004 +@@ -50,6 +50,7 @@ + SHELL = /bin/sh + + prefix = @prefix@ ++cyrus_prefix = @cyrus_prefix@ + + mandir = @mandir@ + +@@ -93,7 +94,7 @@ done for file in $(MAN8); \ do \ -- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \ +- $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \ + $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \ done - .c.o: + clean: Property changes on: head/mail/cyrus-imapd23/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/mail/cyrus-imapd23/files/patch-ac =================================================================== --- head/mail/cyrus-imapd23/files/patch-ac (revision 109457) +++ head/mail/cyrus-imapd23/files/patch-ac (revision 109458) @@ -1,62 +1,62 @@ Index: configure diff -u configure.orig configure ---- configure.orig Thu Jan 15 23:36:50 2004 -+++ configure Sun Mar 7 23:46:32 2004 +--- configure.orig Mon May 17 06:05:03 2004 ++++ configure Wed May 19 00:29:21 2004 @@ -308,7 +308,7 @@ # include #endif" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS' ac_subst_files='' # Initialize some variables set by options. -@@ -6565,7 +6565,7 @@ +@@ -6551,7 +6551,7 @@ BDB_LIBADD="" fi - 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 -@@ -6589,11 +6589,11 @@ +@@ -6575,11 +6575,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char db_create (); +#include int main () { -db_create (); +db_create (0, 0, 0); ; return 0; } -@@ -13187,6 +13187,8 @@ +@@ -13183,6 +13183,8 @@ EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" + eval `${PERL} -V:cccdlflags` + PERL_CCCDLFLAGS="$cccdlflags" fi if test "$sievedir" != "no"; then -@@ -13854,7 +13856,7 @@ +@@ -13850,7 +13852,7 @@ #define HAVE_UCDSNMP 1 _ACEOF - LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" + LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5 echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6 if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then -@@ -14660,6 +14662,7 @@ +@@ -14657,6 +14659,7 @@ s,@LIB_SASL@,$LIB_SASL,;t t s,@SASLFLAGS@,$SASLFLAGS,;t t s,@PERL@,$PERL,;t t +s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t s,@MD5OBJ@,$MD5OBJ,;t t s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t s,@LIB_WRAP@,$LIB_WRAP,;t t Property changes on: head/mail/cyrus-imapd23/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ 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 109457) +++ head/mail/cyrus-imapd23/files/patch-lib::Makefile.in (revision 109458) @@ -1,22 +1,22 @@ Index: lib/Makefile.in diff -u lib/Makefile.in.orig lib/Makefile.in ---- lib/Makefile.in.orig Sun Jan 4 00:16:44 2004 -+++ lib/Makefile.in Thu Mar 11 01:35:47 2004 +--- lib/Makefile.in.orig Thu Mar 11 06:25:39 2004 ++++ lib/Makefile.in Wed May 19 00:34:19 2004 @@ -60,7 +60,7 @@ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@ LIBS = @LIBS@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ LDFLAGS = @LDFLAGS@ SHELL = /bin/sh -@@ -100,7 +100,7 @@ +@@ -102,7 +102,7 @@ all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a install: -- $(srcdir)/../install-sh -d $(DESTDIR)$(exec_prefix)/lib -+ $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(exec_prefix)/lib - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(exec_prefix)/lib - $(RANLIB) $(DESTDIR)$(exec_prefix)/lib/libcyrus.a +- $(srcdir)/../install-sh -d $(DESTDIR)$(libdir) ++ $(INSTALL) -d $(DESTDIR)$(libdir) + $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir) + $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir) + $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a Property changes on: head/mail/cyrus-imapd23/files/patch-lib::Makefile.in ___________________________________________________________________ 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-sieve::Makefile.in =================================================================== --- head/mail/cyrus-imapd23/files/patch-sieve::Makefile.in (revision 109457) +++ head/mail/cyrus-imapd23/files/patch-sieve::Makefile.in (revision 109458) @@ -1,30 +1,30 @@ Index: sieve/Makefile.in diff -u sieve/Makefile.in.orig sieve/Makefile.in ---- sieve/Makefile.in.orig Wed Nov 12 13:02:12 2003 -+++ sieve/Makefile.in Thu Mar 11 01:22:05 2004 +--- sieve/Makefile.in.orig Fri Mar 12 00:25:35 2004 ++++ sieve/Makefile.in Wed May 19 00:38:00 2004 @@ -33,12 +33,13 @@ YACC = @YACC@ YFLAGS = -d LEX = @LEX@ +INSTALL = @INSTALL@ RANLIB = @RANLIB@ COMPILE_ET = @COMPILE_ET@ DEFS = @DEFS@ - CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ LDFLAGS = @LDFLAGS@ MAKEDEPEND = @MAKEDEPEND@ @@ -58,8 +59,8 @@ dist: $(BUILT_SOURCES) install: sievec - $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -- $(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit +- $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit + $(INSTALL) -d ${DESTDIR}$(service_path) -+ $(INSTALL) -s -m 755 sievec $(DESTDIR)$(service_path) || exit ++ $(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit test: $(DEPLIBS) libsieve.a test.o $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS) Property changes on: head/mail/cyrus-imapd23/files/patch-sieve::Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/mail/cyrus-imapd24/Makefile =================================================================== --- head/mail/cyrus-imapd24/Makefile (revision 109457) +++ head/mail/cyrus-imapd24/Makefile (revision 109458) @@ -1,252 +1,241 @@ # New ports collection makefile for: cyrus-imapd # Date created: Jan 4th 2001 # Whom: ume@FreeBSD.org # # $FreeBSD$ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.3 -PORTREVISION= 3 +PORTVERSION= 2.2.4 +#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/&,} 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 LATEST_LINK= ${PORTNAME}22 USE_RC_SUBR= YES - USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-cyrus-prefix=${PREFIX}/cyrus \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ --with-bdb-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} == 3 LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db3 --with-bdb=db3 .elif ${USE_BDB_VER} == 4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db4 --with-bdb=db4 .elif ${USE_BDB_VER} == 41 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db41 --with-bdb=db41 .elif ${USE_BDB_VER} == 42 LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2 .else BROKEN= "WITH_BDB_VER must be 3, 4, 41 or 42" .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-aclocal.m4 \ ${FILESDIR}/extra-patch-configure.in USE_AUTOHEADER= YES USE_AUTOCONF_VER=257 CONFIGURE_ARGS+=--with-drac=${LOCALBASE} BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif .include .if defined(WITH_SNMP) LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 CONFIGURE_ARGS+=--with-ucdsnmp=${LOCALBASE} .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 CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \ Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3 CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \ cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.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 quota.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 PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGINSTALL= ${WRKDIR}/pkg-install .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 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 .if ${PERL_LEVEL} < 500600 @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \ ${WRKSRC}/perl/sieve/scripts/sieveshell.pl .endif -.if !defined(NOPORTDOCS) -post-build: - @/usr/bin/groff -man -Thtml ${WRKSRC}/man/imapd.conf.5 \ - > ${WRKSRC}/doc/man/imapd.conf.5.html -.endif - post-install: -.for file in ${CYRUS_MAN3} - @${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${file} - @${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${file}.gz \ +.for f in ${CYRUS_MAN3} + @${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f} + @${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \ >>${TMPPLIST} .endfor -.for file in ${CYRUS_MAN8} - @${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${file} - @${ECHO_CMD} cyrus/man/man8/${file}.gz >>${TMPPLIST} +.for f in ${CYRUS_MAN8} + @${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f} + @${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST} .endfor @${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST} @${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/man @${MKDIR} ${DOCSDIR}/text -.for file in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${file}.html >>${TMPPLIST} +.for f in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR} + @${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST} .endfor -.for file in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8} - @if [ -f ${WRKSRC}/doc/man/${file}.html ]; then \ - ${INSTALL_DATA} ${WRKSRC}/doc/man/${file}.html \ - ${DOCSDIR}/man/${file}.html; \ - ${ECHO_CMD} share/doc/${PORTNAME}/man/${file}.html \ +.for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8} + @if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \ + ${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \ + ${DOCSDIR}/man/${f}.html; \ + ${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \ >>${TMPPLIST}; \ fi .endfor -.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png - @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${file} >>${TMPPLIST} +.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png + @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} + @${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST} .endfor -.for file in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text - @${ECHO_CMD} share/doc/${PORTNAME}/text/${file} >>${TMPPLIST} +.for f in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text + @${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST} .endfor @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} .endif @${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.109 \ No newline at end of property +1.110 \ No newline at end of property Index: head/mail/cyrus-imapd24/distinfo =================================================================== --- head/mail/cyrus-imapd24/distinfo (revision 109457) +++ head/mail/cyrus-imapd24/distinfo (revision 109458) @@ -1,2 +1,2 @@ -MD5 (cyrus-imapd-2.2.3.tar.gz) = 32888c5120edeb2867d6283fedbdb7d5 -SIZE (cyrus-imapd-2.2.3.tar.gz) = 1887717 +MD5 (cyrus-imapd-2.2.4.tar.gz) = 50831a41ba0121754431e8507887d511 +SIZE (cyrus-imapd-2.2.4.tar.gz) = 1927519 Property changes on: head/mail/cyrus-imapd24/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.27 \ No newline at end of property +1.28 \ No newline at end of property Index: head/mail/cyrus-imapd24/files/patch-Makefile.in =================================================================== --- head/mail/cyrus-imapd24/files/patch-Makefile.in (revision 109457) +++ head/mail/cyrus-imapd24/files/patch-Makefile.in (revision 109458) @@ -1,25 +1,25 @@ Index: Makefile.in diff -u Makefile.in.orig Makefile.in ---- Makefile.in.orig Tue Jan 13 06:02:09 2004 -+++ Makefile.in Sat Apr 3 00:04:36 2004 -@@ -90,13 +90,13 @@ +--- Makefile.in.orig Sat May 15 05:59:10 2004 ++++ Makefile.in Wed May 19 00:23:11 2004 +@@ -97,13 +97,13 @@ touch distcvs install:: - $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin - $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib - $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5 -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5 +- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8 + $(INSTALL) -d ${DESTDIR}$(exec_prefix)/bin + $(INSTALL) -d ${DESTDIR}$(exec_prefix)/lib + $(INSTALL) -d ${DESTDIR}$(prefix)/include/cyrus -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man1 -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man3 -+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man5 ++ $(INSTALL) -d ${DESTDIR}$(mandir)/man1 ++ $(INSTALL) -d ${DESTDIR}$(mandir)/man3 ++ $(INSTALL) -d ${DESTDIR}$(mandir)/man5 + $(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8 @for d in $(SUBDIRS); \ do \ (cd $$d; echo "### Making" install "in" `pwd`; \ Property changes on: head/mail/cyrus-imapd24/files/patch-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/mail/cyrus-imapd24/files/patch-aa =================================================================== --- head/mail/cyrus-imapd24/files/patch-aa (revision 109457) +++ head/mail/cyrus-imapd24/files/patch-aa (revision 109458) @@ -1,13 +1,21 @@ Index: man/Makefile.in diff -u man/Makefile.in.orig man/Makefile.in ---- man/Makefile.in.orig Sat Nov 8 06:33:54 2003 -+++ man/Makefile.in Fri Apr 2 23:50:30 2004 -@@ -102,7 +102,7 @@ +--- man/Makefile.in.orig Wed Mar 31 00:18:41 2004 ++++ man/Makefile.in Wed May 19 01:52:50 2004 +@@ -50,6 +50,7 @@ + SHELL = /bin/sh + + prefix = @prefix@ ++cyrus_prefix = @cyrus_prefix@ + + mandir = @mandir@ + +@@ -93,7 +94,7 @@ done for file in $(MAN8); \ do \ -- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \ +- $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \ + $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \ done - .c.o: + clean: Property changes on: head/mail/cyrus-imapd24/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/mail/cyrus-imapd24/files/patch-ac =================================================================== --- head/mail/cyrus-imapd24/files/patch-ac (revision 109457) +++ head/mail/cyrus-imapd24/files/patch-ac (revision 109458) @@ -1,62 +1,62 @@ Index: configure diff -u configure.orig configure ---- configure.orig Thu Jan 15 23:36:50 2004 -+++ configure Sun Mar 7 23:46:32 2004 +--- configure.orig Mon May 17 06:05:03 2004 ++++ configure Wed May 19 00:29:21 2004 @@ -308,7 +308,7 @@ # include #endif" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS' ac_subst_files='' # Initialize some variables set by options. -@@ -6565,7 +6565,7 @@ +@@ -6551,7 +6551,7 @@ BDB_LIBADD="" fi - 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 -@@ -6589,11 +6589,11 @@ +@@ -6575,11 +6575,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char db_create (); +#include int main () { -db_create (); +db_create (0, 0, 0); ; return 0; } -@@ -13187,6 +13187,8 @@ +@@ -13183,6 +13183,8 @@ EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" + eval `${PERL} -V:cccdlflags` + PERL_CCCDLFLAGS="$cccdlflags" fi if test "$sievedir" != "no"; then -@@ -13854,7 +13856,7 @@ +@@ -13850,7 +13852,7 @@ #define HAVE_UCDSNMP 1 _ACEOF - LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" + LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5 echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6 if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then -@@ -14660,6 +14662,7 @@ +@@ -14657,6 +14659,7 @@ s,@LIB_SASL@,$LIB_SASL,;t t s,@SASLFLAGS@,$SASLFLAGS,;t t s,@PERL@,$PERL,;t t +s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t s,@MD5OBJ@,$MD5OBJ,;t t s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t s,@LIB_WRAP@,$LIB_WRAP,;t t Property changes on: head/mail/cyrus-imapd24/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ 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 109457) +++ head/mail/cyrus-imapd24/files/patch-lib::Makefile.in (revision 109458) @@ -1,22 +1,22 @@ Index: lib/Makefile.in diff -u lib/Makefile.in.orig lib/Makefile.in ---- lib/Makefile.in.orig Sun Jan 4 00:16:44 2004 -+++ lib/Makefile.in Thu Mar 11 01:35:47 2004 +--- lib/Makefile.in.orig Thu Mar 11 06:25:39 2004 ++++ lib/Makefile.in Wed May 19 00:34:19 2004 @@ -60,7 +60,7 @@ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@ LIBS = @LIBS@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ LDFLAGS = @LDFLAGS@ SHELL = /bin/sh -@@ -100,7 +100,7 @@ +@@ -102,7 +102,7 @@ all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a install: -- $(srcdir)/../install-sh -d $(DESTDIR)$(exec_prefix)/lib -+ $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(exec_prefix)/lib - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(exec_prefix)/lib - $(RANLIB) $(DESTDIR)$(exec_prefix)/lib/libcyrus.a +- $(srcdir)/../install-sh -d $(DESTDIR)$(libdir) ++ $(INSTALL) -d $(DESTDIR)$(libdir) + $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir) + $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir) + $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a Property changes on: head/mail/cyrus-imapd24/files/patch-lib::Makefile.in ___________________________________________________________________ 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-sieve::Makefile.in =================================================================== --- head/mail/cyrus-imapd24/files/patch-sieve::Makefile.in (revision 109457) +++ head/mail/cyrus-imapd24/files/patch-sieve::Makefile.in (revision 109458) @@ -1,30 +1,30 @@ Index: sieve/Makefile.in diff -u sieve/Makefile.in.orig sieve/Makefile.in ---- sieve/Makefile.in.orig Wed Nov 12 13:02:12 2003 -+++ sieve/Makefile.in Thu Mar 11 01:22:05 2004 +--- sieve/Makefile.in.orig Fri Mar 12 00:25:35 2004 ++++ sieve/Makefile.in Wed May 19 00:38:00 2004 @@ -33,12 +33,13 @@ YACC = @YACC@ YFLAGS = -d LEX = @LEX@ +INSTALL = @INSTALL@ RANLIB = @RANLIB@ COMPILE_ET = @COMPILE_ET@ DEFS = @DEFS@ - CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ + CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ LDFLAGS = @LDFLAGS@ MAKEDEPEND = @MAKEDEPEND@ @@ -58,8 +59,8 @@ dist: $(BUILT_SOURCES) install: sievec - $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -- $(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit +- $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit + $(INSTALL) -d ${DESTDIR}$(service_path) -+ $(INSTALL) -s -m 755 sievec $(DESTDIR)$(service_path) || exit ++ $(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit test: $(DEPLIBS) libsieve.a test.o $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS) Property changes on: head/mail/cyrus-imapd24/files/patch-sieve::Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property