diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index cc5f36e58c644..55f006b688d09 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2018/04/23 07:28:18 adam Exp $
+# $NetBSD: Makefile,v 1.39 2019/09/06 13:21:35 adam Exp $
-DISTNAME= exim-html-4.91
+DISTNAME= exim-html-4.92.2
CATEGORIES= mail net
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/
MASTER_SITES+= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/
@@ -16,6 +16,7 @@ INSTALLATION_DIRS= share/doc/exim/html
USE_TOOLS+= pax
do-install:
- cd ${WRKSRC}/doc && pax -rw html ${DESTDIR}${PREFIX}/share/doc/exim
+ cd ${WRKSRC}/${DISTNAME}/doc && \
+ ${PAX} -rw html ${DESTDIR}${PREFIX}/share/doc/exim
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim-html/PLIST b/mail/exim-html/PLIST
index d557f72ef1ba5..0e3886fada1d2 100644
--- a/mail/exim-html/PLIST
+++ b/mail/exim-html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2018/04/23 07:28:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2019/09/06 13:21:35 adam Exp $
share/doc/exim/html/spec_html/ch-access_control_lists.html
share/doc/exim/html/spec_html/ch-adding_a_local_scan_function_to_exim.html
share/doc/exim/html/spec_html/ch-adding_new_drivers_or_lookup_types.html
@@ -47,7 +47,7 @@ share/doc/exim/html/spec_html/ch-the_dnslookup_router.html
share/doc/exim/html/spec_html/ch-the_dovecot_authenticator.html
share/doc/exim/html/spec_html/ch-the_exim_command_line.html
share/doc/exim/html/spec_html/ch-the_exim_monitor.html
-share/doc/exim/html/spec_html/ch-the_exim_run_time_configuration_file.html
+share/doc/exim/html/spec_html/ch-the_exim_runtime_configuration_file.html
share/doc/exim/html/spec_html/ch-the_gsasl_authenticator.html
share/doc/exim/html/spec_html/ch-the_heimdalgssapi_authenticator.html
share/doc/exim/html/spec_html/ch-the_ipliteral_router.html
@@ -148,4 +148,9 @@ share/doc/exim/html/static/doc/index.css
share/doc/exim/html/static/doc/index.js
share/doc/exim/html/static/doc/minus-12x12.png
share/doc/exim/html/static/doc/plus-12x12.png
+share/doc/exim/html/static/doc/security/CVE-2016-1531.txt
+share/doc/exim/html/static/doc/security/CVE-2016-9963.txt
+share/doc/exim/html/static/doc/security/CVE-2018-6789.txt
+share/doc/exim/html/static/doc/security/CVE-2019-10149.txt
+share/doc/exim/html/static/doc/security/CVE-2019-13917.txt
share/doc/exim/html/static/js/common.js
diff --git a/mail/exim-html/distinfo b/mail/exim-html/distinfo
index ebf40ef02c344..af5a1af0d41e8 100644
--- a/mail/exim-html/distinfo
+++ b/mail/exim-html/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.30 2018/04/23 07:28:18 adam Exp $
+$NetBSD: distinfo,v 1.32 2019/09/06 13:21:35 adam Exp $
-SHA1 (exim-html-4.91.tar.xz) = 26b8fd410ba651f6f7274d08cd7c4122ff539971
-RMD160 (exim-html-4.91.tar.xz) = 7d5831b3b4a6044123ea60bc4dd8de61005428c8
-SHA512 (exim-html-4.91.tar.xz) = c91a7b2194b817d78cd1184b0b2d64015780085d481cf6d0a63785e94ed50c4d0f78d9356772ea2e37ce6728a81b0afcef8c978f7141d7f7dafd13afe89e6f24
-Size (exim-html-4.91.tar.xz) = 487980 bytes
+SHA1 (exim-html-4.92.2.tar.xz) = 2c65ab88c6e7980cb4b7ccc2a9bbcd3bf4dbfb77
+RMD160 (exim-html-4.92.2.tar.xz) = 6308c92705576e6466217a5902fae93c6c03aee1
+SHA512 (exim-html-4.92.2.tar.xz) = af1f698e042cb87cac21bdb58db4b7ce5aaee1104dc25454a5f640f874c7c7b82c4bf22a4750e90039b3ca601ac71a559bf625c728bd22bf6a7f086d1bb160ba
+Size (exim-html-4.92.2.tar.xz) = 494044 bytes
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 84e3aa0725207..ae67e7b280de8 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.164 2018/12/09 18:52:35 adam Exp $
+# $NetBSD: Makefile,v 1.170 2019/09/06 12:57:33 wiedi Exp $
-DISTNAME= exim-4.91
-PKGREVISION= 3
+DISTNAME= exim-4.92.2
CATEGORIES= mail net
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/
MASTER_SITES+= https://ftp.exim.org/pub/exim/exim4/
@@ -104,7 +103,7 @@ pre-configure:
.if !empty(EXIM_MAX_INCLUDE_SIZE)
${ECHO} MAX_INCLUDE_SIZE=${EXIM_MAX_INCLUDE_SIZE} >> ${WRKSRC}/Local/Makefile
.endif
- sed -e 's:@PREFIX@:${PREFIX}:' \
+ sed -e 's:@PREFIX@:${PREFIX}:' \
-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
< ${WRKSRC}/Local/eximon.conf.pkgsrc \
> ${WRKSRC}/Local/eximon.conf
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 7ffdca564f38b..8398094f1359b 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.69 2018/04/23 07:28:18 adam Exp $
+$NetBSD: distinfo,v 1.72 2019/09/06 12:57:33 wiedi Exp $
-SHA1 (exim-4.91.tar.xz) = 142f510b24f7ff5516a1a0adb5f4afded29f88c6
-RMD160 (exim-4.91.tar.xz) = a11c0a3db5197e4064c8898b4bd32b218661a635
-SHA512 (exim-4.91.tar.xz) = 35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2
-Size (exim-4.91.tar.xz) = 1744660 bytes
+SHA1 (exim-4.92.2.tar.xz) = e308f042a2a3da9774648c2c5fc7b74218bc7298
+RMD160 (exim-4.92.2.tar.xz) = e97e77f61edf88f2e2c3f779585b0ffbb0be18ee
+SHA512 (exim-4.92.2.tar.xz) = d27aca4d4e9df267b0afcbe7b3f74c9ca6e96e7e6eb4d2f86ff00b0e2234eaec90271405eb387a36a2e0d4ec5597b2920753f85318a5618ddbc8af475a7d81cd
+Size (exim-4.92.2.tar.xz) = 1772688 bytes
SHA1 (patch-Local_Makefile.pkgsrc) = de19076443c4d89a7ead97a0cabdec9bb784dd9f
SHA1 (patch-OS_Makefile-Default) = 6af17f036ed02a3bc37c1f303269eea447fcb691
SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
index 8ddd6c83cc1f5..3ad6817427cf5 100644
--- a/mail/exim/options.mk
+++ b/mail/exim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2016/06/11 00:37:24 wiedi Exp $
+# $NetBSD: options.mk,v 1.23 2019/06/07 12:20:32 tm Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.exim
PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
@@ -156,7 +156,7 @@ LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl}
.endif
.if !empty(PKG_OPTIONS:Mspf)
-LOCAL_MAKEFILE_OPTIONS+=EXPERIMENTAL_SPF=yes
+LOCAL_MAKEFILE_OPTIONS+=SUPPORT_SPF=yes
LOOKUP_LIBS+= -lspf2
. include "../../mail/libspf2/buildlink3.mk"
.endif