Index: head/mail/courier-imap/Makefile =================================================================== --- head/mail/courier-imap/Makefile (revision 451317) +++ head/mail/courier-imap/Makefile (revision 451318) @@ -1,125 +1,127 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= courier-imap -PORTVERSION= 4.18.1 +PORTVERSION= 4.18.2 PORTEPOCH= 2 CATEGORIES= mail ipv6 MASTER_SITES= SF/courier/imap/${PORTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= IMAP (and POP3) server that provides access to Maildir mailboxes BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base RUN_DEPENDS= courierauthconfig:security/courier-authlib-base \ ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool LIB_DEPENDS= libcourier-unicode.so:devel/courier-unicode + +CONFLICTS= courier-[0-9]* imap-uw-[0-9]* panda-imap-[0-9]* USES= gmake localbase:ldflags perl5 ssl tar:bzip2 GNU_CONFIGURE= yes USE_RC_SUBR= courier-imap-imapd courier-imap-imapd-ssl \ courier-imap-pop3d courier-imap-pop3d-ssl CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash MAKE_ENV:= ${CONFIGURE_ENV} ALL_TARGET= all makeimapaccess makedat SUB_FILES= pkg-message SUB_LIST= CONFDIR=${CONFDIR} # # options available: # # WITH_SYSLOG_FACILITY: The syslogfacility to use # OPTIONS_DEFINE= FAM TRASHQUOTA GDBM IPV6 GNUTLS FAM_DESC= Fam support for IDLE command TRASHQUOTA_DESC= Include deleted mails in the quota GNUTLS_DESC= Use GnuTLS instead of OpenSSL (Enables SNI) FAM_USES= fam .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" .endif CONFDIR?= ${PREFIX}/etc/${PORTNAME} USERDB?= ${PREFIX}/etc/userdb LIBEXECDIR?= ${PREFIX}/libexec/${PORTNAME} PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --localstatedir="${PREFIX}/var" \ --datadir=${DATADIR} \ --libexecdir=${LIBEXECDIR} \ --enable-workarounds-for-imap-client-bugs \ --enable-unicode \ --disable-root-check \ --with-locking-method=fcntl \ COURIERAUTHCONFIG=${PREFIX}/bin/courierauthconfig GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_USES= pkgconfig IPV6_CONFIGURE_OFF= --without-ipv6 TRASHQUOTA_CONFIGURE_ON=--with-trashquota .include .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif .if ${PORT_OPTIONS:MSYSLOG_FACILITY} CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY} .endif .if ${PORT_OPTIONS:MAUTH_USERDB} .if ${PORT_OPTIONS:MGDBM} CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB} LIB_DEPENDS+= libgdbm.so:databases/gdbm .else CONFIGURE_ARGS+=--with-db=db --with-userdb=${USERDB} .endif .endif EXTRA_DOCS= AUTHORS INSTALL NEWS \ libs/imap/ChangeLog \ libs/imap/README \ libs/imap/README.proxy \ libs/maildir/README.imapkeywords.html \ libs/maildir/README.maildirfilter.html \ libs/maildir/README.maildirquota.txt \ libs/maildir/README.sharedfolders.txt \ libs/tcpd/README.couriertls \ post-patch-FAM-off: @${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \ ${WRKSRC}/libs/maildir/configure post-patch: @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/libs/liblock/configure @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|TLS_PROTOCOL=SSL3|TLS_PROTOCOL=SSL23|g' \ ${WRKSRC}/libs/imap/pop3d-ssl.dist.in \ ${WRKSRC}/libs/imap/imapd-ssl.dist.in post-install: ${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/ .for i in imapd pop3d ${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} .for a in ${EXTRA_DOCS} ${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/mail/courier-imap/distinfo =================================================================== --- head/mail/courier-imap/distinfo (revision 451317) +++ head/mail/courier-imap/distinfo (revision 451318) @@ -1,3 +1,3 @@ -TIMESTAMP = 1503327728 -SHA256 (courier-imap-4.18.1.tar.bz2) = 371b95b29cf6aae3c5967cb92a52c018059950ffb46b540d187b29d57f2f9a0b -SIZE (courier-imap-4.18.1.tar.bz2) = 3203392 +TIMESTAMP = 1507193939 +SHA256 (courier-imap-4.18.2.tar.bz2) = f66ceda3e5aa853e13f417302dfb83b312709e95f1bbcdafcd6214d76a94e79a +SIZE (courier-imap-4.18.2.tar.bz2) = 3205230 Index: head/mail/courier-imap/pkg-plist =================================================================== --- head/mail/courier-imap/pkg-plist (revision 451317) +++ head/mail/courier-imap/pkg-plist (revision 451318) @@ -1,67 +1,67 @@ bin/couriertls bin/deliverquota bin/imapd bin/maildiracl bin/maildirkw bin/maildirmake bin/makedat bin/makeimapaccess bin/pop3d -@unexec if cmp -s %D/%%CONFDIR%%/imapd-ssl.dist %D/%%CONFDIR%%/imapd-ssl; then rm -f %D/%%CONFDIR%%/imapd-ssl; fi +@preunexec if cmp -s %D/%%CONFDIR%%/imapd-ssl.dist %D/%%CONFDIR%%/imapd-ssl; then rm -f %D/%%CONFDIR%%/imapd-ssl; fi %%CONFDIR%%/imapd-ssl.dist -@exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd-ssl.dist -@unexec if cmp -s %D/%%CONFDIR%%/imapd.cnf.dist %D/%%CONFDIR%%/imapd.cnf; then rm -f %D/%%CONFDIR%%/imapd.cnf; fi +@postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd-ssl.dist +@preunexec if cmp -s %D/%%CONFDIR%%/imapd.cnf.dist %D/%%CONFDIR%%/imapd.cnf; then rm -f %D/%%CONFDIR%%/imapd.cnf; fi %%CONFDIR%%/imapd.cnf.dist -@unexec if cmp -s %D/%%CONFDIR%%/imapd.dist %D/%%CONFDIR%%/imapd; then rm -f %D/%%CONFDIR%%/imapd; fi +@preunexec if cmp -s %D/%%CONFDIR%%/imapd.dist %D/%%CONFDIR%%/imapd; then rm -f %D/%%CONFDIR%%/imapd; fi %%CONFDIR%%/imapd.dist -@exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd.dist -@unexec if cmp -s %D/%%CONFDIR%%/pop3d-ssl.dist %D/%%CONFDIR%%/pop3d-ssl; then rm -f %D/%%CONFDIR%%/pop3d-ssl; fi +@postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd.dist +@preunexec if cmp -s %D/%%CONFDIR%%/pop3d-ssl.dist %D/%%CONFDIR%%/pop3d-ssl; then rm -f %D/%%CONFDIR%%/pop3d-ssl; fi %%CONFDIR%%/pop3d-ssl.dist -@exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d-ssl.dist -@unexec if cmp -s %D/%%CONFDIR%%/pop3d.cnf.dist %D/%%CONFDIR%%/pop3d.cnf; then rm -f %D/%%CONFDIR%%/pop3d.cnf; fi +@postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d-ssl.dist +@preunexec if cmp -s %D/%%CONFDIR%%/pop3d.cnf.dist %D/%%CONFDIR%%/pop3d.cnf; then rm -f %D/%%CONFDIR%%/pop3d.cnf; fi %%CONFDIR%%/pop3d.cnf.dist -@unexec if cmp -s %D/%%CONFDIR%%/pop3d.dist %D/%%CONFDIR%%/pop3d; then rm -f %D/%%CONFDIR%%/pop3d; fi +@preunexec if cmp -s %D/%%CONFDIR%%/pop3d.dist %D/%%CONFDIR%%/pop3d; then rm -f %D/%%CONFDIR%%/pop3d; fi %%CONFDIR%%/pop3d.dist -@exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d.dist +@postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d.dist %%CONFDIR%%/quotawarnmsg.example %%LIBEXECDIR%%/couriertcpd %%LIBEXECDIR%%/imapd-ssl.rc %%LIBEXECDIR%%/imapd.rc %%LIBEXECDIR%%/makedatprog %%LIBEXECDIR%%/pop3d-ssl.rc %%LIBEXECDIR%%/pop3d.rc man/man1/couriertcpd.1.gz man/man1/maildiracl.1.gz man/man1/maildirkw.1.gz man/man1/maildirmake.1.gz man/man8/deliverquota.8.gz man/man8/imapd.8.gz man/man8/mkdhparams.8.gz man/man8/mkimapdcert.8.gz man/man8/makeimapaccess.8.gz man/man8/mkpop3dcert.8.gz sbin/imaplogin sbin/mkdhparams sbin/mkimapdcert sbin/mkpop3dcert sbin/pop3login sbin/sharedindexinstall sbin/sharedindexsplit share/courier-imap/mkdhparams share/courier-imap/mkimapdcert share/courier-imap/mkpop3dcert %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.proxy %%PORTDOCS%%%%DOCSDIR%%/README.imapkeywords.html %%PORTDOCS%%%%DOCSDIR%%/README.maildirfilter.html %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt %%PORTDOCS%%%%DOCSDIR%%/README.couriertls @dir %%ETCDIR%%/imapaccess @dir var @dir %%CONFDIR%%/shared @dir %%CONFDIR%%/shared.tmp