diff options
Diffstat (limited to 'mail')
21 files changed, 207 insertions, 216 deletions
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index 2d8cbe701c81..eb74f49291ee 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -6,8 +6,8 @@ # 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/ \ @@ -24,7 +24,6 @@ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend LATEST_LINK= ${PORTNAME}22 USE_RC_SUBR= YES - USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= YES @@ -95,10 +94,6 @@ PLIST_SUB+= IDLED="@comment " CONFIGURE_ARGS+=--enable-listext .endif -.if defined(WITH_ANNOTATEMORE) -CONFIGURE_ARGS+=--enable-annotatemore -.endif - .if defined(WITH_NETSCAPEHACK) CONFIGURE_ARGS+=--enable-netscapehack .endif @@ -188,21 +183,15 @@ post-patch: ${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} @@ -210,25 +199,25 @@ post-install: .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} diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo index 86eb071f95b8..048b880c422e 100644 --- a/mail/cyrus-imapd22/distinfo +++ b/mail/cyrus-imapd22/distinfo @@ -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 diff --git a/mail/cyrus-imapd22/files/patch-Makefile.in b/mail/cyrus-imapd22/files/patch-Makefile.in index 318dfe1d4710..71800e59efb8 100644 --- a/mail/cyrus-imapd22/files/patch-Makefile.in +++ b/mail/cyrus-imapd22/files/patch-Makefile.in @@ -1,24 +1,24 @@ 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 \ diff --git a/mail/cyrus-imapd22/files/patch-aa b/mail/cyrus-imapd22/files/patch-aa index 7a285d51115f..1438b30aa60f 100644 --- a/mail/cyrus-imapd22/files/patch-aa +++ b/mail/cyrus-imapd22/files/patch-aa @@ -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: diff --git a/mail/cyrus-imapd22/files/patch-ac b/mail/cyrus-imapd22/files/patch-ac index a557cd828ee1..687e54705452 100644 --- a/mail/cyrus-imapd22/files/patch-ac +++ b/mail/cyrus-imapd22/files/patch-ac @@ -1,17 +1,17 @@ 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 <unistd.h> #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 @@ -20,7 +20,7 @@ diff -u configure.orig configure 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. */ @@ -34,7 +34,7 @@ diff -u configure.orig configure ; return 0; } -@@ -13187,6 +13187,8 @@ +@@ -13183,6 +13183,8 @@ EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" @@ -43,7 +43,7 @@ diff -u configure.orig configure fi if test "$sievedir" != "no"; then -@@ -13854,7 +13856,7 @@ +@@ -13850,7 +13852,7 @@ #define HAVE_UCDSNMP 1 _ACEOF @@ -52,7 +52,7 @@ diff -u configure.orig configure 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 diff --git a/mail/cyrus-imapd22/files/patch-lib::Makefile.in b/mail/cyrus-imapd22/files/patch-lib::Makefile.in index 4a6c7f6db522..836c91cd3419 100644 --- a/mail/cyrus-imapd22/files/patch-lib::Makefile.in +++ b/mail/cyrus-imapd22/files/patch-lib::Makefile.in @@ -1,7 +1,7 @@ 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@ @@ -11,12 +11,12 @@ diff -u lib/Makefile.in.orig lib/Makefile.in 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 diff --git a/mail/cyrus-imapd22/files/patch-sieve::Makefile.in b/mail/cyrus-imapd22/files/patch-sieve::Makefile.in index 3af248bab22b..24e700fa8645 100644 --- a/mail/cyrus-imapd22/files/patch-sieve::Makefile.in +++ b/mail/cyrus-imapd22/files/patch-sieve::Makefile.in @@ -1,7 +1,7 @@ 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 @@ -11,7 +11,7 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in 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@ @@ -22,9 +22,9 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in 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) diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index 2d8cbe701c81..eb74f49291ee 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -6,8 +6,8 @@ # 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/ \ @@ -24,7 +24,6 @@ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend LATEST_LINK= ${PORTNAME}22 USE_RC_SUBR= YES - USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= YES @@ -95,10 +94,6 @@ PLIST_SUB+= IDLED="@comment " CONFIGURE_ARGS+=--enable-listext .endif -.if defined(WITH_ANNOTATEMORE) -CONFIGURE_ARGS+=--enable-annotatemore -.endif - .if defined(WITH_NETSCAPEHACK) CONFIGURE_ARGS+=--enable-netscapehack .endif @@ -188,21 +183,15 @@ post-patch: ${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} @@ -210,25 +199,25 @@ post-install: .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} diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo index 86eb071f95b8..048b880c422e 100644 --- a/mail/cyrus-imapd23/distinfo +++ b/mail/cyrus-imapd23/distinfo @@ -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 diff --git a/mail/cyrus-imapd23/files/patch-Makefile.in b/mail/cyrus-imapd23/files/patch-Makefile.in index 318dfe1d4710..71800e59efb8 100644 --- a/mail/cyrus-imapd23/files/patch-Makefile.in +++ b/mail/cyrus-imapd23/files/patch-Makefile.in @@ -1,24 +1,24 @@ 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 \ diff --git a/mail/cyrus-imapd23/files/patch-aa b/mail/cyrus-imapd23/files/patch-aa index 7a285d51115f..1438b30aa60f 100644 --- a/mail/cyrus-imapd23/files/patch-aa +++ b/mail/cyrus-imapd23/files/patch-aa @@ -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: diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac index a557cd828ee1..687e54705452 100644 --- a/mail/cyrus-imapd23/files/patch-ac +++ b/mail/cyrus-imapd23/files/patch-ac @@ -1,17 +1,17 @@ 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 <unistd.h> #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 @@ -20,7 +20,7 @@ diff -u configure.orig configure 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. */ @@ -34,7 +34,7 @@ diff -u configure.orig configure ; return 0; } -@@ -13187,6 +13187,8 @@ +@@ -13183,6 +13183,8 @@ EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" @@ -43,7 +43,7 @@ diff -u configure.orig configure fi if test "$sievedir" != "no"; then -@@ -13854,7 +13856,7 @@ +@@ -13850,7 +13852,7 @@ #define HAVE_UCDSNMP 1 _ACEOF @@ -52,7 +52,7 @@ diff -u configure.orig configure 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 diff --git a/mail/cyrus-imapd23/files/patch-lib::Makefile.in b/mail/cyrus-imapd23/files/patch-lib::Makefile.in index 4a6c7f6db522..836c91cd3419 100644 --- a/mail/cyrus-imapd23/files/patch-lib::Makefile.in +++ b/mail/cyrus-imapd23/files/patch-lib::Makefile.in @@ -1,7 +1,7 @@ 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@ @@ -11,12 +11,12 @@ diff -u lib/Makefile.in.orig lib/Makefile.in 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 diff --git a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in b/mail/cyrus-imapd23/files/patch-sieve::Makefile.in index 3af248bab22b..24e700fa8645 100644 --- a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in +++ b/mail/cyrus-imapd23/files/patch-sieve::Makefile.in @@ -1,7 +1,7 @@ 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 @@ -11,7 +11,7 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in 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@ @@ -22,9 +22,9 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in 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) diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 2d8cbe701c81..eb74f49291ee 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -6,8 +6,8 @@ # 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/ \ @@ -24,7 +24,6 @@ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend LATEST_LINK= ${PORTNAME}22 USE_RC_SUBR= YES - USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= YES @@ -95,10 +94,6 @@ PLIST_SUB+= IDLED="@comment " CONFIGURE_ARGS+=--enable-listext .endif -.if defined(WITH_ANNOTATEMORE) -CONFIGURE_ARGS+=--enable-annotatemore -.endif - .if defined(WITH_NETSCAPEHACK) CONFIGURE_ARGS+=--enable-netscapehack .endif @@ -188,21 +183,15 @@ post-patch: ${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} @@ -210,25 +199,25 @@ post-install: .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} diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo index 86eb071f95b8..048b880c422e 100644 --- a/mail/cyrus-imapd24/distinfo +++ b/mail/cyrus-imapd24/distinfo @@ -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 diff --git a/mail/cyrus-imapd24/files/patch-Makefile.in b/mail/cyrus-imapd24/files/patch-Makefile.in index 318dfe1d4710..71800e59efb8 100644 --- a/mail/cyrus-imapd24/files/patch-Makefile.in +++ b/mail/cyrus-imapd24/files/patch-Makefile.in @@ -1,24 +1,24 @@ 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 \ diff --git a/mail/cyrus-imapd24/files/patch-aa b/mail/cyrus-imapd24/files/patch-aa index 7a285d51115f..1438b30aa60f 100644 --- a/mail/cyrus-imapd24/files/patch-aa +++ b/mail/cyrus-imapd24/files/patch-aa @@ -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: diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac index a557cd828ee1..687e54705452 100644 --- a/mail/cyrus-imapd24/files/patch-ac +++ b/mail/cyrus-imapd24/files/patch-ac @@ -1,17 +1,17 @@ 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 <unistd.h> #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 @@ -20,7 +20,7 @@ diff -u configure.orig configure 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. */ @@ -34,7 +34,7 @@ diff -u configure.orig configure ; return 0; } -@@ -13187,6 +13187,8 @@ +@@ -13183,6 +13183,8 @@ EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" @@ -43,7 +43,7 @@ diff -u configure.orig configure fi if test "$sievedir" != "no"; then -@@ -13854,7 +13856,7 @@ +@@ -13850,7 +13852,7 @@ #define HAVE_UCDSNMP 1 _ACEOF @@ -52,7 +52,7 @@ diff -u configure.orig configure 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 diff --git a/mail/cyrus-imapd24/files/patch-lib::Makefile.in b/mail/cyrus-imapd24/files/patch-lib::Makefile.in index 4a6c7f6db522..836c91cd3419 100644 --- a/mail/cyrus-imapd24/files/patch-lib::Makefile.in +++ b/mail/cyrus-imapd24/files/patch-lib::Makefile.in @@ -1,7 +1,7 @@ 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@ @@ -11,12 +11,12 @@ diff -u lib/Makefile.in.orig lib/Makefile.in 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 diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in index 3af248bab22b..24e700fa8645 100644 --- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in +++ b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in @@ -1,7 +1,7 @@ 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 @@ -11,7 +11,7 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in 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@ @@ -22,9 +22,9 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in 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) |